Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rb7310738257f7a0efc48cdb955a5e11b79343677 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b7310738257f7a0efc48cdb955a5e11b79343677) @@ -94,7 +94,7 @@ // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_DGPressuresData , 5 * 4 }, // 5 parameters each 4bytes - {Gui::GuiActionType::ID_DGDrainPumpData , 7 * 4 }, // 7 parameters each 4bytes + {Gui::GuiActionType::ID_DGDrainPumpData , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 12 * 4 }, // 12 parameters each 4bytes {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 + 13 }, // 1 parameter 16bits & 13 parameters each 1 byte Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r10f946b2ecf6eed25d07d6a22216393dca34ffcc -rb7310738257f7a0efc48cdb955a5e11b79343677 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision b7310738257f7a0efc48cdb955a5e11b79343677) @@ -91,6 +91,7 @@ vDGDrainPump.targetFLPMO .toFixed(2) , vDGDrainPump.currentA .toFixed(2) , vDGDrainPump.direction , + vDGDrainPump.maxonRPM , ] label: [ "TgtSpd", @@ -100,6 +101,7 @@ "tgt" , "cur" , "dir" , + "mxn" , ] } Index: sources/model/dg/data/MDGDrainPumpData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7310738257f7a0efc48cdb955a5e11b79343677 --- sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision b7310738257f7a0efc48cdb955a5e11b79343677) @@ -25,6 +25,7 @@ _data.mTargetFLPMO .value, _data.mCurrentA .value, _data.mDirection .value, + _data.mMaxonRPM .value, }; } @@ -37,6 +38,7 @@ if (GetValue(vByteArray, index, _data.mTargetFLPMO )) if (GetValue(vByteArray, index, _data.mCurrentA )) if (GetValue(vByteArray, index, _data.mDirection )) + if (GetValue(vByteArray, index, _data.mMaxonRPM )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -45,6 +47,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; } } /*! @@ -61,5 +64,6 @@ data.mTargetFLPMO = _data.mTargetFLPMO .value; data.mCurrentA = _data.mCurrentA .value; data.mDirection = _data.mDirection .value; + data.mMaxonRPM = _data.mMaxonRPM .value; return data; } Index: sources/model/dg/data/MDGDrainPumpData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7310738257f7a0efc48cdb955a5e11b79343677 --- sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision b7310738257f7a0efc48cdb955a5e11b79343677) @@ -43,6 +43,7 @@ * | #5:(F32) | \ref Data::mTargetFLPMO | * | #6:(F32) | \ref Data::mCurrentA | * | #7:(U32) | \ref Data::mDirection | + * | #8:(U32) | \ref Data::mMaxonRPM \ * * * \sa Data @@ -70,6 +71,7 @@ Types::F32 mTargetFLPMO ; Types::F32 mCurrentA ; Types::U32 mDirection ; + Types::U32 mMaxonRPM ; } _data; public: @@ -86,6 +88,7 @@ float mTargetFLPMO = 0; ///< target Outlet Flow LPM float mCurrentA = 0; ///< drain Pump Current A quint32 mDirection = 0; ///< drain Pump Direction + quint32 mMaxonRPM = 0; ///< drain pump Maxon RPM }; MDGDrainPump () { } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 -rb7310738257f7a0efc48cdb955a5e11b79343677 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision b7310738257f7a0efc48cdb955a5e11b79343677) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 03-Mar-2024 + * \date (last) 05-Mar-2024 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/view/dg/data/VDGDrainPumpData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7310738257f7a0efc48cdb955a5e11b79343677 --- sources/view/dg/data/VDGDrainPumpData.cpp (.../VDGDrainPumpData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/dg/data/VDGDrainPumpData.cpp (.../VDGDrainPumpData.cpp) (revision b7310738257f7a0efc48cdb955a5e11b79343677) @@ -28,4 +28,5 @@ targetFLPMO ( vData.mTargetFLPMO ); currentA ( vData.mCurrentA ); direction ( vData.mDirection ); + maxonRPM ( vData.mMaxonRPM ); } Index: sources/view/dg/data/VDGDrainPumpData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7310738257f7a0efc48cdb955a5e11b79343677 --- sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision b7310738257f7a0efc48cdb955a5e11b79343677) @@ -43,6 +43,7 @@ PROPERTY( float , targetFLPMO , 0) PROPERTY( float , currentA , 0) PROPERTY( quint32 , direction , 0) + PROPERTY( quint32 , maxonRPM , 0) VIEW_DEC(VDGDrainPump, DGDrainPumpData) };