Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r419585f9a0ca480981e1f6981c4f226185423bc6 -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 419585f9a0ca480981e1f6981c4f226185423bc6) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -76,19 +76,19 @@ {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 , 6 * 4 }, // 6 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 {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirTrapData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_HDBloodLeakData , 10 * 4 }, //10 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes - {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, //10 parameters each 4bytes + {Gui::GuiActionType::ID_TreatmentStates , 11 * 4 }, //11 parameters each 4bytes {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes // DG Data Messages Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -102,7 +102,7 @@ qsTr("DG Cleaning" ), // DGCleaning qsTr("DG Scheduling" ), // DGScheduling qsTr("Service" ), // servicePassword - qsTr("Set Date And Time" ), // SetDateTime + qsTr("Set Date and Time" ), // SetDateTime qsTr("Export Logs" ), // ExportLogs qsTr("Set Language" ), // Language qsTr("Water Input Mode" ), // RoInput Index: sources/model/hd/data/MHDBloodLeakData.cpp =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -18,24 +18,42 @@ QVariantList MHDBloodLeakData::parameters() const { return { - _data.mBloodLeakStatus .value, - _data.mBloodLeakState .value, - _data.mBloodLeakPersistentCounter .value, - _data.mBloodLeakSerialCommState .value, + _data.mBloodLeakStatus .value, + _data.mBloodLeakState .value, + _data.mBloodLeakPersistentCounter .value, + _data.mBloodLeakSerialCommState .value, + _data.mBloodLeakIntensity .value, + _data.mBloodLeakDetect .value, + _data.mBloodLeakIntensityMvgAvg .value, + _data.mBloodLeakTimeSinceZeroMS .value, + _data.mBloodLeakDrfitInRangeStatus .value, + _data.mBloodLeakDriftUpperRangeStatus .value, }; } bool MHDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mBloodLeakStatus )) - if (GetValue(vByteArray, index, _data.mBloodLeakState )) - if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) - if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) + if (GetValue(vByteArray, index, _data.mBloodLeakStatus )) + if (GetValue(vByteArray, index, _data.mBloodLeakState )) + if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) + if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) + if (GetValue(vByteArray, index, _data.mBloodLeakIntensity )) + if (GetValue(vByteArray, index, _data.mBloodLeakDetect )) + if (GetValue(vByteArray, index, _data.mBloodLeakIntensityMvgAvg )) + if (GetValue(vByteArray, index, _data.mBloodLeakTimeSinceZeroMS )) + if (GetValue(vByteArray, index, _data.mBloodLeakDrfitInRangeStatus )) + if (GetValue(vByteArray, index, _data.mBloodLeakDriftUpperRangeStatus )) 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; } + 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -45,10 +63,16 @@ */ MHDBloodLeakData::Data MHDBloodLeakData::data() const{ Data data; - data.mBloodLeakStatus = _data.mBloodLeakStatus .value; - data.mBloodLeakState = _data.mBloodLeakState .value; - data.mBloodLeakPersistentCounter = _data.mBloodLeakPersistentCounter .value; - data.mBloodLeakSerialCommState = _data.mBloodLeakSerialCommState .value; + data.mBloodLeakStatus = _data.mBloodLeakStatus .value; + data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakPersistentCounter = _data.mBloodLeakPersistentCounter .value; + data.mBloodLeakSerialCommState = _data.mBloodLeakSerialCommState .value; + data.mBloodLeakIntensity = _data.mBloodLeakIntensity .value; + data.mBloodLeakDetect = _data.mBloodLeakDetect .value; + data.mBloodLeakIntensityMvgAvg = _data.mBloodLeakIntensityMvgAvg .value; + data.mBloodLeakTimeSinceLastZeroMS = _data.mBloodLeakTimeSinceZeroMS .value; + data.mBloodLeakDriftInRangeStatus = _data.mBloodLeakDrfitInRangeStatus .value; + data.mBloodLeakDriftUpperRangeStatus = _data.mBloodLeakDriftUpperRangeStatus .value; return data; } Index: sources/model/hd/data/MHDBloodLeakData.h =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -38,10 +38,16 @@ * * | Payload || * | || - * | #01:(U32) | \ref Data::mBloodLeakStatus | - * | #02:(U32) | \ref Data::mBloodLeakState | - * | #03:(U32) | \ref Data::mBloodLeakPersistentCounter | - * | #04:(U32) | \ref Data::mBloodLeakSerialCommState | + * | #01:(U32) | \ref Data::mBloodLeakStatus | + * | #02:(U32) | \ref Data::mBloodLeakState | + * | #03:(U32) | \ref Data::mBloodLeakPersistentCounter | + * | #04:(U32) | \ref Data::mBloodLeakSerialCommState | + * | #05:(U32) | \ref Data::mBloodLeakIntensity | + * | #06:(U32) | \ref Data::mBloodLeakDetect | + * | #07:(F32) | \ref Data::mBloodLeakIntensityMvgAvg | + * | #08:(F32) | \ref Data::mBloodLeakTimeSinceZeroMS | + * | #09:(F32) | \ref Data::mBloodLeakDrfitInRangeStatus | + * | #10:(F32) | \ref Data::mBloodLeakDriftUpperRangeStatus | * * \sa Data * @@ -61,10 +67,16 @@ QVariantList parameters() const override; struct { - Types::U32 mBloodLeakStatus ; - Types::U32 mBloodLeakState ; - Types::U32 mBloodLeakPersistentCounter ; - Types::U32 mBloodLeakSerialCommState ; + Types::U32 mBloodLeakStatus ; + Types::U32 mBloodLeakState ; + Types::U32 mBloodLeakPersistentCounter ; + Types::U32 mBloodLeakSerialCommState ; + Types::U32 mBloodLeakIntensity ; + Types::U32 mBloodLeakDetect ; + Types::F32 mBloodLeakIntensityMvgAvg ; + Types::U32 mBloodLeakTimeSinceZeroMS ; + Types::U32 mBloodLeakDrfitInRangeStatus ; + Types::U32 mBloodLeakDriftUpperRangeStatus ; } _data; public: @@ -74,10 +86,16 @@ QString infoText() const override { return QString("BloodLeak") ; } struct Data { - quint32 mBloodLeakStatus = 0; - quint32 mBloodLeakState = 0; - quint32 mBloodLeakPersistentCounter = 0; - quint32 mBloodLeakSerialCommState = 0; + quint32 mBloodLeakStatus = 0; + quint32 mBloodLeakState = 0; + quint32 mBloodLeakPersistentCounter = 0; + quint32 mBloodLeakSerialCommState = 0; + quint32 mBloodLeakIntensity = 0; + quint32 mBloodLeakDetect = 0; + float mBloodLeakIntensityMvgAvg = 0; + quint32 mBloodLeakTimeSinceLastZeroMS = 0; + quint32 mBloodLeakDriftInRangeStatus = 0; + quint32 mBloodLeakDriftUpperRangeStatus = 0; }; MHDBloodLeakData () { } Index: sources/model/hd/data/treatment/MTreatmentSalineData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -18,21 +18,30 @@ QVariantList MTreatmentSaline::parameters() const { return { - _data.mTarget .value, - _data.mCumulative .value, - _data.mDelivered .value, + _data.mTarget .value, + _data.mCumulative .value, + _data.mDelivered .value, + _data.mDPI2BLDVolML .value, + _data.mRSRVR2DPIVolML .value, + _data.mZeroingRqstStatus .value, }; } bool MTreatmentSaline::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTarget )) - if (GetValue(vByteArray, index, _data.mCumulative )) - if (GetValue(vByteArray, index, _data.mDelivered )) + if (GetValue(vByteArray, index, _data.mTarget )) + if (GetValue(vByteArray, index, _data.mCumulative )) + if (GetValue(vByteArray, index, _data.mDelivered )) + if (GetValue(vByteArray, index, _data.mDPI2BLDVolML )) + if (GetValue(vByteArray, index, _data.mRSRVR2DPIVolML )) + if (GetValue(vByteArray, index, _data.mZeroingRqstStatus )) 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -42,8 +51,10 @@ */ MTreatmentSaline::Data MTreatmentSaline::data() const { Data data; - data.mTarget = _data.mTarget .value; - data.mCumulative = _data.mCumulative .value; - data.mDelivered = _data.mDelivered .value; + data.mTarget = _data.mTarget .value; + data.mCumulative = _data.mCumulative .value; + data.mDelivered = _data.mDelivered .value; + data.mDPI2BLDVolML = _data.mDPI2BLDVolML .value; + data.mRSRVR2DPIVolML = _data.mRSRVR2DPIVolML .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentSalineData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/model/hd/data/treatment/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -36,9 +36,12 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mTarget | - * | #2:(F32) | \ref Data::mCumulative | - * | #3:(F32) | \ref Data::mDelivered | + * | #1:(U32) | \ref Data::mTarget | + * | #2:(F32) | \ref Data::mCumulative | + * | #3:(F32) | \ref Data::mDelivered | + * | #4:(F32) | \ref Data::mDPI2BLDVolML | + * | #5:(F32) | \ref Data::mRSRVR2DPIVolML | + * | #6:(F32) | \ref Data::mZeroingRqstStatus | * * \sa Data * \sa MAdjustSalineReq : Saline Bolus Request @@ -60,9 +63,12 @@ QVariantList parameters() const override; struct { - Types::U32 mTarget ; - Types::F32 mCumulative ; - Types::F32 mDelivered ; + Types::U32 mTarget ; + Types::F32 mCumulative ; + Types::F32 mDelivered ; + Types::F32 mDPI2BLDVolML ; + Types::F32 mRSRVR2DPIVolML ; + Types::U32 mZeroingRqstStatus ; } _data; public: @@ -72,9 +78,12 @@ QString infoText() const override { return QString("Saline") ; } struct Data { - 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 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 mDPI2BLDVolML = 0; ///< Dialysate inlete pump to blood leak flush volume in milliliters + float mRSRVR2DPIVolML = 0; ///< Reservoir to dialysate inlet pump flush volume in milliliters + quint32 mZeroingRqstStatus = 0; ///< Blood leak zeroing request status }; public: Index: sources/model/hd/data/treatment/MTreatmentStatesData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/model/hd/data/treatment/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -18,31 +18,33 @@ QVariantList MTreatmentStates::parameters() const { return { - _data.mSubMode .value, - _data.mUFState .value, - _data.mSalineState .value, - _data.mHeparinState .value, - _data.mRinsebackState .value, - _data.mRecirculateState .value, - _data.mBloodPrimeState .value, - _data.mTreatmentEndState .value, - _data.mTreatmentStopState .value, - _data.mDialysisState .value, + _data.mSubMode .value, + _data.mUFState .value, + _data.mSalineState .value, + _data.mHeparinState .value, + _data.mRinsebackState .value, + _data.mRecirculateState .value, + _data.mBloodPrimeState .value, + _data.mTreatmentEndState .value, + _data.mTreatmentStopState .value, + _data.mDialysisState .value, + _data.mBloodLeakZeoringState .value, }; } bool MTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mSubMode )) - if (GetValue(vByteArray, index, _data.mUFState )) - if (GetValue(vByteArray, index, _data.mSalineState )) - if (GetValue(vByteArray, index, _data.mHeparinState )) - if (GetValue(vByteArray, index, _data.mRinsebackState )) - if (GetValue(vByteArray, index, _data.mRecirculateState )) - if (GetValue(vByteArray, index, _data.mBloodPrimeState )) - if (GetValue(vByteArray, index, _data.mTreatmentEndState )) - if (GetValue(vByteArray, index, _data.mTreatmentStopState )) - if (GetValue(vByteArray, index, _data.mDialysisState )) + if (GetValue(vByteArray, index, _data.mSubMode )) + if (GetValue(vByteArray, index, _data.mUFState )) + if (GetValue(vByteArray, index, _data.mSalineState )) + if (GetValue(vByteArray, index, _data.mHeparinState )) + if (GetValue(vByteArray, index, _data.mRinsebackState )) + if (GetValue(vByteArray, index, _data.mRecirculateState )) + if (GetValue(vByteArray, index, _data.mBloodPrimeState )) + if (GetValue(vByteArray, index, _data.mTreatmentEndState )) + if (GetValue(vByteArray, index, _data.mTreatmentStopState )) + if (GetValue(vByteArray, index, _data.mDialysisState )) + if (GetValue(vByteArray, index, _data.mBloodLeakZeoringState )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -54,6 +56,7 @@ 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; } } /*! @@ -63,15 +66,16 @@ */ MTreatmentStates::Data MTreatmentStates::data() const { Data data; - data.mSubMode = _data.mSubMode .value; - data.mUFState = _data.mUFState .value; - data.mSalineState = _data.mSalineState .value; - data.mHeparinState = _data.mHeparinState .value; - data.mRinsebackState = _data.mRinsebackState .value; - data.mRecirculateState = _data.mRecirculateState .value; - data.mBloodPrimeState = _data.mBloodPrimeState .value; - data.mTreatmentEndState = _data.mTreatmentEndState .value; - data.mTreatmentStopState = _data.mTreatmentStopState .value; - data.mDialysisState = _data.mDialysisState .value; + data.mSubMode = _data.mSubMode .value; + data.mUFState = _data.mUFState .value; + data.mSalineState = _data.mSalineState .value; + data.mHeparinState = _data.mHeparinState .value; + data.mRinsebackState = _data.mRinsebackState .value; + data.mRecirculateState = _data.mRecirculateState .value; + data.mBloodPrimeState = _data.mBloodPrimeState .value; + data.mTreatmentEndState = _data.mTreatmentEndState .value; + data.mTreatmentStopState = _data.mTreatmentStopState .value; + data.mDialysisState = _data.mDialysisState .value; + data.mBloodLeakZeoringState = _data.mBloodLeakZeoringState .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentStatesData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/model/hd/data/treatment/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -38,16 +38,17 @@ * * | Payload || * | || - * | #01:(U32) | \ref Data::mSubMode | - * | #02:(U32) | \ref Data::mUFState | - * | #03:(U32) | \ref Data::mSalineState | - * | #04:(U32) | \ref Data::mHeparinState | - * | #05:(U32) | \ref Data::mRinsebackState | - * | #06:(U32) | \ref Data::mRecirculateState | - * | #07:(U32) | \ref Data::mBloodPrimeState | - * | #08:(U32) | \ref Data::mTreatmentEndState | - * | #09:(U32) | \ref Data::mTreatmentStopState | - * | #10:(U32) | \ref Data::mDialysisState | + * | #01:(U32) | \ref Data::mSubMode | + * | #02:(U32) | \ref Data::mUFState | + * | #03:(U32) | \ref Data::mSalineState | + * | #04:(U32) | \ref Data::mHeparinState | + * | #05:(U32) | \ref Data::mRinsebackState | + * | #06:(U32) | \ref Data::mRecirculateState | + * | #07:(U32) | \ref Data::mBloodPrimeState | + * | #08:(U32) | \ref Data::mTreatmentEndState | + * | #09:(U32) | \ref Data::mTreatmentStopState | + * | #10:(U32) | \ref Data::mDialysisState | + * | #11:(U32) | \ref Data::mBloodLeakZeoringState | * * \sa Data * \sa Treatment_States @@ -59,6 +60,8 @@ * \sa Blood_Prime_States * \sa Treatment_Stop_States * \sa Treatment_End_States + * \sa Dialysis States + * \sa Blood Leak Zeroing States * *

