Commit 16e4e24069447ff1e377650c1d71549a8b35a808
1 parent
03d3768bb4
Exists in
fhd
수위 대신 밸브 개폐를 기준으로 변경
Showing
2 changed files
with
7 additions
and
7 deletions
Show diff stats
app/gui/oven_control/define.h
| @@ -9,10 +9,10 @@ | @@ -9,10 +9,10 @@ | ||
| 9 | 9 | ||
| 10 | // 0 for normal | 10 | // 0 for normal |
| 11 | // 1 for premium | 11 | // 1 for premium |
| 12 | -#define MODEL_GRADE 0 | 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 0 | 15 | +#define VALVE_HACCP_STAMP 1 |
| 16 | 16 | ||
| 17 | namespace Define | 17 | namespace Define |
| 18 | { | 18 | { |
app/gui/oven_control/haccp.cpp
| @@ -61,11 +61,11 @@ QTime lastStampedTime; | @@ -61,11 +61,11 @@ QTime lastStampedTime; | ||
| 61 | 61 | ||
| 62 | Define::Mode lastMode; | 62 | Define::Mode lastMode; |
| 63 | int lastFan; | 63 | int lastFan; |
| 64 | -int lastWaterLevel; | ||
| 65 | bool lastDoor; | 64 | bool lastDoor; |
| 66 | bool lastDamper; | 65 | bool lastDamper; |
| 67 | bool lastSideNozzle; | 66 | bool lastSideNozzle; |
| 68 | bool lastCoreTempEnabled; | 67 | bool lastCoreTempEnabled; |
| 68 | +bool lastValve; | ||
| 69 | 69 | ||
| 70 | int figureProcessCount(); | 70 | int figureProcessCount(); |
| 71 | void initData(Type type); | 71 | void initData(Type type); |
| @@ -383,11 +383,11 @@ void start() | @@ -383,11 +383,11 @@ void start() | ||
| 383 | { | 383 | { |
| 384 | lastMode = Define::InvalidMode; | 384 | lastMode = Define::InvalidMode; |
| 385 | lastFan = -1; | 385 | lastFan = -1; |
| 386 | - lastWaterLevel = -1; | ||
| 387 | lastDoor = false; | 386 | lastDoor = false; |
| 388 | lastDamper = false; | 387 | lastDamper = false; |
| 389 | lastSideNozzle = false; | 388 | lastSideNozzle = false; |
| 390 | lastCoreTempEnabled = false; | 389 | lastCoreTempEnabled = false; |
| 390 | + lastValve = false; | ||
| 391 | 391 | ||
| 392 | Oven *oven = Oven::getInstance(); | 392 | Oven *oven = Oven::getInstance(); |
| 393 | stampMode(oven->mode()); | 393 | stampMode(oven->mode()); |
| @@ -433,7 +433,7 @@ void stamp(QString caption) | @@ -433,7 +433,7 @@ void stamp(QString caption) | ||
| 433 | data.records.append(s); | 433 | data.records.append(s); |
| 434 | 434 | ||
| 435 | lastDoor = oven->door(); | 435 | lastDoor = oven->door(); |
| 436 | - lastWaterLevel = udp->waterLevel(); | 436 | + lastValve = udp->ssv(); |
| 437 | lastStampedTime.start(); | 437 | lastStampedTime.start(); |
| 438 | } | 438 | } |
| 439 | 439 | ||
| @@ -664,8 +664,8 @@ void check() | @@ -664,8 +664,8 @@ void check() | ||
| 664 | if (oven->door() != lastDoor) | 664 | if (oven->door() != lastDoor) |
| 665 | stamp(); | 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 | stamp(); | 669 | stamp(); |
| 670 | #endif | 670 | #endif |
| 671 | 671 |