Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 -rc70815ad2b3beadf61832f2e4d12eb90d476e020
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
@@ -170,8 +170,8 @@
  */
 void MessageInterpreter::printUnhandled(const Message &vMessage) const
 {
-    if ( logUnhandledMessage(vMessage)) return; // the message is defined as unhandled and can still be handled and logged, return.
     if ( gDisableUnhandledReport      ) return; // if the unhandled message error has been disabled, return.
+    if ( logUnhandledMessage(vMessage)) return; // the message is defined as unhandled and can still be handled and logged, return.
     QString mActionIdHexString = Format::toHexString(vMessage.actionId, false, eLenMessageIDDigits);
     QString logMessage = tr("Unhandled Message ID (HD)") + '\n' +
                          QString("%1 # %2 %3")
@@ -237,7 +237,6 @@
     // Pre-Treatment
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
-    case Gui::GuiActionType::ID_AdjustWaterSampleReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleRequestData                   ); break;
     case Gui::GuiActionType::ID_AdjustWaterSampleResultReq              : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleResultRequestData             ); break;
     case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq             : INTERPRET_TRSMT_MT_MESSAGE(AdjustConsumablesConfirmRequestData            ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq             : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesConfirmRequestData            ); break;
@@ -515,16 +514,19 @@
     case Gui::GuiActionType::ID_SelfTestNoCartridgeData             : ok = notify<Model::MPreTreatmentSelfTestNoCartridge           >(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridgeData           ); break;
     case Gui::GuiActionType::ID_SelfTestDryData                     : ok = notify<Model::MPreTreatmentSelfTestDry                   >(vMessage, vData, Gui::GuiActionType::ID_SelfTestDryData                   ); break;
     case Gui::GuiActionType::ID_DisposablesPrimeData                : ok = notify<Model::MPreTreatmentDisposablesPrime              >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData              ); break;
-    // ----- Pre-Treatment - Adjust
+
+        // ----- Pre-Treatment - Adjust
     case Gui::GuiActionType::ID_AdjustInitTreatmentRsp              : ok = notify<Model::MAdjustInitTreatmentResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustInitTreatmentRsp            ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationRsp       : ok = notify<Model::MAdjustParametersValidationResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustParametersValidationRsp     ); break;
-    case Gui::GuiActionType::ID_AdjustWaterSampleRsp                : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleRsp              ); break;
+    case Gui::GuiActionType::ID_AdjustWaterSampleResultRsp          : ok = notify<Model::MAdjustWaterSampleResultResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleResultRsp        ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp         : ok = notify<Model::MAdjustDisposablesConfirmResponse          >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp       ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp           : ok = notify<Model::MAdjustDisposablesPrimeResponse            >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp         ); break;
     case Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp     : ok = notify<Model::MAdjustPatientConnectionBeginResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp        : ok = notify<Model::MAdjustUltrafiltrationInitResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp      ); break;
     case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp   : ok = notify<Model::MAdjustPatientConnectionConfirmResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break;
     case Gui::GuiActionType::ID_AdjustStartTreatmentRsp             : ok = notify<Model::MAdjustStartTreatmentResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustWaterSampleData               : ok = notify<Model::MWaterSample                               >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleData             ); break;
+//    case Gui::GuiActionType::ID_AdjustWaterSampleTimeout            : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleTimeout          ); break;
 
     // ----- In-Treatment - Datum
     case Gui::GuiActionType::ID_TreatmentTime                       : ok = notify<Model::MTreatmentTime                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                     ); break;
@@ -590,7 +592,8 @@
 
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
-    default                                                         :      printUnhandled                                        (vMessage                                                                      ); break;
+//    default                                                         :      printUnhandled                                        (vMessage                                                                      ); break;
+    default: break; //FIXME later enabled
     }
 
     return ok;
