Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r006258aac11cf89bd1a37ffde078c953f5e307f1 -r23121e17d1a6120ae4a31930e18de362d9533bcb
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 006258aac11cf89bd1a37ffde078c953f5e307f1)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 23121e17d1a6120ae4a31930e18de362d9533bcb)
@@ -200,7 +200,6 @@
         vCanId =  Can::Can_Id::eChlid_UI_TD ;
     vPayload.clear();
     int length = vData.length();
-
     // DEBUG: LOG_EVENT(QString("0x%0").arg(vActionId, 4, 16,QChar('0')));
     switch (vActionId) { // notice we are in transmit mode
     case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len
@@ -250,6 +249,7 @@
     case Gui::GuiActionType::ID_AdjustBloodDialysateReq                 : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodDialysateRequestData                ); break;
     case Gui::GuiActionType::ID_AdjustPressuresLimitsReq                : INTERPRET_TRANSMIT_MESSAGE(AdjustPressuresLimitsRequestData               ); break;
     case Gui::GuiActionType::ID_AdjustSalineReq                         : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData                        ); break;
+    case Gui::GuiActionType::ID_AdjustVitalsReq                         : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData                        ); break;
     case Gui::GuiActionType::ID_AdjustHeparinReq                        : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData                       ); break;
     // in-treatment - ultrafiltration
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData          ); break;
@@ -477,8 +477,9 @@
     // ----- Datum
     case Gui::GuiActionType::ID_HDAccelerometerData                 : ok = notify<Model::MHDAccelerometer                           >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData               ); break;
     case Gui::GuiActionType::ID_HDSyringePumpData                   : ok = notify<Model::MHDSyringePump                             >(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData                 ); break;
-    case Gui::GuiActionType::ID_HDAirBubbleData                     : ok = notify<Model::MHDAirBubbleData                           >(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData                   ); break;
     case Gui::GuiActionType::ID_TDVoltageData                       : ok = notify<Model::MTDVoltageData                             >(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData                     ); break;
+    case Gui::GuiActionType::ID_TDAirBubbleData                     : ok = notify<Model::MTDAirBubbleData                           >(vMessage, vData, Gui::GuiActionType::ID_TDAirBubbleData                   ); break;
+    case Gui::GuiActionType::ID_TDAirPumpData                       : ok = notify<Model::MTDAirPumpData                             >(vMessage, vData, Gui::GuiActionType::ID_TDAirPumpData                     ); break;
     case Gui::GuiActionType::ID_TDAirTrapData                       : ok = notify<Model::MTDAirTrapData                             >(vMessage, vData, Gui::GuiActionType::ID_TDAirTrapData                     ); break;
     case Gui::GuiActionType::ID_TDValvesData                        : ok = notify<Model::MTDValvesData                              >(vMessage, vData, Gui::GuiActionType::ID_TDValvesData                      ); break;
     case Gui::GuiActionType::ID_TDBatteryData                       : ok = notify<Model::MTDBatteryData                             >(vMessage, vData, Gui::GuiActionType::ID_TDBatteryData                     ); break;
@@ -512,18 +513,20 @@
     case Gui::GuiActionType::ID_DialysateOutletFlow                 : ok = notify<Model::MOutletFlow                                >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow               ); break;
     case Gui::GuiActionType::ID_PressureOcclusion                   : ok = notify<Model::MPressureOcclusion                         >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion                 ); break;
     case Gui::GuiActionType::ID_Saline                              : ok = notify<Model::MTreatmentSaline                           >(vMessage, vData, Gui::GuiActionType::ID_Saline                            ); break;
+    case Gui::GuiActionType::ID_Vitals                              : ok = notify<Model::MTreatmentVitals                           >(vMessage, vData, Gui::GuiActionType::ID_Vitals                            ); break;
     case Gui::GuiActionType::ID_Heparin                             : ok = notify<Model::MTreatmentHeparin                          >(vMessage, vData, Gui::GuiActionType::ID_Heparin                           ); break;
     case Gui::GuiActionType::ID_Rinseback                           : ok = notify<Model::MTreatmentRinseback                        >(vMessage, vData, Gui::GuiActionType::ID_Rinseback                         ); break;
     case Gui::GuiActionType::ID_Recirculate                         : ok = notify<Model::MTreatmentRecirculate                      >(vMessage, vData, Gui::GuiActionType::ID_Recirculate                       ); break;
     case Gui::GuiActionType::ID_BloodPrime                          : ok = notify<Model::MTreatmentBloodPrime                       >(vMessage, vData, Gui::GuiActionType::ID_BloodPrime                        ); break;
     case Gui::GuiActionType::ID_TreatmentStop                       : ok = notify<Model::MTreatmentStop                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStop                     ); break;
     case Gui::GuiActionType::ID_Ultrafiltration                     : ok = notify<Model::MTreatmentUltrafiltration                  >(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration                   ); break;
