Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r47b25a76644ca44b81b5a4a728346f8e72e1dc3b -rb80f8f84f21f86ad4c962a2c690447c572498e0b --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 47b25a76644ca44b81b5a4a728346f8e72e1dc3b) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) @@ -100,6 +100,7 @@ ID_AdjustVersionsTDReq = 0x1500, // 21 // ID_TDVersionsRxq - TD Version request received //// ----- @LEAHIZED ID_AdjustVersionsTDRsp = 0x0E00, // 14 //// ----- @LEAHIZED ID_AdjustVersionsDDRsp = 0x0F00, // 15 //// ----- @LEAHIZED + ID_AdjustVersionsFPRsp = 0x5A00, // 90 //// ----- @LEAHIZED ID_AdjustSerialTDRsp = 0x5100, // 81 //// ----- @LEAHIZED ID_AdjustSerialDDRsp = 0x5200, // 82 //// ----- @LEAHIZED @@ -209,6 +210,16 @@ ID_DDGenDialysateData = 0x2F00, // 47 //// ----- @LEAHIZED ID_DDBloodLeakData = 0x6000, // 96 //// ----- TODO: Payload subject to change given FW implementation + // FP Data Messages + ID_FPValvesStatesData = 0x3100, // 49 //// ----- @LEAHIZED + ID_FPROPumpData = 0x3200, // 50 //// ----- @LEAHIZED + ID_FPPressuresData = 0x3400, // 52 //// ----- @LEAHIZED + ID_FPLevelData = 0x3500, // 53 //// ----- @LEAHIZED + ID_FPFlowSensorData = 0x3600, // 54 //// ----- @LEAHIZED + ID_FPConductivityData = 0x3700, // 55 //// ----- @LEAHIZED + ID_FPTemperaturesData = 0x3900, // 57 //// ----- @LEAHIZED + ID_FPROBoosterPumpData = 0x5000, // 80 //// ----- @LEAHIZED + // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 ID_HDSyringePumpData = 0x6900, // 105 @@ -389,6 +400,9 @@ Q_ENUM(DD_Disinfect_States) Q_ENUM(DD_Heat_UI_States) Q_ENUM(DD_Valves) + + #include "FPDefs.h" + Q_ENUM(FP_Valves) }; // to be able to use the enum as signal/slot parameter @@ -464,6 +478,9 @@ // DD Valves typedef GuiActions::DD_Valves GuiDDValves; + // FP Valves + typedef GuiActions::FP_Valves GuiFPValves; + typedef QMap GuiStringIndexMap; typedef QPair GuiStringIndexMapItem; typedef QMapIterator GuiStringIndexMapIterator;