고객사 요청 에러 예외 사항 추가

- 30049 메모리 번지 bit 5~8 =B3 온도센서 이상 에러 처리 Skip - ProductSerial 관련 함수 추가

고객사 요청 에러 예외 사항 추가
- 30049 메모리 번지 bit 5~8 =B3 온도센서 이상 에러 처리 Skip - ProductSerial 관련 함수 추가
고영탁
1 parent 8a88955814
Showing 3 changed files with 11 additions and 1 deletions Show diff stats
app/gui/oven_control/config.cpp
app/gui/oven_control/config.h
app/gui/oven_control/ovenstatics.h
@@ -449,6 +449,13 @@ QString Config::getTempString(int cel_temp){
     return strTemp;
 }
  
+QString Config::getProductSerial()
+{
+    QString strProductSerial;
+    strProductSerial = DEFAULT_PRODUCT_SERIAL;
+    return strProductSerial;
+}
+
 void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){
     QDialog *dlg;
     QString usbPath = "";
@@ -23,6 +23,7 @@
 #define SERVICE_INFO_FILE_NAME "/prime/config/service_info.csv"
 #define RPM_INFO_FILE_NAME  "/prime/config/rpm_info.csv"
  
+#define DEFAULT_PRODUCT_SERIAL  "0123"
  
 static const char rest_time_type_menu[2][16] = {
     QT_TRANSLATE_NOOP("Config","잔여시간\0"),
@@ -293,6 +294,7 @@ class Config : public QObject
  
     static Config *instance;
     InputOverwatcher watcher;
+    QString m_strProductSerial;
  
  
  
@@ -438,6 +440,7 @@ public:
     void removeFavorite(Define::ConfigType idx);
     static QString getDateTimeString(uint32_t sec);
     static QString getTempString(int cel_temp);
+    QString getProductSerial();
  
  
  
@@ -16,7 +16,7 @@
  
 #define SYS_ERROR_MASK  0x03ff
 #define COMM_ERROR_MASK 0x001f
-#define SENSOR_ERROR_MASK   0x03f3
+#define SENSOR_ERROR_MASK   0x0213
 #define STATE_ERROR_MASK    0x0018
  
 #define SYS_ERR_MASK_ERR_CLEAR_COOKING          0x00ff
...	...	@@ -449,6 +449,13 @@ QString Config::getTempString(int cel_temp){
449	449	return strTemp;
450	450	}
451	451
	452	+QString Config::getProductSerial()
	453	+{
	454	+ QString strProductSerial;
	455	+ strProductSerial = DEFAULT_PRODUCT_SERIAL;
	456	+ return strProductSerial;
	457	+}
	458	+
452	459	void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){
453	460	QDialog *dlg;
454	461	QString usbPath = "";
...	...
...	...	@@ -23,6 +23,7 @@
23	23	#define SERVICE_INFO_FILE_NAME "/prime/config/service_info.csv"
24	24	#define RPM_INFO_FILE_NAME "/prime/config/rpm_info.csv"
25	25
	26	+#define DEFAULT_PRODUCT_SERIAL "0123"
26	27
27	28	static const char rest_time_type_menu[2][16] = {
28	29	QT_TRANSLATE_NOOP("Config","잔여시간\0"),
...	...	@@ -293,6 +294,7 @@ class Config : public QObject
293	294
294	295	static Config *instance;
295	296	InputOverwatcher watcher;
	297	+ QString m_strProductSerial;
296	298
297	299
298	300
...	...	@@ -438,6 +440,7 @@ public:
438	440	void removeFavorite(Define::ConfigType idx);
439	441	static QString getDateTimeString(uint32_t sec);
440	442	static QString getTempString(int cel_temp);
	443	+ QString getProductSerial();
441	444
442	445
443	446
...	...
...	...	@@ -16,7 +16,7 @@
16	16
17	17	#define SYS_ERROR_MASK 0x03ff
18	18	#define COMM_ERROR_MASK 0x001f
19		-#define SENSOR_ERROR_MASK 0x03f3
	19	+#define SENSOR_ERROR_MASK 0x0213
20	20	#define STATE_ERROR_MASK 0x0018
21	21
22	22	#define SYS_ERR_MASK_ERR_CLEAR_COOKING 0x00ff
...	...