Index: sources/model/dd/data/MDDTemperaturesData.h =================================================================== diff -u -r3d13050e0319cf30a1686b58c8f2328f6860910a -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/model/dd/data/MDDTemperaturesData.h (.../MDDTemperaturesData.h) (revision 3d13050e0319cf30a1686b58c8f2328f6860910a) +++ sources/model/dd/data/MDDTemperaturesData.h (.../MDDTemperaturesData.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -36,21 +36,29 @@ * * | Payload || * | || - * | #01:(F32) | \ref Data::mInletHeatExchanger | - * | #02:(F32) | \ref Data::mOutletHeatExchanger | - * | #03:(F32) | \ref Data::mHydraulicsPrimaryHeater | - * | #04:(F32) | \ref Data::mTrimmerHeater | - * | #05:(F32) | \ref Data::mBoardTemperature | - * | #06:(F32) | \ref Data::mBarometricTemperature | - * | #07:(F32) | \ref Data::mD16Conductivity | - * | #08:(F32) | \ref Data::mD28Conductivity | - * | #09:(F32) | \ref Data::mD30Conductivity | - * | #10:(F32) | \ref Data::mD44Conductivity | - * | #11:(F32) | \ref Data::mD75Conductivity | - * | #12:(F32) | \ref Data::mD4MovingAverage | - * | #13:(F32) | \ref Data::mD50MovingAverage | - * | #14:(F32) | \ref Data::mD28MovingAverage | - * | #15:(F32) | \ref Data::mD30MovingAverage | + * | #01:(F32) | \ref Data::mD1Temperature | + * | #02:(F32) | \ref Data::mD78Temperature | + * | #03:(F32) | \ref Data::mD4Temperature | + * | #04:(F32) | \ref Data::mD50Temperature | + * | #05:(F32) | \ref Data::mD99Temperature | + * | #06:(F32) | \ref Data::mBoardTemperature | + * | #07:(F32) | \ref Data::mD16Conductivity | + * | #08:(F32) | \ref Data::mD28Conductivity | + * | #09:(F32) | \ref Data::mD30Conductivity | + * | #10:(F32) | \ref Data::mD44Conductivity | + * | #11:(F32) | \ref Data::mD75Conductivity | + * | #12:(F32) | \ref Data::mD4MovingAverage | + * | #13:(F32) | \ref Data::mD50MovingAverage | + * | #14:(F32) | \ref Data::mD99MovingAverage | + * | #15:(F32) | \ref Data::mD28MovingAverage | + * | #16:(F32) | \ref Data::mD30MovingAverage | + * | #17:(F32) | \ref Data::mD78MovingAverage | + * | #18:(F32) | \ref Data::mD9PressureAverage | + * | #19:(F32) | \ref Data::mD66PressureAverage | + * | #20:(F32) | \ref Data::mD51PressureAverage | + * | #21:(F32) | \ref Data::mD18PressureAverage | + * | #22:(F32) | \ref Data::mD41PressureAverage | + * | #23:(F32) | \ref Data::mD87PressureAverage | * * \sa Data * @@ -69,21 +77,29 @@ QVariantList parameters() const override; struct { - Types::F32 d1Temp ; ///< Inlet heat exchanger temperature sensor - Types::F32 x6Temp ; ///< Outlet heat exchanger temperature sensor - Types::F32 d4Temp ; ///< Hydraulics primary heater temperature sensor - Types::F32 d50Temp ; ///< Trimmer heater temperature sensor - Types::F32 boardTemp ; ///< Board temperature sensor - Types::F32 baroTemp ; ///< Barometric temperature sensor - Types::F32 d16CondTemp; ///< D16 temperature value - Types::F32 d28CondTemp; ///< D28 temperature value - Types::F32 d30CondTemp; ///< D30 temperature value - Types::F32 d44CondTemp; ///< D44 temperature value - Types::F32 d75CondTemp; ///< D75 temperature value - Types::F32 d4AvgTemp ; ///< D4 moving average temperature value - Types::F32 d50AvgTemp ; ///< D50 moving average temperature value - Types::F32 d28AvgTemp ; ///< D28 moving average temperature value - Types::F32 d30AvgTemp ; ///< D30 moving average temperature value + Types::F32 mD1Temperature ; + Types::F32 mD78Temperature ; + Types::F32 mD4Temperature ; + Types::F32 mD50Temperature ; + Types::F32 mD99Temperature ; + Types::F32 mBoardTemperature ; + Types::F32 mD16Conductivity ; + Types::F32 mD28Conductivity ; + Types::F32 mD30Conductivity ; + Types::F32 mD44Conductivity ; + Types::F32 mD75Conductivity ; + Types::F32 mD4MovingAverage ; + Types::F32 mD50MovingAverage ; + Types::F32 mD99MovingAverage ; + Types::F32 mD28MovingAverage ; + Types::F32 mD30MovingAverage ; + Types::F32 mD78MovingAverage ; + Types::F32 mD9PressureAverage ; + Types::F32 mD66PressureAverage; + Types::F32 mD51PressureAverage; + Types::F32 mD18PressureAverage; + Types::F32 mD41PressureAverage; + Types::F32 mD87PressureAverage; } _data; public: @@ -93,21 +109,29 @@ QString infoText () const override { return QString("Temperatures"); } struct Data { - float mInletHeatExchanger = 0; ///< Inlet heat exchanger temperature sensor - float mOutletHeatExchanger = 0; ///< Outlet heat exchanger temperature sensor - float mHydraulicsPrimaryHeater = 0; ///< Hydraulics primary heater temperature sensor - float mTrimmerHeater = 0; ///< Trimmer heater temperature sensor - float mBoardTemperature = 0; ///< Board temperature sensor - float mBarometricTemperature = 0; ///< Barometric temperature sensor - float mD16Conductivity = 0; ///< D16 temperature value - float mD28Conductivity = 0; ///< D28 temperature value - float mD30Conductivity = 0; ///< D30 temperature value - float mD44Conductivity = 0; ///< D44 temperature value - float mD75Conductivity = 0; ///< D75 temperature value - float mD4MovingAverage = 0; ///< D4 moving average temperature value - float mD50MovingAverage = 0; ///< D50 moving average temperature value - float mD28MovingAverage = 0; ///< D28 moving average temperature value - float mD30MovingAverage = 0; ///< D30 moving average temperature value + float mD1Temperature = 0; + float mD78Temperature = 0; + float mD4Temperature = 0; + float mD50Temperature = 0; + float mD99Temperature = 0; + float mBoardTemperature = 0; + float mD16Conductivity = 0; + float mD28Conductivity = 0; + float mD30Conductivity = 0; + float mD44Conductivity = 0; + float mD75Conductivity = 0; + float mD4MovingAverage = 0; + float mD50MovingAverage = 0; + float mD99MovingAverage = 0; + float mD28MovingAverage = 0; + float mD30MovingAverage = 0; + float mD78MovingAverage = 0; + float mD9PressureAverage = 0; + float mD66PressureAverage = 0; + float mD51PressureAverage = 0; + float mD18PressureAverage = 0; + float mD41PressureAverage = 0; + float mD87PressureAverage = 0; }; MDDTemperatures() { }