Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc -r490f8e817e5b70b63d514d378da618273dd93f57 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 490f8e817e5b70b63d514d378da618273dd93f57) @@ -76,7 +76,7 @@ {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_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 Index: sources/model/hd/data/treatment/MTreatmentSalineData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r490f8e817e5b70b63d514d378da618273dd93f57 --- sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 490f8e817e5b70b63d514d378da618273dd93f57) @@ -21,6 +21,7 @@ _data.mTarget .value, _data.mCumulative .value, _data.mDelivered .value, + _data.mDPI2BLDVol .value, }; } @@ -29,10 +30,12 @@ if (GetValue(vByteArray, index, _data.mTarget )) if (GetValue(vByteArray, index, _data.mCumulative )) if (GetValue(vByteArray, index, _data.mDelivered )) + if (GetValue(vByteArray, index, _data.mDPI2BLDVol )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -44,6 +47,7 @@ Data data; data.mTarget = _data.mTarget .value; data.mCumulative = _data.mCumulative .value; - data.mDelivered = _data.mDelivered .value; + data.mDelivered = _data.mDelivered .value; + data.mDPI2BLDVol = _data.mDPI2BLDVol .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentSalineData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r490f8e817e5b70b63d514d378da618273dd93f57 --- sources/model/hd/data/treatment/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 490f8e817e5b70b63d514d378da618273dd93f57) @@ -39,6 +39,7 @@ * | #1:(U32) | \ref Data::mTarget | * | #2:(F32) | \ref Data::mCumulative | * | #3:(F32) | \ref Data::mDelivered | + * | #3:(F32) | \ref Data::mDPI2BLDVol | * * \sa Data * \sa MAdjustSalineReq : Saline Bolus Request @@ -63,6 +64,7 @@ Types::U32 mTarget ; Types::F32 mCumulative ; Types::F32 mDelivered ; + Types::F32 mDPI2BLDVol ; } _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 + float mDPI2BLDVol = 0; ///< Dialysate inlete pump to blood leak flush volume }; public: Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp =================================================================== diff -u -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc -r490f8e817e5b70b63d514d378da618273dd93f57 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 490f8e817e5b70b63d514d378da618273dd93f57) @@ -125,7 +125,6 @@ ENUM_READ ( GuiDialysisState, DIALYSIS_START_STATE , dyStart ); ENUM_READ ( GuiDialysisState, DIALYSIS_UF_STATE , dyUltrafiltration ); ENUM_READ ( GuiDialysisState, DIALYSIS_SALINE_BOLUS_STATE , dySalineBolus ); - ENUM_READ ( GuiDialysisState, DIALYSIS_BLOOD_LEAK_ZEROING_STATE , dyBloodLeakZeroing ); } txDialysis ( mDialysis ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to. Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h =================================================================== diff -u -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc -r490f8e817e5b70b63d514d378da618273dd93f57 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 490f8e817e5b70b63d514d378da618273dd93f57) @@ -95,7 +95,6 @@ PROPERTY( bool , dyStart , true ) ///< Start state of the dialysis sub-mode state machine PROPERTY( bool , dyUltrafiltration , false) ///< Ultrafiltration state of the dialysis sub-mode state machine PROPERTY( bool , dySalineBolus , false) ///< Saline bolus state of the dialysis sub-mode state machine - PROPERTY( bool , dyBloodLeakZeroing , false) ///< Blood leak zeroing state of the dialysis sub-mode state machine // Rinseback States PROPERTY( bool , rbInit , true ) ///< RINSEBACK_STOP_INIT_STATE = 0 # Start state (stopped) of the rinseback sub-mode state machine