Index: leahi.pro =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- leahi.pro (.../leahi.pro) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ leahi.pro (.../leahi.pro) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -170,7 +170,6 @@ sources/model/fp/data/MFPPressuresData.h \ sources/model/fp/data/MFPROPumpData.h \ sources/model/fp/data/MFPTemperatureData.h \ - sources/model/fp/data/MFPValvesStatesData.h \ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ @@ -226,7 +225,6 @@ sources/view/fp/data/VFPPressuresData.h \ sources/view/fp/data/VFPROPumpData.h \ sources/view/fp/data/VFPTemperatureData.h \ - sources/view/fp/data/VFPValvesStatesData.h \ sources/view/hd/data/VTreatmentRanges.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ @@ -500,7 +498,6 @@ sources/model/fp/data/MFPPressuresData.cpp \ sources/model/fp/data/MFPROPumpData.cpp \ sources/model/fp/data/MFPTemperatureData.cpp \ - sources/model/fp/data/MFPValvesStatesData.cpp \ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \ @@ -542,7 +539,6 @@ sources/view/fp/data/VFPPressuresData.cpp \ sources/view/fp/data/VFPROPumpData.cpp \ sources/view/fp/data/VFPTemperatureData.cpp \ - sources/view/fp/data/VFPValvesStatesData.cpp \ sources/view/hd/data/post/VHDPOSTData.cpp \ sources/bluetooth/BluetoothInterface.cpp \ sources/cloudsync/CloudSyncController.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -113,7 +113,6 @@ {Gui::GuiActionType::ID_DDGenDialysateData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DDBloodLeakData , 1 * 4 }, // 1 parameters each 4bytes //FP Data Messages - {Gui::GuiActionType::ID_FPValvesStatesData , 2 * 1 + 10 }, // 1 parameter 16bits & 10 parameters each 1 byte {Gui::GuiActionType::ID_FPROPumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_FPPressuresData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_FPLevelData , 1 * 4 }, // 1 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r9048646630717f980a852df54349805ba63773e0 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9048646630717f980a852df54349805ba63773e0) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -649,7 +649,6 @@ LOG_APPED(QString("FP,CheckIn," + QVariant(vData).toStringList().join(','))); break; // FP data messages - case Gui::GuiActionType::ID_FPValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPValvesStatesData ); break; case Gui::GuiActionType::ID_FPROPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPROPumpData ); break; case Gui::GuiActionType::ID_FPPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPPressuresData ); break; case Gui::GuiActionType::ID_FPLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPLevelData ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r9048646630717f980a852df54349805ba63773e0 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 9048646630717f980a852df54349805ba63773e0) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -116,7 +116,6 @@ #include "VDDLevelData.h" #include "VDDBloodLeakData.h" // FP data -#include "VFPValvesStatesData.h" #include "VFPROPumpData.h" #include "VFPPressuresData.h" #include "VFPLevelData.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -212,7 +212,7 @@ ID_DDBloodLeakData = 0x6000, // 96 //// ----- TODO: Payload subject to change given FW implementation // FP Data Messages - ID_FPValvesStatesData = 0x3100, // 49 //// ----- @LEAHIZED + ID_FPValvesStatesData = 0x310F, // 49 //// ----- @OBSOLETE. REMOVE? ID_FPROPumpData = 0x3200, // 50 //// ----- @LEAHIZED ID_FPPressuresData = 0x3400, // 52 //// ----- @LEAHIZED ID_FPLevelData = 0x3500, // 53 //// ----- @LEAHIZED @@ -238,7 +238,7 @@ // In-Treatment Adjustables ID_AdjustDurationReq = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustDurationRsp = 0x1B00, // 27 + ID_AdjustDurationRsp = 0x1B0F, // 27 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustBloodDialysateReq = 0x1700, // 23 ID_AdjustBloodDialysateRsp = 0x1800, // 24 @@ -406,7 +406,6 @@ Q_ENUM(DD_Valves) #include "FPDefs.h" - Q_ENUM(FP_Valves) }; // to be able to use the enum as signal/slot parameter @@ -482,9 +481,6 @@ // DD Valves typedef GuiActions::DD_Valves GuiDDValves; - // FP Valves - typedef GuiActions::FP_Valves GuiFPValves; - typedef QMap GuiStringIndexMap; typedef QPair GuiStringIndexMapItem; typedef QMapIterator GuiStringIndexMapIterator; @@ -525,4 +521,4 @@ void registerQmlTypes(); bool startGui(); -} + } Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml =================================================================== diff -u -rd18aafa7a51849a0ce6777806b6239988217b30a -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision d18aafa7a51849a0ce6777806b6239988217b30a) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -66,28 +66,20 @@ x: col(1.5) y: row(0) model: [ - Number(vFPValvesStates. M4Valve ) , - Number(vFPValvesStates. P39Valve) , - Number(vFPValvesStates. P6Valve ) , - Number(vFPValvesStates. P11Valve) , - Number(vFPValvesStates. P33Valve) , - Number(vFPValvesStates. P34Valve) , - Number(vFPValvesStates. P37Valve) , - Number(vFPValvesStates. M7Valve ) , - Number(vFPValvesStates. P20Valve) , - Number(vFPValvesStates. P43Valve) , + Number(vDDValvesStates. fpValve0) , + Number(vDDValvesStates. fpValve1) , + Number(vDDValvesStates. fpValve2) , + Number(vDDValvesStates. fpValve3) , + Number(vDDValvesStates. fpValve4) , + Number(vDDValvesStates. fpValve5) , ] label: [ - "M4 ", - "P39 ", - "P6 ", "P11 ", "P33 ", "P34 ", "P37 ", - "M7 ", - "P20 ", - "P43 ", + "P39 ", + "P6 ", ] } Index: sources/gui/qml/main.qml =================================================================== diff -u -rb12853c86ef9e517667516dc3e47bca07349cedf -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/gui/qml/main.qml (.../main.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) +++ sources/gui/qml/main.qml (.../main.qml) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -108,7 +108,6 @@ import VDDLevel 0.1 import VDDBloodLeak 0.1 // FP Data -import VFPValvesStates 0.1 import VFPROPump 0.1 import VFPPressures 0.1 import VFPLevel 0.1 @@ -243,7 +242,6 @@ VDDLevel { id: vDDLevel } VDDBloodLeak { id: vDDBloodLeak } // --- FP Data - VFPValvesStates { id: vFPValvesStates } VFPROPump { id: vFPROPump } VFPPressures { id: vFPPressures } VFPLevel { id: vFPLevel } Index: sources/model/MModel.h =================================================================== diff -u -r9048646630717f980a852df54349805ba63773e0 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/model/MModel.h (.../MModel.h) (revision 9048646630717f980a852df54349805ba63773e0) +++ sources/model/MModel.h (.../MModel.h) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -118,7 +118,6 @@ #include "MDDBloodLeakData.h" // FP Data Messages -#include "MFPValvesStatesData.h" #include "MFPROPumpData.h" #include "MFPPressuresData.h" #include "MFPLevelData.h" @@ -398,7 +397,6 @@ REGISTER_METATYPE( DDLevelData ) \ REGISTER_METATYPE( DDBloodLeakData ) \ /* FP Data */ \ - REGISTER_METATYPE( FPValvesStatesData ) \ REGISTER_METATYPE( FPROPumpData ) \ REGISTER_METATYPE( FPPressuresData ) \ REGISTER_METATYPE( FPLevelData ) \ @@ -604,7 +602,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDLevelData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDBloodLeakData ) \ /* FP Data */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPLevelData ) \ @@ -824,7 +821,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DDLevelData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDBloodLeakData ) \ /* FP Data */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( FPValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( FPROPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( FPPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( FPLevelData ) \ @@ -1151,7 +1147,6 @@ ACTION_RECEIVE_SIGNAL( DDLevelData ) \ ACTION_RECEIVE_SIGNAL( DDBloodLeakData ) \ /* FP Data */ \ - ACTION_RECEIVE_SIGNAL( FPValvesStatesData ) \ ACTION_RECEIVE_SIGNAL( FPROPumpData ) \ ACTION_RECEIVE_SIGNAL( FPPressuresData ) \ ACTION_RECEIVE_SIGNAL( FPLevelData ) \ Index: sources/model/dd/data/MDDValvesStatesData.h =================================================================== diff -u -r47b25a76644ca44b81b5a4a728346f8e72e1dc3b -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/model/dd/data/MDDValvesStatesData.h (.../MDDValvesStatesData.h) (revision 47b25a76644ca44b81b5a4a728346f8e72e1dc3b) +++ sources/model/dd/data/MDDValvesStatesData.h (.../MDDValvesStatesData.h) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -38,10 +38,12 @@ * | || * | #01:(U16) | \ref Data::mValvesStatus | * | #02:(U08) | \ref Data::mValvesBCStatus | # Combined with mValvesStates - * | #03:(U08) | \ref Data::mValvesUFStatus | # Combined with mValvesStates - * | #04:(U08) | \ref Data::mValvesSensedState1 | + * | #03:(U08) | \ref Data::mValvesSVStatus | # Combined with mValvesStates + * | #04:(U08) | \ref Data::mValvesIOStatus | # Combined with mValvesStates + * | #05:(U08) | \ref Data::mValvesFPStatus | # Combined with mValvesStates + * | #06:(U08) | \ref Data::mValvesSensedState1 | * | #..:(U08) | \ref Data::mValvesSensedState.. | - * | #31:(U08) | \ref Data::mValvesSensedState28 | + * | #32:(U08) | \ref Data::mValvesSensedState28 | * * * \sa Data @@ -65,7 +67,7 @@ QVariantList parameters() const override; struct { - Types::Flags mValvesStatus ; // 16 bit Hydrolic Valves, 8 bit Balancing Chanber Valves, 8 bit UF Valves + Types::Flags mValvesStatus ; // 16 bit Hydrolic Valves, 8 bit Balancing Chanber Valves, 8 bit Spare Valves, 8 bit IO vales, 8 bit FP valves Types::U08 mValvesSensedState1 ; Types::U08 mValvesSensedState2 ; Types::U08 mValvesSensedState3 ; Fisheye: Tag a524ef99542bfa8d371835bc7c7d24c68ecf1865 refers to a dead (removed) revision in file `sources/model/fp/data/MFPValvesStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag a524ef99542bfa8d371835bc7c7d24c68ecf1865 refers to a dead (removed) revision in file `sources/model/fp/data/MFPValvesStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r994d6d453820ba52adc987d81a2dbd54356a40eb -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 994d6d453820ba52adc987d81a2dbd54356a40eb) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -61,11 +61,11 @@ /*0025*/case GuiAlarmID::ALARM_ID_DD_VALVE_CONTROL_FAILURE : { result = QObject::tr("DD FPGA not accepting commanded valve states." ); break; } /* 25*/ /*0026*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT : { result = QObject::tr("TD arterial pressure sensor freshness/error timeout fault." ); break; } /* 26*/ /*0027*/case GuiAlarmID::ALARM_ID_TD_VENOUS_SENSOR_TIMEOUT_FAULT : { result = QObject::tr("TD venous pressure sensor freshness/error timeout fault." ); break; } /* 27*/ -/*0028*/case GuiAlarmID::ALARM_ID_DD_HYD_OUTLET_PRES_TIMEOUT_FAULT : { result = QObject::tr("DD hydraulics outlet pressure sensor freshness/error timeout fault." ); break; } /* 28*/ -/*0029*/case GuiAlarmID::ALARM_ID_DD_BIBAG_PRES_TIMEOUT_FAULT : { result = QObject::tr("DD bibag pressure sensor freshness/error timeout fault." ); break; } /* 29*/ -/*0030*/case GuiAlarmID::ALARM_ID_DD_SPENT_DIALYSATE_PRES_TIMEOUT_FAULT : { result = QObject::tr("DD spent dialysate pressure sensor freshness/error timeout fault." ); break; } /* 30*/ -/*0031*/case GuiAlarmID::ALARM_ID_DD_FRESH_DIALYSATE_PRES_TIMEOUT_FAULT : { result = QObject::tr("DD fresh dialysate pressure sensor freshness/error timeout fault." ); break; } /* 31*/ -/*0032*/case GuiAlarmID::ALARM_ID_DD_TRANSMEMB_PRES_TIMEOUT_FAULT : { result = QObject::tr("DD transmembrane pressure sensor freshness/error timeout fault." ); break; } /* 32*/ +/*0028*/case GuiAlarmID::ALARM_ID_AVAILABLE_28 : { result = QObject::tr("Available alarms." ); break; } /* 28*/ +/*0029*/case GuiAlarmID::ALARM_ID_AVAILABLE_29 : { result = QObject::tr("Available alarms." ); break; } /* 29*/ +/*0030*/case GuiAlarmID::ALARM_ID_AVAILABLE_30 : { result = QObject::tr("Available alarms." ); break; } /* 30*/ +/*0031*/case GuiAlarmID::ALARM_ID_AVAILABLE_31 : { result = QObject::tr("Available alarms." ); break; } /* 31*/ +/*0032*/case GuiAlarmID::ALARM_ID_AVAILABLE_32 : { result = QObject::tr("Available alarms." ); break; } /* 32*/ /*0033*/case GuiAlarmID::ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE : { result = QObject::tr("TD voltage out of range fault." ); break; } /* 33*/ /*0034*/case GuiAlarmID::ALARM_ID_TD_AC_POWER_LOST : { result = QObject::tr("TD AC power lost." ); break; } /* 34*/ /*0035*/case GuiAlarmID::ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT : { result = QObject::tr("TD AC power lost during treatment." ); break; } /* 35*/ @@ -91,7 +91,7 @@ /*0055*/case GuiAlarmID::ALARM_ID_DD_CONCENTRATE_PUMP_FAULT : { result = QObject::tr("DD concentrate pump fault." ); break; } /* 55*/ /*0056*/case GuiAlarmID::ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE : { result = QObject::tr("DD temperature sensor out of range." ); break; } /* 56*/ /*0057*/case GuiAlarmID::ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT : { result = QObject::tr("DD temperature sensors freshness timeout fault." ); break; } /* 57*/ -/*0058*/case GuiAlarmID::ALARM_ID_DD_BARO_SENSOR_FPGA_FAULT : { result = QObject::tr("DD baro sensors freshness timeout fault." ); break; } /* 58*/ +/*0058*/case GuiAlarmID::ALARM_ID_AVAILABLE_58 : { result = QObject::tr("DD Available alarms." ); break; } /* 58*/ /*0059*/case GuiAlarmID::ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC : { result = QObject::tr("DD barometric sensor coefficients bad CRC." ); break; } /* 59*/ /*0060*/case GuiAlarmID::ALARM_ID_DD_D12_PUMP_RPM_OUT_OF_RANGE : { result = QObject::tr("DD fresh dialysate pump RPM out of range." ); break; } /* 60*/ /*0061*/case GuiAlarmID::ALARM_ID_DD_D12_PUMP_OFF_FAULT : { result = QObject::tr("DD fresh dialysate pump running when it is not commanded to run." ); break; } /* 61*/ @@ -105,8 +105,8 @@ /*0069*/case GuiAlarmID::ALARM_ID_DD_D48_PUMP_DIRECTION_FPGA_FAULT : { result = QObject::tr("DD spent dialysate pump direction error count FPGA fault." ); break; } /* 69*/ /*0070*/case GuiAlarmID::ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D5_HEAT_IS_ON : { result = QObject::tr("DD primary heater is On when no fluid is present." ); break; } /* 70*/ /*0071*/case GuiAlarmID::ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON : { result = QObject::tr("DD trimmer heater is On when no fluid is present." ); break; } /* 71*/ -/*0072*/case GuiAlarmID::ALARM_ID_DD_WATER_INLET_INPUT_PRES_TIMEOUT_FAULT : { result = QObject::tr("DD water inlet input pressure sensor freshness/error timeout fault." ); break; } /* 72*/ -/*0073*/case GuiAlarmID::ALARM_ID_DD_WATER_INLET_OUTPUT_PRES_TIMEOUT_FAULT : { result = QObject::tr("DD water inlet output pressure sensor freshness/error timeout fault." ); break; } /* 73*/ +/*0072*/case GuiAlarmID::ALARM_ID_TD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC : { result = QObject::tr("TD barometric sensor coefficients bad CRC." ); break; } /* 72*/ +/*0073*/case GuiAlarmID::ALARM_ID_TD_BARO_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("TD barometric sensor pressure out of range." ); break; } /* 73*/ /*0074*/case GuiAlarmID::ALARM_ID_DD_D76_PUMP_SPEED_CONTROL_ERROR : { result = QObject::tr("DD UF pump speed control error." ); break; } /* 74*/ /*0075*/case GuiAlarmID::ALARM_ID_DD_SC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("DD spent chamber state 1 fill pressure out of range." ); break; } /* 75*/ /*0076*/case GuiAlarmID::ALARM_ID_DD_SC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("DD spent chamber state 2 fill pressure out of range." ); break; } /* 76*/ @@ -183,9 +183,9 @@ /*0147*/case GuiAlarmID::ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE : { result = QObject::tr("FP pump inlet conductivity high." ); break; } /* 147*/ /*0148*/case GuiAlarmID::ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE : { result = QObject::tr("FP rejection ratio low." ); break; } /* 148*/ /*0149*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE : { result = QObject::tr("FP inlet pressure regulator out of range." ); break; } /* 149*/ -/*0150*/case GuiAlarmID::ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("FP filter health pressure out of range." ); break; } /* 150*/ +/*0150*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLOW_RATE_BELOW_TARGET : { result = QObject::tr("FP flow rate below 75% of target flow." ); break; } /* 150*/ /*0151*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT : { result = QObject::tr("FP membrane flush timeout." ); break; } /* 151*/ -/*0152*/case GuiAlarmID::ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE : { result = QObject::tr("FP membrane flush integrated out of range." ); break; } /* 152*/ +/*0152*/case GuiAlarmID::ALARM_ID_FP_CONCENTRATE_FLUSH_TANK_FULL_TIMEOUT : { result = QObject::tr("FP concentrate flush tank full timeout." ); break; } /* 152*/ /*0153*/case GuiAlarmID::ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT : { result = QObject::tr("FP tank full time out alarm." ); break; } /* 153*/ /*0154*/case GuiAlarmID::ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE: { result = QObject::tr("DD dialysate temperature sensors out of range." ); break; } /* 154*/ /*0155*/case GuiAlarmID::ALARM_ID_DD_BLOOD_LEAK_DETECTED : { result = QObject::tr("DD blood leak detected." ); break; } /* 155*/ @@ -194,7 +194,10 @@ /*0158*/case GuiAlarmID::ALARM_ID_DD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE : { result = QObject::tr("DD blood leak sensor set point failure." ); break; } /* 158*/ /*0159*/case GuiAlarmID::ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT : { result = QObject::tr("DD blood leak sensor recovering please wait." ); break; } /* 159*/ /*0160*/case GuiAlarmID::ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT : { result = QObject::tr("FP tank fill time out alarm." ); break; } /* 160*/ -/*0161*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 161*/ +/*0161*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_CRITICAL_OUT_RANGE : { result = QObject::tr("FP inlet pressure high fault." ); break; } /* 161*/ +/*0162*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE : { result = QObject::tr("FP permeate flow high fault." ); break; } /* 162*/ +/*0163*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE : { result = QObject::tr("FP permeate flow low fault." ); break; } /* 163*/ +/*0164*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 164*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID)); Index: sources/view/VView.h =================================================================== diff -u -r9048646630717f980a852df54349805ba63773e0 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/view/VView.h (.../VView.h) (revision 9048646630717f980a852df54349805ba63773e0) +++ sources/view/VView.h (.../VView.h) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -197,7 +197,6 @@ REGISTER_TYPE( VDDLevel ) \ REGISTER_TYPE( VDDBloodLeak ) \ /* FP - Data */ \ - REGISTER_TYPE( VFPValvesStates ) \ REGISTER_TYPE( VFPROPump ) \ REGISTER_TYPE( VFPPressures ) \ REGISTER_TYPE( VFPLevel ) \ Index: sources/view/dd/data/VDDValvesStatesData.cpp =================================================================== diff -u -rb8124d3043669fc9b63194f50fe75c7722d69aa7 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/view/dd/data/VDDValvesStatesData.cpp (.../VDDValvesStatesData.cpp) (revision b8124d3043669fc9b63194f50fe75c7722d69aa7) +++ sources/view/dd/data/VDDValvesStatesData.cpp (.../VDDValvesStatesData.cpp) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -21,35 +21,52 @@ void VDDValvesStates::onActionReceive(const DDValvesStatesData &vData) { - hydraulicsOutletValve ( vData.mValvesStatus.at( GuiDDValves::D14_VALV )); // Start of Hydraulics valve group - thermalDisinfectValve ( vData.mValvesStatus.at( GuiDDValves::D52_VALV )); - HydraulicsBypassValve ( vData.mValvesStatus.at( GuiDDValves::D8_VALV )); - rinsePortValve ( vData.mValvesStatus.at( GuiDDValves::D54_VALV )); - drainValve ( vData.mValvesStatus.at( GuiDDValves::D53_VALV )); - dialyzerBypassValve ( vData.mValvesStatus.at( GuiDDValves::D34_VALV )); - purgeValve1 ( vData.mValvesStatus.at( GuiDDValves::D64_VALV )); - pressureTestValve ( vData.mValvesStatus.at( GuiDDValves::D31_VALV )); - dryBicarbInletValve ( vData.mValvesStatus.at( GuiDDValves::D65_VALV )); - dialyzerInletValve ( vData.mValvesStatus.at( GuiDDValves::D35_VALV )); - dialyzerOutletValve ( vData.mValvesStatus.at( GuiDDValves::D40_VALV )); - purgeValve2 ( vData.mValvesStatus.at( GuiDDValves::D47_VALV )); - hydraulicsInletValve ( vData.mValvesStatus.at( GuiDDValves::D3_VALV )); - waterInletValve ( vData.mValvesStatus.at( GuiDDValves::DD_M4_VALV)); + hydraulicsOutletValve ( vData.mValvesStatus.at( GuiDDValves::D14_VALV )); // Start of Hydraulics valve group + thermalDisinfectValve ( vData.mValvesStatus.at( GuiDDValves::D52_VALV )); + HydraulicsBypassValve ( vData.mValvesStatus.at( GuiDDValves::D8_VALV )); + rinsePortValve ( vData.mValvesStatus.at( GuiDDValves::D54_VALV )); + drainValve ( vData.mValvesStatus.at( GuiDDValves::D53_VALV )); + dialyzerBypassValve ( vData.mValvesStatus.at( GuiDDValves::D34_VALV )); + purgeValve1 ( vData.mValvesStatus.at( GuiDDValves::D64_VALV )); + pressureTestValve ( vData.mValvesStatus.at( GuiDDValves::D31_VALV )); + dryBicarbInletValve ( vData.mValvesStatus.at( GuiDDValves::D65_VALV )); + dialyzerInletValve ( vData.mValvesStatus.at( GuiDDValves::D35_VALV )); + dialyzerOutletValve ( vData.mValvesStatus.at( GuiDDValves::D40_VALV )); + purgeValve2 ( vData.mValvesStatus.at( GuiDDValves::D47_VALV )); + hydraulicsInletValve ( vData.mValvesStatus.at( GuiDDValves::D3_VALV )); + dryBicarbValve ( vData.mValvesStatus.at( GuiDDValves::D80_VALV )); + deScalerValve ( vData.mValvesStatus.at( GuiDDValves::D81_VALV )); + // 2 reserved flags are here... // - balancingChamberValve1 ( vData.mValvesStatus.at( GuiDDValves::D23_VALV )); // Start of Balancing Chamber valve group - balancingChamberValve2 ( vData.mValvesStatus.at( GuiDDValves::D19_VALV )); - balancingChamberValve3 ( vData.mValvesStatus.at( GuiDDValves::D25_VALV )); - balancingChamberValve7 ( vData.mValvesStatus.at( GuiDDValves::D26_VALV )); - balancingChamberValve5 ( vData.mValvesStatus.at( GuiDDValves::D24_VALV )); - balancingChamberValve6 ( vData.mValvesStatus.at( GuiDDValves::D20_VALV )); - balancingChamberValve4 ( vData.mValvesStatus.at( GuiDDValves::D21_VALV )); - balancingChamberValve8 ( vData.mValvesStatus.at( GuiDDValves::D22_VALV )); + balancingChamberValve1 ( vData.mValvesStatus.at( GuiDDValves::D23_VALV )); // Start of Balancing Chamber valve group + balancingChamberValve2 ( vData.mValvesStatus.at( GuiDDValves::D19_VALV )); + balancingChamberValve3 ( vData.mValvesStatus.at( GuiDDValves::D25_VALV )); + balancingChamberValve4 ( vData.mValvesStatus.at( GuiDDValves::D21_VALV )); + balancingChamberValve5 ( vData.mValvesStatus.at( GuiDDValves::D24_VALV )); + balancingChamberValve6 ( vData.mValvesStatus.at( GuiDDValves::D20_VALV )); + balancingChamberValve7 ( vData.mValvesStatus.at( GuiDDValves::D26_VALV )); + balancingChamberValve8 ( vData.mValvesStatus.at( GuiDDValves::D22_VALV )); - ultrafiltrationInletValve1 ( vData.mValvesStatus.at( GuiDDValves::D69_VALV )); // Start of Ultrafiltration valve group - ultrafiltrationInletValve2 ( vData.mValvesStatus.at( GuiDDValves::D71_VALV )); - ultrafiltrationOutletValve1 ( vData.mValvesStatus.at( GuiDDValves::D70_VALV )); - ultrafiltrationOutletValve2 ( vData.mValvesStatus.at( GuiDDValves::D72_VALV )); + spareValve0 ( vData.mValvesStatus.at( GuiDDValves::D79_PMP_VALV )); // Start of spare valve group + spareValve1 ( vData.mValvesStatus.at( GuiDDValves::SPARE1_VALV )); + spareValve2 ( vData.mValvesStatus.at( GuiDDValves::SPARE2_VALV )); + spareValve3 ( vData.mValvesStatus.at( GuiDDValves::SPARE3_VALV )); + spareValve4 ( vData.mValvesStatus.at( GuiDDValves::SPARE4_VALV )); + spareValve5 ( vData.mValvesStatus.at( GuiDDValves::SPARE5_VALV )); + spareValve6 ( vData.mValvesStatus.at( GuiDDValves::SPARE6_VALV )); + spareValve7 ( vData.mValvesStatus.at( GuiDDValves::SPARE7_VALV )); + + ioValve0 ( vData.mValvesStatus.at( GuiDDValves::M4_VALV )); // start of IO Valves + ioValve1 ( vData.mValvesStatus.at( GuiDDValves::M12_VALV )); + + fpValve0 ( vData.mValvesStatus.at( GuiDDValves::P11_VALV )); // start of FP Valves + fpValve1 ( vData.mValvesStatus.at( GuiDDValves::P33_VALV )); + fpValve2 ( vData.mValvesStatus.at( GuiDDValves::P34_VALV )); + fpValve3 ( vData.mValvesStatus.at( GuiDDValves::P37_VALV )); + fpValve4 ( vData.mValvesStatus.at( GuiDDValves::P39_VALV )); + fpValve5 ( vData.mValvesStatus.at( GuiDDValves::P6_VALV )); + // 4 reserved flags are here... // valvesSensedState1 ( vData.mValvesSensedState1 ); Index: sources/view/dd/data/VDDValvesStatesData.h =================================================================== diff -u -rb8124d3043669fc9b63194f50fe75c7722d69aa7 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 --- sources/view/dd/data/VDDValvesStatesData.h (.../VDDValvesStatesData.h) (revision b8124d3043669fc9b63194f50fe75c7722d69aa7) +++ sources/view/dd/data/VDDValvesStatesData.h (.../VDDValvesStatesData.h) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) @@ -51,22 +51,37 @@ PROPERTY( bool , dialyzerOutletValve , 0 ) PROPERTY( bool , purgeValve2 , 0 ) PROPERTY( bool , hydraulicsInletValve , 0 ) - PROPERTY( bool , waterInletValve , 0 ) + PROPERTY( bool , dryBicarbValve , 0 ) + PROPERTY( bool , deScalerValve , 0 ) PROPERTY( bool , balancingChamberValve1 , 0 ) PROPERTY( bool , balancingChamberValve2 , 0 ) PROPERTY( bool , balancingChamberValve3 , 0 ) - PROPERTY( bool , balancingChamberValve7 , 0 ) + PROPERTY( bool , balancingChamberValve4 , 0 ) PROPERTY( bool , balancingChamberValve5 , 0 ) PROPERTY( bool , balancingChamberValve6 , 0 ) - PROPERTY( bool , balancingChamberValve4 , 0 ) + PROPERTY( bool , balancingChamberValve7 , 0 ) PROPERTY( bool , balancingChamberValve8 , 0 ) - PROPERTY( bool , ultrafiltrationInletValve1 , 0 ) - PROPERTY( bool , ultrafiltrationInletValve2 , 0 ) - PROPERTY( bool , ultrafiltrationOutletValve1 , 0 ) - PROPERTY( bool , ultrafiltrationOutletValve2 , 0 ) + PROPERTY( bool , spareValve0 , 0 ) + PROPERTY( bool , spareValve1 , 0 ) + PROPERTY( bool , spareValve2 , 0 ) + PROPERTY( bool , spareValve3 , 0 ) + PROPERTY( bool , spareValve4 , 0 ) + PROPERTY( bool , spareValve5 , 0 ) + PROPERTY( bool , spareValve6 , 0 ) + PROPERTY( bool , spareValve7 , 0 ) + PROPERTY( bool , ioValve0 , 0 ) + PROPERTY( bool , ioValve1 , 0 ) + + PROPERTY( bool , fpValve0 , 0 ) + PROPERTY( bool , fpValve1 , 0 ) + PROPERTY( bool , fpValve2 , 0 ) + PROPERTY( bool , fpValve3 , 0 ) + PROPERTY( bool , fpValve4 , 0 ) + PROPERTY( bool , fpValve5 , 0 ) + PROPERTY( quint8 , valvesSensedState1 , 0 ) PROPERTY( quint8 , valvesSensedState2 , 0 ) PROPERTY( quint8 , valvesSensedState3 , 0 ) Fisheye: Tag a524ef99542bfa8d371835bc7c7d24c68ecf1865 refers to a dead (removed) revision in file `sources/view/fp/data/VFPValvesStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag a524ef99542bfa8d371835bc7c7d24c68ecf1865 refers to a dead (removed) revision in file `sources/view/fp/data/VFPValvesStatesData.h'. Fisheye: No comparison available. Pass `N' to diff?