Index: sources/model/dg/data/MDGConductivityData.cpp
===================================================================
diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/model/dg/data/MDGConductivityData.cpp	(.../MDGConductivityData.cpp)	(revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b)
+++ sources/model/dg/data/MDGConductivityData.cpp	(.../MDGConductivityData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2022-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    MDGConductivityData.cpp
- * \author  (last)      Michael Garthwaite
- * \date    (last)      23-Feb-2022
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      30-Mar-2023
  * \author  (original)  Michael Garthwaite
  * \date    (original)  23-Feb-2022
  *
@@ -18,40 +18,72 @@
 
 QVariantList MDGConductivityData::parameters() const {
     return {
-        _data.mRORejectionRatio .value,
-        _data.mCPi              .value,
-        _data.mCPo              .value,
-        _data.mCD1              .value,
-        _data.mCD2              .value,
+        _data.mRORejectionRatio   .value,
+        _data.mCPi                .value,
+        _data.mCPo                .value,
+        _data.mCD1                .value,
+        _data.mCD2                .value,
+        _data.mCPiRaw             .value,
+        _data.mCPoRaw             .value,
+        _data.mCD1Raw             .value,
+        _data.mCD2Raw             .value,
+        _data.mCPiSensorStatus    .value,
+        _data.mCPoSensorStatus    .value,
+        _data.mCD1SensorStatus    .value,
+        _data.mCD2SensorStatus    .value,
     };
 }
 
 bool MDGConductivityData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mRORejectionRatio     ))
-    if (GetValue(vByteArray, index, _data.mCPi                  ))
-    if (GetValue(vByteArray, index, _data.mCPo                  ))
-    if (GetValue(vByteArray, index, _data.mCD1                  ))
-    if (GetValue(vByteArray, index, _data.mCD2                  ))
+    if (GetValue(vByteArray, index, _data.mRORejectionRatio ))
+    if (GetValue(vByteArray, index, _data.mCPi              ))
+    if (GetValue(vByteArray, index, _data.mCPo              ))
+    if (GetValue(vByteArray, index, _data.mCD1              ))
+    if (GetValue(vByteArray, index, _data.mCD2              ))
+    if (GetValue(vByteArray, index, _data.mCPiRaw           ))
+    if (GetValue(vByteArray, index, _data.mCPoRaw           ))
+    if (GetValue(vByteArray, index, _data.mCD1Raw           ))
+    if (GetValue(vByteArray, index, _data.mCD2Raw           ))
+    if (GetValue(vByteArray, index, _data.mCPiSensorStatus  ))
+    if (GetValue(vByteArray, index, _data.mCPoSensorStatus  ))
+    if (GetValue(vByteArray, index, _data.mCD1SensorStatus  ))
+    if (GetValue(vByteArray, index, _data.mCD2SensorStatus  ))
         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; }
 }
 
 /*!
- * \brief   MDGConductivity::data
+ * \brief   MDGConductivityData
  * \details Provides model's Data from the received messages data values
  * \return  Data
  */
 MDGConductivityData::Data MDGConductivityData::data() const {
     Data data;
-    data.mRORejectionRatio  = _data.mRORejectionRatio .value;
-    data.mCPi               = _data.mCPi              .value;
-    data.mCPo               = _data.mCPo              .value;
-    data.mCD1               = _data.mCD1              .value;
-    data.mCD2               = _data.mCD2              .value;
+    data.mRORejectionRatio  = _data.mRORejectionRatio   .value;
+    data.mCPi               = _data.mCPi                .value;
+    data.mCPo               = _data.mCPo                .value;
+    data.mCD1               = _data.mCD1                .value;
+    data.mCD2               = _data.mCD2                .value;
+    data.mCPiRaw            = _data.mCPiRaw             .value;
+    data.mCPoRaw            = _data.mCPoRaw             .value;
+    data.mCD1Raw            = _data.mCD1Raw             .value;
+    data.mCD2Raw            = _data.mCD2Raw             .value;
+    data.mCPiSensorStatus   = _data.mCPiSensorStatus    .value;
+    data.mCPoSensorStatus   = _data.mCPoSensorStatus    .value;
+    data.mCD1SensorStatus   = _data.mCD1SensorStatus    .value;
+    data.mCD2SensorStatus   = _data.mCD2SensorStatus    .value;
     return data;
 }