Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -61,70 +61,72 @@ */ enum GuiActionsType_Enum /* : quint16 QML doesn't support enum types */ { - ID_Unknown = 0x0000, - ID_CANBusFaultCount = 0x9909, + ID_Unknown = 0x0000, + ID_CANBusFaultCount = 0x9909, - ID_RawData = 0xFFFE, + ID_RawData = 0xFFFE, - ID_Acknow = 0xFFFF, - ID_AcknowGeneric = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder + ID_Acknow = 0xFFFF, + ID_AcknowGeneric = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder - ID_HDDebugText = 0xF1FF, - ID_DGDebugText = 0xF2FF, + ID_HDDebugText = 0xF1FF, + ID_DGDebugText = 0xF2FF, - ID_DGCheckIn = 0x0600, - ID_KeepAlive = 0x0700, + ID_DGCheckIn = 0x0600, + ID_KeepAlive = 0x0700, - ID_PowerOff = 0x0100, - ID_ShuttingDown = 0x0E00, - ID_TreatmentTime = 0x0D00, - ID_BloodFlow = 0x0500, - ID_DialysateInletFlow = 0x0800, - ID_DialysateOutletFlow = 0x0B00, - ID_TreatmentRanges = 0x1A00, // 26 - ID_PressureOcclusion = 0x0900, - ID_TreatmentStates = 0x0F00, // 15 - ID_Saline = 0x2F00, // 47 + ID_PowerOff = 0x0100, + ID_ShuttingDown = 0x0E00, + ID_TreatmentTime = 0x0D00, + ID_BloodFlow = 0x0500, + ID_DialysateInletFlow = 0x0800, + ID_DialysateOutletFlow = 0x0B00, + ID_TreatmentRanges = 0x1A00, // 26 + ID_PressureOcclusion = 0x0900, + ID_TreatmentStates = 0x0F00, // 15 + ID_Saline = 0x2F00, // 47 - ID_AlarmStatus = 0x0200, - ID_AlarmTriggered = 0x0300, - ID_AlarmCleared = 0x0400, - ID_CreateTreatmentReq = 0x3500, // 53 - Not implemented yet on FW side - ID_CreateTreatmentRsp = 0x3600, // 54 - Not implemented yet on FW side + ID_AlarmStatus = 0x0200, + ID_AlarmTriggered = 0x0300, + ID_AlarmCleared = 0x0400, + ID_CreateTreatmentReq = 0x3500, // 53 - Not implemented yet on FW side + ID_CreateTreatmentRsp = 0x3600, // 54 - Not implemented yet on FW side - ID_AlarmSilenceReq = 0x3200, // 50 - Not implemented yet on FW side - ID_AlarmSilenceRsp = 0x0000, // Needs to be removed. + ID_AlarmSilenceReq = 0x3200, // 50 - Not implemented yet on FW side + ID_AlarmSilenceRsp = 0x0000, // Needs to be removed. - ID_HDOperationModeData = 0x2500, // 37 + ID_HDOperationModeData = 0x2500, // 37 - ID_DGROPumpData = 0x1F00, // 31 - ID_DGPressuresData = 0x2000, // 32 - ID_DGDrainPumpData = 0x2400, // 36 - ID_DGOperationModeData = 0x2700, // 39 - ID_DGReservoirData = 0x2800, // 40 - ID_DGValvesStatesData = 0x2A00, // 42 - ID_DGHeatersData = 0x2C00, // 44 - ID_DGLoadCellReadingsData = 0x0C00, // 12 - ID_DGTemperaturesData = 0x2D00, // 45 + ID_DGROPumpData = 0x1F00, // 31 + ID_DGPressuresData = 0x2000, // 32 + ID_DGDrainPumpData = 0x2400, // 36 + ID_DGOperationModeData = 0x2700, // 39 + ID_DGReservoirData = 0x2800, // 40 + ID_DGValvesStatesData = 0x2A00, // 42 + ID_DGHeatersData = 0x2C00, // 44 + ID_DGLoadCellReadingsData = 0x0C00, // 12 + ID_DGTemperaturesData = 0x2D00, // 45 - ID_AdjustBloodDialysateReq = 0x1700, // 23 - ID_AdjustBloodDialysateRsp = 0x1800, // 24 + ID_AdjustBloodDialysateReq = 0x1700, // 23 + ID_AdjustBloodDialysateRsp = 0x1800, // 24 - ID_AdjustUltrafiltrationStateReq = 0x1000, // 16 - ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 + ID_AdjustUltrafiltrationStateReq = 0x1000, // 16 + ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 - ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 - ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 + ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 + ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 - ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21 - ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 + ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21 + ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 - ID_AdjustDurationReq = 0x1600, // 22 - ID_AdjustDurationRsp = 0x1B00, // 27 + ID_AdjustDurationReq = 0x1600, // 22 + ID_AdjustDurationRsp = 0x1B00, // 27 - ID_AdjustSalineReq = 0x1200, // 18 - ID_AdjustSalineRsp = 0x1400, // 20 + ID_AdjustSalineReq = 0x1200, // 18 + ID_AdjustSalineRsp = 0x1400, // 20 + ID_AdjustPressuresLimitsReq = 0x4600, // 70 + ID_AdjustPressuresLimitsRsp = 0x4700, // 71 }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ {