Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r95c2b1e716dedddbde9aa2176e746ed485a36944 -r83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1) @@ -93,9 +93,9 @@ // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGPressuresData , 5 * 4 }, // 5 parameters each 4bytes - {Gui::GuiActionType::ID_DGDrainPumpData , 4 * 4 }, // 4 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 , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_DGReservoirData , 15 * 4 }, // 15 parameters each 4bytes {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 }, // 1 parameters each 2bytes {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 -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1 --- sources/model/dg/data/MDGReservoirData.cpp (.../MDGReservoirData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGReservoirData.cpp (.../MDGReservoirData.cpp) (revision 83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1) @@ -8,7 +8,7 @@ * \file MDGReservoirData.cpp * \author (last) Behrouz NematiPour * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 02-Jul-2020 * */ @@ -18,21 +18,57 @@ QVariantList MDGReservoir::parameters() const { return { - _data.mActiveReservoir .value, - _data.mFillToVol .value, - _data.mDrainToVol .value + _data.mActiveReservoir .value, + _data.mFillToVol .value, + _data.mDrainToVol .value, + _data.mTimeReservoirCycleMS .value, + _data.mTimeReservoirFill2SwitchMS .value, + _data.mTimeUFDecayMS .value, + _data.mTempUFFill .value, + _data.mTempReservoirUseActual .value, + _data.mTempReservoirEndFill .value, + _data.mTempAvgFill .value, + _data.mTempLastFill .value, + _data.mTimereservoirFill .value, + _data.mTempRsrvr0ActualTrimmer .value, + _data.mTempFillMixAvgTrimmer .value, + _data.mTempRsrvrEndFillTrimmer .value, }; } bool MDGReservoir::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mActiveReservoir )) - if (GetValue(vByteArray, index, _data.mFillToVol )) - if (GetValue(vByteArray, index, _data.mDrainToVol )) + if (GetValue(vByteArray, index, _data.mActiveReservoir )) + if (GetValue(vByteArray, index, _data.mFillToVol )) + if (GetValue(vByteArray, index, _data.mDrainToVol )) + if (GetValue(vByteArray, index, _data.mTimeReservoirCycleMS )) + if (GetValue(vByteArray, index, _data.mTimeReservoirFill2SwitchMS )) + if (GetValue(vByteArray, index, _data.mTimeUFDecayMS )) + if (GetValue(vByteArray, index, _data.mTempUFFill )) + if (GetValue(vByteArray, index, _data.mTempReservoirUseActual )) + if (GetValue(vByteArray, index, _data.mTempReservoirEndFill )) + 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; } 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -42,8 +78,20 @@ */ MDGReservoir::Data MDGReservoir::data() const { Data data; - data.mActiveReservoir = _data.mActiveReservoir .value; - data.mFillToVol = _data.mFillToVol .value; - data.mDrainToVol = _data.mDrainToVol .value; + data.mActiveReservoir = _data.mActiveReservoir .value; + data.mFillToVol = _data.mFillToVol .value; + data.mDrainToVol = _data.mDrainToVol .value; + data.mTimeReservoirCycleMS = _data.mTimeReservoirCycleMS .value; + data.mTimeReservoirFill2SwitchMS = _data.mTimeReservoirFill2SwitchMS .value; + data.mTimeUFDecayMS = _data.mTimeUFDecayMS .value; + data.mTempUFFill = _data.mTempUFFill .value; + data.mTempReservoirUseActual = _data.mTempReservoirUseActual .value; + data.mTempReservoirEndFill = _data.mTempReservoirEndFill .value; + 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 -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1 --- sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision 83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1) @@ -8,7 +8,7 @@ * \file MDGReservoirData.h * \author (last) Behrouz NematiPour * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 02-Jul-2020 * */ @@ -36,10 +36,21 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mActiveReservoir | - * | #2:(U32) | \ref Data::mFillToVol | - * | #3:(U32) | \ref Data::mDrainToVol | - * + * | #01:(U32) | \ref Data::mActiveReservoir | + * | #02:(U32) | \ref Data::mFillToVol | + * | #03:(U32) | \ref Data::mDrainToVol | + * | #04:(U32) | \ref Data::mTimeReservoirCycleMS | + * | #05:(U32) | \ref Data::mTimeReservoirFill2SwitchMS | + * | #06:(F32) | \ref Data::mTimeUFDecayMS | + * | #07:(F32) | \ref Data::mTempUFFill | + * | #08:(F32) | \ref Data::mTempReservoirUseActual | + * | #09:(F32) | \ref Data::mTempReservoirEndFill | + * | #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

