Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r65558208e4968de9a5470ff5fda1ee2a9d00c793 -re125bd5cf13750eaf241d518b9c846139afaa81c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) @@ -223,12 +223,11 @@ // Disinfect ID_AdjustDisinfectReq = 0x7F00, // 127 ID_AdjustDisinfectRsp = 0x8000, // 128 - ID_AdjustDisinfectChemicalConfirmReq = 0x8100, // 129 // there is no specific response message for this request and changing of the state in HDOpMode.subMode is used as the response - ID_DisinfectDGFlushData = 0x8200, // 130 - ID_DisinfectDGHeatTimeData = 0x8300, // 131 - ID_DisinfectDGHeatTempData = 0x8400, // 132 + ID_AdjustChemicalConfirmReq = 0x8100, // 129 + ID_AdjustChemicalConfirmRsp = 0x8200, // 130 + ID_DisinfectDGFlushTimeData = 0x8300, // 131 + ID_DisinfectDGHeatTimeData = 0x8400, // 132 ID_DisinfectDGChemicalTimeData = 0x8500, // 133 - ID_DisinfectDGChemicalTBDData = 0x8600, // 134 }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { @@ -302,6 +301,15 @@ #include "DGDefs.h" Q_ENUM(DG_Op_Modes) Q_ENUM(DG_Heat_States) + + // TODO: temporary enum until DG defines one + enum DG_Disinfect_States { + DG_DISINFECT_STATE_UNKNOWN = -1, + DG_DISINFECT_STATE_FLUSH = 0, + DG_DISINFECT_STATE_HEAT = 1, + DG_DISINFECT_STATE_CHEM = 2, + }; + Q_ENUM(DG_Disinfect_States) }; // to be able to use the enum as signal/slot parameter @@ -366,6 +374,7 @@ typedef GuiActions::HD_Post_Treatment_Mode_States GuiPostTreatmentStates; // Disinfection Heat States + typedef GuiActions::DG_Disinfect_States GuiDisinfectDGStates; typedef GuiActions::DG_Heat_States GuiDisinfectDGHeatStates; /*!