Index: sources/model/MModel.h
===================================================================
diff -u -r47c8f13876317ba36500400f894d96c9bce9eb17 -rb6d23ac9f339d36f9c68000ecc59dcc07fec8838
--- sources/model/MModel.h	(.../MModel.h)	(revision 47c8f13876317ba36500400f894d96c9bce9eb17)
+++ sources/model/MModel.h	(.../MModel.h)	(revision b6d23ac9f339d36f9c68000ecc59dcc07fec8838)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2022 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 MModel.h
- * \author (last) Behrouz NematiPour
- * \date (last) 16-Oct-2020
- * \author (original) Behrouz NemaiPour
- * \date (original) 02-Jul-2020
+ * \file    MModel.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      17-Feb-2022
+ * \author  (original)  Behrouz NemaiPour
+ * \date    (original)  02-Jul-2020
  *
  */
 #pragma once
@@ -45,7 +45,8 @@
 
 // HD Data Messages
 #include "MTreatmentTimeData.h"
-#include "MTreatmentFlowsData.h"
+#include "MTreatmentBloodFlowData.h"
+#include "MTreatmentDialysateFlowData.h"
 #include "MTreatmentOutletFlowData.h"
 #include "MTreatmentPressureOcclusionData.h"
 #include "MTreatmentRangesData.h"
@@ -57,6 +58,9 @@
 #include "MTreatmentStopData.h"
 #include "MHDAccelerometerData.h"
 #include "MHDSyringePumpData.h"
+#include "MHDAirTrapData.h"
+#include "MHDBloodLeakData.h"
+#include "MHDAirBubbleData.h"
 
 // Debugging Messages
 #include "MHDDebugText.h"
@@ -88,6 +92,7 @@
 #include "MDGTemperaturesData.h"
 #include "MDGValvesStatesData.h"
 #include "MDGAccelerometerData.h"
+#include "MDGConductivityData.h"
 
 // Pre-Treatment
 #include "MPreTreatmentAdjustRequests.h"
@@ -294,6 +299,9 @@
     REGISTER_METATYPE(                                                      TreatmentStopData ) \
     REGISTER_METATYPE(                                                      HDSyringePumpData ) \
     REGISTER_METATYPE(                                                    HDAccelerometerData ) \
+    REGISTER_METATYPE(                                                        HDBloodLeakData ) \
+    REGISTER_METATYPE(                                                          HDAirTrapData ) \
+    REGISTER_METATYPE(                                                        HDAirBubbleData ) \
     /*                                      Treatment Log                                    */ \
     REGISTER_METATYPE(                                                  TreatmentLogAvrgeData ) \
     REGISTER_METATYPE(                                                  TreatmentLogAlarmData ) \
@@ -315,6 +323,7 @@
     REGISTER_METATYPE(                                                 DGLoadCellReadingsData ) \
     REGISTER_METATYPE(                                                     DGTemperaturesData ) \
     REGISTER_METATYPE(                                                    DGAccelerometerData ) \
+    REGISTER_METATYPE(                                                     DGConductivityData ) \
                                                                                                 \
     REGISTER_METATYPE(                                                        HDDebugTextData ) \
     REGISTER_METATYPE(                                                        DGDebugTextData ) \
@@ -463,6 +472,9 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               TreatmentStopData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               HDSyringePumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDAccelerometerData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDBloodLeakData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDAirBubbleData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   HDAirTrapData ) \
     /*                                      Treatment Log                                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           TreatmentLogAvrgeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           TreatmentLogAlarmData ) \
@@ -484,6 +496,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          DGLoadCellReadingsData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DGTemperaturesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             DGAccelerometerData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DGConductivityData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDebugTextData ) \
@@ -635,6 +648,9 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                       TreatmentStopData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                       HDSyringePumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDAccelerometerData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDBloodLeakData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDAirBubbleData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                           HDAirTrapData ) \
     /*                                      Treatment Log                                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                   TreatmentLogAvrgeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                   TreatmentLogAlarmData ) \
@@ -656,6 +672,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                  DGLoadCellReadingsData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                      DGTemperaturesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     DGAccelerometerData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      DGConductivityData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGDebugTextData ) \
@@ -892,6 +909,9 @@
     ACTION_RECEIVE_SIGNAL(                                                  TreatmentStopData ) \
     ACTION_RECEIVE_SIGNAL(                                                  HDSyringePumpData ) \
     ACTION_RECEIVE_SIGNAL(                                                HDAccelerometerData ) \
+    ACTION_RECEIVE_SIGNAL(                                                    HDBloodLeakData ) \
+    ACTION_RECEIVE_SIGNAL(                                                      HDAirTrapData ) \
+    ACTION_RECEIVE_SIGNAL(                                                    HDAirBubbleData ) \
     /*                                      Alarms                                           */ \
     ACTION_RECEIVE_SIGNAL(                                                    AlarmStatusData ) \
     ACTION_RECEIVE_SIGNAL(                                                 AlarmTriggeredData ) \
@@ -912,6 +932,7 @@
     ACTION_RECEIVE_SIGNAL(                                             DGLoadCellReadingsData ) \
     ACTION_RECEIVE_SIGNAL(                                                 DGTemperaturesData ) \
     ACTION_RECEIVE_SIGNAL(                                                DGAccelerometerData ) \
+    ACTION_RECEIVE_SIGNAL(                                                 DGConductivityData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                                    HDDebugTextData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DGDebugTextData ) \