Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r61a9a75c5b5ed003dc326ec3cc138a8f0e78c1e0
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 61a9a75c5b5ed003dc326ec3cc138a8f0e78c1e0)
@@ -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
@@ -271,6 +272,7 @@
     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;
@@ -289,7 +291,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;
@@ -560,6 +562,7 @@
     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;
@@ -590,7 +593,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;
 
@@ -642,9 +645,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;
@@ -667,6 +667,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;