Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra4a9cb38498d26d828800224a7c7524fa0843e3e --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a4a9cb38498d26d828800224a7c7524fa0843e3e) @@ -100,7 +100,7 @@ {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 + 13 }, // 1 parameter 16bits & 13 parameters each 1 byte {Gui::GuiActionType::ID_DGHeatersData , 11 * 4 }, // 11 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DGTemperaturesData , 21 * 4 }, // 21 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 // HD Data Messages Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra4a9cb38498d26d828800224a7c7524fa0843e3e --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision a4a9cb38498d26d828800224a7c7524fa0843e3e) @@ -230,6 +230,9 @@ vDGTemperatures.interalTHDRTD .toFixed(2) , vDGTemperatures.internalCondSnsrTemp .toFixed(2) , vDGTemperatures.baroTempSensor .toFixed(2) , + // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen + //vDGTemperatures.dialysateInletMvngAvg .toFixed(2) , + //vDGTemperatures.redundantOutletMvngAvg .toFixed(2) , ] label: [ "TPi" , @@ -253,6 +256,9 @@ "iTHD" , "iCond" , "baro" , + // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen + // TDiAvg, + // TROAvg, ] } Index: sources/model/dg/data/MDGTemperaturesData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra4a9cb38498d26d828800224a7c7524fa0843e3e --- sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision a4a9cb38498d26d828800224a7c7524fa0843e3e) @@ -40,6 +40,8 @@ _data.mInteralTHDRTD .value, _data.mInternalCondSnsrTemp .value, _data.mBaroTempSensor .value, + _data.mDialysateInletMvngAvg .value, + _data.mRedundantOutletMvngAvg .value, }; } @@ -66,6 +68,8 @@ if (GetValue(vByteArray, index, _data.mInteralTHDRTD )) if (GetValue(vByteArray, index, _data.mInternalCondSnsrTemp )) if (GetValue(vByteArray, index, _data.mBaroTempSensor )) + if (GetValue(vByteArray, index, _data.mDialysateInletMvngAvg )) + if (GetValue(vByteArray, index, _data.mRedundantOutletMvngAvg )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -88,6 +92,8 @@ 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; } } /*! @@ -118,5 +124,7 @@ data.mInteralTHDRTD = _data.mInteralTHDRTD .value; data.mInternalCondSnsrTemp = _data.mInternalCondSnsrTemp .value; data.mBaroTempSensor = _data.mBaroTempSensor .value; + data.mDialysateInletMvngAvg = _data.mDialysateInletMvngAvg .value; + data.mRedundantOutletMvngAvg = _data.mRedundantOutletMvngAvg .value; return data; } Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra4a9cb38498d26d828800224a7c7524fa0843e3e --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision a4a9cb38498d26d828800224a7c7524fa0843e3e) @@ -57,6 +57,8 @@ * | #19:(F32) | \ref Data::mInteralTHDRTD | * | #20:(F32) | \ref Data::mInternalCondSnsrTemp | * | #21:(F32) | \ref Data::mBaroTempSensor | + * | #22:(F32) | \ref Data::mDialysateInletMvngAvg | + * | #23:(F32) | \ref Data::mRedundantOutletMvngAvg | * * \sa Data * @@ -101,6 +103,8 @@ Types::F32 mInteralTHDRTD ; ///< THd RTD channel temperature sensor Types::F32 mInternalCondSnsrTemp ; ///< Conductivity Sensor internal temperature sensor Types::F32 mBaroTempSensor ; ///< Barometric temperature sensor + Types::F32 mDialysateInletMvngAvg ; ///< Dialysate inlet moving average + Types::F32 mRedundantOutletMvngAvg ; ///< Redundant outlet moving average } _data; public: @@ -131,6 +135,8 @@ float mInteralTHDRTD = 0; ///< THd RTD channel temperature sensor float mInternalCondSnsrTemp = 0; ///< Conductivity Sensor internal temperature sensor float mBaroTempSensor = 0; ///< Barometric temperature sensor + float mDialysateInletMvngAvg = 0; ///< Dialysate inlet moving average + float mRedundantOutletMvngAvg = 0; ///< Redundant outlet moving average }; MDGTemperatures() { } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r34afdf9e90a0b4c9df05b0bb60c70f6ff9b09a53 -ra4a9cb38498d26d828800224a7c7524fa0843e3e --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 34afdf9e90a0b4c9df05b0bb60c70f6ff9b09a53) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a4a9cb38498d26d828800224a7c7524fa0843e3e) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 04-Feb-2024 + * \date (last) 05-Feb-2024 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/view/dg/data/VDGTemperaturesData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra4a9cb38498d26d828800224a7c7524fa0843e3e --- sources/view/dg/data/VDGTemperaturesData.cpp (.../VDGTemperaturesData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/dg/data/VDGTemperaturesData.cpp (.../VDGTemperaturesData.cpp) (revision a4a9cb38498d26d828800224a7c7524fa0843e3e) @@ -42,4 +42,6 @@ interalTHDRTD ( vData.mInteralTHDRTD ); internalCondSnsrTemp ( vData.mInternalCondSnsrTemp ); baroTempSensor ( vData.mBaroTempSensor ); + dialysateInletMvngAvg ( vData.mDialysateInletMvngAvg ); + redundantOutletMvngAvg ( vData.mRedundantOutletMvngAvg ); } Index: sources/view/dg/data/VDGTemperaturesData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra4a9cb38498d26d828800224a7c7524fa0843e3e --- sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision a4a9cb38498d26d828800224a7c7524fa0843e3e) @@ -57,6 +57,8 @@ PROPERTY( float , interalTHDRTD , 0) PROPERTY( float , internalCondSnsrTemp , 0) PROPERTY( float , baroTempSensor , 0) + PROPERTY( float , dialysateInletMvngAvg , 0) + PROPERTY( float , redundantOutletMvngAvg , 0) VIEW_DEC(VDGTemperatures, DGTemperaturesData) };