Index: sources/model/dg/data/MDGReservoirData.h =================================================================== diff -u -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) +++ sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDGReservoirData.h - * \author (last) Behrouz NemaiPour - * \date (last) 17-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGReservoirData.h + * \author (last) Behrouz NematiPour + * \date (last) 31-Oct-2023 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -36,10 +36,18 @@ * * | 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 | * \sa Data * *

Logging info

@@ -58,9 +66,18 @@ 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 ; } _data; public: @@ -70,9 +87,18 @@ 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; ///< }; MDGReservoir () {}