Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -r30a3a58cde0e82d66c8c5f242ec550007e20b694 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2022 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 MDGValvesStatesData.h * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 + * \date (last) 28-Mar-2023 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * @@ -36,7 +36,21 @@ * * | Payload || * | || - * | #1:(U16) | \ref Data::mStates | + * | #01:(U16) | \ref Data::mStates | + * | #02:(U08) | \ref Data::mVRf | + | #03:(U08) | \ref Data::mVRi | + | #04:(U08) | \ref Data::mRes | + | #05:(U08) | \ref Data::mVRo | + | #06:(U08) | \ref Data::mVPo | + | #07:(U08) | \ref Data::mVBf | + | #08:(U08) | \ref Data::mVRc | + | #09:(U08) | \ref Data::mVDr | + | #10:(U08) | \ref Data::mVPi | + | #11:(U08) | \ref Data::mVSP | + | #12:(U08) | \ref Data::mVR1 | + | #13:(U08) | \ref Data::mVR2 | + | #14:(U08) | \ref Data::mVPd | + * * \sa Data * \sa Flag @@ -57,28 +71,42 @@ public: enum Flag { - eFlag_ValveStates_01 = 0, - eFlag_ValveStates_02 , - eFlag_ValveStates_03 , - eFlag_ValveStates_04 , - eFlag_ValveStates_05 , - eFlag_ValveStates_06 , - eFlag_ValveStates_07 , - eFlag_ValveStates_08 , - eFlag_ValveStates_09 , - eFlag_ValveStates_10 , - eFlag_ValveStates_11 , - eFlag_ValveStates_12 , - eFlag_ValveStates_13 , - eFlag_Bits_Length = 16, - }; + eFlag_ValveStates_VRF = 0, ///< Valve Reservoir Fill + eFlag_ValveStates_VRI , ///< Valve Reservoir Inlet + eFlag_ValveStates_RES , ///< Reserved // it is removed and VR1,VR2 added + eFlag_ValveStates_VRO , ///< Valve Reservoir Outlet + eFlag_ValveStates_VPO , ///< Valve Pressure Outlet + eFlag_ValveStates_VBF , ///< Valve Bypass Filter + eFlag_ValveStates_VRC , ///< Valve Recirculate + eFlag_ValveStates_VDR , ///< Valve Drain + eFlag_ValveStates_VPI , ///< Valve Pressure Inlet + eFlag_ValveStates_VSP , ///< Valve Sampling Port + eFlag_ValveStates_VR1 , ///< Valve Reservoir 1 Drain + eFlag_ValveStates_VR2 , ///< Valve Reservoir 2 Drain + eFlag_ValveStates_VPD , ///< Valve Production Drain + eFlag_Bits_Length = 16, // the 16 bit has to be consumed since the next data starts after the 16 bit. + }; + private: // DG Valves States (U16) Valves States QVariantList parameters() const override; struct { - Types::Flags mStates ; + Types::Flags mStates ; + Types::U08 mVRf ; + Types::U08 mVRi ; + Types::U08 mRes ; + Types::U08 mVRo ; + Types::U08 mVPo ; + Types::U08 mVBf ; + Types::U08 mVRc ; + Types::U08 mVDr ; + Types::U08 mVPi ; + Types::U08 mVSP ; + Types::U08 mVR1 ; + Types::U08 mVR2 ; + Types::U08 mVPd ; } _data; public: @@ -88,7 +116,20 @@ QString infoText () const override { return QString("ValvesStates"); } struct Data { - QBitArray mStates ; + QBitArray mStates ; + quint8 mVRf = 0; + quint8 mVRi = 0; + quint8 mRes = 0; + quint8 mVRo = 0; + quint8 mVPo = 0; + quint8 mVBf = 0; + quint8 mVRc = 0; + quint8 mVDr = 0; + quint8 mVPi = 0; + quint8 mVSP = 0; + quint8 mVR1 = 0; + quint8 mVR2 = 0; + quint8 mVPd = 0; }; MDGValvesStates () { }