Index: etc/reports/alarms/AlarmMapping.csv =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -129,4 +129,5 @@ 128,"UI Reserved failure." 129,"UI Reserved failure." 130,"UI Reserved failure." - 131,"Number of alarms." + 131,"TD Battery Low warning." + 132,"Number of alarms." Index: etc/reports/alarms/AlarmMapping.py =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -130,7 +130,8 @@ 128 : "UI Reserved failure." 129 : "UI Reserved failure." 130 : "UI Reserved failure." - 131 : "Number of alarms." + 131 : "TD Battery Low warning." + 132 : "Number of alarms." } # dictionary of rejection reason from application source code. @@ -184,6 +185,11 @@ 45 : "REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER" # RO only mode invalid parameter. 46 : "REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH" # RO only mode invalid payload length. 47 : "REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED" # Cannot resume treatment per alarm. - 48 : "NUM_OF_REQUEST_REJECT_REASONS" # Number of settings change reject codes. + 48 : "REQUEST_REJECT_REASON_HEPARIN_STOP_TIME_EXCEEDS_DURATION" # The Heparin stop time setting is greater than the treatment duration. + 49 : "REQUEST_REJECT_REASON_HEPARIN_STOP_TIME_WITH_NO_DISPENSE" # Heparin settings are zero but stop time setting is non-zero. + 50 : "REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE" # Heparin cannot be paused if not currently deliverying Heparin. + 51 : "REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED" # Heparin cannot be resumed if not paused. + 52 : "REQUEST_REJECT_REASON_HEPARIN_VOLUME_EXCEEDS_10_ML" # Heparin volume needed for treatment exceeds 10 mL maximum. + 53 : "NUM_OF_REQUEST_REJECT_REASONS" # Number of settings change reject codes. } Index: leahi.pro =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- leahi.pro (.../leahi.pro) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ leahi.pro (.../leahi.pro) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -131,6 +131,10 @@ \ # Controllers sources/ApplicationController.h \ sources/device/DeviceController.h \ + sources/model/dg/data/MDDConductivityData.h \ + sources/model/dg/data/MDDGenDialysateData.h \ + sources/model/hd/data/treatment/MTreatmentSetPointData.h \ + sources/model/hd/data/treatment/MTreatmentUltrafiltrationData.h \ sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h \ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h \ @@ -229,7 +233,6 @@ sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MHDAirBubbleData.h \ sources/model/hd/data/MTDAirTrapData.h \ - sources/model/hd/data/MTDBloodPumpData.h \ sources/model/hd/data/MTDVoltageData.h \ sources/model/hd/data/MTDTemperatureData.h \ sources/model/hd/data/MTDValvesData.h \ @@ -276,7 +279,6 @@ sources/model/dg/data/MDGTemperaturesData.h \ sources/model/dg/data/MDGValvesStatesData.h \ sources/model/dg/data/MDGAccelerometerData.h \ - sources/model/dg/data/MDGConductivityData.h \ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ @@ -299,14 +301,16 @@ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.h \ \ # ---------- Views - POST + sources/view/dg/data/VDDGenDialysateData.h \ sources/view/dg/data/post/VDGPOSTData.h \ \ # ---------- Views - Settings sources/view/hd/data/VTDBatteryData.h \ - sources/view/hd/data/VTDBloodPumpData.h \ sources/view/hd/data/VTDEjectorData.h \ sources/view/hd/data/VTDSwitchesData.h \ sources/view/hd/data/VTDTemperatureData.h \ sources/view/hd/data/VTDValvesData.h \ + sources/view/hd/data/treatment/VTreatmentSetPointData.h \ + sources/view/hd/data/treatment/VTreatmentUltrafiltrationData.h \ sources/view/settings/VDateTime.h \ sources/view/settings/VSettings.h \ sources/view/settings/VLocalization.h \ @@ -376,7 +380,6 @@ sources/view/hd/data/treatment/VTreatmentTime.h \ sources/view/hd/data/treatment/VTreatmentBloodFlow.h \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ - sources/view/hd/data/treatment/VTreatmentUltrafiltration.h \ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h \ sources/view/hd/data/treatment/VTreatmentSalineData.h \ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ @@ -399,7 +402,7 @@ sources/view/dg/data/VDGTemperaturesData.h \ sources/view/dg/data/VDGValvesStatesData.h \ sources/view/dg/data/VDGAccelerometerData.h \ - sources/view/dg/data/VDGConductivityData.h \ + sources/view/dg/data/VDDConductivityData.h \ \ # Storage sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ @@ -428,11 +431,15 @@ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.cpp \ + sources/model/dg/data/MDDConductivityData.cpp \ + sources/model/dg/data/MDDGenDialysateData.cpp \ + sources/model/hd/data/treatment/MTreatmentSetPointData.cpp \ + sources/model/hd/data/treatment/MTreatmentUltrafiltrationData.cpp \ sources/model/ui/data/MUIBloodPressureData.cpp \ sources/storage/Settings.cpp \ sources/storage/TreatmentLog.cpp \ + sources/view/dg/data/VDDGenDialysateData.cpp \ sources/view/hd/data/VTDBatteryData.cpp \ - sources/view/hd/data/VTDBloodPumpData.cpp \ sources/view/hd/data/VTDEjectorData.cpp \ sources/view/hd/data/VTDSwitchesData.cpp \ sources/view/hd/data/VTDTemperatureData.cpp \ @@ -514,7 +521,6 @@ sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MHDAirBubbleData.cpp \ sources/model/hd/data/MTDAirTrapData.cpp \ - sources/model/hd/data/MTDBloodPumpData.cpp \ sources/model/hd/data/MTDVoltageData.cpp \ sources/model/hd/data/MTDTemperatureData.cpp \ sources/model/hd/data/MTDValvesData.cpp \ @@ -564,7 +570,6 @@ sources/model/dg/data/MDGTemperaturesData.cpp \ sources/model/dg/data/MDGValvesStatesData.cpp \ sources/model/dg/data/MDGAccelerometerData.cpp \ - sources/model/dg/data/MDGConductivityData.cpp \ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ @@ -592,6 +597,8 @@ sources/view/hd/alarm/VAlarmStatus.cpp \ sources/view/hd/alarm/VAlarmActiveList.cpp \ \ # ---------- Views - Settings + sources/view/hd/data/treatment/VTreatmentSetPointData.cpp \ + sources/view/hd/data/treatment/VTreatmentUltrafiltrationData.cpp \ sources/view/settings/VSettings.cpp \ sources/view/settings/VLocalization.cpp \ sources/view/settings/VDateTime.cpp \ @@ -658,7 +665,6 @@ sources/view/hd/data/treatment/VTreatmentTime.cpp \ sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ - sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp \ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp \ sources/view/hd/data/treatment/VTreatmentSalineData.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ @@ -682,7 +688,7 @@ sources/view/dg/data/VDGTemperaturesData.cpp \ sources/view/dg/data/VDGValvesStatesData.cpp \ sources/view/dg/data/VDGAccelerometerData.cpp \ - sources/view/dg/data/VDGConductivityData.cpp \ + sources/view/dg/data/VDDConductivityData.cpp \ \ # Storage sources/storage/StorageGlobals.cpp \ sources/storage/FileHandler.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -72,11 +72,12 @@ // ----- {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_BloodFlow , 10 * 4 }, //10 parameters each 4bytes + {Gui::GuiActionType::ID_BloodFlow , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DialysateInletFlow , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_DialysateOutletFlow , 13 * 4 }, //13 parameters each 4bytes {Gui::GuiActionType::ID_PressureOcclusion , 12 * 4 }, //12 parameters each 4bytes - {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes @@ -102,19 +103,20 @@ {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_DGConductivityData , 13 * 4 }, // 13 parameters each 4bytes + {Gui::GuiActionType::ID_DDConductivityData , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_DDGenDialysateData , 10 * 4 }, // 10 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes {Gui::GuiActionType::ID_TDVoltageData , 11 * 4 }, //11 parameters each 4bytes - {Gui::GuiActionType::ID_TDBloodPumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes {Gui::GuiActionType::ID_TDEjectorData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) {Gui::GuiActionType::ID_TDTemperatureData , 1 * 4 }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) + {Gui::GuiActionType::ID_TreatmentSetPointData , 3 * 4 }, // 3 parameters each 4bytes // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 3 + 2 }, // 3 parameters each 4bytes + 1 parameter 2bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -480,7 +480,6 @@ case Gui::GuiActionType::ID_HDAirBubbleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData ); break; case Gui::GuiActionType::ID_TDVoltageData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData ); break; case Gui::GuiActionType::ID_TDAirTrapData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirTrapData ); break; - case Gui::GuiActionType::ID_TDBloodPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDBloodPumpData ); break; case Gui::GuiActionType::ID_TDValvesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDValvesData ); break; case Gui::GuiActionType::ID_TDBatteryData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDBatteryData ); break; case Gui::GuiActionType::ID_TDSwitchesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDSwitchesData ); break; @@ -518,6 +517,8 @@ case Gui::GuiActionType::ID_Recirculate : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Recirculate ); break; case Gui::GuiActionType::ID_BloodPrime : ok = notify(vMessage, vData, Gui::GuiActionType::ID_BloodPrime ); break; case Gui::GuiActionType::ID_TreatmentStop : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStop ); break; + case Gui::GuiActionType::ID_Ultrafiltration : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration ); break; + case Gui::GuiActionType::ID_TreatmentSetPointData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentSetPointData ); break; // ----- In-Treatment Adjust case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; @@ -597,7 +598,8 @@ case Gui::GuiActionType::ID_DDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDebugText ); break; case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; - case Gui::GuiActionType::ID_DGConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGConductivityData ); break; + case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; + case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // DG Response Messages Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -75,9 +75,10 @@ // In-treatment - Data #include "VTreatmentBloodFlow.h" #include "VTreatmentDialysateFlow.h" -#include "VTreatmentUltrafiltration.h" +#include "VTreatmentUltrafiltrationData.h" #include "VTreatmentPressureOcclusion.h" #include "VTreatmentTime.h" +#include "VTreatmentSetPointData.h" #include "VTreatmentRanges.h" #include "VTreatmentSalineData.h" #include "VTreatmentHeparinData.h" @@ -91,7 +92,6 @@ #include "VHDAirBubbleData.h" #include "VTDAirTrapData.h" #include "VTDVoltageData.h" -#include "VTDBloodPumpData.h" #include "VTDValvesData.h" #include "VTDBatteryData.h" #include "VTDSwitchesData.h" @@ -108,7 +108,8 @@ #include "VDGTemperaturesData.h" #include "VDGValvesStatesData.h" #include "VDGAccelerometerData.h" -#include "VDGConductivityData.h" +#include "VDDConductivityData.h" +#include "VDDGenDialysateData.h" // ----- #include "VTreatmentCreate.h" // ----- In-Treatment Adjustments Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -127,13 +127,14 @@ // ----- ID_PowerOff = 0x010F, // 010F //// ----- @CRAPIZED - ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication - ID_TreatmentTime = 0x0D0F, // //// ----- @CRAPIZED: had to change to avoid duplication - ID_BloodFlow = 0x0500, + ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED + ID_BloodFlow = 0x1100, // 11 //// ----- @LEAHIZED ID_DialysateInletFlow = 0x0800, ID_DialysateOutletFlow = 0x0B00, - ID_PressureOcclusion = 0x0900, - ID_Saline = 0x2F00, // 47 + ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED + ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED + ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED ID_Heparin = 0x4D00, // 77 ID_Rinseback = 0x5600, // 86 ID_Recirculate = 0x5A00, // 90 @@ -175,13 +176,13 @@ ID_SelfTestDryData = 0x6300, // 99 // Pre-Treatment Disposable Priming ID_AdjustDisposablesPrimeReq = 0x3C00, // 60 - ID_AdjustDisposablesPrimeRsp = 0x3D00, // 61 + ID_AdjustDisposablesPrimeRsp = 0x3D0F, // 61 //// ----- @CRAPIZED: had to change to avoid duplication ID_DisposablesPrimeData = 0x43FF, // ?? //// ----- @CRAPIZED - FFed // Pre-Treatment Patient Connection Begin ID_AdjustPatientConnectionBeginReq = 0x6400, // 100 ID_AdjustPatientConnectionBeginRsp = 0x6500, // 101 // Pre-Treatment Ultrafiltration initial volume - ID_AdjustUltrafiltrationInitReq = 0x4F00, // 79 + ID_AdjustUltrafiltrationInitReq = 0x4F0F, // 79 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 // Pre-Treatment Patient Connection Confirm ID_AdjustPatientConnectionConfirmReq = 0x6600, // 102 @@ -191,7 +192,7 @@ ID_AdjustStartTreatmentRsp = 0x7200, // 114 // DG Data Messages - ID_DGROPumpData = 0x1F00, // 31 + ID_DGROPumpData = 0x1F0F, // 31 //// ----- @CRAPIZED: had to change to avoid duplication ID_DGPressuresData = 0x2000, // 32 ID_DGDrainPumpData = 0x2400, // 36 ID_DGOperationModeData = 0x2700, // 39 @@ -201,7 +202,8 @@ ID_DGLoadCellReadingsData = 0x0C00, // 12 ID_DGTemperaturesData = 0x2D00, // 45 ID_DGAccelerometerData = 0x3400, // 52 - ID_DGConductivityData = 0x3100, // 49 + ID_DDConductivityData = 0x1F00, // 31 //// ----- @LEAHIZED + ID_DDGenDialysateData = 0x2F00, // 47 //// ----- @LEAHIZED // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 @@ -210,12 +212,12 @@ ID_HDAirBubbleData = 0x9300, // 147 ID_TDAirTrapData = 0x2A00, // 42 //// ----- @LEAHIZED ID_TDVoltageData = 0x1D00, // 29 //// ----- @LEAHIZED - ID_TDBloodPumpData = 0x1100, // 17 //// ----- @LEAHIZED ID_TDValvesData = 0x2B00, // 43 //// ----- @LEAHIZED ID_TDBatteryData = 0x9400, //149 //// ----- TODO: MsgID subject to change given FW implementation ID_TDSwitchesData = 0x2100, // 33 //// ----- @LEAHIZED ID_TDEjectorData = 0x4E00, // 78 //// ----- @LEAHIZED ID_TDTemperatureData = 0x9100, //146 //// ----- TODO: MsgID subject to change given FW implementation + ID_TreatmentSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED // In-Treatment Adjustables ID_AdjustDurationReq = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication @@ -237,7 +239,7 @@ ID_AdjustUltrafiltrationStateReq = 0x100F, // 16 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 - ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 + ID_AdjustUltrafiltrationEditReq = 0x110F, // 17 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 ID_AdjustUltrafiltrationConfirmReq = 0x150F, // 21 //// ----- @CRAPIZED: had to change to avoid duplication Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -65,15 +65,15 @@ x: col(0) y: row(0) model: [ - vTDBloodPump.setFlow , - vTDBloodPump.measFlow .toFixed(2) , - vTDBloodPump.rotorSpeed .toFixed(2) , - vTDBloodPump.motorSpeed .toFixed(2) , - vTDBloodPump.currMotor .toFixed(2) , - vTDBloodPump.setRPM .toFixed(2) , - vTDBloodPump.pressureFlow , - vTDBloodPump.rotationCount , - vTDBloodPump.rotorHallState , + vTreatmentBloodFlow.flowSetPoint , + vTreatmentBloodFlow.measuredFlow .toFixed(2) , + vTreatmentBloodFlow.rotorSpeed .toFixed(2) , + vTreatmentBloodFlow.motorSpeed .toFixed(2) , + vTreatmentBloodFlow.motorCtlCurrent .toFixed(2) , + vTreatmentBloodFlow.rPM .toFixed(2) , + vTreatmentBloodFlow.rotorCount , + vTreatmentBloodFlow.presFlow , + vTreatmentBloodFlow.rotorHall , ] label: [ @@ -83,9 +83,9 @@ "mSpd ", "cMot ", "RPM ", - "pFlow ", "rCnt ", - "state ", + "pFlow ", + "rHall ", ] } Index: sources/gui/qml/main.qml =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/gui/qml/main.qml (.../main.qml) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/gui/qml/main.qml (.../main.qml) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -29,7 +29,6 @@ import VHDAirBubble 0.1 import VTDAirTrap 0.1 import VTDVoltage 0.1 -import VTDBloodPump 0.1 import VTDValves 0.1 import VTDBattery 0.1 import VTDSwitches 0.1 @@ -69,6 +68,7 @@ import VTreatmentPressureOcclusion 0.1 import VTreatmentUltrafiltration 0.1 import VTreatmentTime 0.1 +import VTreatmentSetPoint 0.1 import VTreatmentRinseback 0.1 import VTreatmentRecirculate 0.1 import VTreatmentBloodPrime 0.1 @@ -100,7 +100,8 @@ import VDGValvesStates 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 -import VDGConductivity 0.1 +import VDDConductivity 0.1 +import VDDGenDialysate 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 @@ -191,7 +192,6 @@ VHDBloodLeak { id: vHDBloodLeak } VTDAirTrap { id: vTDAirTrap } VTDVoltage { id: vTDVoltage } - VTDBloodPump { id: vTDBloodPump } VTDValves { id: vTDValves } VTDBattery { id: vTDBattery } VTDSwitches { id: vTDSwitches } @@ -202,6 +202,7 @@ VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } + VTreatmentSetPoint { id: vTreatmentSetPoint } VTreatmentBloodPrime { id: vTreatmentBloodPrime } VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } @@ -217,7 +218,8 @@ VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } VDGAccelerometer { id: vDGAccelerometer } - VDGConductivity { id: vDGConductivity } + VDDConductivity { id: vDDConductivity } + VDDGenDialysate { id: vDDGenDialysate } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush } Index: sources/model/MModel.h =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/MModel.h (.../MModel.h) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/model/MModel.h (.../MModel.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -57,6 +57,8 @@ #include "MTreatmentRecirculateData.h" #include "MTreatmentBloodPrimeData.h" #include "MTreatmentStopData.h" +#include "MTreatmentUltrafiltrationData.h" +#include "MTreatmentSetPointData.h" #include "MHDAccelerometerData.h" #include "MHDSyringePumpData.h" #include "MHDBloodLeakData.h" @@ -65,7 +67,6 @@ #include "MHDUsageInfoResponse.h" #include "MTDAirTrapData.h" #include "MTDVoltageData.h" -#include "MTDBloodPumpData.h" #include "MTDValvesData.h" #include "MTDBatteryData.h" #include "MTDSwitchesData.h" @@ -106,7 +107,8 @@ #include "MDGTemperaturesData.h" #include "MDGValvesStatesData.h" #include "MDGAccelerometerData.h" -#include "MDGConductivityData.h" +#include "MDDConductivityData.h" +#include "MDDGenDialysateData.h" // Pre-Treatment #include "MPreTreatmentAdjustRequests.h" @@ -331,12 +333,13 @@ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( TreatmentStopData ) \ + REGISTER_METATYPE( TreatmentUltrafiltrationData ) \ + REGISTER_METATYPE( TreatmentSetPointData ) \ REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ REGISTER_METATYPE( HDBloodLeakData ) \ REGISTER_METATYPE( TDAirTrapData ) \ REGISTER_METATYPE( TDVoltageData ) \ - REGISTER_METATYPE( TDBloodPumpData ) \ REGISTER_METATYPE( TDValvesData ) \ REGISTER_METATYPE( TDBatteryData ) \ REGISTER_METATYPE( TDSwitchesData ) \ @@ -363,7 +366,8 @@ REGISTER_METATYPE( DGLoadCellReadingsData ) \ REGISTER_METATYPE( DGTemperaturesData ) \ REGISTER_METATYPE( DGAccelerometerData ) \ - REGISTER_METATYPE( DGConductivityData ) \ + REGISTER_METATYPE( DDConductivityData ) \ + REGISTER_METATYPE( DDGenDialysateData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -519,13 +523,14 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStopData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSetPointData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAirBubbleData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirTrapData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDVoltageData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDBloodPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDTemperatureData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDEjectorData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDSwitchesData ) \ @@ -549,7 +554,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGConductivityData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDConductivityData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDGenDialysateData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -719,13 +725,14 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStopData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSetPointData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAirBubbleData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirTrapData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDVoltageData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( TDBloodPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDValvesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDBatteryData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDSwitchesData ) \ @@ -749,7 +756,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGConductivityData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDConductivityData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDGenDialysateData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -1023,12 +1031,13 @@ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStopData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentSetPointData ) \ ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \ ACTION_RECEIVE_SIGNAL( TDAirTrapData ) \ ACTION_RECEIVE_SIGNAL( TDVoltageData ) \ - ACTION_RECEIVE_SIGNAL( TDBloodPumpData ) \ ACTION_RECEIVE_SIGNAL( TDValvesData ) \ ACTION_RECEIVE_SIGNAL( TDBatteryData ) \ ACTION_RECEIVE_SIGNAL( TDSwitchesData ) \ @@ -1054,7 +1063,8 @@ ACTION_RECEIVE_SIGNAL( DGLoadCellReadingsData ) \ ACTION_RECEIVE_SIGNAL( DGTemperaturesData ) \ ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ - ACTION_RECEIVE_SIGNAL( DGConductivityData ) \ + ACTION_RECEIVE_SIGNAL( DDConductivityData ) \ + ACTION_RECEIVE_SIGNAL( DDGenDialysateData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ Fisheye: Tag 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 refers to a dead (removed) revision in file `sources/model/dg/data/MDGConductivityData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 refers to a dead (removed) revision in file `sources/model/dg/data/MDGConductivityData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -164,7 +164,8 @@ /*0128*/case GuiAlarmID::ALARM_ID_UI_RESERVED_128 : { result = QObject::tr("UI Reserved failure." ); break; } /* 128*/ /*0129*/case GuiAlarmID::ALARM_ID_UI_RESERVED_129 : { result = QObject::tr("UI Reserved failure." ); break; } /* 129*/ /*0130*/case GuiAlarmID::ALARM_ID_UI_RESERVED_130 : { result = QObject::tr("UI Reserved failure." ); break; } /* 130*/ -/*0131*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 131*/ +/*0131*/case GuiAlarmID::ALARM_ID_BATTERY_LOW : { result = QObject::tr("TD Battery Low warning." ); break; } /* 131*/ +/*0132*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 132*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID)); Fisheye: Tag 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 refers to a dead (removed) revision in file `sources/model/hd/data/MTDBloodPumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 refers to a dead (removed) revision in file `sources/model/hd/data/MTDBloodPumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -18,31 +18,29 @@ QVariantList MBloodFlow::parameters() const { return { - _data.mFlowSetPoint .value, - _data.mMeasuredFlow .value, - _data.mRotorSpeed .value, - _data.mMotorSpeed .value, - _data.mMotorCtlSpeed .value, - _data.mMotorCtlCurrent .value, - _data.mPWMDutyCycle .value, - _data.mRotorCount .value, - _data.mPresFlow .value, - _data.mRotorHall .value, + _data.mFlowSetPoint .value, + _data.mMeasuredFlow .value, + _data.mRotorSpeed .value, + _data.mMotorSpeed .value, + _data.mMotorCtlCurrent .value, + _data.mRPM .value, + _data.mRotorCount .value, + _data.mPresFlow .value, + _data.mRotorHall .value, }; } bool MBloodFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorCtlSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPWMDutyCycle )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorCount )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPresFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorHall )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRotorCount )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPresFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRotorHall )) goto lError; return true ; @@ -60,15 +58,14 @@ */ MBloodFlow::Data MBloodFlow::data() const { Data data; - data.mFlowSetPoint = _data.mFlowSetPoint .value; - data.mMeasuredFlow = _data.mMeasuredFlow .value; - data.mRotorSpeed = _data.mRotorSpeed .value; - data.mMotorSpeed = _data.mMotorSpeed .value; - data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; - data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; - data.mPWMDutyCycle = _data.mPWMDutyCycle .value; - data.mRotorCount = _data.mRotorCount .value; - data.mPresFlow = _data.mPresFlow .value; - data.mRotorHall = _data.mRotorHall .value; + data.mFlowSetPoint = _data.mFlowSetPoint .value; + data.mMeasuredFlow = _data.mMeasuredFlow .value; + data.mRotorSpeed = _data.mRotorSpeed .value; + data.mMotorSpeed = _data.mMotorSpeed .value; + data.mMotorCtlCurrent = _data.mMotorCtlCurrent .value; + data.mRPM = _data.mRPM .value; + data.mRotorCount = _data.mRotorCount .value; + data.mPresFlow = _data.mPresFlow .value; + data.mRotorHall = _data.mRotorHall .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -31,28 +31,27 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x0500| 0x040 | 7 | 1 Hz | N | HD | All | Blood Flow Data | + * |0x1100| 0x100 | 7 | 1 Hz | N | TD | All | Blood Flow Data | * * | Payload || * | || * | #1 :(S32) | \ref Data::mFlowSetPoint | * | #2 :(F32) | \ref Data::mMeasuredFlow | * | #3 :(F32) | \ref Data::mRotorSpeed | * | #4 :(F32) | \ref Data::mMotorSpeed | - * | #5 :(F32) | \ref Data::mMotorCtlSpeed | - * | #6 :(F32) | \ref Data::mMotorCtlCurrent | - * | #7 :(F32) | \ref Data::mPWMDutyCycle | - * | #8 :(U32) | \ref Data::mRotorCount | - * | #9 :(U32) | \ref Data::mPresFlow | - * | #10:(U32) | \ref Data::mRotorHall | + * | #5 :(F32) | \ref Data::mMotorCtlCurrent | + * | #6 :(F32) | \ref Data::mRPM | + * | #7 :(U32) | \ref Data::mRotorCount | + * | #8 :(U32) | \ref Data::mPresFlow | + * | #9 :(U32) | \ref Data::mRotorHall | * * \sa Data * *