@@ -58,9 +69,21 @@ QVariantList parameters() const override; struct { - Types::U32 mActiveReservoir ; - Types::U32 mFillToVol ; - Types::U32 mDrainToVol ; + Types::U32 mActiveReservoir ; + Types::U32 mFillToVol ; + Types::U32 mDrainToVol ; + Types::U32 mTimeReservoirCycleMS ; + Types::U32 mTimeReservoirFill2SwitchMS ; + Types::F32 mTimeUFDecayMS ; + Types::F32 mTempUFFill ; + Types::F32 mTempReservoirUseActual ; + Types::F32 mTempReservoirEndFill ; + Types::F32 mTempAvgFill ; + Types::F32 mTempLastFill ; + Types::F32 mTimereservoirFill ; + Types::F32 mTempRsrvr0ActualTrimmer ; + Types::F32 mTempFillMixAvgTrimmer ; + Types::F32 mTempRsrvrEndFillTrimmer ; } _data; public: @@ -70,9 +93,21 @@ QString infoText () const override { return QString("Reservoir"); } struct Data { - quint32 mActiveReservoir = 0; ///< Active reservoir - quint32 mFillToVol = 0; ///< Fill to vol (mL) - quint32 mDrainToVol = 0; ///< Drain to vol (mL) + quint32 mActiveReservoir = 0; ///< Active reservoir + quint32 mFillToVol = 0; ///< Fill to vol (mL) + quint32 mDrainToVol = 0; ///< Drain to vol (mL) + quint32 mTimeReservoirCycleMS = 0; ///< + quint32 mTimeReservoirFill2SwitchMS = 0; ///< + float mTimeUFDecayMS = 0; ///< + float mTempUFFill = 0; ///< + float mTempReservoirUseActual = 0; ///< + float mTempReservoirEndFill = 0; ///< + 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 -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1 --- sources/view/dg/data/VDGReservoirData.cpp (.../VDGReservoirData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGReservoirData.cpp (.../VDGReservoirData.cpp) (revision 83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1) @@ -21,7 +21,19 @@ void VDGReservoir::onActionReceive(const DGReservoirData &vData) { - activeReservoir ( vData.mActiveReservoir ); - fillToVol ( vData.mFillToVol ); - drainToVol ( vData.mDrainToVol ); + activeReservoir ( vData.mActiveReservoir ); + fillToVol ( vData.mFillToVol ); + drainToVol ( vData.mDrainToVol ); + timeReservoirCycleMS ( vData.mTimeReservoirCycleMS ); + timeReservoirFill2SwitchMS ( vData.mTimeReservoirFill2SwitchMS ); + timeUFDecayMS ( vData.mTimeUFDecayMS ); + tempUFFill ( vData.mTempUFFill ); + tempReservoirUseActual ( vData.mTempReservoirUseActual ); + tempReservoirEndFill ( vData.mTempReservoirEndFill ); + 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 -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1 --- sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision 83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1) @@ -36,9 +36,21 @@ { Q_OBJECT - PROPERTY( float , activeReservoir , 0) - PROPERTY( float , fillToVol , 0) - PROPERTY( float , drainToVol , 0) + PROPERTY( float , activeReservoir , 0) + PROPERTY( float , fillToVol , 0) + PROPERTY( float , drainToVol , 0) + PROPERTY( quint32 , timeReservoirCycleMS , 0) + PROPERTY( quint32 , timeReservoirFill2SwitchMS , 0) + PROPERTY( float , timeUFDecayMS , 0) + PROPERTY( float , tempUFFill , 0) + PROPERTY( float , tempReservoirUseActual , 0) + PROPERTY( float , tempReservoirEndFill , 0) + 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) };