Index: sources/canbus/messageinterpreter.cpp
===================================================================
diff -u -r772d48b0ccaa0d25b6ed48bba3a4b29dc73c5c16 -ra19862d191c2501faa4e8cde64804ef18b80c6b3
--- sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 772d48b0ccaa0d25b6ed48bba3a4b29dc73c5c16)
+++ sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision a19862d191c2501faa4e8cde64804ef18b80c6b3)
@@ -183,82 +183,90 @@
     vPayload.clear();
     int count = vData.length();
 
+    LOG_EVENT(QString("%0").arg(vActionId));
+
     switch (vActionId) { // notice we are in transmit mode
-    case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len
-        break; // No data, Just registered
+        case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len
+          break; // No data, Just registered
 
+        case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len
+        {
+            if ( count ) { // this message has a variable length
+                vPayload = Format::fromVariant(vData[0]);
+            }
+            LOG_EVENT(mSenderID + QString("CheckIn"));
+        } break;
 
-    case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len
-        if ( count ) { // this message has a variable length
-            vPayload = Format::fromVariant(vData[0]);
-        }
-        LOG_EVENT(mSenderID + QString("CheckIn"));
-        break;
+        case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
+        {
+            if ( count ) { // this message has a variable length
+                vPayload = Format::fromVariant(vData[0]);
+            }
+            LOG_EVENT(mSenderID + QString("RawData"));
 
-    case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
-        if ( count ) { // this message has a variable length
-            vPayload = Format::fromVariant(vData[0]);
-        }
-        LOG_EVENT(mSenderID + QString("RawData"));
-        break;
+        } break;
 
-    case Gui::GuiActionType::ID_PowerOff:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload += Format::fromVariant(vData);
-        LOG_EVENT(AdjustPowerOffRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_PowerOff:
+        {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload += Format::fromVariant(vData);
+            LOG_EVENT(AdjustPowerOffRequestData::toString(vData));
 
-    case Gui::GuiActionType::ID_AdjustBloodDialysateReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustBloodDialysateRequestData::toString(vData));
-        break;
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustDurationReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustDurationRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustBloodDialysateReq:
+        {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustBloodDialysateRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustUltrafiltrationStateRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustDurationReq:
+        {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustDurationRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustUltrafiltrationEditRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustUltrafiltrationStateRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustUltrafiltrationConfirmRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustUltrafiltrationEditRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AlarmSilenceReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AlarmSilenceRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustUltrafiltrationConfirmRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_CreateTreatmentReq: {
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        TreatmentParameters params;
-        params.fromVariantList(vData);
-        LOG_EVENT(params.toString());
-        break;
-    }
+        case Gui::GuiActionType::ID_AlarmSilenceReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AlarmSilenceRequestData::toString(vData));
+        } break;
 
-    default:
-        QString mActionIdHexString = Format::toHexString(vActionId);
-        LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
-        ok = false;
-        break;
+        case Gui::GuiActionType::ID_CreateTreatmentReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            TreatmentParameters params;
+            params.fromVariantList(vData);
+            LOG_EVENT("GOT HERE");
+            LOG_EVENT(params.toString());
+        } break;
 
+        default: {
+            QString mActionIdHexString = Format::toHexString(vActionId);
+            LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
+            ok = false;
+        } break;
+
     }
     return ok;
 }