Index: sources/canbus/messageinterpreter.cpp
===================================================================
diff -u -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d
--- sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f)
+++ sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d)
@@ -257,8 +257,8 @@
 
     // coco-begin-validated: Is a placeholder and There is no definition/implementation of DG communication with UI.
     case eChlid_DG_UI   :
-    //case eChlid_DG_Alarm:
-    case eChlid_DG_Sync :   ok = interpretMessage_DG(vMessage, vData); break;
+    case eChlid_DG_Alarm:
+    case eChlid_DG_Sync : ok = interpretMessage_DG(vMessage, vData); break;
 
     default:
         break;
@@ -282,36 +282,38 @@
  */
 bool MessageInterpreter::interpretMessage_HD(const Message &vMessage, QVariantList &vData)
 {
-    bool    ok = false;
+    bool ok = false;
     vData.clear();
-    //qDebug() << vMessage.actionId;
     switch (vMessage.actionId) { // notice we are in receive mode
     // ----- Debug
-    case Gui::GuiActionType::ID_CANBusFaultCount               : ok = canbusFaultCountData         (vMessage, vData); break;
+    case Gui::GuiActionType::ID_CANBusFaultCount                : ok = canbusFaultCountData         (vMessage, vData); break;
 
     // ----- Datum
-    case Gui::GuiActionType::ID_TreatmentTime                  : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentTime       , Model::MTreatmentTime     ); break;
-    case Gui::GuiActionType::ID_BloodFlow                      : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_BloodFlow           , Model::MBloodFlow         ); break;
-    case Gui::GuiActionType::ID_DialysateInletFlow             : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DialysateInletFlow  , Model::MDialysateFlow     ); break;
-    case Gui::GuiActionType::ID_DialysateOutletFlow            : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DialysateOutletFlow , Model::MOutletFlow        ); break;
-    case Gui::GuiActionType::ID_TreatmentRanges                : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentRanges     , Model::MTreatmentRanges   ); break;
-    case Gui::GuiActionType::ID_PressureOcclusion              : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_PressureOcclusion   , Model::MPressureOcclusion ); break;
-    case Gui::GuiActionType::ID_TreatmentState                 : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentState      , Model::MTreatmentStates   ); break;
+    case Gui::GuiActionType::ID_TreatmentTime                   : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentTime          , Model::MTreatmentTime     ); break;
+    case Gui::GuiActionType::ID_BloodFlow                       : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_BloodFlow              , Model::MBloodFlow         ); break;
+    case Gui::GuiActionType::ID_DialysateInletFlow              : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DialysateInletFlow     , Model::MDialysateFlow     ); break;
+    case Gui::GuiActionType::ID_DialysateOutletFlow             : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DialysateOutletFlow    , Model::MOutletFlow        ); break;
+    case Gui::GuiActionType::ID_TreatmentRanges                 : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentRanges        , Model::MTreatmentRanges   ); break;
+    case Gui::GuiActionType::ID_PressureOcclusion               : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_PressureOcclusion      , Model::MPressureOcclusion ); break;
+    case Gui::GuiActionType::ID_TreatmentStates                 : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentStates        , Model::MTreatmentStates   ); break;
 
     // ----- Events
-    case Gui::GuiActionType::ID_Acknow                         : ok = true;                                           break;
-    case Gui::GuiActionType::ID_PowerOff                       : ok = powerOff                     (vMessage, vData); break;
-    case Gui::GuiActionType::ID_PowerOffBroadcast              : ok = true; LOG_EVENT("HD,PowerOff Warning");         break;
-    case Gui::GuiActionType::ID_AlarmStatus                    : ok = alarmStatus                  (vMessage, vData); break;
-    case Gui::GuiActionType::ID_AlarmTriggered                 : ok = alarmTriggered               (vMessage, vData); break;
-    case Gui::GuiActionType::ID_AlarmCleared                   : ok = alarmCleared                 (vMessage, vData); break;
+    case Gui::GuiActionType::ID_HDOperationModeData             : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_HDOperationModeData    , Model::MHDOperationMode   ); break;
+    case Gui::GuiActionType::ID_HDDebugText                     : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_HDDebugText            , Model::MHDDebugText       ); break;
 
+    case Gui::GuiActionType::ID_Acknow                          : ok = true;                                           break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
+    case Gui::GuiActionType::ID_PowerOff                        : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_PowerOff               , Model::MPowerOff          ); break;
+    case Gui::GuiActionType::ID_ShuttingDown                    : ok = true; LOG_EVENT("HD,ShuttingDown");             break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
+    case Gui::GuiActionType::ID_AlarmStatus                     : ok = alarmStatus                  (vMessage, vData); break;
+    case Gui::GuiActionType::ID_AlarmTriggered                  : ok = alarmTriggered               (vMessage, vData); break;
+    case Gui::GuiActionType::ID_AlarmCleared                    : ok = alarmCleared                 (vMessage, vData); break;
+
     // Adjustment Response Messages
