Commit a27cda0a60f578d7c7f519753a6ccf05110674d3
1 parent
119e390ad6
Exists in
master
and in
2 other branches
GUI V 1.2.01
- 고객사 요청 에러 체크 비트 수정
Showing
3 changed files
with
27 additions
and
26 deletions
Show diff stats
app/gui/oven_control/define.h
app/gui/oven_control/ovenstatics.cpp
| @@ -432,6 +432,7 @@ void OvenStatistics::oneSecTimerFired(void){ | @@ -432,6 +432,7 @@ void OvenStatistics::oneSecTimerFired(void){ | ||
| 432 | if(nStateErrValStableCnt>=DELAY_ERROR_TIME){ | 432 | if(nStateErrValStableCnt>=DELAY_ERROR_TIME){ |
| 433 | errstatetemp = state.controller_error; | 433 | errstatetemp = state.controller_error; |
| 434 | if(errstatetemp != 0 && errstatetemp != curControlErrorState){ | 434 | if(errstatetemp != 0 && errstatetemp != curControlErrorState){ |
| 435 | + qDebug() << "__func__" << "state error"; | ||
| 435 | processStateError((errstatetemp&state_err_mask[cookingstate][cfg->getConfigValue(Define::config_model).d32]),ltime); | 436 | processStateError((errstatetemp&state_err_mask[cookingstate][cfg->getConfigValue(Define::config_model).d32]),ltime); |
| 436 | } | 437 | } |
| 437 | curControlErrorState = errstatetemp; | 438 | curControlErrorState = errstatetemp; |
app/gui/oven_control/ovenstatics.h
| @@ -358,31 +358,31 @@ private: | @@ -358,31 +358,31 @@ private: | ||
| 358 | }; | 358 | }; |
| 359 | 359 | ||
| 360 | const uint32_t state_err_mask[3][MAX_MODEL_COUNT] = { | 360 | const uint32_t state_err_mask[3][MAX_MODEL_COUNT] = { |
| 361 | - {0x0000, //ele 10 | ||
| 362 | - 0x0000, //ele 20 | ||
| 363 | - 0x0000, //ele 24 | ||
| 364 | - 0x0000, //ele 40 | ||
| 365 | - 0x0000, //lpg 10 | ||
| 366 | - 0x0000, //lpg 20 | ||
| 367 | - 0x0000, //lpg 24 | ||
| 368 | - 0x0000, //lpg 40 | ||
| 369 | - 0x0000, //lng 10 | ||
| 370 | - 0x0000, //lng 20 | ||
| 371 | - 0x0000, //lng 24 | ||
| 372 | - 0x0000 //lng 40 | 361 | + {0x0018, //ele 10 |
| 362 | + 0x0018, //ele 20 | ||
| 363 | + 0x0018, //ele 24 | ||
| 364 | + 0x0018, //ele 40 | ||
| 365 | + 0x0018, //lpg 10 | ||
| 366 | + 0x0018, //lpg 20 | ||
| 367 | + 0x0018, //lpg 24 | ||
| 368 | + 0x0018, //lpg 40 | ||
| 369 | + 0x0018, //lng 10 | ||
| 370 | + 0x0018, //lng 20 | ||
| 371 | + 0x0018, //lng 24 | ||
| 372 | + 0x0018 //lng 40 | ||
| 373 | }, //end of noncooking state | 373 | }, //end of noncooking state |
| 374 | - {0x0000, //ele 10 | ||
| 375 | - 0x0000, //ele 20 | ||
| 376 | - 0x0000, //ele 24 | ||
| 377 | - 0x0000, //ele 40 | ||
| 378 | - 0x0000, //lpg 10 | ||
| 379 | - 0x0000, //lpg 20 | ||
| 380 | - 0x0000, //lpg 24 | ||
| 381 | - 0x0000, //lpg 40 | ||
| 382 | - 0x0000, //lng 10 | ||
| 383 | - 0x0000, //lng 20 | ||
| 384 | - 0x0000, //lng 24 | ||
| 385 | - 0x0000 //lng 40 | 374 | + {0x0018, //ele 10 |
| 375 | + 0x0018, //ele 20 | ||
| 376 | + 0x0018, //ele 24 | ||
| 377 | + 0x0018, //ele 40 | ||
| 378 | + 0x0018, //lpg 10 | ||
| 379 | + 0x0018, //lpg 20 | ||
| 380 | + 0x0018, //lpg 24 | ||
| 381 | + 0x0018, //lpg 40 | ||
| 382 | + 0x0018, //lng 10 | ||
| 383 | + 0x0018, //lng 20 | ||
| 384 | + 0x0018, //lng 24 | ||
| 385 | + 0x0018 //lng 40 | ||
| 386 | }, | 386 | }, |
| 387 | {0x0000, //ele 10 | 387 | {0x0000, //ele 10 |
| 388 | 0x0000, //ele 20 | 388 | 0x0000, //ele 20 |