Index: leahi.pro
===================================================================
diff -u -r99d10909ee4ee821cd4ab6dc323c3798d9090b39 -r128121958d87699685bd88261e39bb968a0de204
--- leahi.pro (.../leahi.pro) (revision 99d10909ee4ee821cd4ab6dc323c3798d9090b39)
+++ leahi.pro (.../leahi.pro) (revision 128121958d87699685bd88261e39bb968a0de204)
@@ -68,6 +68,10 @@
sources/model/dd/data \
sources/model/dd/adjustment \
sources/model/dd/adjustment/settings \
+ sources/model/fp \
+ sources/model/fp/data \
+ sources/model/fp/adjustment \
+ sources/model/fp/adjustment/settings \
sources/view \
sources/view/td \
sources/view/td/data \
@@ -77,6 +81,8 @@
sources/view/dd/data \
sources/view/confirm \
sources/view/settings \
+ sources/view/fp \
+ sources/view/fp/data \
\
sources/gui \
sources/utility \
@@ -130,6 +136,7 @@
common/AlarmDefs.h \
common/Compatible.h \
common/DDDefs.h \
+ common/FPDefs.h \
common/TDDefs.h \
common/MsgDefs.h \
\ # Main
@@ -155,6 +162,15 @@
sources/model/dd/data/MDDPressuresData.h \
sources/model/dd/data/MDDTemperaturesData.h \
sources/model/dd/data/MDDValvesStatesData.h \
+ sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.h \
+ sources/model/fp/data/MFPBoostPumpData.h \
+ sources/model/fp/data/MFPConductivityData.h \
+ sources/model/fp/data/MFPFlowData.h \
+ sources/model/fp/data/MFPLevelData.h \
+ 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 \
@@ -197,6 +213,14 @@
sources/view/dd/data/VDDPressuresData.h \
sources/view/dd/data/VDDTemperaturesData.h \
sources/view/dd/data/VDDValvesStatesData.h \
+ sources/view/fp/data/VFPBoostPumpData.h \
+ sources/view/fp/data/VFPConductivityData.h \
+ sources/view/fp/data/VFPFlowData.h \
+ sources/view/fp/data/VFPLevelData.h \
+ 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 \
@@ -463,6 +487,15 @@
sources/model/dd/data/MDDPressuresData.cpp \
sources/model/dd/data/MDDTemperaturesData.cpp \
sources/model/dd/data/MDDValvesStatesData.cpp \
+ sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.cpp \
+ sources/model/fp/data/MFPBoostPumpData.cpp \
+ sources/model/fp/data/MFPConductivityData.cpp \
+ sources/model/fp/data/MFPFlowData.cpp \
+ sources/model/fp/data/MFPLevelData.cpp \
+ 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 \
@@ -495,6 +528,14 @@
sources/view/dd/data/VDDPressuresData.cpp \
sources/view/dd/data/VDDTemperaturesData.cpp \
sources/view/dd/data/VDDValvesStatesData.cpp \
+ sources/view/fp/data/VFPBoostPumpData.cpp \
+ sources/view/fp/data/VFPConductivityData.cpp \
+ sources/view/fp/data/VFPFlowData.cpp \
+ sources/view/fp/data/VFPLevelData.cpp \
+ 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: leahi.qrc
===================================================================
diff -u -re1ecb77ba0ff9619b7363f14e1ed3c3e110c4057 -r128121958d87699685bd88261e39bb968a0de204
--- leahi.qrc (.../leahi.qrc) (revision e1ecb77ba0ff9619b7363f14e1ed3c3e110c4057)
+++ leahi.qrc (.../leahi.qrc) (revision 128121958d87699685bd88261e39bb968a0de204)
@@ -41,6 +41,7 @@
sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
+ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r128121958d87699685bd88261e39bb968a0de204
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 128121958d87699685bd88261e39bb968a0de204)
@@ -165,7 +165,7 @@
ID_DGFilterFlushData = 0x600F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication
ID_AdjustWaterSampleReq = 0x5D00, // 93
ID_AdjustWaterSampleRsp = 0x5E00, // 94
- ID_AdjustWaterSampleResultReq = 0x5F00, // 95 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+ ID_AdjustWaterSampleResultReq = 0x5F0F, // 95 //// ----- @CRAPIZED: had to change to avoid duplication
// Pre-Treatment Consumables Installation Confirm
ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
// Pre-Treatment SelfTest NoCartridge Progress Data
@@ -245,8 +245,8 @@
ID_AdjustPressuresLimitsReq = 0x4600, // 70
ID_AdjustPressuresLimitsRsp = 0x4700, // 71
- ID_AdjustSalineReq = 0x1200, // 18
- ID_AdjustSalineRsp = 0x1400, // 20
+ ID_AdjustSalineReq = 0x5F00, // 95
+ ID_AdjustSalineRsp = 0x6000, // 96
ID_AdjustHeparinReq = 0x4B00, // 75
ID_AdjustHeparinRsp = 0x4C00, // 76
Index: sources/gui/qml/main.qml
===================================================================
diff -u -re1ecb77ba0ff9619b7363f14e1ed3c3e110c4057 -r128121958d87699685bd88261e39bb968a0de204
--- sources/gui/qml/main.qml (.../main.qml) (revision e1ecb77ba0ff9619b7363f14e1ed3c3e110c4057)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 128121958d87699685bd88261e39bb968a0de204)
@@ -107,6 +107,15 @@
import VDDGenDialysate 0.1
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
+import VFPFlow 0.1
+import VFPConductivity 0.1
+import VFPTemperature 0.1
+import VFPBoostPump 0.1
// In-Treatment - Adjustemnt
import VTreatmentAdjustmentDuration 0.1
import VTreatmentAdjustmentFlows 0.1
@@ -215,7 +224,7 @@
VTreatmentRinseback { id: vTreatmentRinseback }
VTreatmentRecirculate { id: vTreatmentRecirculate }
VTreatmentStop { id: vTreatmentStop }
- // ---- DG
+ // ---- DD
VDGDrainPump { id: vDGDrainPump }
VDDHeaters { id: vDDHeaters }
VDGLoadCellReadings { id: vDGLoadCellReadings }
@@ -232,6 +241,15 @@
VDDGenDialysate { id: vDDGenDialysate }
VDDLevel { id: vDDLevel }
VDDBloodLeak { id: vDDBloodLeak }
+ // --- FP Data
+ VFPValvesStates { id: vFPValvesStates }
+ VFPROPump { id: vFPROPump }
+ VFPPressures { id: vFPPressures }
+ VFPLevel { id: vFPLevel }
+ VFPFlow { id: vFPFlow }
+ VFPConductivity { id: vFPConductivity }
+ VFPTemperature { id: vFPTemperature }
+ VFPBoostPump { id: vFPBoostPump }
// --- Pre-Treatment Progress Data
VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment }
VDGFilterFlush { id: vDGFilterFlush }