Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb50ec62b54a1af1755922c833e1ccaabb50bb59e -rcaf45633324f0abb5ced699731f8d6f1c4de4510 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b50ec62b54a1af1755922c833e1ccaabb50bb59e) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision caf45633324f0abb5ced699731f8d6f1c4de4510) @@ -374,47 +374,46 @@ ID_AdjustDDCalibrationTemperatureReq = 0x1E01, // 286 //// ----- @LEAHIZED ID_AdjustDDCalibrationTemperatureRsp = 0x1F01, // 287 //// ----- @LEAHIZED - ID_DDCalibrationConcentratePumpReq = 0x2001, - ID_DDCalibrationConcentratePumpRsp = 0x2101, - ID_AdjustDDCalibrationConcentratePumpReq = 0x2201, - ID_AdjustDDCalibrationConcentratePumpRsp = 0x2301, + ID_DDCalibrationConcentratePumpReq = 0x2001, // 288 //// ----- @LEAHIZED + ID_DDCalibrationConcentratePumpRsp = 0x2101, // 289 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConcentratePumpReq = 0x2201, // 290 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConcentratePumpRsp = 0x2301, // 291 //// ----- @LEAHIZED -// = 0x2401, -// = 0x2501, -// = 0x2601, -// = 0x2701, + ID_DDCalibrationD12DialysatePumpReq = 0x2401, // 292 //// ----- @LEAHIZED + ID_DDCalibrationD12DialysatePumpRsp = 0x2501, // 293 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD12DialysatePumpReq = 0x2601, // 294 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD12DialysatePumpRsp = 0x2701, // 295 //// ----- @LEAHIZED -// = 0x2801, -// = 0x2901, -// = 0x2A01, -// = 0x2B01, + ID_DDCalibrationD48DialysatePumpReq = 0x2801, // 296 //// ----- @LEAHIZED + ID_DDCalibrationD48DialysatePumpRsp = 0x2901, // 297 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD48DialysatePumpReq = 0x2A01, // 298 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD48DialysatePumpRsp = 0x2B01, // 299 //// ----- @LEAHIZED -// = 0x2C01, -// = 0x2D01, -// = 0x2E01, -// = 0x2F01, + ID_DDCalibrationAcidConcentratesReq = 0x2C01, // 300 //// ----- @LEAHIZED + ID_DDCalibrationAcidConcentratesRsp = 0x2D01, // 301 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAcidConcentratesReq = 0x2E01, // 302 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAcidConcentratesRsp = 0x2F01, // 303 //// ----- @LEAHIZED -// = 0x3001, -// = 0x3101, -// = 0x3201, -// = 0x3301, + ID_DDCalibrationBicarbConcentratesReq = 0x3001, // 304 //// ----- @LEAHIZED + ID_DDCalibrationBicarbConcentratesRsp = 0x3101, // 305 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBicarbConcentratesReq = 0x3201, // 306 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBicarbConcentratesRsp = 0x3301, // 307 //// ----- @LEAHIZED -// = 0x3401, -// = 0x3501, -// = 0x3601, -// = 0x3701, + ID_DDCalibrationAccelerometerSensorReq = 0x3401, // 308 //// ----- @LEAHIZED + ID_DDCalibrationAccelerometerSensorRsp = 0x3501, // 309 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAccelerometerSensorReq= 0x3601, // 310 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAccelerometerSensorRsp= 0x3701, // 311 //// ----- @LEAHIZED -// = 0x3801, -// = 0x3901, -// = 0x3A01, -// = 0x3B01, + ID_DDCalibrationBloodLeakSensorReq = 0x3801, // 312 //// ----- @LEAHIZED + ID_DDCalibrationBloodLeakSensorRsp = 0x3901, // 313 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBloodLeakSensorReq = 0x3A01, // 314 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBloodLeakSensorRsp = 0x3B01, // 315 //// ----- @LEAHIZED -// = 0x3C01, -// = 0x3D01, -// = 0x3E01, -// = 0x3F01, + ID_DDCalibrationConductivitySensorReq = 0x3C01, // 316 //// ----- @LEAHIZED + ID_DDCalibrationConductivitySensorRsp = 0x3D01, // 317 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConductivitySensorReq = 0x3E01, // 318 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConductivitySensorRsp = 0x3F01, // 319 //// ----- @LEAHIZED - }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { @@ -504,7 +503,7 @@ Q_ENUM(DD_Heat_UI_States) Q_ENUM(DD_Valves) Q_ENUM(PressureSensors) - Q_ENUM(SENSORS_NAME) // temperature + Q_ENUM(TemperatureSensors) Q_ENUM(ConcentratePumps) Q_ENUM(dd_acid_types) Q_ENUM(dd_bicarb_types) @@ -587,7 +586,7 @@ // DD Valves typedef GuiActions::DD_Valves GuiDDValves; typedef GuiActions::PressureSensors GuiDDCalibrationPressure; - typedef GuiActions::SENSORS_NAME GuiDDCalibrationTemperature; + typedef GuiActions::TemperatureSensors GuiDDCalibrationTemperature; typedef GuiActions::ConcentratePumps GuiDDCalibrationConcentratePump; typedef GuiActions::dd_acid_types GuiDDCalibrationAcidType; typedef GuiActions::dd_bicarb_types GuiDDCalibrationBicarbType;