Index: sources/gui/guiglobals.h =================================================================== diff -u -r70a248b93720a46cb3a0f60b092698acd2acc7c1 -r4a6abe765f03feae8100ec660aa04aa218d4dfa3 --- sources/gui/guiglobals.h (.../guiglobals.h) (revision 70a248b93720a46cb3a0f60b092698acd2acc7c1) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 4a6abe765f03feae8100ec660aa04aa218d4dfa3) @@ -29,61 +29,30 @@ public: enum /*class*/ GuiActionsType_Enum /*: quint16 QML doesn't support enum types */ { - Unknown = 0x0000, - PowerOff = 0x0100, - KeepAlive = 0x0700, - BloodFlow = 0x0500, - DialysateFlow = 0x0800, + Unknown = 0x0000, + PowerOff = 0x0100, + KeepAlive = 0x0700, + BloodFlow = 0x0500, + DialysateInletFlow = 0x0800, + DialysateOutletFlow = 0x0B00, + TreatmentTime = 0x0D00, + PowerOffBroadcast = 0x0E00, - AlarmStatus = 0x0200, - AlarmTriggered = 0x0300, - AlarmCleared = 0x0400, + AlarmStatus = 0x0200, + AlarmTriggered = 0x0300, + AlarmCleared = 0x0400, - String = 0xFFFE, + PressureOcclusion = 0x0900, - Acknow = 0xFFFF, + String = 0xFFFE, + + Acknow = 0xFFFF, }; enum class GuiActionsIndx_Enum { // ---- PowerOff PowerOff_ShowHide = 0 , PowerOff_Response = 0 , - - // ---- BloodFlow - BloodFlow_FlowSetPoint = 0 , - BloodFlow_MeasuredFlow , - BloodFlow_RotorSpeed , - BloodFlow_MotorSpeed , - BloodFlow_MotorCtlSpeed , - BloodFlow_MotorCtlCurrent , - BloodFlow_PWMDtCycle , - - // ---- DialysateFlow - DialysateFlow_FlowSetPoint = 0 , - DialysateFlow_MeasuredFlow , - DialysateFlow_RotorSpeed , - DialysateFlow_MotorSpeed , - DialysateFlow_MotorCtlSpeed , - DialysateFlow_MotorCtlCurrent , - DialysateFlow_PWMDtCycle , - - // ---- AlarmStatus - AlarmStatus_Priority = 0 , - AlarmStatus_AlarmID , - AlarmStatus_EscalateIn , - AlarmStatus_MuteTimeout , - AlarmStatus_Flag_systemFault , - AlarmStatus_Flag_stop , - AlarmStatus_Flag_noClear , - AlarmStatus_Flag_noResume , - AlarmStatus_Flag_noRinseback , - AlarmStatus_Flag_noEndTreatment , - AlarmStatus_Flag_noNewTreatment , - AlarmStatus_Flag_bypassDialyzer , - AlarmStatus_Flag_alarmsToEscalate , - AlarmStatus_Flag_alarmsSilenced , - AlarmStatus_Flag_Bits_Length = 16, - }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ {