Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r292beb22109065953f769ace13c3a395674612ac -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 292beb22109065953f769ace13c3a395674612ac) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -129,9 +129,9 @@ {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes {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_TDVoltageData , 8 * 4 }, // 8 parameters each 4bytes {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_TDEjectorData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDTemperatureData , 1 * 4 }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r292beb22109065953f769ace13c3a395674612ac -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 292beb22109065953f769ace13c3a395674612ac) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -181,7 +181,7 @@ DebugDataColumn { id: _TDEjectorColumn textObjectName :"_TDEjectorData" - title : qsTr(" Ejector ") + title : qsTr("[0x4E] Ejector ") anchors { top : parent.top left : _TDValvesColumn.right @@ -190,11 +190,15 @@ model: [ vTDEjector.state , vTDEjector.setSpeed .toFixed(2) , + vTDEjector.retractOpticalSensor , + vTDEjector.engageOpticalSensor , ] label: [ - "State (H5) ", - "Spd (H5) " , + "State (H5) ", + "Spd (H5) " , + "Retract Opt Sensor " , + "Engage Opt Sensor " , ] } @@ -270,34 +274,28 @@ DebugDataColumn { id: _TDVoltageCoulumn textObjectName :"_TDVoltageData" - title : qsTr(" Volume ") + title : qsTr("[0x1D] Voltage ") anchors { top : _TDBloodFlowColumn.bottom topMargin : spacing } model: [ - vTDVoltage.line_1_2V .toFixed(2) , - vTDVoltage.line_3_3V .toFixed(2) , - vTDVoltage.logic5V .toFixed(2) , - vTDVoltage.sensors5V .toFixed(2) , - vTDVoltage.line_24V .toFixed(2) , - vTDVoltage.regen24V .toFixed(2) , - vTDVoltage.fpgaAdcRef .toFixed(2) , - vTDVoltage.presRef .toFixed(2) , - vTDVoltage.fpgaVcc .toFixed(2) , - vTDVoltage.fpgaVaux .toFixed(2) , - vTDVoltage.fpgaVpvn .toFixed(2) + vTDVoltage.line_1_2V .toFixed(2) , + vTDVoltage.line_3_3V .toFixed(2) , + vTDVoltage.logic5V .toFixed(2) , + vTDVoltage.line_24V_1 .toFixed(2) , + vTDVoltage.line_24V_2 .toFixed(2) , + vTDVoltage.fpgaVcc .toFixed(2) , + vTDVoltage.fpgaVaux .toFixed(2) , + vTDVoltage.fpgaVpvn .toFixed(2) ] label: [ "1.2V" , "3.3V" , "L5V" , - "S5V" , - "24V" , - "R24V" , - "ADC" , - "Ref" , + "24V_1" , + "24V_2" , "VCC" , "Vaux" , "VPN" , Index: sources/model/td/data/MTDEjectorData.cpp =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/model/td/data/MTDEjectorData.cpp (.../MTDEjectorData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/MTDEjectorData.cpp (.../MTDEjectorData.cpp) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -18,15 +18,19 @@ QVariantList MTDEjectorData::parameters() const { return { - _data.mH5State .value, - _data.mH5SetSpeed .value, + _data.mState .value, + _data.mSetSpeed .value, + _data.mRetractOpticalSensor .value, + _data.mEngageOpticalSensor .value, }; } bool MTDEjectorData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mH5State )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH5SetSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSetSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRetractOpticalSensor )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mEngageOpticalSensor )) goto lError; return true ; @@ -43,7 +47,9 @@ */ MTDEjectorData::Data MTDEjectorData::data() const{ Data data; - data.mState = _data.mH5State .value; - data.mSetSpeed = _data.mH5SetSpeed .value; + data.mState = _data.mState .value; + data.mSetSpeed = _data.mSetSpeed .value; + data.mRetractOpticalSensor = _data.mRetractOpticalSensor .value; + data.mEngageOpticalSensor = _data.mEngageOpticalSensor .value; return data; } Index: sources/model/td/data/MTDEjectorData.h =================================================================== diff -u -r9d27f14c2b528c0f199004614f10d55589e08614 -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/model/td/data/MTDEjectorData.h (.../MTDEjectorData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) +++ sources/model/td/data/MTDEjectorData.h (.../MTDEjectorData.h) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -35,8 +35,10 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mState | - * | #2:(F32) | \ref Data::mSetSpeed | + * | #1:(U32) | \ref Data::mState | + * | #2:(F32) | \ref Data::mSetSpeed | + * | #3:(U32) | \ref Data::mRetractOpticalSensor| + * | #4:(U32) | \ref Data::mEngageOpticalSensor | * * \sa Data * @@ -56,8 +58,10 @@ QVariantList parameters() const override; struct { - Types::U32 mH5State ; - Types::F32 mH5SetSpeed ; + Types::U32 mState ; + Types::F32 mSetSpeed ; + Types::U32 mRetractOpticalSensor; + Types::U32 mEngageOpticalSensor ; } _data; public: @@ -68,8 +72,11 @@ struct Data { - quint32 mState = 0; ///< Ejector State - float mSetSpeed = 0; ///< Ejector set speed + quint32 mState = 0; ///< Ejector State + float mSetSpeed = 0; ///< Ejector set speed + quint32 mRetractOpticalSensor = 0; ///< Retract Optical Sensor + quint32 mEngageOpticalSensor = 0; ///< Engage Optical Sensor + }; MTDEjectorData () { } Index: sources/model/td/data/MTDVoltageData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/model/td/data/MTDVoltageData.cpp (.../MTDVoltageData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDVoltageData.cpp (.../MTDVoltageData.cpp) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -18,33 +18,28 @@ QVariantList MTDVoltageData::parameters() const { return { - _data.m1_2V.value, - _data.m3_3V.value, - _data.mLogic5V.value, - _data.mSensors5V.value, - _data.m24V.value, - _data.mRegen24V.value, - _data.mFpgaAdcRef.value, - _data.mPresRef.value, - _data.mFpgaVcc.value, - _data.mFpgaVaux.value, - _data.mFpgaVpvn.value, + _data.m1_2V .value, + _data.m3_3V .value, + _data.mLogic5V .value, + _data.m24V_1 .value, + _data.m24V_2 .value, + _data.mFpgaVcc .value, + _data.mFpgaVaux .value, + _data.mFpgaVpvn .value, + }; } bool MTDVoltageData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.m1_2V )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m3_3V )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mLogic5V )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mSensors5V )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m24V )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRegen24V )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mFpgaAdcRef )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPresRef )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mFpgaVcc )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mFpgaVaux )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mFpgaVpvn )) goto lError; + if ( ! GetValue(vByteArray, index, _data.m1_2V )) goto lError; + if ( ! GetValue(vByteArray, index, _data.m3_3V )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mLogic5V )) goto lError; + if ( ! GetValue(vByteArray, index, _data.m24V_1 )) goto lError; + if ( ! GetValue(vByteArray, index, _data.m24V_2 )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFpgaVcc )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFpgaVaux )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFpgaVpvn )) goto lError; return true ; @@ -61,16 +56,14 @@ */ MTDVoltageData::Data MTDVoltageData::data() const{ Data data; - data.m1_2V = _data.m1_2V.value; - data.m3_3V = _data.m3_3V.value; - data.mLogic5V = _data.mLogic5V.value; - data.mSensors5V = _data.mSensors5V.value; - data.m24V = _data.m24V.value; - data.mRegen24V = _data.mRegen24V.value; - data.mFpgaAdcRef = _data.mFpgaAdcRef.value; - data.mPresRef = _data.mPresRef.value; - data.mFpgaVcc = _data.mFpgaVcc.value; - data.mFpgaVaux = _data.mFpgaVaux.value; - data.mFpgaVpvn = _data.mFpgaVpvn.value; + data.m1_2V = _data.m1_2V .value; + data.m3_3V = _data.m3_3V .value; + data.mLogic5V = _data.mLogic5V .value; + data.m24V_1 = _data.m24V_1 .value; + data.m24V_2 = _data.m24V_2 .value; + data.mFpgaVcc = _data.mFpgaVcc .value; + data.mFpgaVaux = _data.mFpgaVaux .value; + data.mFpgaVpvn = _data.mFpgaVpvn .value; + return data; } Index: sources/model/td/data/MTDVoltageData.h =================================================================== diff -u -r5b0ca11dbb81526e44972b30c96f9e95a8a430a3 -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/model/td/data/MTDVoltageData.h (.../MTDVoltageData.h) (revision 5b0ca11dbb81526e44972b30c96f9e95a8a430a3) +++ sources/model/td/data/MTDVoltageData.h (.../MTDVoltageData.h) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -38,14 +38,11 @@ * | #01:(F32) | \ref Data::m1_2V | * | #02:(F32) | \ref Data::m3_3V | * | #03:(F32) | \ref Data::mLogic5V | - * | #04:(F32) | \ref Data::mSensors5V | - * | #05:(F32) | \ref Data::m24V | - * | #06:(F32) | \ref Data::mRegen24V | - * | #07:(F32) | \ref Data::mFpgaAdcRef | - * | #08:(F32) | \ref Data::mPresRef | - * | #09:(F32) | \ref Data::mFpgaVcc | - * | #10:(F32) | \ref Data::mFpgaVaux | - * | #11:(F32) | \ref Data::mFpgaVpvn | + * | #04:(F32) | \ref Data::m24V_1 | + * | #05:(F32) | \ref Data::m24V_2 | + * | #06:(F32) | \ref Data::mFpgaVcc | + * | #07:(F32) | \ref Data::mFpgaVaux | + * | #08:(F32) | \ref Data::mFpgaVpvn | * * \sa Data * @@ -65,17 +62,15 @@ QVariantList parameters() const override; struct { - Types::F32 m1_2V; - Types::F32 m3_3V; - Types::F32 mLogic5V; - Types::F32 mSensors5V; - Types::F32 m24V; - Types::F32 mRegen24V; - Types::F32 mFpgaAdcRef; - Types::F32 mPresRef; - Types::F32 mFpgaVcc; - Types::F32 mFpgaVaux; - Types::F32 mFpgaVpvn; + Types::F32 m1_2V ; + Types::F32 m3_3V ; + Types::F32 mLogic5V ; + Types::F32 m24V_1 ; + Types::F32 m24V_2 ; + Types::F32 mFpgaVcc ; + Types::F32 mFpgaVaux ; + Types::F32 mFpgaVpvn ; + } _data; public: @@ -86,17 +81,14 @@ struct Data { - float m1_2V = 0; ///< 1.2V line - float m3_3V = 0; ///< 3.3V line - float mLogic5V = 0; ///< Logic voltage (5V) - float mSensors5V = 0; ///< Sensors voltage (5V) - float m24V = 0; ///< Actuators voltage (24V) - float mRegen24V = 0; ///< Actuators regen voltage (24V) - float mFpgaAdcRef = 0; ///< FPGA ADC reference voltage (1V) - float mPresRef = 0; ///< PBA ADC reference voltage (3V) - float mFpgaVcc = 0; ///< FPGA Vcc (3V) - float mFpgaVaux = 0; ///< FPGA Vaux (3V) - float mFpgaVpvn = 0; ///< FPGA Vpvn (1V) + float m1_2V = 0; ///< 1.2V line + float m3_3V = 0; ///< 3.3V line + float mLogic5V = 0; ///< Logic voltage (5V) + float m24V_1 = 0; ///< Sensors voltage (5V) + float m24V_2 = 0; ///< Actuators voltage (24V) + float mFpgaVcc = 0; ///< Actuators regen voltage (24V) + float mFpgaVaux = 0; ///< FPGA ADC reference voltage (1V) + float mFpgaVpvn = 0; ///< PBA ADC reference voltage (3V) }; MTDVoltageData () { } Index: sources/view/td/data/VTDEjectorData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/view/td/data/VTDEjectorData.cpp (.../VTDEjectorData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDEjectorData.cpp (.../VTDEjectorData.cpp) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -20,6 +20,8 @@ VIEW_DEF(VTDEjector, TDEjectorData) void VTDEjector::onActionReceive(const TDEjectorData &vData) { - state (vData.mState ); - setSpeed (vData.mSetSpeed ); + state (vData.mState ); + setSpeed (vData.mSetSpeed ); + retractOpticalSensor(vData.mRetractOpticalSensor); + engageOpticalSensor (vData.mEngageOpticalSensor ); } Index: sources/view/td/data/VTDEjectorData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/view/td/data/VTDEjectorData.h (.../VTDEjectorData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDEjectorData.h (.../VTDEjectorData.h) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -35,8 +35,10 @@ class VTDEjector : public QObject { Q_OBJECT - PROPERTY( quint32 , state , 0) - PROPERTY( float , setSpeed , 0) + PROPERTY( quint32 , state , 0) + PROPERTY( float , setSpeed , 0) + PROPERTY( quint32 , retractOpticalSensor , 0) + PROPERTY( quint32 , engageOpticalSensor , 0) VIEW_DEC(VTDEjector, TDEjectorData) }; Index: sources/view/td/data/VTDVoltageData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/view/td/data/VTDVoltageData.cpp (.../VTDVoltageData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDVoltageData.cpp (.../VTDVoltageData.cpp) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -20,15 +20,12 @@ VIEW_DEF(VTDVoltage, TDVoltageData) void VTDVoltage::onActionReceive(const TDVoltageData &vData) { - line_1_2V (vData.m1_2V ); - line_3_3V (vData.m3_3V ); - logic5V (vData.mLogic5V ); - sensors5V (vData.mSensors5V ); - line_24V (vData.m24V ); - regen24V (vData.mRegen24V ); - fpgaAdcRef (vData.mFpgaAdcRef ); - presRef (vData.mPresRef ); - fpgaVcc (vData.mFpgaVcc ); - fpgaVaux (vData.mFpgaVaux ); - fpgaVpvn (vData.mFpgaVpvn ); + line_1_2V (vData.m1_2V ); + line_3_3V (vData.m3_3V ); + logic5V (vData.mLogic5V ); + line_24V_1 (vData.m24V_1 ); + line_24V_2 (vData.m24V_2 ); + fpgaVcc (vData.mFpgaVcc ); + fpgaVaux (vData.mFpgaVaux ); + fpgaVpvn (vData.mFpgaVpvn ); } Index: sources/view/td/data/VTDVoltageData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/view/td/data/VTDVoltageData.h (.../VTDVoltageData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDVoltageData.h (.../VTDVoltageData.h) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -35,17 +35,14 @@ class VTDVoltage : public QObject { Q_OBJECT - PROPERTY( float , line_1_2V , 0) - PROPERTY( float , line_3_3V , 0) - PROPERTY( float , logic5V , 0) - PROPERTY( float , sensors5V , 0) - PROPERTY( float , line_24V , 0) - PROPERTY( float , regen24V , 0) - PROPERTY( float , fpgaAdcRef , 0) - PROPERTY( float , presRef , 0) - PROPERTY( float , fpgaVcc , 0) - PROPERTY( float , fpgaVaux , 0) - PROPERTY( float , fpgaVpvn , 0) + PROPERTY( float , line_1_2V , 0) + PROPERTY( float , line_3_3V , 0) + PROPERTY( float , logic5V , 0) + PROPERTY( float , line_24V_1 , 0) + PROPERTY( float , line_24V_2 , 0) + PROPERTY( float , fpgaVcc , 0) + PROPERTY( float , fpgaVaux , 0) + PROPERTY( float , fpgaVpvn , 0) VIEW_DEC(VTDVoltage, TDVoltageData) };