수위 대신 밸브 개폐를 기준으로 변경

김태훈
1 parent 03d3768bb4
Showing 2 changed files with 7 additions and 7 deletions Show diff stats
app/gui/oven_control/define.h
app/gui/oven_control/haccp.cpp
@@ -9,10 +9,10 @@
  
 // 0 for normal
 // 1 for premium
-#define MODEL_GRADE 0
+#define MODEL_GRADE 1
  
 #define ENABLE_WASH_RESUMING 0
-#define WATER_LEVEL_HACCP_STAMP 0
+#define VALVE_HACCP_STAMP 1
  
 namespace Define
 {
@@ -61,11 +61,11 @@ QTime lastStampedTime;
  
 Define::Mode lastMode;
 int lastFan;
-int lastWaterLevel;
 bool lastDoor;
 bool lastDamper;
 bool lastSideNozzle;
 bool lastCoreTempEnabled;
+bool lastValve;
  
 int figureProcessCount();
 void initData(Type type);
@@ -383,11 +383,11 @@ void start()
 {
     lastMode = Define::InvalidMode;
     lastFan = -1;
-    lastWaterLevel = -1;
     lastDoor = false;
     lastDamper = false;
     lastSideNozzle = false;
     lastCoreTempEnabled = false;
+    lastValve = false;
  
     Oven *oven = Oven::getInstance();
     stampMode(oven->mode());
@@ -433,7 +433,7 @@ void stamp(QString caption)
     data.records.append(s);
  
     lastDoor = oven->door();
-    lastWaterLevel = udp->waterLevel();
+    lastValve = udp->ssv();
     lastStampedTime.start();
 }
  
@@ -664,8 +664,8 @@ void check()
     if (oven->door() != lastDoor)
         stamp();
  
-#if WATER_LEVEL_HACCP_STAMP
-    if (udp->waterLevel() != lastWaterLevel)
+#if VALVE_HACCP_STAMP
+    if (udp->ssv() != lastValve)
         stamp();
 #endif
...	...	@@ -9,10 +9,10 @@
9	9
10	10	// 0 for normal
11	11	// 1 for premium
12		-#define MODEL_GRADE 0
	12	+#define MODEL_GRADE 1
13	13
14	14	#define ENABLE_WASH_RESUMING 0
15		-#define WATER_LEVEL_HACCP_STAMP 0
	15	+#define VALVE_HACCP_STAMP 1
16	16
17	17	namespace Define
18	18	{
...	...
...	...	@@ -61,11 +61,11 @@ QTime lastStampedTime;
61	61
62	62	Define::Mode lastMode;
63	63	int lastFan;
64		-int lastWaterLevel;
65	64	bool lastDoor;
66	65	bool lastDamper;
67	66	bool lastSideNozzle;
68	67	bool lastCoreTempEnabled;
	68	+bool lastValve;
69	69
70	70	int figureProcessCount();
71	71	void initData(Type type);
...	...	@@ -383,11 +383,11 @@ void start()
383	383	{
384	384	lastMode = Define::InvalidMode;
385	385	lastFan = -1;
386		- lastWaterLevel = -1;
387	386	lastDoor = false;
388	387	lastDamper = false;
389	388	lastSideNozzle = false;
390	389	lastCoreTempEnabled = false;
	390	+ lastValve = false;
391	391
392	392	Oven *oven = Oven::getInstance();
393	393	stampMode(oven->mode());
...	...	@@ -433,7 +433,7 @@ void stamp(QString caption)
433	433	data.records.append(s);
434	434
435	435	lastDoor = oven->door();
436		- lastWaterLevel = udp->waterLevel();
	436	+ lastValve = udp->ssv();
437	437	lastStampedTime.start();
438	438	}
439	439
...	...	@@ -664,8 +664,8 @@ void check()
664	664	if (oven->door() != lastDoor)
665	665	stamp();
666	666
667		-#if WATER_LEVEL_HACCP_STAMP
668		- if (udp->waterLevel() != lastWaterLevel)
	667	+#if VALVE_HACCP_STAMP
	668	+ if (udp->ssv() != lastValve)
669	669	stamp();
670	670	#endif
671	671
...	...