Index: sources/gui/guiglobals.h =================================================================== diff -u -r90bcc276f2a879169fef20e9168711cf906c0e54 -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d --- sources/gui/guiglobals.h (.../guiglobals.h) (revision 90bcc276f2a879169fef20e9168711cf906c0e54) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d) @@ -38,7 +38,7 @@ * *** Exactly as it is going to be shown/used in denali messages ***\n * *** then it can be compared exactly the way it is with no conversion.***\n */ - enum GuiActionsType_Enum /*: quint16 QML doesn't support enum types */ { + enum GuiActionsType_Enum /* : quint16 QML doesn't support enum types */ { ID_Unknown = 0x0000, ID_CANBusFaultCount = 0x9909, @@ -48,23 +48,28 @@ 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_DGCheckIn = 0x0600, ID_KeepAlive = 0x0700, ID_PowerOff = 0x0100, - ID_PowerOffBroadcast = 0x0E00, + ID_ShuttingDown = 0x0E00, ID_TreatmentTime = 0x0D00, ID_BloodFlow = 0x0500, ID_DialysateInletFlow = 0x0800, ID_DialysateOutletFlow = 0x0B00, ID_TreatmentRanges = 0x1A00, // 26 ID_PressureOcclusion = 0x0900, - ID_TreatmentState = 0x0F00, // 15 + ID_TreatmentStates = 0x0F00, // 15 ID_AlarmStatus = 0x0200, ID_AlarmTriggered = 0x0300, ID_AlarmCleared = 0x0400, + ID_HDOperationModeData = 0x2500, // 37 + ID_DGROPumpData = 0x1F00, // 31 ID_DGPressuresData = 0x2000, // 32 ID_DGDrainPumpData = 0x2400, // 36 @@ -115,6 +120,10 @@ #include "MsgDefs.h" Q_ENUM(Request_Reject_Reasons) + #include "HDDefs.h" + Q_ENUM(HD_Op_Modes) + Q_ENUM(UF_Adjustments) + #include "DGDefs.h" Q_ENUM(DG_Op_Modes) }; @@ -128,8 +137,12 @@ typedef GuiActions::Request_Reject_Reasons GuiRequestReasons; + typedef GuiActions::HD_Op_Modes GuiHDOpModes; typedef GuiActions::DG_Op_Modes GuiDGOpModes; + typedef GuiActions::UF_Adjustments GuiUFAdjustment; + + void registerTypes(); void registerQmlTypes();