Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -rddd4cdc839b671226eba060eefbdcc5e6efad95f --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a7c580f0998ee781c47314384f677249cea4c4b4) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ddd4cdc839b671226eba060eefbdcc5e6efad95f) @@ -96,7 +96,7 @@ {Gui::GuiActionType::ID_DGPressuresData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DGDrainPumpData , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_DGReservoirData , 15 * 4 }, // 15 parameters 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 {Gui::GuiActionType::ID_DGHeatersData , 11 * 4 }, // 11 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes Index: sources/model/dg/data/MDGReservoirData.cpp =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -rddd4cdc839b671226eba060eefbdcc5e6efad95f --- sources/model/dg/data/MDGReservoirData.cpp (.../MDGReservoirData.cpp) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/model/dg/data/MDGReservoirData.cpp (.../MDGReservoirData.cpp) (revision ddd4cdc839b671226eba060eefbdcc5e6efad95f) @@ -30,9 +30,6 @@ _data.mTempAvgFill .value, _data.mTempLastFill .value, _data.mTimereservoirFill .value, - _data.mTempRsrvr0ActualTrimmer .value, - _data.mTempFillMixAvgTrimmer .value, - _data.mTempRsrvrEndFillTrimmer .value, }; } @@ -50,9 +47,6 @@ if (GetValue(vByteArray, index, _data.mTempAvgFill )) if (GetValue(vByteArray, index, _data.mTempLastFill )) if (GetValue(vByteArray, index, _data.mTimereservoirFill )) - if (GetValue(vByteArray, index, _data.mTempRsrvr0ActualTrimmer )) - if (GetValue(vByteArray, index, _data.mTempFillMixAvgTrimmer )) - if (GetValue(vByteArray, index, _data.mTempRsrvrEndFillTrimmer )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -66,9 +60,6 @@ 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; } } /*! @@ -90,8 +81,5 @@ data.mTempAvgFill = _data.mTempAvgFill .value; data.mTempLastFill = _data.mTempLastFill .value; data.mTimereservoirFill = _data.mTimereservoirFill .value; - data.mTempRsrvr0ActualTrimmer = _data.mTempRsrvr0ActualTrimmer .value; - data.mTempFillMixAvgTrimmer = _data.mTempFillMixAvgTrimmer .value; - data.mTempRsrvrEndFillTrimmer = _data.mTempRsrvrEndFillTrimmer .value; return data; } Index: sources/model/dg/data/MDGReservoirData.h =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -rddd4cdc839b671226eba060eefbdcc5e6efad95f --- sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision ddd4cdc839b671226eba060eefbdcc5e6efad95f) @@ -48,9 +48,6 @@ * | #10:(F32) | \ref Data::mTempAvgFill | * | #11:(F32) | \ref Data::mTempLastFill | * | #12:(F32) | \ref Data::mTimereservoirFill | - * | #13:(F32) | \ref Data::mTempRsrvr0ActualTrimmer | - * | #14:(F32) | \ref Data::mTempFillMixAvgTrimmer | - * | #15:(F32) | \ref Data::mTempRsrvrEndFillTrimmer | * \sa Data * *

Logging info

@@ -81,9 +78,6 @@ Types::F32 mTempAvgFill ; Types::F32 mTempLastFill ; Types::F32 mTimereservoirFill ; - Types::F32 mTempRsrvr0ActualTrimmer ; - Types::F32 mTempFillMixAvgTrimmer ; - Types::F32 mTempRsrvrEndFillTrimmer ; } _data; public: @@ -105,9 +99,6 @@ float mTempAvgFill = 0; ///< float mTempLastFill = 0; ///< float mTimereservoirFill = 0; ///< - float mTempRsrvr0ActualTrimmer = 0; ///< - float mTempFillMixAvgTrimmer = 0; ///< - float mTempRsrvrEndFillTrimmer = 0; ///< }; MDGReservoir () {} Index: sources/view/dg/data/VDGReservoirData.cpp =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -rddd4cdc839b671226eba060eefbdcc5e6efad95f --- sources/view/dg/data/VDGReservoirData.cpp (.../VDGReservoirData.cpp) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/view/dg/data/VDGReservoirData.cpp (.../VDGReservoirData.cpp) (revision ddd4cdc839b671226eba060eefbdcc5e6efad95f) @@ -33,7 +33,4 @@ tempAvgFill ( vData.mTempAvgFill ); tempLastFill ( vData.mTempLastFill ); timereservoirFill ( vData.mTimereservoirFill ); - tempRsrvr0ActualTrimmer ( vData.mTempRsrvr0ActualTrimmer ); - tempFillMixAvgTrimmer ( vData.mTempFillMixAvgTrimmer ); - tempRsrvrEndFillTrimmer ( vData.mTempRsrvrEndFillTrimmer ); } Index: sources/view/dg/data/VDGReservoirData.h =================================================================== diff -u -r28845c70151c3fb6f1a8e92c82da0232b6ca854a -rddd4cdc839b671226eba060eefbdcc5e6efad95f --- sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision 28845c70151c3fb6f1a8e92c82da0232b6ca854a) +++ sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision ddd4cdc839b671226eba060eefbdcc5e6efad95f) @@ -48,9 +48,6 @@ PROPERTY( float , tempAvgFill , 0) PROPERTY( float , tempLastFill , 0) PROPERTY( float , timereservoirFill , 0) - PROPERTY( float , tempRsrvr0ActualTrimmer , 0) - PROPERTY( float , tempFillMixAvgTrimmer , 0) - PROPERTY( float , tempRsrvrEndFillTrimmer , 0) VIEW_DEC(VDGReservoir, DGReservoirData) };