Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r024129d0aa4be9de46b0b223d2980a7be4747f15 -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 024129d0aa4be9de46b0b223d2980a7be4747f15) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -87,7 +87,7 @@ {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_TDAirTrapData , 6 * 4 }, // 6 parameters each 4bytes + {Gui::GuiActionType::ID_TDAirTrapData , 10 * 4 }, // 10 parameters each 4bytes {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter each 4bytes Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r024129d0aa4be9de46b0b223d2980a7be4747f15 -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 024129d0aa4be9de46b0b223d2980a7be4747f15) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -65,50 +65,62 @@ DebugDataColumn { id: _TDAirTrapCoulumn textObjectName :"_TDAirTrapData" - title : qsTr(" Air Trap ") + title : qsTr("[0x2A] Air Trap ") anchors { top : parent.top left : _TDPressureOcclusionColumn.right leftMargin : spacing } model: [ - vTDAirTrap.lowLevel , - vTDAirTrap.upLevel , - vTDAirTrap.lowLevelRaw , - vTDAirTrap.upLevelRaw , - vTDAirTrap.valveIntakeState , - vTDAirTrap.valveOutletState , - vTDAirTrap.controlling , + vTDAirTrap.h17State , + vTDAirTrap.h16State , + vTDAirTrap.h17RawState , + vTDAirTrap.h16RawState , + vTDAirTrap.h13State , + vTDAirTrap.h20State , + vTDAirTrap.isAutoControlling , + vTDAirTrap.airTrapState , + vTDAirTrap.airPumpLowerPowerLevel , + vTDAirTrap.airPumpRaisePowerLevel , ] label: [ - "ATL (H17)", - "ATH (H16)", - "rARL (H17)", - "rATH (H16)", - "IState (H13)", - "OState (H20)", - "ctrl ", + "ATL (H17) ", + "ATH (H16) ", + "rARL (H17) ", + "rATH (H16) ", + "IState (H13) ", + "OState (H20) ", + "ctrl ", + "AT State ", + "AP Lower PL ", + "AP Rraise PL ", ] } DebugDataColumn { id: _TDAirPumpColumn textObjectName :"_TDAirPumpData" - title : qsTr(" Air Pumps ") + title : qsTr("[0x20] Air Pumps ") anchors { top : _TDAirTrapCoulumn.bottom topMargin : spacing left : _TDAirTrapCoulumn.left } model: [ - vTDAirPump.airPumpState , - vTDAirPump.airPumpPower , + vTDAirPump.airPumpState , + vTDAirPump.airPumpRPM , + vTDAirPump.airPumpPower , + vTDAirPump.airPumpFGPARPM , + vTDAirPump.airPumpScalarPower , ] label: [ - "state (H12) ", - "power (H12) ", + "state (H12) ", + "RPM (H12) ", + "power (H12) ", + "FPGA RPM (H12) ", + "scalar power ", ] } Index: sources/model/td/data/MTDAirPumpData.cpp =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/model/td/data/MTDAirPumpData.cpp (.../MTDAirPumpData.cpp) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/model/td/data/MTDAirPumpData.cpp (.../MTDAirPumpData.cpp) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -18,15 +18,21 @@ QVariantList MTDAirPumpData::parameters() const { return { - _data.h12State .value, - _data.h12Power .value, + _data.mH12State .value, + _data.mH12RPM .value, + _data.mH12Power .value, + _data.mFPGAH12RPM .value, + _data.mScalarPower .value, }; } bool MTDAirPumpData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.h12State )) goto lError; - if ( ! GetValue(vByteArray, index, _data.h12Power )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH12State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH12RPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH12Power )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFPGAH12RPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mScalarPower )) goto lError; return true ; @@ -43,7 +49,10 @@ */ MTDAirPumpData::Data MTDAirPumpData::data() const{ Data data; - data.mAirPumpState = _data.h12State .value; - data.mAirPumpPower = _data.h12Power .value; + data.mState = _data.mH12State .value; + data.mRPM = _data.mH12RPM .value; + data.mPower = _data.mH12Power .value; + data.mFPGARPM = _data.mFPGAH12RPM .value; + data.mScalarPower = _data.mScalarPower .value; return data; } Index: sources/model/td/data/MTDAirPumpData.h =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/model/td/data/MTDAirPumpData.h (.../MTDAirPumpData.h) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/model/td/data/MTDAirPumpData.h (.../MTDAirPumpData.h) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -37,8 +37,11 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mAirPumpState | - * | #2:(U32) | \ref Data::mAirPumpPower | + * | #1:(U32) | \ref Data::mH12State | + * | #2:(U32) | \ref Data::mH12RPM | + * | #3:(F32) | \ref Data::mH12Power | + * | #4:(U32) | \ref Data::mFPGAH12RPM | + * | #5:(U32) | \ref Data::mScalarPower | * * \sa Data * @@ -58,8 +61,11 @@ QVariantList parameters() const override; struct { - Types::U32 h12State ; - Types::U32 h12Power ; + Types::U32 mH12State ; + Types::U32 mH12RPM ; + Types::F32 mH12Power ; + Types::U32 mFPGAH12RPM ; + Types::U32 mScalarPower ; } _data; public: @@ -70,8 +76,11 @@ struct Data { - quint32 mAirPumpState = 0; ///< Air Pump State - quint32 mAirPumpPower = 0; ///< Air Pump Power + quint32 mState = 0; + quint32 mRPM = 0; + float mPower = 0; + quint32 mFPGARPM = 0; + quint32 mScalarPower = 0; }; MTDAirPumpData () { } Index: sources/model/td/data/MTDAirTrapData.cpp =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/model/td/data/MTDAirTrapData.cpp (.../MTDAirTrapData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/MTDAirTrapData.cpp (.../MTDAirTrapData.cpp) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -18,25 +18,31 @@ QVariantList MTDAirTrapData::parameters() const { return { - _data.mH17State .value, - _data.mH16State .value, - _data.mH17RawState .value, - _data.mH16RawState .value, - _data.mH13State .value, - _data.mH20State .value, - _data.mControlling .value, + _data.mH17State .value, + _data.mH16State .value, + _data.mH17RawState .value, + _data.mH16RawState .value, + _data.mH13State .value, + _data.mH20State .value, + _data.mIsAutoControlling .value, + _data.mAirTrapState .value, + _data.mAirPumpLowerPowerLevel .value, + _data.mAirPumpRaisePowerLevel .value, }; } bool MTDAirTrapData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mH17State )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH16State )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH17RawState )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH16RawState )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH13State )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH20State )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mControlling )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH17State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH16State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH17RawState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH16RawState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH13State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH20State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsAutoControlling )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAirTrapState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAirPumpLowerPowerLevel )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAirPumpRaisePowerLevel )) goto lError; return true ; @@ -53,12 +59,15 @@ */ MTDAirTrapData::Data MTDAirTrapData::data() const{ Data data; - data.mLowLevel = _data.mH17State .value; - data.mUpLevel = _data.mH16State .value; - data.mLowLevelRaw = _data.mH17RawState .value; - data.mUpLevelRaw = _data.mH16RawState .value; - data.mValveIntakeState = _data.mH13State .value; - data.mValveOutletState = _data.mH20State .value; - data.mControlling = _data.mControlling .value; + data.mH17State = _data.mH17State .value; + data.mH16State = _data.mH16State .value; + data.mH17RawState = _data.mH17RawState .value; + data.mH16RawState = _data.mH16RawState .value; + data.mH13State = _data.mH13State .value; + data.mH20State = _data.mH20State .value; + data.mIsAutoControlling = _data.mIsAutoControlling .value; + data.mAirTrapState = _data.mAirTrapState .value; + data.mAirPumpLowerPowerLevel = _data.mAirPumpLowerPowerLevel .value; + data.mAirPumpRaisePowerLevel = _data.mAirPumpRaisePowerLevel .value; return data; } Index: sources/model/td/data/MTDAirTrapData.h =================================================================== diff -u -r9d27f14c2b528c0f199004614f10d55589e08614 -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/model/td/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) +++ sources/model/td/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -35,14 +35,18 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mLowLevel | - * | #2:(U32) | \ref Data::mUpLevel | - * | #3:(U32) | \ref Data::mLowLevelRaw | - * | #4:(U32) | \ref Data::mUpLevelRaw | - * | #5:(U32) | \ref Data::mValveIntakeState | - * | #6:(U32) | \ref Data::mValveOutletState | - * | #7:(U32) | \ref Data::mControlling | - * + * | #1:(U32) | \ref Data::mH17State | + * | #2:(U32) | \ref Data::mH16State | + * | #3:(U32) | \ref Data::mH17RawState | + * | #4:(U32) | \ref Data::mH16RawState | + * | #5:(U32) | \ref Data::mH13State | + * | #6:(U32) | \ref Data::mH20State | + * | #7:(U32) | \ref Data::mIsAutoControlling | + * | #8:(U32) | \ref Data::mAirTrapState | + * | #9:(U32) | \ref Data::mAirPumpLowerPowerLevel | + * |#10:(U32) | \ref Data::mAirPumpRaisePowerLevel | + + * \sa Data * *

