Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -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 @@ -59,7 +73,7 @@ enum Flag { eFlag_ValveStates_VRF = 0, ///< Valve Reservoir Fill eFlag_ValveStates_VRI , ///< Valve Reservoir Inlet - eFlag_ValveStates_VRD , ///< Valve Reservoir Drain + 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 @@ -71,15 +85,28 @@ eFlag_ValveStates_VR2 , ///< Valve Reservoir 2 Drain eFlag_ValveStates_VPD , ///< Valve Production Drain - eFlag_Bits_Length = 16, - }; + 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: @@ -89,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 () { }