Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -r4c32cadadd4c8abdee1eab4ef6425f356f863547
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 4c32cadadd4c8abdee1eab4ef6425f356f863547)
@@ -217,7 +217,8 @@
     // Generic Confirm
     case Gui::GuiActionType::ID_DuetConfirmUIr                          : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData                             ); break;
     // RO Water
-    case Gui::GuiActionType::ID_DuetRoWaterModeUIi                      : INTERPRET_TRANSMIT_MESSAGE(DuetRoWaterModeUIiData                         ); break;
+    case Gui::GuiActionType::ID_AdjustRoWaterModeReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustRoWaterModeRequestData                   ); break;
+    case Gui::GuiActionType::ID_RoWaterModeReq                          : INTERPRET_TRSMT_MT_MESSAGE(RoWaterModeRequestData                         ); break;
     // POST
     case Gui::GuiActionType::ID_UIPostFinalResultData                   : INTERPRET_TRANSMIT_MESSAGE(AdjustUIPostFinalResultRequestData             ); break;
     // Settings
@@ -260,6 +261,11 @@
     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_AdjustDryBicartDisconnectReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData           ); 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;
+
     // in-treatment - ultrafiltration
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData          ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData           ); break;
@@ -286,7 +292,7 @@
     // alarms
     case Gui::GuiActionType::ID_AlarmSilenceReq                         : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData                        ); break;
     case Gui::GuiActionType::ID_AlarmUserActionReq                      : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData                     ); break;
-    case Gui::GuiActionType::ID_AlarmVolumeSetReq                       : INTERPRET_TRANSMIT_MESSAGE(AdjustHDAlarmVolumeRequestData                 ); break;
+    case Gui::GuiActionType::ID_AlarmVolumeSetReq                       : INTERPRET_TRANSMIT_MESSAGE(AdjustTDAlarmVolumeRequestData                 ); break;
     // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
     case Gui::GuiActionType::ID_AlarmActiveListReq                      : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData                     ); break;
     case Gui::GuiActionType::ID_AlarmTriggered                          : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData                      ); 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;
@@ -564,6 +572,10 @@
     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_AdjustDryBicartDisconnectRsp        : ok = notify<Model::MAdjustDryBicartDisconnectResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp      ); 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;
 
     // ----- Post-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp   : ok = notify<Model::MAdjustPatientDisconnectionConfirmResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break;
@@ -584,7 +596,7 @@
     case Gui::GuiActionType::ID_AlarmStatus                         : ok = notify<Model::MAlarmStatus                           >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus                           ); break;
     case Gui::GuiActionType::ID_AlarmTriggered                      : ok = notify<Model::MAlarmTriggered                        >(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered                        ); break;
     case Gui::GuiActionType::ID_AlarmCleared                        : ok = notify<Model::MAlarmCleared                          >(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared                          ); break;
-    case Gui::GuiActionType::ID_AlarmVolumeSetRsp                   : ok = notify<Model::MAdjustHDAlarmVolumeResponse           >(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp                     ); break;
+    case Gui::GuiActionType::ID_AlarmVolumeSetRsp                   : ok = notify<Model::MAdjustTDAlarmVolumeResponse           >(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp                     ); break;
     // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
     case Gui::GuiActionType::ID_AlarmActiveListRsp                  : ok = notify<Model::MAlarmActiveListResponse               >(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp                    ); break;
 
@@ -636,9 +648,6 @@
     // DG Response Messages
     case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp     : ok = notify<Model::MAdjustServiceDatesDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp       ); break;
     case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp    : ok = notify<Model::MAdjustDGCleaningUsageResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp      ); break;
-    // RO Water
-    case Gui::GuiActionType::ID_DuetRoWaterStatDGq          : ok = notify<Model::MDuetRoWaterStatDGq            >(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq            ); break;
-    case Gui::GuiActionType::ID_DuetRoWaterModeDGr          : ok = notify<Model::MDuetRoWaterModeDGr            >(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterModeDGr            ); break;
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
     default                                                 :      printUnhandled                                (vMessage                                                              ); break;
@@ -661,6 +670,9 @@
     case Gui::GuiActionType::ID_DDValvesStatesData          : ok = notify<Model::MDDValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData            ); break;
 
     case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); break;
+    case Gui::GuiActionType::ID_RoWaterModeRsp              : ok = notify<Model::MRoWaterModeResponse           >(vMessage, vData, Gui::GuiActionType::ID_RoWaterModeRsp                ); break;
+    case Gui::GuiActionType::ID_AdjustRoWaterModeRsp        : ok = notify<Model::MAdjustRoWaterModeResponse     >(vMessage, vData, Gui::GuiActionType::ID_AdjustRoWaterModeRsp          ); break;
+
     case Gui::GuiActionType::ID_DDOperationModeData         : ok = notify<Model::MDDOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData           ); break;
     case Gui::GuiActionType::ID_AdjustVersionsDDRsp         : ok = notify<Model::MAdjustVersionsDDResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp           ); break;
     case Gui::GuiActionType::ID_AdjustSerialDDRsp           : ok = notify<Model::MAdjustSerialNumberDDResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp             ); break;