-    case Gui::GuiActionType::ID_TreatmentSetPointData               : ok = notify<Model::MTreatmentSetPoint                         >(vMessage, vData, Gui::GuiActionType::ID_TreatmentSetPointData             ); break;
+    case Gui::GuiActionType::ID_TreatmentParametersSetPointData     : ok = notify<Model::MTreatmentParametersSetPoint               >(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData   ); break;
     // ----- In-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustDurationRsp                   : ok = notify<Model::MAdjustDurationResponse                    >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp                 ); break;
     case Gui::GuiActionType::ID_AdjustBloodDialysateRsp             : ok = notify<Model::MAdjustBloodDialysateResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp           ); break;
     case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp            : ok = notify<Model::MAdjustPressuresLimitsResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp          ); break;
     case Gui::GuiActionType::ID_AdjustSalineRsp                     : ok = notify<Model::MAdjustSalineResponse                      >(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp                   ); break;
+    case Gui::GuiActionType::ID_AdjustVitalsRsp                     : ok = notify<Model::MAdjustVitalsResponse                      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVitalsRsp                   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp       : ok = notify<Model::MAdjustUltrafiltrationStateResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp     ); break;
     case Gui::GuiActionType::ID_AdjustHeparinRsp                    : ok = notify<Model::MAdjustHeparinResponse                     >(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp                  ); break;
     case Gui::GuiActionType::ID_AdjustRinsebackRsp                  : ok = notify<Model::MAdjustRinsebackResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp                ); break;
@@ -587,19 +590,23 @@
 
     // DG data messages
     case Gui::GuiActionType::ID_DGROPumpData                : ok = notify<Model::MDGROPump                      >(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData                  ); break;
-    case Gui::GuiActionType::ID_DGPressuresData             : ok = notify<Model::MDGPressures                   >(vMessage, vData, Gui::GuiActionType::ID_DGPressuresData               ); break;
+    case Gui::GuiActionType::ID_DDPressuresData             : ok = notify<Model::MDDPressures                   >(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData               ); break;
     case Gui::GuiActionType::ID_DGDrainPumpData             : ok = notify<Model::MDGDrainPump                   >(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData               ); break;
     case Gui::GuiActionType::ID_DGOperationModeData         : ok = notify<Model::MDGOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData           ); break;
     case Gui::GuiActionType::ID_DGReservoirData             : ok = notify<Model::MDGReservoir                   >(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData               ); break;
-    case Gui::GuiActionType::ID_DGValvesStatesData          : ok = notify<Model::MDGValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DGValvesStatesData            ); break;
-    case Gui::GuiActionType::ID_DGHeatersData               : ok = notify<Model::MDGHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DGHeatersData                 ); break;
+    case Gui::GuiActionType::ID_DDValvesStatesData          : ok = notify<Model::MDDValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData            ); break;
+    case Gui::GuiActionType::ID_DDHeatersData               : ok = notify<Model::MDDHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData                 ); break;
     case Gui::GuiActionType::ID_DGLoadCellReadingsData      : ok = notify<Model::MDGLoadCellReadings            >(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData        ); break;
-    case Gui::GuiActionType::ID_DGTemperaturesData          : ok = notify<Model::MDGTemperatures                >(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData            ); break;
+    case Gui::GuiActionType::ID_DDConcentratePumpData       : ok = notify<Model::MDDConcentratePump             >(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData         ); break;
+    case Gui::GuiActionType::ID_DDTemperaturesData          : ok = notify<Model::MDDTemperatures                >(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData            ); break;
+    case Gui::GuiActionType::ID_DDDialysatePumpData         : ok = notify<Model::MDDDialysatePump               >(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData           ); break;
     case Gui::GuiActionType::ID_DDDebugText                 : ok = notify<Model::MDGDebugText                   >(vMessage, vData, Gui::GuiActionType::ID_DDDebugText                   ); break;
     case Gui::GuiActionType::ID_DGGeneralEvent              : ok = notify<Model::MDGGeneralEvent                >(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent                ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData         : ok = notify<Model::MDGAccelerometer               >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData           ); break;
     case Gui::GuiActionType::ID_DDConductivityData          : ok = notify<Model::MDDConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData            ); break;
     case Gui::GuiActionType::ID_DDGenDialysateData          : ok = notify<Model::MDDGenDialysateData            >(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData            ); break;
+    case Gui::GuiActionType::ID_DDLevelData                 : ok = notify<Model::MDDLevelData                   >(vMessage, vData, Gui::GuiActionType::ID_DDLevelData                   ); break;
+    case Gui::GuiActionType::ID_DDBloodLeakData             : ok = notify<Model::MDDBloodLeakData               >(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData               ); break;
     // ----- Datum - Pre-Treatment progress
     case Gui::GuiActionType::ID_DGFilterFlushData           : ok = notify<Model::MDGFilterFlush                 >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData             ); break;
     // DG Response Messages