Index: sources/model/td/data/MTDValvesData.h =================================================================== diff -u -r9d27f14c2b528c0f199004614f10d55589e08614 -r292beb22109065953f769ace13c3a395674612ac --- sources/model/td/data/MTDValvesData.h (.../MTDValvesData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) +++ sources/model/td/data/MTDValvesData.h (.../MTDValvesData.h) (revision 292beb22109065953f769ace13c3a395674612ac) @@ -37,9 +37,14 @@ * | || * | #1:(U32) | \ref Data::mValveId | * | #2:(U32) | \ref Data::mState | - * | #3:(U32) | \ref Data::mPosName | - * | #4:(S16) | \ref Data::mPosCount | - * | #5:(S16) | \ref Data::mNextPos | + * | #3:(U32) | \ref Data::mCurrPosID | + * | #4:(S16) | \ref Data::mCurrPos | + * | #5:(S16) | \ref Data::mCmdPos | + * | #6:(S16) | \ref Data::mPosA | + * | #7:(S16) | \ref Data::mPosB | + * | #8:(S16) | \ref Data::mPosC | + * | #9:(S16) | \ref Data::mPosD | + * |#10:(S16) | \ref Data::mMaxHomingPos | * * \sa Data * @@ -61,9 +66,14 @@ struct { Types::U32 mValveId ; Types::U32 mState ; - Types::U32 mPosName ; - Types::S16 mPosCount ; - Types::S16 mNextPos ; + Types::U32 mCurrPosID ; + Types::S16 mCurrPos ; + Types::S16 mCmdPos ; + Types::S16 mPosA ; + Types::S16 mPosB ; + Types::S16 mPosC ; + Types::S16 mPosD ; + Types::S16 mMaxHomingPos ; } _data; public: @@ -74,11 +84,16 @@ struct Data { - quint32 mValveId = 0; ///< Valve ID - quint32 mState = 0; ///< Valve State - quint32 mPosName = 0; ///< Position Name - qint16 mPosCount = 0; ///< Position Count - qint16 mNextPos = 0; ///< Next Position + quint32 mValveId = 0; + quint32 mState = 0; + quint32 mCurrPosID = 0; + qint16 mCurrPos = 0; + qint16 mCmdPos = 0; + qint16 mPosA = 0; + qint16 mPosB = 0; + qint16 mPosC = 0; + qint16 mPosD = 0; + qint16 mMaxHomingPos = 0; }; MTDValvesData () { }