diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index d213f68..fdfab9c 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -12,7 +12,7 @@ #define MODEL_GRADE 1 #define ENABLE_WASH_RESUMING 0 -#define WATER_LEVEL_HACCP_STAMP 1 +#define VALVE_HACCP_STAMP 1 namespace Define { diff --git a/app/gui/oven_control/haccp.cpp b/app/gui/oven_control/haccp.cpp index a08ee94..65d04cd 100644 --- a/app/gui/oven_control/haccp.cpp +++ b/app/gui/oven_control/haccp.cpp @@ -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