Index: denali.pro =================================================================== diff -u -r22e9fba5d14ea03731b4e30f6bbde22561921894 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- denali.pro (.../denali.pro) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) +++ denali.pro (.../denali.pro) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -201,6 +201,9 @@ sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ sources/model/hd/data/MHDSyringePumpData.h \ + sources/model/hd/data/MHDAirBubbleData.h \ + sources/model/hd/data/MHDAirTrapData.h \ + sources/model/hd/data/MHDBloodLeakData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentTimeData.h \ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h \ @@ -241,6 +244,7 @@ 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 \ @@ -319,6 +323,9 @@ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.h \ sources/view/hd/data/VHDSyringePumpData.h \ + sources/view/hd/data/VHDAirBubbleData.h \ + sources/view/hd/data/VHDAirTrapData.h \ + sources/view/hd/data/VHDBloodLeakData.h \ sources/view/hd/data/VTreatmentRanges.h \ sources/view/hd/data/treatment/VTreatmentTime.h \ sources/view/hd/data/treatment/VTreatmentBloodFlow.h \ @@ -348,6 +355,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 \ \ # Storage sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ @@ -445,6 +453,9 @@ sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ sources/model/hd/data/MHDSyringePumpData.cpp \ + sources/model/hd/data/MHDAirBubbleData.cpp \ + sources/model/hd/data/MHDAirTrapData.cpp \ + sources/model/hd/data/MHDBloodLeakData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentTimeData.cpp \ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp \ @@ -488,6 +499,7 @@ 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 \ @@ -560,6 +572,9 @@ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VHDSyringePumpData.cpp \ + sources/view/hd/data/VHDAirBubbleData.cpp \ + sources/view/hd/data/VHDAirTrapData.cpp \ + sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ @@ -595,6 +610,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 \ \ # Storage sources/storage/StorageGlobals.cpp \ sources/storage/FileHandler.cpp \ Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -429,6 +429,9 @@ // ----- Datum case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; case Gui::GuiActionType::ID_HDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData ); break; + case Gui::GuiActionType::ID_HDAirBubbleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData ); break; + case Gui::GuiActionType::ID_HDAirTrapData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAirTrapData ); break; + case Gui::GuiActionType::ID_HDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDBloodLeakData ); break; // ----- Datum - Treatment case Gui::GuiActionType::ID_TreatmentRanges : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges ); break; @@ -546,6 +549,7 @@ case Gui::GuiActionType::ID_DGDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDebugText ); 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; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // ----- Datum - Disinfection Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -192,12 +192,14 @@ ID_DGLoadCellReadingsData = 0x0C00, // 12 ID_DGTemperaturesData = 0x2D00, // 45 ID_DGAccelerometerData = 0x3400, // 52 - + ID_DGConductivityData = 0x3100, // 49 // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 ID_HDSyringePumpData = 0x6900, // 105 + ID_HDBloodLeakData = 0x6C00, // 108 + ID_HDAirBubbleData = 0x9300, // 147 + ID_HDAirTrapData = 0x3E00, // 62 - // In-Treatment Adjustables ID_AdjustDurationReq = 0x1600, // 22 ID_AdjustDurationRsp = 0x1B00, // 27 Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r42c02ce3428eecfd017c1567b0e20829acc0912f -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 42c02ce3428eecfd017c1567b0e20829acc0912f) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -304,16 +304,12 @@ model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , vTreatmentPressureOcclusion.venousPressure .toFixed(2) , - vTreatmentPressureOcclusion.bloodPumpOcclusion , - vTreatmentPressureOcclusion.dialysateInletPumpOcclusion , - vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion + vTreatmentPressureOcclusion.bloodPumpOcclusion ] label: [ "PBA" , "PBo" , - "OB" , - "ODi" , - "ODo" , + "OB" , ] textObjectName: "_PressureOcclusionData" Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -35,6 +35,7 @@ title.text : qsTr("Rinseback Complete") instructionBased : true header.confirmVisible : vTreatmentTime .time_IsLeft + header.confirmEnabled : vTreatmentRinseback .isCompleted hasTimeout : vTreatmentRinseback .timeoutTotal timeoutValue : vTreatmentRinseback .timeoutCountDown * 60 Index: sources/model/MModel.h =================================================================== diff -u -r42c02ce3428eecfd017c1567b0e20829acc0912f -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/model/MModel.h (.../MModel.h) (revision 42c02ce3428eecfd017c1567b0e20829acc0912f) +++ sources/model/MModel.h (.../MModel.h) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -58,6 +58,9 @@ #include "MTreatmentStopData.h" #include "MHDAccelerometerData.h" #include "MHDSyringePumpData.h" +#include "MHDAirTrapData.h" +#include "MHDBloodLeakData.h" +#include "MHDAirBubbleData.h" // Debugging Messages #include "MHDDebugText.h" @@ -89,6 +92,7 @@ #include "MDGTemperaturesData.h" #include "MDGValvesStatesData.h" #include "MDGAccelerometerData.h" +#include "MDGConductivityData.h" // Pre-Treatment #include "MPreTreatmentAdjustRequests.h" @@ -893,6 +897,9 @@ ACTION_RECEIVE_SIGNAL( TreatmentStopData ) \ ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ + ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \ + ACTION_RECEIVE_SIGNAL( HDAirTrapData ) \ + ACTION_RECEIVE_SIGNAL( HDAirBubbleData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ @@ -913,6 +920,7 @@ ACTION_RECEIVE_SIGNAL( DGLoadCellReadingsData ) \ ACTION_RECEIVE_SIGNAL( DGTemperaturesData ) \ ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ + ACTION_RECEIVE_SIGNAL( DGConductivityData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -23,7 +23,7 @@ _data.mRate .value, _data.mTimeoutTotal .value, _data.mTimeoutCountDown.value, - _data.mSafetyVolume .value, + _data.mIsCompleted .value, }; } @@ -34,7 +34,7 @@ if (GetValue(vByteArray, index, _data.mRate )) if (GetValue(vByteArray, index, _data.mTimeoutTotal )) if (GetValue(vByteArray, index, _data.mTimeoutCountDown)) - if (GetValue(vByteArray, index, _data.mSafetyVolume )) + if (GetValue(vByteArray, index, _data.mIsCompleted )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -56,6 +56,6 @@ data.mRate = _data.mRate .value; data.mTimeoutTotal = _data.mTimeoutTotal .value; data.mTimeoutCountDown = _data.mTimeoutCountDown.value; - data.mSafetyVolume = _data.mSafetyVolume .value; + data.mIsCompleted = _data.mIsCompleted .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -41,7 +41,7 @@ * | #3:(U32) | \ref Data::mRate | * | #4:(U32) | \ref Data::mTimeoutTotal | * | #5:(U32) | \ref Data::mTimeoutCountDown| - * | #6:(F32) | \ref Data::mSafetyVolume | + * | #6:(F32) | \ref Data::mIsCompleted | * * \sa Data * \sa MAdjustRinsebackReq : Rinseback Request @@ -68,7 +68,7 @@ Types::U32 mRate ; Types::U32 mTimeoutTotal ; Types::U32 mTimeoutCountDown; - Types::F32 mSafetyVolume ; + Types::U32 mIsCompleted ; } _data; public: @@ -83,7 +83,7 @@ quint32 mRate = 0; ///< Current flow rate of rinseback delivery quint32 mTimeoutTotal = 0; ///< Total Timeout of rinseback delivery quint32 mTimeoutCountDown = 0; ///< Current Timeout count down of rinseback delivery - float mSafetyVolume = 0; ///< Safety Volume of rinseback delivery + quint32 mIsCompleted = 0; ///< Safety Volume of rinseback delivery }; public: Index: sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp (.../VTreatmentRinsebackData.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp (.../VTreatmentRinsebackData.cpp) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -26,4 +26,5 @@ rate ( vData.mRate ); timeoutTotal ( vData.mTimeoutTotal ); timeoutCountDown( vData.mTimeoutCountDown ); + isCompleted ( vData.mIsCompleted ); } Index: sources/view/hd/data/treatment/VTreatmentRinsebackData.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 --- sources/view/hd/data/treatment/VTreatmentRinsebackData.h (.../VTreatmentRinsebackData.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/data/treatment/VTreatmentRinsebackData.h (.../VTreatmentRinsebackData.h) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) @@ -41,6 +41,7 @@ PROPERTY( quint32 , rate , 0) PROPERTY( quint32 , timeoutTotal , 0) PROPERTY( quint32 , timeoutCountDown, 0) + PROPERTY( quint32 , isCompleted , 0) VIEW_DEC(VTreatmentRinseback, TreatmentRinsebackData) };