Index: sources/canbus/messagedispatcher.cpp
===================================================================
diff -u -r1732e83d2a0308b9c706f37d6d7724a364bbff2a -r460df093c4475816fc25d6b4c3ebfc50424ccca3
--- sources/canbus/messagedispatcher.cpp	(.../messagedispatcher.cpp)	(revision 1732e83d2a0308b9c706f37d6d7724a364bbff2a)
+++ sources/canbus/messagedispatcher.cpp	(.../messagedispatcher.cpp)	(revision 460df093c4475816fc25d6b4c3ebfc50424ccca3)
@@ -61,7 +61,7 @@
 
 void MessageDispatcher::keepAlive()
 {
-#ifndef QT_DEBUG
+#ifndef DISABLE_KEEP_ALIVE
     QVariantList mData;
     mData += static_cast<quint8>(GuiActionData::NoData);
     actionTransmit(GuiActionType::KeepAlive, mData);
@@ -75,29 +75,13 @@
         _messageList[vCanId].append(Message());
     }
 
-
     // build the message
-    if (! _builder.buildMessage(vPayload, _messageList[vCanId].last())) {
-        // Test
-        for (const auto &key : _messageList.keys()) {
-            for (const auto &item : _messageList[key]) {
-                qDebug() << "item :" << key << item.actionId << item.data;
-            }
-        }
-        qDebug() << "";
+    if (! _builder.buildMessage(vPayload, _messageList[vCanId].last(), vCanId)) {
         _messageList[vCanId].removeLast();
         return;
     }
     Message mMessage = _messageList[vCanId].last();
 
-    // Test
-    for (const auto &key : _messageList.keys()) {
-        for (const auto &item : _messageList[key]) {
-            qDebug() << "item :" << key << item.actionId << item.data;
-        }
-    }
-    qDebug() << "";
-
     // TODO : must be moved to a MessageModel class
     if (mMessage.isComplete()) {
         GuiActionType mActionId;
@@ -117,7 +101,7 @@
 void MessageDispatcher::actionTransmit(GuiActionType vActionId, const QVariantList &vData)
 {
     QByteArray mData;
-    if (! _interpreter.interpretAction(vActionId, vData, mData)) {
+    if (! _interpreter.interpretMessage(vActionId, vData, mData)) {
         qDebug() << "Error :" << "Incorrect Message";
         return;
     }