@@ -616,6 +619,8 @@
     switch (vMessage.actionId) { // notice we are in receive mode
     case Gui::GuiActionType::ID_Acknow                      : ok = true;                                                                    /* TODO : implement notify<>() */              break;
         LOG_APPED(QString("DD,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      break;
+
+    /*
     // ----- POST
     case Gui::GuiActionType::ID_DGPostSingleResultData      : ok = notify<Model::MDGPostSingleResult            >(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData        ); break;
     case Gui::GuiActionType::ID_DGPostFinalResultData       : ok = notify<Model::MDGPostFinalResult             >(vMessage, vData, Gui::GuiActionType::ID_DGPostFinalResultData         ); break;
@@ -624,7 +629,6 @@
     case Gui::GuiActionType::ID_DGROPumpData                : ok = notify<Model::MDGROPump                      >(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData                  ); 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_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;
@@ -635,24 +639,34 @@
     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
-    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;
     case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp     : ok = notify<Model::MAdjustServiceDatesDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp       ); break;
-    case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); 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;
+    */
+        ///////////////////////////////////////
+        //// FIXME: RO LOOP TEST
+        ///////////////////////////////////////
+
+
+    case Gui::GuiActionType::ID_DDGenDialysateData          : ok = notify<Model::MDDGenDialysateData            >(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData            ); break;
+    case Gui::GuiActionType::ID_DDConductivityData          : ok = notify<Model::MDDConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData            ); break;
+
+    case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); 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;
+
+    default: break; //FIXME later enabled
     }
 
     return ok;
@@ -680,20 +694,22 @@
         LOG_APPED(QString("FP,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      break;
 
     // FP data messages
-    case Gui::GuiActionType::ID_FPROPumpData                : ok = notify<Model::MFPROPump                      >(vMessage, vData, Gui::GuiActionType::ID_FPROPumpData              ); break;
-    case Gui::GuiActionType::ID_FPPressuresData             : ok = notify<Model::MFPPressures                   >(vMessage, vData, Gui::GuiActionType::ID_FPPressuresData           ); break;
-    case Gui::GuiActionType::ID_FPLevelData                 : ok = notify<Model::MFPLevel                       >(vMessage, vData, Gui::GuiActionType::ID_FPLevelData               ); break;
-    case Gui::GuiActionType::ID_FPFlowSensorData            : ok = notify<Model::MFPFlow                        >(vMessage, vData, Gui::GuiActionType::ID_FPFlowSensorData          ); break;
-    case Gui::GuiActionType::ID_FPConductivityData          : ok = notify<Model::MFPConductivity                >(vMessage, vData, Gui::GuiActionType::ID_FPConductivityData        ); break;
-    case Gui::GuiActionType::ID_FPTemperaturesData          : ok = notify<Model::MFPTemperature                 >(vMessage, vData, Gui::GuiActionType::ID_FPTemperaturesData        ); break;
-    case Gui::GuiActionType::ID_FPROBoosterPumpData         : ok = notify<Model::MFPBoostPump                   >(vMessage, vData, Gui::GuiActionType::ID_FPROBoosterPumpData       ); break;
+    case Gui::GuiActionType::ID_FPROPumpData                : ok = notify<Model::MFPROPump                      >(vMessage, vData, Gui::GuiActionType::ID_FPROPumpData                  ); break;
+    case Gui::GuiActionType::ID_FPPressuresData             : ok = notify<Model::MFPPressures                   >(vMessage, vData, Gui::GuiActionType::ID_FPPressuresData               ); break;
+    case Gui::GuiActionType::ID_FPLevelData                 : ok = notify<Model::MFPLevel                       >(vMessage, vData, Gui::GuiActionType::ID_FPLevelData                   ); break;
+    case Gui::GuiActionType::ID_FPFlowSensorData            : ok = notify<Model::MFPFlow                        >(vMessage, vData, Gui::GuiActionType::ID_FPFlowSensorData              ); break;
+    case Gui::GuiActionType::ID_FPConductivityData          : ok = notify<Model::MFPConductivity                >(vMessage, vData, Gui::GuiActionType::ID_FPConductivityData            ); break;
+    case Gui::GuiActionType::ID_FPTemperaturesData          : ok = notify<Model::MFPTemperature                 >(vMessage, vData, Gui::GuiActionType::ID_FPTemperaturesData            ); break;
+    case Gui::GuiActionType::ID_FPROBoosterPumpData         : ok = notify<Model::MFPBoostPump                   >(vMessage, vData, Gui::GuiActionType::ID_FPROBoosterPumpData           ); break;
+    case Gui::GuiActionType::ID_FPRORejectionPercentageData : ok = notify<Model::MFPRORejectionPercentage       >(vMessage, vData, Gui::GuiActionType::ID_FPRORejectionPercentageData   ); break;
 
     // FP Response Messages
     case Gui::GuiActionType::ID_AdjustVersionsFPRsp         : ok = notify<Model::MAdjustVersionsFPResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsFPRsp       ); break;
 
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
-    default                                                 :      printUnhandled                                (vMessage                                                          ); break;
+//    default                                                 :      printUnhandled                                (vMessage                                                          ); break;
+    default: break; //FIXME later enabled
     }
 
     return ok;