에프에이리눅스 / 1611_0007_prime_oven

Compare View

switch
from
...
to
 
Commits (2)
Showing 2 changed files   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @1b66934
@@ -5,13 +5,14 @@ @@ -5,13 +5,14 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 6 7 #define MINOR_VER 6
8 -#define HOTFIX_VER 3 8 +#define HOTFIX_VER 5
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
12 #define MODEL_GRADE 1 12 #define MODEL_GRADE 1
13 13
14 #define ENABLE_WASH_RESUMING 0 14 #define ENABLE_WASH_RESUMING 0
  15 +#define WATER_LEVEL_HACCP_STAMP 1
15 16
16 namespace Define 17 namespace Define
17 { 18 {
app/gui/oven_control/haccp.cpp
  Diff comments   View file @1b66934
@@ -664,8 +664,10 @@ void check() @@ -664,8 +664,10 @@ void check()
664 if (oven->door() != lastDoor) 664 if (oven->door() != lastDoor)
665 stamp(); 665 stamp();
666 666
  667 +#if WATER_LEVEL_HACCP_STAMP
667 if (udp->waterLevel() != lastWaterLevel) 668 if (udp->waterLevel() != lastWaterLevel)
668 stamp(); 669 stamp();
  670 +#endif
669 671
670 if (lastStampedTime.elapsed() > 30 * 1000 - 100) 672 if (lastStampedTime.elapsed() > 30 * 1000 - 100)
671 stamp(); 673 stamp();