Logging info

* | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | BloodFlow | * */ @@ -62,16 +61,15 @@ friend class ::tst_models; struct { - Types::S32 mFlowSetPoint ; ///< Flow Set Point - Types::F32 mMeasuredFlow ; ///< Measured Flow - Types::F32 mRotorSpeed ; ///< Rotor Speed - Types::F32 mMotorSpeed ; ///< Motor Speed - Types::F32 mMotorCtlSpeed ; ///< Motor Controller Speed - Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current - Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % - Types::U32 mRotorCount ; ///< Rotor Count - Types::U32 mPresFlow ; ///< Prescribed flow rate - Types::U32 mRotorHall ; ///< Rotor hall sensor value + Types::S32 mFlowSetPoint ; ///< Flow Set Point + Types::F32 mMeasuredFlow ; ///< Measured Flow + Types::F32 mRotorSpeed ; ///< Rotor Speed + Types::F32 mMotorSpeed ; ///< Motor Speed + Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current + Types::F32 mRPM ; ///< RPM + Types::U32 mRotorCount ; ///< Rotor Count + Types::U32 mPresFlow ; ///< Prescribed flow rate + Types::U32 mRotorHall ; ///< Rotor Hall Sensor Value } _data; QVariantList parameters() const override; @@ -81,16 +79,15 @@ QString infoText () const override { return QString("BloodFlow"); } struct Data { - qint32 mFlowSetPoint = 0; ///< Flow Set Point - float mMeasuredFlow = 0; ///< Measured Flow - float mRotorSpeed = 0; ///< Rotor Speed - float mMotorSpeed = 0; ///< Motor Speed - float mMotorCtlSpeed = 0; ///< Motor Controller Speed - float mMotorCtlCurrent = 0; ///< Motor Controller Current - float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % - quint32 mRotorCount = 0; ///< Rotor Count - quint32 mPresFlow = 0; ///< Prescribed flow rate - quint32 mRotorHall = 0; ///< Rotor Hall Sensor Value + qint32 mFlowSetPoint = 0; ///< Flow Set Point + float mMeasuredFlow = 0; ///< Measured Flow + float mRotorSpeed = 0; ///< Rotor Speed + float mMotorSpeed = 0; ///< Motor Speed + float mMotorCtlCurrent = 0; ///< Motor Controller Current + float mRPM = 0; ///< RPM + quint32 mRotorCount = 0; ///< Rotor Count + quint32 mPresFlow = 0; ///< Prescribed flow rate + quint32 mRotorHall = 0; ///< Rotor Hall Sensor Value }; MBloodFlow() { } Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -18,35 +18,35 @@ QVariantList MPressureOcclusion::parameters() const { return { - _data.mArterialPressure .value, - _data.mVenousPressure .value, - _data.mBloodPumpOcclusion .value, - _data.mPressureLimitState .value, - _data.mArterialLimitLow .value, - _data.mArterialLimitHigh .value, - _data.mVenousLimitLow .value, - _data.mVenousLimitHigh .value, - _data.mArtLongFilter .value, - _data.mVenousLongFilter .value, - _data.mBloodOcclLongFilter .value, - _data.mPartialOcclBaseline .value, + _data.mArterialPressure .value, + _data.mVenousPressure .value, + _data.mLimitState .value, + _data.mArterialMin .value, + _data.mArterialMax .value, + _data.mVenousMin .value, + _data.mVenousMax .value, + _data.mArterialLongFilter .value, + _data.mVenousLongFilter .value, + _data.mTmpPressure .value, + _data.mTmpMin .value, + _data.mTmpMax .value, }; } bool MPressureOcclusion::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mArterialPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodPumpOcclusion )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPressureLimitState )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialLimitLow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialLimitHigh )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousLimitLow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousLimitHigh )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArtLongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousLongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodOcclLongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPartialOcclBaseline )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mLimitState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialMin )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialMax )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousMin )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousMax )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialLongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousLongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTmpPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTmpMin )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTmpMax )) goto lError; return true ; @@ -63,17 +63,17 @@ */ MPressureOcclusion::Data MPressureOcclusion::data() const { Data data; - data.mArterialPressure = _data.mArterialPressure .value; - data.mVenousPressure = _data.mVenousPressure .value; - data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; - data.mPressureLimitState = _data.mPressureLimitState .value; - data.mArterialLimitLow = _data.mArterialLimitLow .value; - data.mArterialLimitHigh = _data.mArterialLimitHigh .value; - data.mVenousLimitLow = _data.mVenousLimitLow .value; - data.mVenousLimitHigh = _data.mVenousLimitHigh .value; - data.mArtLongFilter = _data.mArtLongFilter .value; - data.mVenousLongFilter = _data.mVenousLongFilter .value; - data.mBloodOcclLongFilter = _data.mBloodOcclLongFilter .value; - data.mPartialOcclBaseline = _data.mPartialOcclBaseline .value; + data.mArterialPressure = _data.mArterialPressure .value; + data.mVenousPressure = _data.mVenousPressure .value; + data.mLimitState = _data.mLimitState .value; + data.mArterialMin = _data.mArterialMin .value; + data.mArterialMax = _data.mArterialMax .value; + data.mVenousMin = _data.mVenousMin .value; + data.mVenousMax = _data.mVenousMax .value; + data.mArterialLongFilter = _data.mArterialLongFilter .value; + data.mVenousLongFilter = _data.mVenousLongFilter .value; + data.mTmpPressure = _data.mTmpPressure .value; + data.mTmpMin = _data.mTmpMin .value; + data.mTmpMax = _data.mTmpMax .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -32,30 +32,30 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x0900| 0x040 | 7 | 1 Hz | N | HD | All | PressureOcclusion Data | + * |0x2400| 0x100 | 7 | 1 Hz | N | TD | All | PressureOcclusion Data | * * | Payload || * | || * | #1: (F32) | \ref Data::mArterialPressure | * | #2: (F32) | \ref Data::mVenousPressure | - * | #3: (U32) | \ref Data::mBloodPumpOcclusion | - * | #4: (U32) | \ref Data::mPressureLimitState | - * | #5: (S32) | \ref Data::mArterialLimitLow | - * | #6: (S32) | \ref Data::mArterialLimitHigh | - * | #7: (S32) | \ref Data::mVenousLimitLow | - * | #8: (S32) | \ref Data::mVenousLimitHigh | - * | #9: (F32) | \ref Data::mArtLongFilter | - * | #10:(F32) | \ref Data::mVenousLongFilter | - * | #11:(F32) | \ref Data::mBloodOcclLongFilter | - * | #12:(F32) | \ref Data::mPartialOcclBaseline | + * | #3: (U32) | \ref Data::mLimitState | + * | #4: (S32) | \ref Data::mArterialMin | + * | #5: (S32) | \ref Data::mArterialMax | + * | #6: (S32) | \ref Data::mVenousMin | + * | #7: (S32) | \ref Data::mVenousMax | + * | #8: (F32) | \ref Data::mArterialLongFilter | + * | #9: (F32) | \ref Data::mVenousLongFilter | + * | #10:(F32) | \ref Data::mTmpPressure | + * | #11:(F32) | \ref Data::mTmpMin | + * | #12:(F32) | \ref Data::mTmpMax | * * \sa Data * *

Logging info

* | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | Occlusion | * */ @@ -67,18 +67,18 @@ QVariantList parameters() const override; struct { - Types::F32 mArterialPressure ; ///< Latest arterial pressure (mmHg) - Types::F32 mVenousPressure ; ///< Latest venous pressure (mmHg) - Types::U32 mBloodPumpOcclusion ; ///< Latest BP occlusion (no units) - Types::U32 mPressureLimitState ; ///< Current pressure limits state (enum-stabilization or stable) - Types::S32 mArterialLimitLow ; ///< Current arterial minimum pressure limit (mmHg) - Types::S32 mArterialLimitHigh ; ///< Current arterial maximum pressure limit (mmHg) - Types::S32 mVenousLimitLow ; ///< Current venous minimum pressure limit (mmHg) - Types::S32 mVenousLimitHigh ; ///< Current venous maximum pressure limit (mmHg) - Types::F32 mArtLongFilter ; ///< Arterial long filter (mmHg) - Types::F32 mVenousLongFilter ; ///< Venous long filter (mmHg) - Types::F32 mBloodOcclLongFilter ; ///< Blood pump occlusion long filter - Types::F32 mPartialOcclBaseline ; ///< Partial Occlusion base line + Types::F32 mArterialPressure ; ///< Latest arterial pressure (mmHg) + Types::F32 mVenousPressure ; ///< Latest venous pressure (mmHg) + Types::U32 mLimitState ; ///< Latest BP occlusion (no units) + Types::S32 mArterialMin ; ///< Current pressure limits state (enum-stabilization or stable) + Types::S32 mArterialMax ; ///< Current arterial minimum pressure limit (mmHg) + Types::S32 mVenousMin ; ///< Current arterial maximum pressure limit (mmHg) + Types::S32 mVenousMax ; ///< Current venous minimum pressure limit (mmHg) + Types::F32 mArterialLongFilter ; ///< Current venous maximum pressure limit (mmHg) + Types::F32 mVenousLongFilter ; ///< Arterial long filter (mmHg) + Types::F32 mTmpPressure ; ///< Venous long filter (mmHg) + Types::F32 mTmpMin ; ///< Blood pump occlusion long filter + Types::F32 mTmpMax ; ///< Partial Occlusion base line } _data; public: @@ -88,18 +88,18 @@ QString infoText () const override { return QString("Occlusion"); } struct Data { - float mArterialPressure = 0; - float mVenousPressure = 0; - quint32 mBloodPumpOcclusion = 0; - quint32 mPressureLimitState = 0; - qint32 mArterialLimitLow = 0; - qint32 mArterialLimitHigh = 0; - qint32 mVenousLimitLow = 0; - qint32 mVenousLimitHigh = 0; - float mArtLongFilter = 0; - float mVenousLongFilter = 0; - float mBloodOcclLongFilter = 0; - float mPartialOcclBaseline = 0; + float mArterialPressure = 0; + float mVenousPressure = 0; + quint32 mLimitState = 0; + qint32 mArterialMin = 0; + qint32 mArterialMax = 0; + qint32 mVenousMin = 0; + qint32 mVenousMax = 0; + float mArterialLongFilter = 0; + float mVenousLongFilter = 0; + float mTmpPressure = 0; + float mTmpMin = 0; + float mTmpMax = 0; }; MPressureOcclusion () { } Index: sources/model/hd/data/treatment/MTreatmentSalineData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -21,6 +21,7 @@ _data.mTarget .value, _data.mCumulative .value, _data.mDelivered .value, + _data.mState .value, }; } @@ -29,6 +30,7 @@ if ( ! GetValue(vByteArray, index, _data.mTarget )) goto lError; if ( ! GetValue(vByteArray, index, _data.mCumulative )) goto lError; if ( ! GetValue(vByteArray, index, _data.mDelivered )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; return true ; @@ -47,6 +49,7 @@ Data data; data.mTarget = _data.mTarget .value; data.mCumulative = _data.mCumulative .value; - data.mDelivered = _data.mDelivered .value; + data.mDelivered = _data.mDelivered .value; + data.mState = _data.mState .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentSalineData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/treatment/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -32,13 +32,14 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x2F00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Saline Bolus Data | + * |0x3D00| 0x100 | 7 | 1 Hz | N | TD | All | Treatment Saline Bolus Data | * * | Payload || * | || * | #1:(U32) | \ref Data::mTarget | * | #2:(F32) | \ref Data::mCumulative | * | #3:(F32) | \ref Data::mDelivered | + * | #4:(U32) | \ref Data::mState | * * \sa Data * \sa MAdjustSalineReq : Saline Bolus Request @@ -48,7 +49,7 @@ * | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | Saline | * */ @@ -63,6 +64,7 @@ Types::U32 mTarget ; Types::F32 mCumulative ; Types::F32 mDelivered ; + Types::U32 mState ; } _data; public: @@ -75,6 +77,7 @@ quint32 mTarget = 0; ///< Target volume for the current started saline bolus float mCumulative = 0; ///< Cumulative volume of all saline deliveries during current treatment float mDelivered = 0; ///< Current delivered saline volume + quint32 mState = 0; ///< Saline Bolus state }; public: Index: sources/model/hd/data/treatment/MTreatmentTimeData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/treatment/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x0D00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Time Data | + * |0x3B00| 0x100 | 7 | 1 Hz | N | TD | All | Treatment Time Data | * * | Payload || * | || @@ -46,7 +46,7 @@ * | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | TreatmentTime | * */ Index: sources/view/VView.h =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/view/VView.h (.../VView.h) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/view/VView.h (.../VView.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -157,6 +157,7 @@ REGISTER_TYPE( VTreatmentUltrafiltration ) \ REGISTER_TYPE( VTreatmentPressureOcclusion ) \ REGISTER_TYPE( VTreatmentTime ) \ + REGISTER_TYPE( VTreatmentSetPoint ) \ REGISTER_TYPE( VTreatmentRanges ) \ REGISTER_TYPE( VTreatmentSaline ) \ REGISTER_TYPE( VTreatmentHeparin ) \ @@ -172,7 +173,6 @@ REGISTER_TYPE( VHDAirBubble ) \ REGISTER_TYPE( VTDAirTrap ) \ REGISTER_TYPE( VTDVoltage ) \ - REGISTER_TYPE( VTDBloodPump ) \ REGISTER_TYPE( VTDValves ) \ REGISTER_TYPE( VTDBattery ) \ REGISTER_TYPE( VTDSwitches ) \ @@ -189,7 +189,8 @@ REGISTER_TYPE( VDGTemperatures ) \ REGISTER_TYPE( VDGValvesStates ) \ REGISTER_TYPE( VDGAccelerometer ) \ - REGISTER_TYPE( VDGConductivity ) \ + REGISTER_TYPE( VDDConductivity ) \ + REGISTER_TYPE( VDDGenDialysate ) \ /* Pre-Treatment */ \ REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ REGISTER_TYPE( VDGFilterFlush ) \ Fisheye: Tag 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 refers to a dead (removed) revision in file `sources/view/hd/data/VTDBloodPumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 refers to a dead (removed) revision in file `sources/view/hd/data/VTDBloodPumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -21,14 +21,13 @@ void VTreatmentBloodFlow::onActionReceive(const BloodFlowData &vData) { - bloodFlow_FlowSetPoint (vData.mFlowSetPoint ); - bloodFlow_MeasuredFlow (vData.mMeasuredFlow ); - bloodFlow_RotorSpeed (vData.mRotorSpeed ); - bloodFlow_MotorSpeed (vData.mMotorSpeed ); - bloodFlow_MotorCtlSpeed (vData.mMotorCtlSpeed ); - bloodFlow_MotorCtlCurrent (vData.mMotorCtlCurrent ); - bloodFlow_PWMDutyCycle (vData.mPWMDutyCycle ); - bloodFlow_RotorCount (vData.mRotorCount ); - bloodFlow_PresFlow (vData.mPresFlow ); - bloodFlow_RotorHall (vData.mRotorHall ); + flowSetPoint (vData. mFlowSetPoint ); + measuredFlow (vData. mMeasuredFlow ); + rotorSpeed (vData. mRotorSpeed ); + motorSpeed (vData. mMotorSpeed ); + motorCtlCurrent (vData. mMotorCtlCurrent ); + rPM (vData. mRPM ); + rotorCount (vData. mRotorCount ); + presFlow (vData. mPresFlow ); + rotorHall (vData. mRotorHall ); } Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -36,16 +36,15 @@ { Q_OBJECT - PROPERTY( qint32 , bloodFlow_FlowSetPoint , 0) - PROPERTY( float , bloodFlow_MeasuredFlow , 0) - PROPERTY( float , bloodFlow_RotorSpeed , 0) - PROPERTY( float , bloodFlow_MotorSpeed , 0) - PROPERTY( float , bloodFlow_MotorCtlSpeed , 0) - PROPERTY( float , bloodFlow_MotorCtlCurrent, 0) - PROPERTY( float , bloodFlow_PWMDutyCycle , 0) - PROPERTY( quint32, bloodFlow_RotorCount , 0) - PROPERTY( quint32, bloodFlow_PresFlow , 0) - PROPERTY( quint32, bloodFlow_RotorHall , 0) + PROPERTY( qint32 , flowSetPoint , 0) + PROPERTY( float , measuredFlow , 0) + PROPERTY( float , rotorSpeed , 0) + PROPERTY( float , motorSpeed , 0) + PROPERTY( float , motorCtlCurrent , 0) + PROPERTY( float , rPM , 0) + PROPERTY( quint32, rotorCount , 0) + PROPERTY( quint32, presFlow , 0) + PROPERTY( quint32, rotorHall , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) }; Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -21,16 +21,16 @@ void VTreatmentPressureOcclusion::onActionReceive(const PressureOcclusionData &vData) { - arterialPressure ( vData.mArterialPressure ); - venousPressure ( vData.mVenousPressure ); - bloodPumpOcclusion ( vData.mBloodPumpOcclusion ); - pressureLimitState ( vData.mPressureLimitState ); - arterialPressureLimitLowerBound ( vData.mArterialLimitLow ); - arterialPressureLimitUpperBound ( vData.mArterialLimitHigh ); - venousPressureLimitLowerBound ( vData.mVenousLimitLow ); - venousPressureLimitUpperBound ( vData.mVenousLimitHigh ); - arterialPressureLongFilter ( vData.mArtLongFilter ); - venousLongFilter ( vData.mVenousLongFilter ); - bloodPumpOcclLongFilter ( vData.mBloodOcclLongFilter ); - partialOcclBaseLine ( vData.mPartialOcclBaseline ); + arterialPressure ( vData.mArterialPressure ); + venousPressure ( vData.mVenousPressure ); + limitState ( vData.mLimitState ); + arterialMin ( vData.mArterialMin ); + arterialMax ( vData.mArterialMax ); + venousMin ( vData.mVenousMin ); + venousMax ( vData.mVenousMax ); + arterialLongFilter ( vData.mArterialLongFilter ); + venousLongFilter ( vData.mVenousLongFilter ); + tmpPressure ( vData.mTmpPressure ); + tmpMin ( vData.mTmpMin ); + tmpMax ( vData.mTmpMax ); } Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -36,18 +36,18 @@ { Q_OBJECT - PROPERTY( float , arterialPressure , 0) - PROPERTY( float , venousPressure , 0) - PROPERTY( quint32 , bloodPumpOcclusion , 0) - PROPERTY( quint32 , pressureLimitState , 0) - PROPERTY( qint32 , arterialPressureLimitLowerBound , 0) - PROPERTY( qint32 , arterialPressureLimitUpperBound , 0) - PROPERTY( qint32 , venousPressureLimitLowerBound , 0) - PROPERTY( qint32 , venousPressureLimitUpperBound , 0) - PROPERTY( float , arterialPressureLongFilter , 0) - PROPERTY( float , venousLongFilter , 0) - PROPERTY( float , bloodPumpOcclLongFilter , 0) - PROPERTY( float , partialOcclBaseLine , 0) + PROPERTY( float , arterialPressure , 0) + PROPERTY( float , venousPressure , 0) + PROPERTY( quint32 , limitState , 0) + PROPERTY( qint32 , arterialMin , 0) + PROPERTY( qint32 , arterialMax , 0) + PROPERTY( qint32 , venousMin , 0) + PROPERTY( qint32 , venousMax , 0) + PROPERTY( float , arterialLongFilter , 0) + PROPERTY( float , venousLongFilter , 0) + PROPERTY( float , tmpPressure , 0) + PROPERTY( float , tmpMin , 0) + PROPERTY( float , tmpMax , 0) VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) }; Index: sources/view/hd/data/treatment/VTreatmentSalineData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/view/hd/data/treatment/VTreatmentSalineData.cpp (.../VTreatmentSalineData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentSalineData.cpp (.../VTreatmentSalineData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -24,4 +24,5 @@ target (vData.mTarget ); cumulative (vData.mCumulative); delivered (vData.mDelivered ); + state (vData.mState ); } Index: sources/view/hd/data/treatment/VTreatmentSalineData.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/view/hd/data/treatment/VTreatmentSalineData.h (.../VTreatmentSalineData.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentSalineData.h (.../VTreatmentSalineData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -39,6 +39,7 @@ PROPERTY( quint32 , target , 0) PROPERTY( float , cumulative , 0) PROPERTY( float , delivered , 0) + PROPERTY( quint32 , state , 0) VIEW_DEC(VTreatmentSaline, TreatmentSalineData) }; Fisheye: Tag 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentUltrafiltration.h'. Fisheye: No comparison available. Pass `N' to diff?