모델 별 하부 에러 마스크 적용

- 착하 오타 수정 -> 착화

모델 별 하부 에러 마스크 적용
- 착하 오타 수정 -> 착화
고영탁
1 parent 20fcaaf681
Showing 2 changed files with 58 additions and 10 deletions Show diff stats
app/gui/oven_control/ovenstatics.cpp
app/gui/oven_control/ovenstatics.h
@@ -283,21 +283,21 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){
     if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){
         //버너 컨트롤러 1 착화 이상
         item = &(srvdata->err_log.items.upper_fire_fail);
-        strMsg  = tr("상부 버너 착하가 되지 않습니다.");
-        strTitle = tr("상부 버너 착하 이상 발생");
+        strMsg  = tr("상부 버너 착화가 되지 않습니다.");
+        strTitle = tr("상부 버너 착화 이상 발생");
         processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER1],strMsg,strTitle,ltime);
     }
     if(errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER2)){
         //버너 컨트롤러 2 착화 이상
         item = &(srvdata->err_log.items.lower_fire_fail);
-        strMsg  = tr("하부 버너 착하가 되지 않습니다.");
-        strTitle  = tr("하부 버너 착하 이상 발생");
+        strMsg  = tr("하부 버너 착화가 되지 않습니다.");
+        strTitle  = tr("하부 버너 착화 이상 발생");
         processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER2],strMsg,strTitle,ltime);
     }
     if(errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER3)){
         item = &(srvdata->err_log.items.steam_fire_fail);
-        strMsg  = tr("스팀 버너 착하가 되지 않습니다.");
-        strTitle  = tr("스팀 버너 착하 이상 발생");
+        strMsg  = tr("스팀 버너 착화가 되지 않습니다.");
+        strTitle  = tr("스팀 버너 착화 이상 발생");
          processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER3],strMsg,strTitle,ltime);
     }
     if(errflag & MAKE_MASK(SYS_ERR_OVNE_TEMP_ALARM)){
@@ -211,10 +211,58 @@ public:
  
 private:
  
-    const uint32_t sys_err_mask[MAX_MODEL_COUNT] =          {0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff};
-    const uint32_t comm_err_mask[MAX_MODEL_COUNT] =    {0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f};
-    const uint32_t sensor_err_mask[MAX_MODEL_COUNT] =    {0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213};
-    const uint32_t state_err_mask[MAX_MODEL_COUNT] =       {0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018};
+    const uint32_t sys_err_mask[MAX_MODEL_COUNT] =          {0x03ff, //ele_10
+                                                             0x03ff, //ele_20
+                                                             0x03ff, //ele_24
+                                                             0x03ff, //ele_40
+                                                             0x03fd, //lpg_10
+                                                             0x03ff, //lpg_20
+                                                             0x03fd, //lpg_24
+                                                             0x03ff, //lpg_40
+                                                             0x03fd, //lng_10
+                                                             0x03ff, //lng_20
+                                                             0x03fd, //lng_24
+                                                             0x03ff //lng_40
+                                                            };
+    const uint32_t comm_err_mask[MAX_MODEL_COUNT] =    {0x001f, //ele_10
+                                                        0x001f, //ele_20
+                                                        0x001f, //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
+                                                       };
+    const uint32_t sensor_err_mask[MAX_MODEL_COUNT] =    {0x0213, //ele10
+                                                          0x0213, //ele 20
+                                                          0x0213, //ele 24
+                                                          0x0213, //ele 40
+                                                          0x0213, //lpg 10
+                                                          0x0213, //lpg 20
+                                                          0x0213, //lpg 24
+                                                          0x0213, //lpg 40
+                                                          0x0213, //lng 10
+                                                          0x0213, //lng 20
+                                                          0x0213, //lng 24
+                                                          0x0213  //lng40
+                                                         };
+    const uint32_t state_err_mask[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
+                                                           };
  
  
     const error_exe_type sys_err_type_def[SYS_STATE_MAX][SYS_ERR_MAX]={ //30047
...	...	@@ -283,21 +283,21 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){
283	283	if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){
284	284	//버너 컨트롤러 1 착화 이상
285	285	item = &(srvdata->err_log.items.upper_fire_fail);
286		- strMsg = tr("상부 버너 착하가 되지 않습니다.");
287		- strTitle = tr("상부 버너 착하 이상 발생");
	286	+ strMsg = tr("상부 버너 착화가 되지 않습니다.");
	287	+ strTitle = tr("상부 버너 착화 이상 발생");
288	288	processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER1],strMsg,strTitle,ltime);
289	289	}
290	290	if(errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER2)){
291	291	//버너 컨트롤러 2 착화 이상
292	292	item = &(srvdata->err_log.items.lower_fire_fail);
293		- strMsg = tr("하부 버너 착하가 되지 않습니다.");
294		- strTitle = tr("하부 버너 착하 이상 발생");
	293	+ strMsg = tr("하부 버너 착화가 되지 않습니다.");
	294	+ strTitle = tr("하부 버너 착화 이상 발생");
295	295	processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER2],strMsg,strTitle,ltime);
296	296	}
297	297	if(errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER3)){
298	298	item = &(srvdata->err_log.items.steam_fire_fail);
299		- strMsg = tr("스팀 버너 착하가 되지 않습니다.");
300		- strTitle = tr("스팀 버너 착하 이상 발생");
	299	+ strMsg = tr("스팀 버너 착화가 되지 않습니다.");
	300	+ strTitle = tr("스팀 버너 착화 이상 발생");
301	301	processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER3],strMsg,strTitle,ltime);
302	302	}
303	303	if(errflag & MAKE_MASK(SYS_ERR_OVNE_TEMP_ALARM)){
...	...
...	...	@@ -211,10 +211,58 @@ public:
211	211
212	212	private:
213	213
214		- const uint32_t sys_err_mask[MAX_MODEL_COUNT] = {0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff};
215		- const uint32_t comm_err_mask[MAX_MODEL_COUNT] = {0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f};
216		- const uint32_t sensor_err_mask[MAX_MODEL_COUNT] = {0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213};
217		- const uint32_t state_err_mask[MAX_MODEL_COUNT] = {0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018};
	214	+ const uint32_t sys_err_mask[MAX_MODEL_COUNT] = {0x03ff, //ele_10
	215	+ 0x03ff, //ele_20
	216	+ 0x03ff, //ele_24
	217	+ 0x03ff, //ele_40
	218	+ 0x03fd, //lpg_10
	219	+ 0x03ff, //lpg_20
	220	+ 0x03fd, //lpg_24
	221	+ 0x03ff, //lpg_40
	222	+ 0x03fd, //lng_10
	223	+ 0x03ff, //lng_20
	224	+ 0x03fd, //lng_24
	225	+ 0x03ff //lng_40
	226	+ };
	227	+ const uint32_t comm_err_mask[MAX_MODEL_COUNT] = {0x001f, //ele_10
	228	+ 0x001f, //ele_20
	229	+ 0x001f, //ele_24
	230	+ 0x001f, //ele_40
	231	+ 0x001d, //lpg_10
	232	+ 0x001f, //lpg_20
	233	+ 0x001d, //lpg_24
	234	+ 0x001f, //lpg_40
	235	+ 0x001d, //lng_10
	236	+ 0x001f, //lng_20
	237	+ 0x001d, //lng_24
	238	+ 0x001f //lng_40
	239	+ };
	240	+ const uint32_t sensor_err_mask[MAX_MODEL_COUNT] = {0x0213, //ele10
	241	+ 0x0213, //ele 20
	242	+ 0x0213, //ele 24
	243	+ 0x0213, //ele 40
	244	+ 0x0213, //lpg 10
	245	+ 0x0213, //lpg 20
	246	+ 0x0213, //lpg 24
	247	+ 0x0213, //lpg 40
	248	+ 0x0213, //lng 10
	249	+ 0x0213, //lng 20
	250	+ 0x0213, //lng 24
	251	+ 0x0213 //lng40
	252	+ };
	253	+ const uint32_t state_err_mask[MAX_MODEL_COUNT] = {0x0018, //ele 10
	254	+ 0x0018, //ele 20
	255	+ 0x0018, //ele 24
	256	+ 0x0018, //ele 40
	257	+ 0x0018, //lpg 10
	258	+ 0x0018, //lpg 20
	259	+ 0x0018, //lpg 24
	260	+ 0x0018, //lpg 40
	261	+ 0x0018, //lng 10
	262	+ 0x0018, //lng 20
	263	+ 0x0018, //lng 24
	264	+ 0x0018 //lng 40
	265	+ };
218	266
219	267
220	268	const error_exe_type sys_err_type_def[SYS_STATE_MAX][SYS_ERR_MAX]={ //30047
...	...