Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r291906e7a62816a10cb424389df9ac3704aa8dc3 -r292beb22109065953f769ace13c3a395674612ac --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 292beb22109065953f769ace13c3a395674612ac) @@ -86,7 +86,7 @@ {Gui::GuiActionType::ID_BloodPrime , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_TDAirPumpData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_TDAirPumpData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_TDAirTrapData , 10 * 4 }, // 10 parameters each 4bytes {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- @@ -130,7 +130,7 @@ {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes //TD Data Messages {Gui::GuiActionType::ID_TDVoltageData , 11 * 4 }, //11 parameters each 4bytes - {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes + {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 7*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes {Gui::GuiActionType::ID_TDEjectorData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r291906e7a62816a10cb424389df9ac3704aa8dc3 -r292beb22109065953f769ace13c3a395674612ac --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 292beb22109065953f769ace13c3a395674612ac) @@ -146,26 +146,36 @@ DebugDataColumn { id: _TDValvesColumn textObjectName :"_TDValvesData" - title : qsTr(" Valves ") + title : qsTr("[0X2B] Valves ") anchors { top : parent.top left : _TDAirTrapCoulumn.right leftMargin : spacing } model: [ - vTDValves.valveId , - vTDValves.state , - vTDValves.posName , - vTDValves.posCount , - vTDValves.nextPos , + vTDValves.valveId , + vTDValves.state , + vTDValves.currPosID , + vTDValves.currPos , + vTDValves.cmdPos , + vTDValves.posA , + vTDValves.posB , + vTDValves.posC , + vTDValves.posD , + vTDValves.maxHomingPos , ] label: [ - "ID ", - "state ", - "Name ", - "Cnt ", - "nPos ", + "ID ", + "state ", + "Curr Pos ID ", + "Curr Pos ", + "Cmd Pos ", + "Pos A ", + "Pos B ", + "Pos C ", + "Pos D ", + "Max Homing Pos ", ] } Index: sources/model/td/data/MTDValvesData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r292beb22109065953f769ace13c3a395674612ac --- sources/model/td/data/MTDValvesData.cpp (.../MTDValvesData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDValvesData.cpp (.../MTDValvesData.cpp) (revision 292beb22109065953f769ace13c3a395674612ac) @@ -18,21 +18,31 @@ QVariantList MTDValvesData::parameters() const { return { - _data.mValveId .value, - _data.mState .value, - _data.mPosName .value, - _data.mPosCount .value, - _data.mNextPos .value, + _data.mValveId .value, + _data.mState .value, + _data.mCurrPosID .value, + _data.mCurrPos .value, + _data.mCmdPos .value, + _data.mPosA .value, + _data.mPosB .value, + _data.mPosC .value, + _data.mPosD .value, + _data.mMaxHomingPos .value, }; } bool MTDValvesData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mValveId )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPosName )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPosCount )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mNextPos )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mValveId )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCurrPosID )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCurrPos )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCmdPos )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPosA )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPosB )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPosC )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPosD )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMaxHomingPos )) goto lError; return true ; @@ -49,10 +59,15 @@ */ MTDValvesData::Data MTDValvesData::data() const{ Data data; - data.mValveId = _data.mValveId .value; - data.mState = _data.mState .value; - data.mPosName = _data.mPosName .value; - data.mPosCount = _data.mPosCount .value; - data.mNextPos = _data.mNextPos .value; + data.mValveId = _data.mValveId .value; + data.mState = _data.mState .value; + data.mCurrPosID = _data.mCurrPosID .value; + data.mCurrPos = _data.mCurrPos .value; + data.mCmdPos = _data.mCmdPos .value; + data.mPosA = _data.mPosA .value; + data.mPosB = _data.mPosB .value; + data.mPosC = _data.mPosC .value; + data.mPosD = _data.mPosD .value; + data.mMaxHomingPos = _data.mMaxHomingPos .value; return data; } 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 () { } Index: sources/view/td/data/VTDValvesData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r292beb22109065953f769ace13c3a395674612ac --- sources/view/td/data/VTDValvesData.cpp (.../VTDValvesData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDValvesData.cpp (.../VTDValvesData.cpp) (revision 292beb22109065953f769ace13c3a395674612ac) @@ -20,9 +20,14 @@ VIEW_DEF(VTDValves, TDValvesData) void VTDValves::onActionReceive(const TDValvesData &vData) { - valveId (vData.mValveId ); - state (vData.mState ); - posName (vData.mPosName ); - posCount (vData.mPosCount ); - nextPos (vData.mNextPos ); + valveId (vData.mValveId ); + state (vData.mState ); + currPosID (vData.mCurrPosID ); + currPos (vData.mCurrPos ); + cmdPos (vData.mCmdPos ); + posA (vData.mPosA ); + posB (vData.mPosB ); + posC (vData.mPosC ); + posD (vData.mPosD ); + maxHomingPos (vData.mMaxHomingPos ); } Index: sources/view/td/data/VTDValvesData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r292beb22109065953f769ace13c3a395674612ac --- sources/view/td/data/VTDValvesData.h (.../VTDValvesData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDValvesData.h (.../VTDValvesData.h) (revision 292beb22109065953f769ace13c3a395674612ac) @@ -35,11 +35,16 @@ class VTDValves : public QObject { Q_OBJECT - PROPERTY( quint32 , valveId , 0) - PROPERTY( quint32 , state , 0) - PROPERTY( quint32 , posName , 0) - PROPERTY( qint16 , posCount , 0) - PROPERTY( qint16 , nextPos , 0) + PROPERTY( quint32 , valveId , 0) + PROPERTY( quint32 , state , 0) + PROPERTY( quint32 , currPosID , 0) + PROPERTY( qint16 , currPos , 0) + PROPERTY( qint16 , cmdPos , 0) + PROPERTY( qint16 , posA , 0) + PROPERTY( qint16 , posB , 0) + PROPERTY( qint16 , posC , 0) + PROPERTY( qint16 , posD , 0) + PROPERTY( qint16 , maxHomingPos , 0) VIEW_DEC(VTDValves, TDValvesData) };