Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rd862dfcd402206e33b314c458e41c13b684a4565
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision d862dfcd402206e33b314c458e41c13b684a4565)
@@ -461,15 +461,15 @@
 
     // ----- Settings
     case Gui::GuiActionType::ID_AdjustServiceModeRsp                : ok = notify<Model::MAdjustServiceModeResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceModeRsp              ); break;
-    case Gui::GuiActionType::ID_AdjustVersionsHDReq                 : ok = notify<Model::MAdjustVersionsHDRequest                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDReq               ); break;
-    case Gui::GuiActionType::ID_AdjustVersionsHDRsp                 : ok = notify<Model::MAdjustVersionsHDResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDRsp               ); break;
-    case Gui::GuiActionType::ID_AdjustSerialHDRsp                   : ok = notify<Model::MAdjustSerialNumberHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp                 ); break;
+    case Gui::GuiActionType::ID_AdjustVersionsTDReq                 : ok = notify<Model::MAdjustVersionsTDRequest                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDReq               ); break;
+    case Gui::GuiActionType::ID_AdjustVersionsTDRsp                 : ok = notify<Model::MAdjustVersionsTDResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDRsp               ); break;
+    case Gui::GuiActionType::ID_AdjustSerialTDRsp                   : ok = notify<Model::MAdjustSerialNumberTDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialTDRsp                 ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp             : ok = notify<Model::MAdjustServiceDatesHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp           ); break;
     case Gui::GuiActionType::ID_AdjustHDDateTimeRsp                 : ok = notify<Model::MAdjustHDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp               ); break;
     case Gui::GuiActionType::ID_HDUsageInfoRsp                      : ok = notify<Model::MHDUsageInfoResponse                       >(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp                    ); break;
     case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp        : ok = notify<Model::MAdjustInstitutionalRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp      ); break;
     // ----- States
-    case Gui::GuiActionType::ID_HDOperationModeData                 : ok = notify<Model::MHDOperationMode                           >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData               ); break;
+    case Gui::GuiActionType::ID_TDOpModeData                        : ok = notify<Model::MTDOpMode                                  >(vMessage, vData, Gui::GuiActionType::ID_TDOpModeData                      ); break;
     case Gui::GuiActionType::ID_PreTreatmentStates                  : ok = notify<Model::MPreTreatmentStates                        >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates                ); break;
     case Gui::GuiActionType::ID_TreatmentStates                     : ok = notify<Model::MTreatmentStates                           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates                   ); break;
     case Gui::GuiActionType::ID_PostTreatmentStates                 : ok = notify<Model::MPostTreatmentStates                       >(vMessage, vData, Gui::GuiActionType::ID_PostTreatmentStates               ); break;
@@ -478,7 +478,14 @@
     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_HDAirBubbleData                     : ok = notify<Model::MHDAirBubbleData                           >(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData                   ); break;
-    case Gui::GuiActionType::ID_HDAirTrapData                       : ok = notify<Model::MHDAirTrapData                             >(vMessage, vData, Gui::GuiActionType::ID_HDAirTrapData                     ); break;
+    case Gui::GuiActionType::ID_TDVoltageData                       : ok = notify<Model::MTDVoltageData                             >(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData                     ); break;
+    case Gui::GuiActionType::ID_TDAirTrapData                       : ok = notify<Model::MTDAirTrapData                             >(vMessage, vData, Gui::GuiActionType::ID_TDAirTrapData                     ); break;
+    case Gui::GuiActionType::ID_TDBloodPumpData                     : ok = notify<Model::MTDBloodPumpData                           >(vMessage, vData, Gui::GuiActionType::ID_TDBloodPumpData                   ); break;
+    case Gui::GuiActionType::ID_TDValvesData                        : ok = notify<Model::MTDValvesData                              >(vMessage, vData, Gui::GuiActionType::ID_TDValvesData                      ); break;
+    case Gui::GuiActionType::ID_TDBatteryData                       : ok = notify<Model::MTDBatteryData                             >(vMessage, vData, Gui::GuiActionType::ID_TDBatteryData                     ); break;
+    case Gui::GuiActionType::ID_TDSwitchesData                      : ok = notify<Model::MTDSwitchesData                            >(vMessage, vData, Gui::GuiActionType::ID_TDSwitchesData                    ); break;
+    case Gui::GuiActionType::ID_TDEjectorData                       : ok = notify<Model::MTDEjectorData                             >(vMessage, vData, Gui::GuiActionType::ID_TDEjectorData                     ); break;
+    case Gui::GuiActionType::ID_TDTemperatureData                   : ok = notify<Model::MTDTemperatureData                         >(vMessage, vData, Gui::GuiActionType::ID_TDTemperatureData                 ); break;
     case Gui::GuiActionType::ID_HDBloodLeakData                     : ok = notify<Model::MHDBloodLeakData                           >(vMessage, vData, Gui::GuiActionType::ID_HDBloodLeakData                   ); break;
 
     // ----- Datum - Treatment