Logging info

@@ -61,13 +65,16 @@ QVariantList parameters() const override; struct { - Types::U32 mH17State ; - Types::U32 mH16State ; - Types::U32 mH17RawState ; - Types::U32 mH16RawState ; - Types::U32 mH13State ; - Types::U32 mH20State ; - Types::U32 mControlling ; + Types::U32 mH17State ; + Types::U32 mH16State ; + Types::U32 mH17RawState ; + Types::U32 mH16RawState ; + Types::U32 mH13State ; + Types::U32 mH20State ; + Types::U32 mIsAutoControlling ; + Types::U32 mAirTrapState ; + Types::U32 mAirPumpLowerPowerLevel ; + Types::U32 mAirPumpRaisePowerLevel ; } _data; public: @@ -78,13 +85,16 @@ struct Data { - quint32 mLowLevel = 0; ///< lower level value - quint32 mUpLevel = 0; ///< upper level value - quint32 mLowLevelRaw = 0; ///< lower level raw value - quint32 mUpLevelRaw = 0; ///< upper level raw value - quint32 mValveIntakeState = 0; ///< Air trap intake Valve state (open/closed) - quint32 mValveOutletState = 0; ///< Air trap outlet valve state (open/closed) - quint32 mControlling = 0; ///< air control + quint32 mH17State = 0; ///< lower level value + quint32 mH16State = 0; ///< upper level value + quint32 mH17RawState = 0; ///< lower level raw value + quint32 mH16RawState = 0; ///< upper level raw value + quint32 mH13State = 0; ///< Air trap intake Valve state (open/closed) + quint32 mH20State = 0; ///< Air trap outlet valve state (open/closed) + quint32 mIsAutoControlling = 0; ///< air control + quint32 mAirTrapState = 0; ///< air control + quint32 mAirPumpLowerPowerLevel = 0; ///< air control + quint32 mAirPumpRaisePowerLevel = 0; ///< air control }; MTDAirTrapData () { } Index: sources/view/td/data/VTDAirPumpData.cpp =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/view/td/data/VTDAirPumpData.cpp (.../VTDAirPumpData.cpp) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/view/td/data/VTDAirPumpData.cpp (.../VTDAirPumpData.cpp) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -20,6 +20,9 @@ VIEW_DEF(VTDAirPump, TDAirPumpData) void VTDAirPump::onActionReceive(const TDAirPumpData &vData) { - airPumpState (vData.mAirPumpState ); - airPumpPower (vData.mAirPumpPower ); + airPumpState (vData.mState ); + airPumpRPM (vData.mRPM ); + airPumpPower (vData.mPower ); + airPumpFGPARPM (vData.mFPGARPM ); + airPumpScalarPower (vData.mScalarPower ); } Index: sources/view/td/data/VTDAirPumpData.h =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/view/td/data/VTDAirPumpData.h (.../VTDAirPumpData.h) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/view/td/data/VTDAirPumpData.h (.../VTDAirPumpData.h) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -35,8 +35,11 @@ class VTDAirPump : public QObject { Q_OBJECT - PROPERTY( quint32 , airPumpState , 0) - PROPERTY( quint32 , airPumpPower , 0) + PROPERTY( quint32 , airPumpState , 0) + PROPERTY( quint32 , airPumpRPM , 0) + PROPERTY( float , airPumpPower , 0) + PROPERTY( quint32 , airPumpFGPARPM , 0) + PROPERTY( quint32 , airPumpScalarPower , 0) VIEW_DEC(VTDAirPump, TDAirPumpData) }; Index: sources/view/td/data/VTDAirTrapData.cpp =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/view/td/data/VTDAirTrapData.cpp (.../VTDAirTrapData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/view/td/data/VTDAirTrapData.cpp (.../VTDAirTrapData.cpp) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -20,11 +20,14 @@ VIEW_DEF(VTDAirTrap, TDAirTrapData) void VTDAirTrap::onActionReceive(const TDAirTrapData &vData) { - lowLevel (vData.mLowLevel ); - upLevel (vData.mUpLevel ); - lowLevelRaw (vData.mLowLevelRaw ); - upLevelRaw (vData.mUpLevelRaw ); - valveIntakeState (vData.mValveIntakeState ); - valveOutletState (vData.mValveOutletState ); - controlling (vData.mControlling ); + h17State (vData.mH17State ); + h16State (vData.mH16State ); + h17RawState (vData.mH17RawState ); + h16RawState (vData.mH16RawState ); + h13State (vData.mH13State ); + h20State (vData.mH20State ); + isAutoControlling (vData.mIsAutoControlling ); + airTrapState (vData.mAirTrapState ); + airPumpLowerPowerLevel (vData.mAirPumpLowerPowerLevel ); + airPumpRaisePowerLevel (vData.mAirPumpRaisePowerLevel ); } Index: sources/view/td/data/VTDAirTrapData.h =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/view/td/data/VTDAirTrapData.h (.../VTDAirTrapData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/view/td/data/VTDAirTrapData.h (.../VTDAirTrapData.h) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -35,13 +35,16 @@ class VTDAirTrap : public QObject { Q_OBJECT - PROPERTY( quint32 , lowLevel , 0) - PROPERTY( quint32 , upLevel , 0) - PROPERTY( quint32 , lowLevelRaw , 0) - PROPERTY( quint32 , upLevelRaw , 0) - PROPERTY( quint32 , valveIntakeState , 0) - PROPERTY( quint32 , valveOutletState , 0) - PROPERTY( quint32 , controlling , 0) + PROPERTY( quint32 , h17State , 0) + PROPERTY( quint32 , h16State , 0) + PROPERTY( quint32 , h17RawState , 0) + PROPERTY( quint32 , h16RawState , 0) + PROPERTY( quint32 , h13State , 0) + PROPERTY( quint32 , h20State , 0) + PROPERTY( quint32 , isAutoControlling , 0) + PROPERTY( quint32 , airTrapState , 0) + PROPERTY( quint32 , airPumpLowerPowerLevel , 0) + PROPERTY( quint32 , airPumpRaisePowerLevel , 0) VIEW_DEC(VTDAirTrap, TDAirTrapData) };