Index: sources/model/hd/data/MHDBloodLeakData.cpp
===================================================================
diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06
--- sources/model/hd/data/MHDBloodLeakData.cpp	(.../MHDBloodLeakData.cpp)	(revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b)
+++ sources/model/hd/data/MHDBloodLeakData.cpp	(.../MHDBloodLeakData.cpp)	(revision 78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2020-2020 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 MHDBloodLeakData.cpp
- * \author (last) Michael Gathwaite
- * \date (last) 23-Feb-2022
- * \author (original) Michael Garthwaite
- * \date (original) 23-Feb-2022
+ * \file    MHDBloodLeakData.cpp
+ * \author  (last)      Dara Navaei
+ * \date    (last)      06-Nov-2024
+ * \author  (original)  Michael Garthwaite
+ * \date    (original)  23-Feb-2022
  *
  */
 #include "MHDBloodLeakData.h"
@@ -18,31 +18,31 @@
 
 QVariantList MHDBloodLeakData::parameters() const {
     return {
-        _data.mBloodLeakStatus           .value,
-        _data.mBloodLeakState            .value,
-        _data.mBloodLeakZeroStatusCounter.value,
-        _data.mBloodLeakCounter          .value,
-        _data.mBloodLeakZeroedStatus     .value,
-        _data.mBloodLeakDetectSetPoint   .value,
-        _data.mBloodLeakDetectLevel      .value,
-        _data.mBloodLeakStatusCount      .value,
-        _data.mBloodLeakLEDIntensity     .value,
-        _data.mBloodLeakRegisterCounter  .value,
+        _data.mBloodLeakStatus                .value,
+        _data.mBloodLeakState                 .value,
+        _data.mBloodLeakPersistentCounter     .value,
+        _data.mBloodLeakSerialCommState       .value,
+        _data.mBloodLeakIntensity             .value,
+        _data.mBloodLeakDetect                .value,
+        _data.mBloodLeakIntensityMvgAvg       .value,
+        _data.mBloodLeakTimeSinceZeroMS       .value,
+        _data.mBloodLeakDrfitInRangeStatus    .value,
+        _data.mBloodLeakDriftUpperRangeStatus .value,
     };
 }
 
 bool MHDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mBloodLeakStatus              ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakState               ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakZeroStatusCounter   ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakCounter             ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakZeroedStatus        ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakDetectSetPoint      ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakDetectLevel         ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakStatusCount         ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakLEDIntensity        ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakRegisterCounter     ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakStatus                    ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakState                     ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter         ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState           ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakIntensity                 ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakDetect                    ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakIntensityMvgAvg           ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakTimeSinceZeroMS           ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakDrfitInRangeStatus        ))
+    if (GetValue(vByteArray, index, _data.mBloodLeakDriftUpperRangeStatus     ))
     return true ;
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
@@ -63,16 +63,16 @@
  */
 MHDBloodLeakData::Data MHDBloodLeakData::data() const{
     Data data;
-    data.mBloodLeakStatus           =  _data.mBloodLeakStatus           .value;
-    data.mBloodLeakState            =  _data.mBloodLeakState            .value;
-    data.mBloodLeakZeroStatusCounter=  _data.mBloodLeakZeroStatusCounter.value;
-    data.mBloodLeakCounter          =  _data.mBloodLeakCounter          .value;
-    data.mBloodLeakZeroedStatus     =  _data.mBloodLeakZeroedStatus     .value;
-    data.mBloodLeakDetectSetPoint   =  _data.mBloodLeakDetectSetPoint   .value;
-    data.mBloodLeakDetectLevel      =  _data.mBloodLeakDetectLevel      .value;
-    data.mBloodLeakStatusCount      =  _data.mBloodLeakStatusCount      .value;
-    data.mBloodLeakLEDIntensity     =  _data.mBloodLeakLEDIntensity     .value;
-    data.mBloodLeakRegisterCounter  =  _data.mBloodLeakRegisterCounter  .value;
+    data.mBloodLeakStatus                 = _data.mBloodLeakStatus                  .value;
+    data.mBloodLeakState                  = _data.mBloodLeakState                   .value;
+    data.mBloodLeakPersistentCounter      = _data.mBloodLeakPersistentCounter       .value;
+    data.mBloodLeakSerialCommState        = _data.mBloodLeakSerialCommState         .value;
+    data.mBloodLeakIntensity              = _data.mBloodLeakIntensity               .value;
+    data.mBloodLeakDetect                 = _data.mBloodLeakDetect                  .value;
+    data.mBloodLeakIntensityMvgAvg        = _data.mBloodLeakIntensityMvgAvg         .value;
+    data.mBloodLeakTimeSinceLastZeroMS    = _data.mBloodLeakTimeSinceZeroMS         .value;
+    data.mBloodLeakDriftInRangeStatus     = _data.mBloodLeakDrfitInRangeStatus      .value;
+    data.mBloodLeakDriftUpperRangeStatus  = _data.mBloodLeakDriftUpperRangeStatus   .value;
     return data;
 }