Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,9 +29,9 @@ * \brief The MDGTemperatures class * \details The DG temperatures data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | #8:(F32) | #9:(F32) | #10:(F32) | #11:(F32) | #12:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | + * |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data | mInletPrimaryHeater | mOutletPrimaryHeater | mConductivitySensor1 | mConductivitySensor2 | mOutletRedundancy | mInletDialysate | mPrimaryHeaterThermoCouple | mTrimmerHeaterThermoCouple | mPrimaryHeaterColdJunction | mTrimmerHeaterColdJunction | mPrimaryHeaterInternal | mTrimmerHeaterInternal | * * \sa Data * @@ -48,18 +48,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: