Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rc4dffe90d1a236a107599027b0b4248d25314af6 -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c4dffe90d1a236a107599027b0b4248d25314af6) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -84,7 +84,7 @@ {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 , 7 * 4 }, // 7 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -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 -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -22,6 +22,9 @@ _data.mBloodLeakState .value, _data.mBloodLeakPersistentCounter .value, _data.mBloodLeakSerialCommState .value, + _data.mBloodLeakIntensity .value, + _data.mBloodLeakDetect .value, + _data.mBloodLeakIntensityMvgAvg .value, }; } @@ -31,11 +34,17 @@ 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 )) 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; } } /*! @@ -45,10 +54,13 @@ */ MHDBloodLeakData::Data MHDBloodLeakData::data() const{ Data data; - data.mBloodLeakStatus = _data.mBloodLeakStatus .value; - data.mBloodLeakState = _data.mBloodLeakState .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; return data; } Index: sources/model/hd/data/MHDBloodLeakData.h =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -42,6 +42,9 @@ * | #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 | * * \sa Data * @@ -65,6 +68,9 @@ Types::U32 mBloodLeakState ; Types::U32 mBloodLeakPersistentCounter ; Types::U32 mBloodLeakSerialCommState ; + Types::U32 mBloodLeakIntensity ; + Types::U32 mBloodLeakDetect ; + Types::F32 mBloodLeakIntensityMvgAvg ; } _data; public: @@ -78,6 +84,9 @@ quint32 mBloodLeakState = 0; quint32 mBloodLeakPersistentCounter = 0; quint32 mBloodLeakSerialCommState = 0; + quint32 mBloodLeakIntensity = 0; + quint32 mBloodLeakDetect = 0; + float mBloodLeakIntensityMvgAvg = 0; }; MHDBloodLeakData () { } Index: sources/view/hd/data/VHDBloodLeakData.cpp =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -24,4 +24,7 @@ bloodLeakState (vData.mBloodLeakState ); bloodLeakPersistentCounter (vData.mBloodLeakPersistentCounter ); bloodLeakSerialCommState (vData.mBloodLeakSerialCommState ); + bloodLeakIntensity (vData.mBloodLeakIntensity ); + bloodLeakDetect (vData.mBloodLeakDetect ); + bloodLeakIntensityMvgAvg (vData.mBloodLeakIntensityMvgAvg ); } Index: sources/view/hd/data/VHDBloodLeakData.h =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -39,6 +39,9 @@ PROPERTY( quint32 , bloodLeakState , 0) PROPERTY( quint32 , bloodLeakPersistentCounter , 0) PROPERTY( quint32 , bloodLeakSerialCommState , 0) + PROPERTY( quint32 , bloodLeakIntensity , 0) + PROPERTY( quint32 , bloodLeakDetect , 0) + PROPERTY( float , bloodLeakIntensityMvgAvg , 0) VIEW_DEC(VHDBloodLeak, HDBloodLeakData) }; Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -120,10 +120,12 @@ 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 ); 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 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -95,6 +95,7 @@ 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