Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) @@ -26,6 +26,25 @@ namespace Model { +/*! + * \brief The MDGTemperatures class + * \details The DG temperatures data model + * + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | + * |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data | \ref Data::mInletPrimaryHeater | \ref Data::mOutletPrimaryHeater | \ref Data::mConductivitySensor1 | + * + * | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | #8:(F32) | + * |:--: |:--: |:--: |:--: |:--: | + * | \ref Data::mConductivitySensor2 | \ref Data::mOutletRedundancy | \ref Data::mInletDialysate | \ref Data::mPrimaryHeaterThermoCouple | \ref Data::mTrimmerHeaterThermoCouple | + * + * | #9:(F32) | #10:(F32) | #11:(F32) | #12:(F32) | + * | :--: |:--: |:--: |:--: | + * | \ref Data::mPrimaryHeaterColdJunction | \ref Data::mTrimmerHeaterColdJunction | \ref Data::mPrimaryHeaterInternal | \ref Data::mTrimmerHeaterInternal | + * + * \sa Data + * + */ class MDGTemperatures : public MAbstract { // friends @@ -38,18 +57,18 @@ QVariantList parameters() const override; struct { - Types::F32 mInletPrimaryHeater ; - Types::F32 mOutletPrimaryHeater ; - Types::F32 mConductivitySensor1 ; - Types::F32 mConductivitySensor2 ; - Types::F32 mOutletRedundancy ; - Types::F32 mInletDialysate ; - Types::F32 mPrimaryHeaterThermoCouple ; - Types::F32 mTrimmerHeaterThermoCouple ; - Types::F32 mPrimaryHeaterColdJunction ; - Types::F32 mTrimmerHeaterColdJunction ; - Types::F32 mPrimaryHeaterInternal ; - Types::F32 mTrimmerHeaterInternal ; + Types::F32 mInletPrimaryHeater ; /* 01 */ + Types::F32 mOutletPrimaryHeater ; /* 02 */ + Types::F32 mConductivitySensor1 ; /* 03 */ + Types::F32 mConductivitySensor2 ; /* 04 */ + Types::F32 mOutletRedundancy ; /* 05 */ + Types::F32 mInletDialysate ; /* 06 */ + Types::F32 mPrimaryHeaterThermoCouple ; /* 07 */ + Types::F32 mTrimmerHeaterThermoCouple ; /* 08 */ + Types::F32 mPrimaryHeaterColdJunction ; /* 09 */ + Types::F32 mTrimmerHeaterColdJunction ; /* 10 */ + Types::F32 mPrimaryHeaterInternal ; /* 11 */ + Types::F32 mTrimmerHeaterInternal ; /* 12 */ } _data; public: @@ -78,7 +97,6 @@ bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; - } typedef Model::MDGTemperatures::Data DGTemperaturesData;