Index: sources/model/MModel.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -ra245272e6d8eee5c3658245570b6d31bd039af74
--- sources/model/MModel.h	(.../MModel.h)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/model/MModel.h	(.../MModel.h)	(revision a245272e6d8eee5c3658245570b6d31bd039af74)
@@ -59,12 +59,20 @@
 #include "MTreatmentStopData.h"
 #include "MHDAccelerometerData.h"
 #include "MHDSyringePumpData.h"
-#include "MHDAirTrapData.h"
 #include "MHDBloodLeakData.h"
 #include "MHDAirBubbleData.h"
 #include "MHDRTCEpochData.h"
 #include "MHDUsageInfoResponse.h"
+#include "MTDAirTrapData.h"
+#include "MTDVoltageData.h"
+#include "MTDBloodPumpData.h"
+#include "MTDValvesData.h"
+#include "MTDBatteryData.h"
+#include "MTDSwitchesData.h"
+#include "MTDEjectorData.h"
+#include "MTDTemperatureData.h"
 
+
 // Debugging Messages
 #include "MHDDebugText.h"
 #include "MDGDebugText.h"
@@ -74,8 +82,8 @@
 // Settings
 #include "MAdjustHDRequests.h"
 #include "MAdjustDGRequests.h"
-#include "MAdjustHDVersionsRequest.h"
-#include "MAdjustHDVersionsResponse.h"
+#include "MAdjustTDVersionsRequest.h"
+#include "MAdjustTDVersionsResponse.h"
 #include "MAdjustDGVersionsResponse.h"
 #include "MAdjustHDSerialNumberResponse.h"
 #include "MAdjustDGSerialNumberResponse.h"
@@ -326,7 +334,14 @@
     REGISTER_METATYPE(                                                      HDSyringePumpData ) \
     REGISTER_METATYPE(                                                    HDAccelerometerData ) \
     REGISTER_METATYPE(                                                        HDBloodLeakData ) \
-    REGISTER_METATYPE(                                                          HDAirTrapData ) \
+    REGISTER_METATYPE(                                                          TDAirTrapData ) \
+    REGISTER_METATYPE(                                                          TDVoltageData ) \
+    REGISTER_METATYPE(                                                        TDBloodPumpData ) \
+    REGISTER_METATYPE(                                                           TDValvesData ) \
+    REGISTER_METATYPE(                                                          TDBatteryData ) \
+    REGISTER_METATYPE(                                                         TDSwitchesData ) \
+    REGISTER_METATYPE(                                                          TDEjectorData ) \
+    REGISTER_METATYPE(                                                      TDTemperatureData ) \
     REGISTER_METATYPE(                                                        HDAirBubbleData ) \
     REGISTER_METATYPE(                                                HDUsageInfoResponseData ) \
     REGISTER_METATYPE(                                                 HDUsageInfoRequestData ) \
@@ -438,8 +453,8 @@
     REGISTER_METATYPE(                                          AdjustRecirculateResponseData ) \
     REGISTER_METATYPE(                                         AdjustTreatmentEndResponseData ) \
     REGISTER_METATYPE(                                      AdjustPressuresLimitsResponseData ) \
-    REGISTER_METATYPE(                                            AdjustVersionsHDRequestData ) \
-    REGISTER_METATYPE(                                           AdjustVersionsHDResponseData ) \
+    REGISTER_METATYPE(                                            AdjustVersionsTDRequestData ) \
+    REGISTER_METATYPE(                                           AdjustVersionsTDResponseData ) \
     REGISTER_METATYPE(                                           AdjustVersionsDGResponseData ) \
     REGISTER_METATYPE(                                       AdjustSerialNumberHDResponseData ) \
     REGISTER_METATYPE(                                       AdjustSerialNumberDGResponseData ) \
@@ -508,7 +523,14 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDAccelerometerData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDBloodLeakData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDAirBubbleData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   HDAirTrapData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDAirTrapData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDVoltageData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 TDBloodPumpData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               TDTemperatureData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDEjectorData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                  TDSwitchesData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDBatteryData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                    TDValvesData ) \
     /*                                      Treatment Log                                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           TreatmentLogAvrgeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           TreatmentLogAlarmData ) \
@@ -569,8 +591,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  AdjustTreatmentEndResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustPressuresLimitsResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustVersionsHDRequestData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustVersionsHDResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustVersionsTDRequestData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustVersionsTDResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustVersionsDGResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustSerialNumberHDResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustSerialNumberDGResponseData ) \
@@ -701,7 +723,14 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDAccelerometerData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDBloodLeakData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDAirBubbleData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                           HDAirTrapData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDAirTrapData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDVoltageData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         TDBloodPumpData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                            TDValvesData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDBatteryData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                          TDSwitchesData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDEjectorData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       TDTemperatureData ) \
     /*                                      Treatment Log                                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                   TreatmentLogAvrgeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                   TreatmentLogAlarmData ) \
@@ -762,8 +791,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                          AdjustTreatmentEndResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                       AdjustPressuresLimitsResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustVersionsHDRequestData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustVersionsHDResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustVersionsTDRequestData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustVersionsTDResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustVersionsDGResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustSerialNumberHDResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustSerialNumberDGResponseData ) \
@@ -997,7 +1026,14 @@
     ACTION_RECEIVE_SIGNAL(                                                  HDSyringePumpData ) \
     ACTION_RECEIVE_SIGNAL(                                                HDAccelerometerData ) \
     ACTION_RECEIVE_SIGNAL(                                                    HDBloodLeakData ) \
-    ACTION_RECEIVE_SIGNAL(                                                      HDAirTrapData ) \
+    ACTION_RECEIVE_SIGNAL(                                                      TDAirTrapData ) \
+    ACTION_RECEIVE_SIGNAL(                                                      TDVoltageData ) \
+    ACTION_RECEIVE_SIGNAL(                                                    TDBloodPumpData ) \
+    ACTION_RECEIVE_SIGNAL(                                                       TDValvesData ) \
+    ACTION_RECEIVE_SIGNAL(                                                      TDBatteryData ) \
+    ACTION_RECEIVE_SIGNAL(                                                     TDSwitchesData ) \
+    ACTION_RECEIVE_SIGNAL(                                                      TDEjectorData ) \
+    ACTION_RECEIVE_SIGNAL(                                                  TDTemperatureData ) \
     ACTION_RECEIVE_SIGNAL(                                                    HDAirBubbleData ) \
     /*                                      Alarms                                           */ \
     ACTION_RECEIVE_SIGNAL(                                                    AlarmStatusData ) \
@@ -1060,8 +1096,8 @@
     ACTION_RECEIVE_SIGNAL(                                      AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                     AdjustTreatmentEndResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                  AdjustPressuresLimitsResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                        AdjustVersionsHDRequestData ) \
-    ACTION_RECEIVE_SIGNAL(                                       AdjustVersionsHDResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                        AdjustVersionsTDRequestData ) \
+    ACTION_RECEIVE_SIGNAL(                                       AdjustVersionsTDResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                       AdjustVersionsDGResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustSerialNumberHDResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustSerialNumberDGResponseData ) \