Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) @@ -206,7 +206,7 @@ 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 + case Gui::GuiActionType::ID_TDCheckIn: // len: 255, can have any len if ( length ) { // this message has a variable length vPayload = Format::fromVariant(vData.first()); } @@ -215,13 +215,6 @@ } break; - case Gui::GuiActionType::ID_RawData: // len: 255, can have any len - if ( length ) { // this message has a variable length - vPayload = Format::fromVariant(vData.first()); - } - LOG_APPED_UI(QString("RawData")); - break; - // Generic Confirm case Gui::GuiActionType::ID_DuetConfirmUIr : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData ); break; // RO Water @@ -430,7 +423,7 @@ switch (vMessage.actionId) { // notice we are in receive mode // ----- Debug case Gui::GuiActionType::ID_CANBusFaultCount : ok = canbusFaultCountData (vMessage, vData); /* TODO : implement notify<>() */ break; - case Gui::GuiActionType::ID_HDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDDebugText ); break; + case Gui::GuiActionType::ID_TDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDDebugText ); break; case Gui::GuiActionType::ID_HDGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDGeneralEvent ); break; // ----- Events @@ -561,7 +554,6 @@ vData.clear(); switch (vMessage.actionId) { // notice we are in receive mode case Gui::GuiActionType::ID_Acknow : ok = true; /* TODO : implement notify<>() */ break; - case Gui::GuiActionType::ID_DGCheckIn : ok = true; /* TODO : implement notify<>() */ LOG_APPED(QString("DG,CheckIn," + QVariant(vData).toStringList().join(','))); break; // ----- POST case Gui::GuiActionType::ID_DGPostSingleResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData ); break; @@ -577,7 +569,7 @@ case Gui::GuiActionType::ID_DGHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGHeatersData ); break; case Gui::GuiActionType::ID_DGLoadCellReadingsData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData ); break; case Gui::GuiActionType::ID_DGTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData ); break; - case Gui::GuiActionType::ID_DGDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDebugText ); break; + case Gui::GuiActionType::ID_DDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDebugText ); break; case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; case Gui::GuiActionType::ID_DGConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGConductivityData ); break;