diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h index 96ca7ef..55de5e9 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "../../app-prime-modbus/include/all_share.h" #include "udphandler.h" #include "oven.h" @@ -223,6 +224,49 @@ private: * 190618 : 수위센서 에러 삭제 */ //30047 +#if MODEL_GRADE == 2 + const uint32_t sys_err_mask[3][MAX_MODEL_COUNT] = { + {0x0018, //ele_10 + 0x0018, //ele_20 + 0x0018, //ele_24 + 0x0018, //ele_40 + 0x0018, //lpg_10 + 0x0018, //lpg_20 + 0x0018, //lpg_24 + 0x0018, //lpg_40 + 0x0018, //lng_10 + 0x0018, //lng_20 + 0x0018, //lng_24 + 0x0018 //lng_40 + },// noncooking state + {0x001d, //ele_10 + 0x001f, //ele_20 + 0x001d, //ele_24 + 0x001f, //ele_40 + 0x001d, //lpg_10 + 0x001f, //lpg_20 + 0x001d, //lpg_24 + 0x001f, //lpg_40 + 0x001d, //lng_10 + 0x001f, //lng_20 + 0x001d, //lng_24 + 0x001f //lng_40 + },//cooking state + {0x001d, //ele_10 + 0x001f, //ele_20 + 0x001d, //ele_24 + 0x001f, //ele_40 + 0x001d, //lpg_10 + 0x001f, //lpg_20 + 0x001d, //lpg_24 + 0x001f, //lpg_40 + 0x001d, //lng_10 + 0x001f, //lng_20 + 0x001d, //lng_24 + 0x001f //lng_40 + } //washing state + }; +#else const uint32_t sys_err_mask[3][MAX_MODEL_COUNT] = { {0x0098, //ele_10 0x0098, //ele_20 @@ -264,6 +308,7 @@ private: 0x039f //lng_40 } //washing state }; +#endif //30048 const uint32_t comm_err_mask[3][MAX_MODEL_COUNT] = { {0x000d, //ele_10 @@ -322,6 +367,49 @@ private: //30049 +#if MODEL_GRADE == 2 + const uint32_t sensor_err_mask[3][MAX_MODEL_COUNT] = { + {0x0203, //ele10 + 0x0203, //ele 20 + 0x0203, //ele 24 + 0x0203, //ele 40 + 0x0203, //lpg 10 + 0x0203, //lpg 20 + 0x0203, //lpg 24 + 0x0203, //lpg 40 + 0x0203, //lng 10 + 0x0203, //lng 20 + 0x0203, //lng 24 + 0x0203 //lng40 + }, // end of noncooking state + {0x0203, //ele10 + 0x0203, //ele 20 + 0x0203, //ele 24 + 0x0203, //ele 40 + 0x0203, //lpg 10 + 0x0203, //lpg 20 + 0x0203, //lpg 24 + 0x0203, //lpg 40 + 0x0203, //lng 10 + 0x0203, //lng 20 + 0x0203, //lng 24 + 0x0203 //lng40 + }, //cooking state + {0x0203, //ele10 + 0x0203, //ele 20 + 0x0203, //ele 24 + 0x0203, //ele 40 + 0x0203, //lpg 10 + 0x0203, //lpg 20 + 0x0203, //lpg 24 + 0x0203, //lpg 40 + 0x0203, //lng 10 + 0x0203, //lng 20 + 0x0203, //lng 24 + 0x0203 //lng40 + } // washing state + }; +#else const uint32_t sensor_err_mask[3][MAX_MODEL_COUNT] = { {0x0213, //ele10 0x0213, //ele 20 @@ -363,6 +451,8 @@ private: 0x0213 //lng40 } // washing state }; +#endif + //30057 const uint32_t state_err_mask[3][MAX_MODEL_COUNT] = { {0x0018, //ele 10