Index: sources/model/dd/data/MDDTemperaturesData.h
===================================================================
diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r3d13050e0319cf30a1686b58c8f2328f6860910a
--- sources/model/dd/data/MDDTemperaturesData.h	(.../MDDTemperaturesData.h)	(revision 0cb2630813e6f7216adaf990f4129deb87b849bf)
+++ sources/model/dd/data/MDDTemperaturesData.h	(.../MDDTemperaturesData.h)	(revision 3d13050e0319cf30a1686b58c8f2328f6860910a)
@@ -36,46 +36,22 @@
  *
  * | Payload  ||
  * |          ||
- * | #01:(F32) | \ref Data::mInletPrimaryHeater         |
- * | #02:(F32) | \ref Data::mHeatDisinfect              |
- * | #03:(F32) | \ref Data::mOutletPrimaryHeater        |
- * | #04:(F32) | \ref Data::mConductivitySensor1        |
- * | #05:(F32) | \ref Data::mConductivitySensor2        |
- * | #06:(F32) | \ref Data::mOutletRedundancy           |
- * | #07:(F32) | \ref Data::mInletDialysate             |
- * | #08:(F32) | \ref Data::mPrimaryHeaterThermoCouple  |
- * | #09:(F32) | \ref Data::mTrimmerHeaterThermoCouple  |
- * | #10:(F32) | \ref Data::mPrimaryHeaterColdJunction  |
- * | #11:(F32) | \ref Data::mTrimmerHeaterColdJunction  |
- * | #12:(F32) | \ref Data::mPrimaryHeaterInternal      |
- * | #13:(F32) | \ref Data::mTrimmerHeaterInternal      |
- * | #14:(F32) | \ref Data::mFpgaBoard                  |
- * | #15:(F32) | \ref Data::mLoadCellA1B1               |
- * | #16:(F32) | \ref Data::mLoadCellA2B2               |
- * | #17:(F32) | \ref Data::mInternalTHDORTD            |
- * | #18:(F32) | \ref Data::mInternalTDIRTD             |
- * | #19:(F32) | \ref Data::mInteralTHDRTD              |
- * | #20:(F32) | \ref Data::mInternalCondSnsrTemp       |
- * | #21:(F32) | \ref Data::mBaroTempSensor             |
- * | #22:(F32) | \ref Data::mDialysateInletMvngAvg      |
- * | #23:(F32) | \ref Data::mRedundantOutletMvngAvg     |
+ * | #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         |
  *
- *  F32 d1Temp      ;                   ///< Inlet heat exchanger temperature sensor
-    F32 x6Temp      ;                   ///< Outlet heat exchanger temperature sensor
-    F32 d4Temp      ;                   ///< Hydraulics primary heater temperature sensor
-    F32 d50Temp     ;                   ///< Trimmer heater temperature sensor
-    F32 boardTemp   ;                   ///< Board temperature sensor
-    F32 baroTemp    ;                   ///< Barometric temperature sensor
-    F32 d16CondTemp ;                   ///< D16 temperature value
-    F32 d28CondTemp ;                   ///< D28 temperature value
-    F32 d30CondTemp ;                   ///< D30 temperature value
-    F32 d44CondTemp ;                   ///< D44 temperature value
-    F32 d75CondTemp ;                   ///< D75 temperature value
-    F32 d4AvgTemp   ;                   ///< D4 moving average temperature value
-    F32 d50AvgTemp  ;                   ///< D50 moving average temperature value
-    F32 d28AvgTemp  ;                   ///< D28 moving average temperature value
-    F32 d30AvgTemp  ;                   ///< D30 moving average temperature value
- *
  * \sa Data
  *
  * <h2 class="groupheader">Logging info</h2>
@@ -90,11 +66,6 @@
 
     // friends
     friend class ::tst_models;
-
-    // DD Temperatures Data     1 - F32 Inlet primary heater    5 - F32 Outlet redundancy                9 - F32 Primary heater cold junction
-    //                          2 - F32 Outlet primary heater   6 - F32 Inlet dialysate                 10 - F32 Trimmer heater cold junction
-    //                          3 - F32 Conductivity sensor 1   7 - F32 Primary heater thermo-couple    11 - F32 Primary heater internal temperature
-    //                          4 - F32 Conductivity sensor 2   8 - F32 Trimmer heater thermo-couple    12 - F32 Trimmer heater internal temperature
     QVariantList parameters() const override;
 
     struct {