Index: leahi.pro =================================================================== diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- leahi.pro (.../leahi.pro) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) +++ leahi.pro (.../leahi.pro) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -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 \ @@ -501,7 +499,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 \ @@ -543,7 +540,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 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -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 -r87be1a4b3a1d19c60b37908f1cba8e310799a963 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 87be1a4b3a1d19c60b37908f1cba8e310799a963) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -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.h =================================================================== diff -u -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -106,18 +106,18 @@ // Service Information ID_AdjustServiceDatesReq = 0x8900, // 137 - ID_AdjustServiceDatesHDRsp = 0x8A00, // 138 - ID_AdjustServiceDatesDGRsp = 0x8C00, // 140 + ID_AdjustServiceDatesHDRsp = 0x8A0F, // 138 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustServiceDatesDGRsp = 0x8C0F, // 140 //// ----- @CRAPIZED: had to change to avoid duplication // HD/DG Usage Counter ID_HDUsageInfoReq = 0xA000, // 160 - ID_HDUsageInfoRsp = 0x8B00, // 139 + ID_HDUsageInfoRsp = 0x8B0F, // 139 //// ----- @CRAPIZED: had to change to avoid duplication // RTC - ID_AdjustHDDateTimeReq = 0x6D00, // 109 - ID_AdjustHDDateTimeRsp = 0x6E00, // 110 - ID_AdjustDGDateTimeReq = 0x6F00, // 111 - ID_AdjustDGDateTimeRsp = 0x7000, // 112 + ID_AdjustTDDateTimeReq = 0x6C00, // 108 + ID_AdjustTDDateTimeRsp = 0x6D00, // 109 + ID_AdjustDDDateTimeReq = 0x6E00, // 110 + ID_AdjustDDDateTimeRsp = 0x6F00, // 111 ID_HDRTCEpochData = 0x0A0F, // 10 //// ----- @CRAPIZED // State Messages @@ -136,7 +136,7 @@ ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED - ID_Heparin = 0x4D00, // 77 + ID_Heparin = 0x8C00, // 140 ID_Rinseback = 0x5600, // 86 ID_Recirculate = 0x5A00, // 90 ID_BloodPrime = 0x5900, // 89 @@ -224,7 +224,7 @@ // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 ID_HDSyringePumpData = 0x6900, // 105 - ID_HDBloodLeakData = 0x6C00, // 108 + ID_HDBloodLeakData = 0x6C0F, // 108 //// ----- @CRAPIZED: had to change to avoid duplication ID_TDAirBubbleData = 0x1E00, // 30 //// ----- @LEAHIZED ID_TDAirPumpData = 0x2000, // 32 //// ----- @LEAHIZED ID_TDAirTrapData = 0x2A00, // 42 //// ----- @LEAHIZED @@ -252,8 +252,8 @@ ID_AdjustVitalsReq = 0x6300, // 99 ID_AdjustVitalsRsp = 0x6400, // 100 - ID_AdjustHeparinReq = 0x4B00, // 75 - ID_AdjustHeparinRsp = 0x4C00, // 76 + ID_AdjustHeparinReq = 0x8A00, // 138 + ID_AdjustHeparinRsp = 0x8B00, // 139 // Ultrafiltration ID_AdjustUltrafiltrationStateReq = 0x4700, // 71 //// ----- @LEAHIZED Index: sources/gui/qml/main.qml =================================================================== diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- sources/gui/qml/main.qml (.../main.qml) (revision 93b7d7da5dea9e0392e139b59117eb0315d6c343) +++ sources/gui/qml/main.qml (.../main.qml) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -110,7 +110,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 @@ -247,7 +246,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 -r6e18f1d24b8cc3d84d26f46f36f73deb34e54371 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- sources/model/MModel.h (.../MModel.h) (revision 6e18f1d24b8cc3d84d26f46f36f73deb34e54371) +++ sources/model/MModel.h (.../MModel.h) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -118,7 +118,6 @@ #include "MDDBloodLeakData.h" // FP Data Messages -#include "MFPValvesStatesData.h" #include "MFPROPumpData.h" #include "MFPPressuresData.h" #include "MFPLevelData.h" @@ -400,7 +399,6 @@ REGISTER_METATYPE( DDLevelData ) \ REGISTER_METATYPE( DDBloodLeakData ) \ /* FP Data */ \ - REGISTER_METATYPE( FPValvesStatesData ) \ REGISTER_METATYPE( FPROPumpData ) \ REGISTER_METATYPE( FPPressuresData ) \ REGISTER_METATYPE( FPLevelData ) \ @@ -606,7 +604,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 ) \ @@ -826,7 +823,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 ) \ @@ -1153,7 +1149,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 ) \