Logging info

* | || @@ -76,16 +79,17 @@ QVariantList parameters() const override; struct { - Types::U32 mSubMode ; - Types::U32 mUFState ; - Types::U32 mSalineState ; - Types::U32 mHeparinState ; - Types::U32 mRinsebackState ; - Types::U32 mRecirculateState ; - Types::U32 mBloodPrimeState ; - Types::U32 mTreatmentEndState ; - Types::U32 mTreatmentStopState ; - Types::U32 mDialysisState ; + Types::U32 mSubMode ; + Types::U32 mUFState ; + Types::U32 mSalineState ; + Types::U32 mHeparinState ; + Types::U32 mRinsebackState ; + Types::U32 mRecirculateState ; + Types::U32 mBloodPrimeState ; + Types::U32 mTreatmentEndState ; + Types::U32 mTreatmentStopState ; + Types::U32 mDialysisState ; + Types::U32 mBloodLeakZeoringState ; } _data; public: @@ -95,16 +99,17 @@ QString infoText () const override { return QString("TreatmentStates"); } struct Data { - quint32 mSubMode = 0; ///< Sub-Mode State - Treatment_States - quint32 mUFState = 0; ///< UF State - UF_States - quint32 mSalineState = 0; ///< Saline State - Saline_Bolus_States - quint32 mHeparinState = 0; ///< Heparin State - Heparin_Bolus_States - quint32 mRinsebackState = 0; ///< Rinseback State - Rinseback_States - quint32 mRecirculateState = 0; ///< Recirculate State - Treatment_Recirc_States - quint32 mBloodPrimeState = 0; ///< BloodPrime State - Blood_Prime_States - quint32 mTreatmentEndState = 0; ///< TreatmentEnd State - Treatment_Stop_States - quint32 mTreatmentStopState = 0; ///< TreatmentStop State - Treatment_End_States - quint32 mDialysisState = 0; ///< Dialysis State - Dialysis_State + quint32 mSubMode = 0; ///< Sub-Mode State - Treatment_States + quint32 mUFState = 0; ///< UF State - UF_States + quint32 mSalineState = 0; ///< Saline State - Saline_Bolus_States + quint32 mHeparinState = 0; ///< Heparin State - Heparin_Bolus_States + quint32 mRinsebackState = 0; ///< Rinseback State - Rinseback_States + quint32 mRecirculateState = 0; ///< Recirculate State - Treatment_Recirc_States + quint32 mBloodPrimeState = 0; ///< BloodPrime State - Blood_Prime_States + quint32 mTreatmentEndState = 0; ///< TreatmentEnd State - Treatment_Stop_States + quint32 mTreatmentStopState = 0; ///< TreatmentStop State - Treatment_End_States + quint32 mDialysisState = 0; ///< Dialysis State - Dialysis_State + quint32 mBloodLeakZeoringState = 0; ///< Blood leak zeroing State - Blood leak zeroing States }; MTreatmentStates() { } Index: sources/view/hd/data/VHDBloodLeakData.cpp =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -20,8 +20,14 @@ VIEW_DEF(VHDBloodLeak, HDBloodLeakData) void VHDBloodLeak::onActionReceive(const HDBloodLeakData &vData) { - bloodLeakStatus (vData.mBloodLeakStatus ); - bloodLeakState (vData.mBloodLeakState ); - bloodLeakPersistentCounter (vData.mBloodLeakPersistentCounter ); - bloodLeakSerialCommState (vData.mBloodLeakSerialCommState ); + bloodLeakStatus (vData.mBloodLeakStatus ); + bloodLeakState (vData.mBloodLeakState ); + bloodLeakPersistentCounter (vData.mBloodLeakPersistentCounter ); + bloodLeakSerialCommState (vData.mBloodLeakSerialCommState ); + bloodLeakIntensity (vData.mBloodLeakIntensity ); + bloodLeakDetect (vData.mBloodLeakDetect ); + bloodLeakIntensityMvgAvg (vData.mBloodLeakIntensityMvgAvg ); + bloodLeakTimeSinceLastZeroMS (vData.mBloodLeakTimeSinceLastZeroMS ); + bloodLeakDriftInRangeStatus (vData.mBloodLeakDriftInRangeStatus ); + bloodLeakDriftUpperRangeStatus (vData.mBloodLeakDriftUpperRangeStatus ); } Index: sources/view/hd/data/VHDBloodLeakData.h =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -35,10 +35,16 @@ class VHDBloodLeak : public QObject { Q_OBJECT - PROPERTY( quint32 , bloodLeakStatus , 0) - PROPERTY( quint32 , bloodLeakState , 0) - PROPERTY( quint32 , bloodLeakPersistentCounter , 0) - PROPERTY( quint32 , bloodLeakSerialCommState , 0) + PROPERTY( quint32 , bloodLeakStatus , 0) + PROPERTY( quint32 , bloodLeakState , 0) + PROPERTY( quint32 , bloodLeakPersistentCounter , 0) + PROPERTY( quint32 , bloodLeakSerialCommState , 0) + PROPERTY( quint32 , bloodLeakIntensity , 0) + PROPERTY( quint32 , bloodLeakDetect , 0) + PROPERTY( float , bloodLeakIntensityMvgAvg , 0) + PROPERTY( quint32 , bloodLeakTimeSinceLastZeroMS , 0) + PROPERTY( quint32 , bloodLeakDriftInRangeStatus , 0) + PROPERTY( quint32 , bloodLeakDriftUpperRangeStatus , 0) VIEW_DEC(VHDBloodLeak, HDBloodLeakData) }; Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -120,6 +120,7 @@ ENUM_CHECK ( GuiDialysisState, DIALYSIS_START_STATE ) ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_STATE ) ENUM_CHECK ( GuiDialysisState, DIALYSIS_SALINE_BOLUS_STATE ) + ENUM_CHECK ( GuiDialysisState, DIALYSIS_BLOOD_LEAK_ZEROING_STATE ) ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES ) } ENUM_READ ( GuiDialysisState, DIALYSIS_START_STATE , dyStart ); ENUM_READ ( GuiDialysisState, DIALYSIS_UF_STATE , dyUltrafiltration );