-    case Gui::GuiActionType::ID_AdjustDurationRsp              : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustDurationRsp       , Model::MAdjustDurationResponse       ); break;
-    case Gui::GuiActionType::ID_AdjustBloodDialysateRsp        : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustBloodDialysateRsp , Model::MAdjustBloodDialysateResponse ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq  : ok = adjustUltrafiltrationState   (vMessage, vData); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp   : ok = adjustUltrafiltrationEdit    (vMessage, vData); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp: ok = adjustUltrafiltrationConfirm (vMessage, vData); break;
+    case Gui::GuiActionType::ID_AdjustDurationRsp               : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustDurationRsp       , Model::MAdjustDurationResponse       ); break;
+    case Gui::GuiActionType::ID_AdjustBloodDialysateRsp         : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustBloodDialysateRsp , Model::MAdjustBloodDialysateResponse ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq   : ok = adjustUltrafiltrationState   (vMessage, vData); break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
 
     // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.
@@ -337,25 +339,25 @@
 bool MessageInterpreter::interpretMessage_DG(const Message &vMessage, QVariantList &vData)
 {
     bool    ok = false;
-    QString mSenderID = "DG,";
     vData.clear();
-
     switch (vMessage.actionId) { // notice we are in receive mode
     case Gui::GuiActionType::ID_DGCheckIn:
         ok = true;
-        LOG_EVENT(mSenderID + QString("DG,CheckIn," + QVariant(vData).toStringList().join(',')));
+        LOG_EVENT(QString("DG,CheckIn," + QVariant(vData).toStringList().join(',')));
         break;
 
-    case Gui::GuiActionType::ID_DGROPumpData           : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGROPumpData           , Model::MDGROPump             ); break;
-    case Gui::GuiActionType::ID_DGPressuresData        : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGPressuresData        , Model::MDGPressures          ); break;
-    case Gui::GuiActionType::ID_DGDrainPumpData        : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGDrainPumpData        , Model::MDGDrainPump          ); break;
-    case Gui::GuiActionType::ID_DGOperationModeData    : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGOperationModeData    , Model::MDGOperationMode      ); break;
-    case Gui::GuiActionType::ID_DGReservoirData        : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGReservoirData        , Model::MDGReservoir          ); break;
-    case Gui::GuiActionType::ID_DGValvesStatesData     : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGValvesStatesData     , Model::MDGValvesStates       ); break;
-    case Gui::GuiActionType::ID_DGHeatersData          : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGHeatersData          , Model::MDGHeaters            ); break;
-    case Gui::GuiActionType::ID_DGLoadCellReadingsData : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGLoadCellReadingsData , Model::MDGLoadCellReadings   ); break;
-    case Gui::GuiActionType::ID_DGTemperaturesData     : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGTemperaturesData     , Model::MDGTemperatures       ); break;
+    case Gui::GuiActionType::ID_DGROPumpData            : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGROPumpData           , Model::MDGROPump             ); break;
+    case Gui::GuiActionType::ID_DGPressuresData         : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGPressuresData        , Model::MDGPressures          ); break;
+    case Gui::GuiActionType::ID_DGDrainPumpData         : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGDrainPumpData        , Model::MDGDrainPump          ); break;
+    case Gui::GuiActionType::ID_DGOperationModeData     : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGOperationModeData    , Model::MDGOperationMode      ); break;
+    case Gui::GuiActionType::ID_DGReservoirData         : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGReservoirData        , Model::MDGReservoir          ); break;
+    case Gui::GuiActionType::ID_DGValvesStatesData      : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGValvesStatesData     , Model::MDGValvesStates       ); break;
+    case Gui::GuiActionType::ID_DGHeatersData           : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGHeatersData          , Model::MDGHeaters            ); break;
+    case Gui::GuiActionType::ID_DGLoadCellReadingsData  : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGLoadCellReadingsData , Model::MDGLoadCellReadings   ); break;
+    case Gui::GuiActionType::ID_DGTemperaturesData      : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGTemperaturesData     , Model::MDGTemperatures       ); break;
 
+    case Gui::GuiActionType::ID_DGDebugText             : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGDebugText            , Model::MDGDebugText          ); break;
+
     // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.
     default                                     :
@@ -401,31 +403,6 @@
 // ---------- ---------- ---------- ---------- ---------- - HD   ---------- ---------- ---------- ---------- ---------- //
 
 /*!
- * \brief   MessageInterpreter::powerOff
- * \details This method interprets Power Off message data
- *          in vMessage of type Message.
- * \param   vMessage    - The vMessage of type Message which contains all the data,
- *                        require to be interpreted.
- * \param   vData       - Power Off data
- * \return  true if the data can be extracted as defined for Power Off Message ID
- */
-bool MessageInterpreter::powerOff(const Message &vMessage, QVariantList &vData)
-{
-    // TODO : review other methods
-    bool ok = false;
-    if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_PowerOff) ) return ok;
-
-    Model::MPowerOff mData;
-    ok = mData.fromByteArray(vMessage.data);
-    LOG_EVENT("HD," + mData.toString());
-
-    mData.toVariantList(vData);
-    emit didActionReceive(mData.data());
-
-    return ok;
-}
-
-/*!
  * \brief   MessageInterpreter::alarmStatus
  * \details This method interprets Alarm Status message data
  *          in vMessage of type Message.