Index: sources/model/dg/data/MDGHeatersData.cpp
===================================================================
diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r38ae7b93679d05a54fc460dac68891562d7da72d
--- sources/model/dg/data/MDGHeatersData.cpp	(.../MDGHeatersData.cpp)	(revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997)
+++ sources/model/dg/data/MDGHeatersData.cpp	(.../MDGHeatersData.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file MDGHeatersData.cpp
- * \author (last) Behrouz NemaiPour
- * \date (last) 04-Jul-2020
- * \author (original) Behrouz NemaiPour
- * \date (original) 02-Jul-2020
+ * \file    MDGHeatersData.cpp
+ * \author  (last)      Dara Navaei
+ * \date    (last)      08-May-2024
+ * \author  (original)  Behrouz NemaiPour
+ * \date    (original)  02-Jul-2020
  *
  */
 #include "MDGHeatersData.h"
@@ -18,21 +18,52 @@
 
 QVariantList MDGHeaters::parameters() const {
     return {
-        _data.mMainPrimaryDC  .value,
-        _data.mSmallPrimaryDC .value,
-        _data.mTrimmerDC      .value
+        _data.mMainPrimayHeaterDC       .value,
+        _data.mSmallPrimaryHeaterDC     .value,
+        _data.mTrimmerHeaterDC          .value,
+        _data.mPrimaryTargetTemp        .value,
+        _data.mTrimmerTargetTemp        .value,
+        _data.mPrimaryHeaterState       .value,
+        _data.mTrimmerHeaterState       .value,
+        _data.mPrimaryEfficiency        .value,
+        _data.mPrimaryCalcTargetTemp    .value,
+        _data.mTrimmerCalcCurrentTemp   .value,
+        _data.mTrimmerUseLastDC         .value,
+        _data.mTrimmerPreviousFlow      .value,
+        _data.mTrimmerContolCounter     .value,
     };
+
 }
 
 bool MDGHeaters::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mMainPrimaryDC  ))
-    if (GetValue(vByteArray, index, _data.mSmallPrimaryDC ))
-    if (GetValue(vByteArray, index, _data.mTrimmerDC      ))
+    if (GetValue(vByteArray, index, _data.mMainPrimayHeaterDC       ))
+    if (GetValue(vByteArray, index, _data.mSmallPrimaryHeaterDC     ))
+    if (GetValue(vByteArray, index, _data.mTrimmerHeaterDC          ))
+    if (GetValue(vByteArray, index, _data.mPrimaryTargetTemp        ))
+    if (GetValue(vByteArray, index, _data.mTrimmerTargetTemp        ))
+    if (GetValue(vByteArray, index, _data.mPrimaryHeaterState       ))
+    if (GetValue(vByteArray, index, _data.mTrimmerHeaterState       ))
+    if (GetValue(vByteArray, index, _data.mPrimaryEfficiency        ))
+    if (GetValue(vByteArray, index, _data.mPrimaryCalcTargetTemp    ))
+    if (GetValue(vByteArray, index, _data.mTrimmerCalcCurrentTemp   ))
+    if (GetValue(vByteArray, index, _data.mTrimmerUseLastDC         ))
+    if (GetValue(vByteArray, index, _data.mTrimmerPreviousFlow      ))
+    if (GetValue(vByteArray, index, _data.mTrimmerContolCounter     ))
                             return true ;
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
 }
 
 /*!
@@ -42,8 +73,18 @@
  */
 MDGHeaters::Data MDGHeaters::data() const {
     Data data;
-    data.mMainPrimaryDC  = _data.mMainPrimaryDC  .value;
-    data.mSmallPrimaryDC = _data.mSmallPrimaryDC .value;
-    data.mTrimmerDC      = _data.mTrimmerDC      .value;
+    data.mMainPrimayHeaterDC        = _data.mMainPrimayHeaterDC     .value;
+    data.mSmallPrimaryHeaterDC      = _data.mSmallPrimaryHeaterDC   .value;
+    data.mTrimmerHeaterDC           = _data.mTrimmerHeaterDC        .value;
+    data.mPrimaryTargetTemp         = _data.mPrimaryTargetTemp      .value;
+    data.mTrimmerTargetTemp         = _data.mTrimmerTargetTemp      .value;
+    data.mPrimaryHeaterState        = _data.mPrimaryHeaterState     .value;
+    data.mTrimmerHeaterState        = _data.mTrimmerHeaterState     .value;
+    data.mPrimaryEfficiency         = _data.mPrimaryEfficiency      .value;
+    data.mPrimaryCalcTargetTemp     = _data.mPrimaryCalcTargetTemp  .value;
+    data.mTrimmerCalcCurrentTemp    = _data.mTrimmerCalcCurrentTemp .value;
+    data.mTrimmerUseLastDC          = _data.mTrimmerUseLastDC       .value;
+    data.mTrimmerPreviousFlow       = _data.mTrimmerPreviousFlow    .value;
+    data.mTrimmerContolCounter      = _data.mTrimmerContolCounter   .value;
     return data;
 }