Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9)
@@ -261,13 +261,19 @@
     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;
+    case Gui::GuiActionType::ID_AdjustHDFStateReq                       : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFStateRequestData                      ); break;
+    case Gui::GuiActionType::ID_AdjustAutoSubReq                        : INTERPRET_TRANSMIT_MESSAGE(AdjustAutoSubRequestData                       ); break;
+    case Gui::GuiActionType::ID_AdjustHDFReq                            : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFRequestData                           ); break;
+
+    case Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData           ); break;
     // in-treatment - ultrafiltration
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData          ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData           ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData        ); break;
     case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFDurationEditRequestData        ); break;
     case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFVolumeEditRequestData          ); break;
     case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq              : INTERPRET_TRSMT_MT_MESSAGE(AdjustIsolatedUFConfirmRequestData             ); break;
+    case Gui::GuiActionType::ID_AdjustIsoUFStateReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFStateRequestData               ); break;
     // End-Treatment
     case Gui::GuiActionType::ID_AdjustRinsebackReq                      : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData                     ); break;
     case Gui::GuiActionType::ID_AdjustRecirculateReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData                   ); break;
@@ -492,7 +498,7 @@
 
     // ----- 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_TDSyringePumpData                   : ok = notify<Model::MTDSyringePump                             >(vMessage, vData, Gui::GuiActionType::ID_TDSyringePumpData                 ); 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;
@@ -531,6 +537,7 @@
     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_HDF                                 : ok = notify<Model::MTreatmentHDF                              >(vMessage, vData, Gui::GuiActionType::ID_HDF                               ); 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;
@@ -540,6 +547,7 @@
     case Gui::GuiActionType::ID_Ultrafiltration                     : ok = notify<Model::MTreatmentUltrafiltration                  >(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration                   ); break;
     case Gui::GuiActionType::ID_IsolatedUF                          : ok = notify<Model::MTreatmentIsolatedUF                       >(vMessage, vData, Gui::GuiActionType::ID_IsolatedUF                        ); break;
     case Gui::GuiActionType::ID_TreatmentParametersSetPointData     : ok = notify<Model::MTreatmentParametersSetPoint               >(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData   ); break;
+    case Gui::GuiActionType::ID_DryBicartDisconnectData             : ok = notify<Model::MTreatmentDryBicartDisconnect              >(vMessage, vData, Gui::GuiActionType::ID_DryBicartDisconnectData           ); break;
     // ----- In-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustBloodPrimeRsp                 : ok = notify<Model::MAdjustBloodPrimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodPrimeRsp               ); break;
     case Gui::GuiActionType::ID_AdjustDurationEditRsp               : ok = notify<Model::MAdjustDurationEditResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationEditRsp             ); break;
@@ -556,13 +564,18 @@
     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_AdjustIsoUFStateRsp                 : ok = notify<Model::MAdjustIsolatedUFStateResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsoUFStateRsp               ); 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;
     case Gui::GuiActionType::ID_AdjustRecirculateRsp                : ok = notify<Model::MAdjustRecirculateResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp              ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentEndRsp               : ok = notify<Model::MAdjustTreatmentEndResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp             ); break;
     case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp     : ok = notify<Model::MAdjustIsolatedUFDurationEditResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp   ); break;
     case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp       : ok = notify<Model::MAdjustIsolatedUFVolumeEditResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp     ); break;
     case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp          : ok = notify<Model::MAdjustIsolatedUFConfirmResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp        ); break;
+    case Gui::GuiActionType::ID_AdjsutHDFStateRsp                   : ok = notify<Model::MAdjustHDFStateResponse                    >(vMessage, vData, Gui::GuiActionType::ID_AdjsutHDFStateRsp                 ); break;
+    case Gui::GuiActionType::ID_AdjustAutoSubRsp                    : ok = notify<Model::MAdjustAutoSubResponse                     >(vMessage, vData, Gui::GuiActionType::ID_AdjustAutoSubRsp                  ); break;
+    case Gui::GuiActionType::ID_AdjustHDFRsp                        : ok = notify<Model::MAdjustHDFResponse                         >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDFRsp                      ); break;
+    case Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp        : ok = notify<Model::MAdjustDryBicartDisconnectResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp      ); break;
 
     // ----- Post-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp   : ok = notify<Model::MAdjustPatientDisconnectionConfirmResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break;