Commit 8600aab7f241a90f1f57dbb2b621280fa4b370de
1 parent
7dd0ae57e1
Exists in
fhd
PSSCO 에러 정의 추가
Showing
1 changed file
with
90 additions
and
0 deletions
Show diff stats
app/gui/oven_control/ovenstatics.h
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | #include <QObject> | 4 | #include <QObject> |
| 5 | #include <time.h> | 5 | #include <time.h> |
| 6 | #include <qmap.h> | 6 | #include <qmap.h> |
| 7 | +#include <define.h> | ||
| 7 | #include "../../app-prime-modbus/include/all_share.h" | 8 | #include "../../app-prime-modbus/include/all_share.h" |
| 8 | #include "udphandler.h" | 9 | #include "udphandler.h" |
| 9 | #include "oven.h" | 10 | #include "oven.h" |
| @@ -223,6 +224,49 @@ private: | @@ -223,6 +224,49 @@ private: | ||
| 223 | * 190618 : 수위센서 에러 삭제 | 224 | * 190618 : 수위센서 에러 삭제 |
| 224 | */ | 225 | */ |
| 225 | //30047 | 226 | //30047 |
| 227 | +#if MODEL_GRADE == 2 | ||
| 228 | + const uint32_t sys_err_mask[3][MAX_MODEL_COUNT] = { | ||
| 229 | + {0x0018, //ele_10 | ||
| 230 | + 0x0018, //ele_20 | ||
| 231 | + 0x0018, //ele_24 | ||
| 232 | + 0x0018, //ele_40 | ||
| 233 | + 0x0018, //lpg_10 | ||
| 234 | + 0x0018, //lpg_20 | ||
| 235 | + 0x0018, //lpg_24 | ||
| 236 | + 0x0018, //lpg_40 | ||
| 237 | + 0x0018, //lng_10 | ||
| 238 | + 0x0018, //lng_20 | ||
| 239 | + 0x0018, //lng_24 | ||
| 240 | + 0x0018 //lng_40 | ||
| 241 | + },// noncooking state | ||
| 242 | + {0x001d, //ele_10 | ||
| 243 | + 0x001f, //ele_20 | ||
| 244 | + 0x001d, //ele_24 | ||
| 245 | + 0x001f, //ele_40 | ||
| 246 | + 0x001d, //lpg_10 | ||
| 247 | + 0x001f, //lpg_20 | ||
| 248 | + 0x001d, //lpg_24 | ||
| 249 | + 0x001f, //lpg_40 | ||
| 250 | + 0x001d, //lng_10 | ||
| 251 | + 0x001f, //lng_20 | ||
| 252 | + 0x001d, //lng_24 | ||
| 253 | + 0x001f //lng_40 | ||
| 254 | + },//cooking state | ||
| 255 | + {0x001d, //ele_10 | ||
| 256 | + 0x001f, //ele_20 | ||
| 257 | + 0x001d, //ele_24 | ||
| 258 | + 0x001f, //ele_40 | ||
| 259 | + 0x001d, //lpg_10 | ||
| 260 | + 0x001f, //lpg_20 | ||
| 261 | + 0x001d, //lpg_24 | ||
| 262 | + 0x001f, //lpg_40 | ||
| 263 | + 0x001d, //lng_10 | ||
| 264 | + 0x001f, //lng_20 | ||
| 265 | + 0x001d, //lng_24 | ||
| 266 | + 0x001f //lng_40 | ||
| 267 | + } //washing state | ||
| 268 | + }; | ||
| 269 | +#else | ||
| 226 | const uint32_t sys_err_mask[3][MAX_MODEL_COUNT] = { | 270 | const uint32_t sys_err_mask[3][MAX_MODEL_COUNT] = { |
| 227 | {0x0098, //ele_10 | 271 | {0x0098, //ele_10 |
| 228 | 0x0098, //ele_20 | 272 | 0x0098, //ele_20 |
| @@ -264,6 +308,7 @@ private: | @@ -264,6 +308,7 @@ private: | ||
| 264 | 0x039f //lng_40 | 308 | 0x039f //lng_40 |
| 265 | } //washing state | 309 | } //washing state |
| 266 | }; | 310 | }; |
| 311 | +#endif | ||
| 267 | //30048 | 312 | //30048 |
| 268 | const uint32_t comm_err_mask[3][MAX_MODEL_COUNT] = { | 313 | const uint32_t comm_err_mask[3][MAX_MODEL_COUNT] = { |
| 269 | {0x000d, //ele_10 | 314 | {0x000d, //ele_10 |
| @@ -322,6 +367,49 @@ private: | @@ -322,6 +367,49 @@ private: | ||
| 322 | 367 | ||
| 323 | 368 | ||
| 324 | //30049 | 369 | //30049 |
| 370 | +#if MODEL_GRADE == 2 | ||
| 371 | + const uint32_t sensor_err_mask[3][MAX_MODEL_COUNT] = { | ||
| 372 | + {0x0203, //ele10 | ||
| 373 | + 0x0203, //ele 20 | ||
| 374 | + 0x0203, //ele 24 | ||
| 375 | + 0x0203, //ele 40 | ||
| 376 | + 0x0203, //lpg 10 | ||
| 377 | + 0x0203, //lpg 20 | ||
| 378 | + 0x0203, //lpg 24 | ||
| 379 | + 0x0203, //lpg 40 | ||
| 380 | + 0x0203, //lng 10 | ||
| 381 | + 0x0203, //lng 20 | ||
| 382 | + 0x0203, //lng 24 | ||
| 383 | + 0x0203 //lng40 | ||
| 384 | + }, // end of noncooking state | ||
| 385 | + {0x0203, //ele10 | ||
| 386 | + 0x0203, //ele 20 | ||
| 387 | + 0x0203, //ele 24 | ||
| 388 | + 0x0203, //ele 40 | ||
| 389 | + 0x0203, //lpg 10 | ||
| 390 | + 0x0203, //lpg 20 | ||
| 391 | + 0x0203, //lpg 24 | ||
| 392 | + 0x0203, //lpg 40 | ||
| 393 | + 0x0203, //lng 10 | ||
| 394 | + 0x0203, //lng 20 | ||
| 395 | + 0x0203, //lng 24 | ||
| 396 | + 0x0203 //lng40 | ||
| 397 | + }, //cooking state | ||
| 398 | + {0x0203, //ele10 | ||
| 399 | + 0x0203, //ele 20 | ||
| 400 | + 0x0203, //ele 24 | ||
| 401 | + 0x0203, //ele 40 | ||
| 402 | + 0x0203, //lpg 10 | ||
| 403 | + 0x0203, //lpg 20 | ||
| 404 | + 0x0203, //lpg 24 | ||
| 405 | + 0x0203, //lpg 40 | ||
| 406 | + 0x0203, //lng 10 | ||
| 407 | + 0x0203, //lng 20 | ||
| 408 | + 0x0203, //lng 24 | ||
| 409 | + 0x0203 //lng40 | ||
| 410 | + } // washing state | ||
| 411 | + }; | ||
| 412 | +#else | ||
| 325 | const uint32_t sensor_err_mask[3][MAX_MODEL_COUNT] = { | 413 | const uint32_t sensor_err_mask[3][MAX_MODEL_COUNT] = { |
| 326 | {0x0213, //ele10 | 414 | {0x0213, //ele10 |
| 327 | 0x0213, //ele 20 | 415 | 0x0213, //ele 20 |
| @@ -363,6 +451,8 @@ private: | @@ -363,6 +451,8 @@ private: | ||
| 363 | 0x0213 //lng40 | 451 | 0x0213 //lng40 |
| 364 | } // washing state | 452 | } // washing state |
| 365 | }; | 453 | }; |
| 454 | +#endif | ||
| 455 | + | ||
| 366 | //30057 | 456 | //30057 |
| 367 | const uint32_t state_err_mask[3][MAX_MODEL_COUNT] = { | 457 | const uint32_t state_err_mask[3][MAX_MODEL_COUNT] = { |
| 368 | {0x0018, //ele 10 | 458 | {0x0018, //ele 10 |