Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d) @@ -368,6 +368,53 @@ ID_DDCalibrationPressureRsp = 0x1901, // 281 //// ----- @LEAHIZED ID_AdjustDDCalibrationPressureReq = 0x1A01, // 282 //// ----- @LEAHIZED ID_AdjustDDCalibrationPressureRsp = 0x1B01, // 283 //// ----- @LEAHIZED + + ID_DDCalibrationTemperatureReq = 0x1C01, // 284 //// ----- @LEAHIZED + ID_DDCalibrationTemperatureRsp = 0x1D01, // 285 //// ----- @LEAHIZED + ID_AdjustDDCalibrationTemperatureReq = 0x1E01, // 286 //// ----- @LEAHIZED + ID_AdjustDDCalibrationTemperatureRsp = 0x1F01, // 287 //// ----- @LEAHIZED + +// = 0x2001, +// = 0x2101, +// = 0x2201, +// = 0x2301, + +// = 0x2401, +// = 0x2501, +// = 0x2601, +// = 0x2701, + +// = 0x2801, +// = 0x2901, +// = 0x2A01, +// = 0x2B01, + +// = 0x2C01, +// = 0x2D01, +// = 0x2E01, +// = 0x2F01, + +// = 0x3001, +// = 0x3101, +// = 0x3201, +// = 0x3301, + +// = 0x3401, +// = 0x3501, +// = 0x3601, +// = 0x3701, + +// = 0x3801, +// = 0x3901, +// = 0x3A01, +// = 0x3B01, + +// = 0x3C01, +// = 0x3D01, +// = 0x3E01, +// = 0x3F01, + + }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { @@ -456,6 +503,12 @@ Q_ENUM(DD_Disinfect_States) Q_ENUM(DD_Heat_UI_States) Q_ENUM(DD_Valves) + Q_ENUM(PressureSensors) + Q_ENUM(SENSORS_NAME) // temperature + Q_ENUM(ConcentratePumps) + Q_ENUM(dd_acid_types) + Q_ENUM(dd_bicarb_types) + Q_ENUM(Conductivity_Sensors) #include "FPDefs.h" }; @@ -533,6 +586,12 @@ // DD Valves typedef GuiActions::DD_Valves GuiDDValves; + typedef GuiActions::PressureSensors GuiDDCalibrationPressure; + typedef GuiActions::SENSORS_NAME GuiDDCalibrationTemperature; + typedef GuiActions::ConcentratePumps GuiDDCalibrationConcentratePump; + typedef GuiActions::dd_acid_types GuiDDCalibrationAcidType; + typedef GuiActions::dd_bicarb_types GuiDDCalibrationBicarbType; + typedef GuiActions::Conductivity_Sensors GuiDDCalibrationConductivitySensor; typedef QMap GuiStringIndexMap; typedef QPair GuiStringIndexMapItem;