Index: sources/model/hd/data/MHDBloodLeakData.cpp
===================================================================
diff -u -r482949dd876ebec823e955670b3d9f3834e9c215 -r78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06
--- sources/model/hd/data/MHDBloodLeakData.cpp	(.../MHDBloodLeakData.cpp)	(revision 482949dd876ebec823e955670b3d9f3834e9c215)
+++ sources/model/hd/data/MHDBloodLeakData.cpp	(.../MHDBloodLeakData.cpp)	(revision 78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06)
@@ -6,8 +6,8 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    MHDBloodLeakData.cpp
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      22-Mar-2023
+ * \author  (last)      Dara Navaei
+ * \date    (last)      06-Nov-2024
  * \author  (original)  Michael Garthwaite
  * \date    (original)  23-Feb-2022
  *
@@ -18,24 +18,42 @@
 
 QVariantList MHDBloodLeakData::parameters() const {
     return {
-        _data.mBloodLeakStatus              .value,
-        _data.mBloodLeakState               .value,
-        _data.mBloodLeakPersistentCounter   .value,
-        _data.mBloodLeakSerialCommState     .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.mBloodLeakPersistentCounter   ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState     ))
+    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; }
     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; }
 }
 
 /*!
@@ -45,10 +63,16 @@
  */
 MHDBloodLeakData::Data MHDBloodLeakData::data() const{
     Data data;
-    data.mBloodLeakStatus            =  _data.mBloodLeakStatus             .value;
-    data.mBloodLeakState             =  _data.mBloodLeakState              .value;
-    data.mBloodLeakPersistentCounter = _data.mBloodLeakPersistentCounter   .value;
-    data.mBloodLeakSerialCommState   = _data.mBloodLeakSerialCommState     .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;
 }