@@ -572,7 +579,7 @@
     vData.clear();
     switch (vMessage.actionId) { // notice we are in receive mode
     case Gui::GuiActionType::ID_Acknow                      : ok = true;                                                                    /* TODO : implement notify<>() */              break;
-        LOG_APPED(QString("DG,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      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;
@@ -594,8 +601,8 @@
     // ----- 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_AdjustVersionsDGRsp         : ok = notify<Model::MAdjustVersionsDGResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp           ); break;
-    case Gui::GuiActionType::ID_AdjustSerialDGRsp           : ok = notify<Model::MAdjustSerialNumberDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDGRsp             ); 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;
     case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp     : ok = notify<Model::MAdjustServiceDatesDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp       ); break;
     case Gui::GuiActionType::ID_AdjustDGDateTimeRsp         : ok = notify<Model::MAdjustDGDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp           ); break;
     case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp    : ok = notify<Model::MAdjustDGCleaningUsageResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp      ); break;
@@ -717,24 +724,25 @@
  */
 bool MessageInterpreter::logUnhandledMessage(const Message &vMessage) const {
     bool ok = false;
-    quint16 id = vMessage.actionId;
-    QString logString = QString("%1,").arg(id,4,16);
-    if (_messageList.contains(id)) {
+    quint16 msg_id = vMessage.actionId;
+    QString logString = QString("%1,").arg(msg_id,4,16);
+    QString can_id;
+    QString item = "<undefined>";
+
+    identifySource(vMessage.can_id, &can_id);   // Message Can Channel.
+    logString += can_id + ",";
+    // qDebug() << __FUNCTION__ << logString;
+
+    if (_messageList.contains(msg_id)) {
         ok = true;
-        QStringList items = _messageList[id];
+        QStringList items = _messageList[msg_id];
         int index = 0;
         for ( int i = 0; i < items.count(); i++ ) {
-            QString item = items[i];
-            if (i == 0) {
-                QString ID;
-                switch (identifySource(vMessage.can_id, &ID)) {
-                case Can_Source::eCan_TD: logString += ID + ",~" + item; break;
-                case Can_Source::eCan_DD: logString += ID + ",~" + item; break;
-                case Can_Source::eCan_DI: logString += ID + ",~" + item; break;
-                default                 : logString += ID + ",~" + item; break;
-                }
+            item = items[i];
+            if (i == 0) {   // Message Name/Identifier
+                logString += "~" + item;
             }
-            else {
+            else {          // Message payload data
                 if ( item == "F32" ) {
                     Types::F32 param;
                     if (! GetValue(vMessage.data, index, param ))   logString += ",?";
@@ -777,12 +785,12 @@
                 }
             }
         }
-        LOG_APPED(logString);
     }
     else {
         if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return.
-            LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16));
+            LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(msg_id, 0, 16));
         }
     }
+    LOG_APPED(logString + item);
     return ok;
 }