Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rc84fa6f5db06b04deaa6d46d04ee653abfd987b8 -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c84fa6f5db06b04deaa6d46d04ee653abfd987b8) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) @@ -334,7 +334,6 @@ {Gui::GuiActionType::ID_DuetRoWaterModeUIi , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 3 * 4 }, // 3 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, {Gui::GuiActionType::ID_RawData , 255 }, {Gui::GuiActionType::ID_Acknow , 0 }, {Gui::GuiActionType::ID_AcknowGeneric , 1 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -re07cde120d7476c4add90c4f86cf55af9ea830de -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e07cde120d7476c4add90c4f86cf55af9ea830de) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) @@ -455,7 +455,6 @@ vData.clear(); 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_TDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDDebugText ); break; case Gui::GuiActionType::ID_HDGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDGeneralEvent ); break; @@ -714,34 +713,6 @@ } // ---------- ---------- Message handlers ---------- ---------- // - -// ---------- ---------- ---------- ---------- ---------- Debug ---------- ---------- ---------- ---------- ---------- // -/*! - * \brief MessageInterpreter::canbusFaultCountData - * \details This method interprets Fault Count message data - * in vMessage of type Message. This message is only used for debugging purposes. - * \param vMessage - The vMessage of type Message which contains all the data, - * require to be interpreted. - * \param vData - Fault Count data - * \return true if the data can be extracted as defined for Fault Count Message ID - */ -bool MessageInterpreter::canbusFaultCountData(const Message &vMessage, QVariantList &vData) -{ - // TODO : review other methods - bool ok = false; - if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_CANBusFaultCount) ) return ok; - - QVariantList mData; - int index = 0; - Types::U32 mCanBUSFaultCount; - ok = GetValue(vMessage.data, index, mCanBUSFaultCount); - // developer safety if for any reason length of CanBUSFaultCount set to 0 - if (ok) { - vData += mCanBUSFaultCount.value; - } - return ok; -} - // ---------- ---------- ---------- ---------- ---------- Adjustments ---------- ---------- ---------- ---------- ---------- // /*! * \brief MessageInterpreter::updateUnhandledMessages Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc84fa6f5db06b04deaa6d46d04ee653abfd987b8 -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c84fa6f5db06b04deaa6d46d04ee653abfd987b8) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) @@ -62,7 +62,6 @@ enum GuiActionsType_Enum /* : quint16 QML does not support enum types */ { ID_Unknown = 0x0000, - ID_CANBusFaultCount = 0x9909, ID_RawData = 0xFFFE, Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r707f492165e583964b1840c72f2d668b18525631 -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 707f492165e583964b1840c72f2d668b18525631) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) @@ -585,13 +585,4 @@ } } } - - Connections { target: _GuiView - function onDidActionReceive( vAction, vData ) { - // DEBUG: console.debug("onDidActionReceive", vAction, vData) - if (vAction === GuiActions.ID_CANBusFaultCount ) { - _canbusFaultCountText.count = vData[0] - } - } - } } Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml =================================================================== diff -u -r707f492165e583964b1840c72f2d668b18525631 -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e --- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision 707f492165e583964b1840c72f2d668b18525631) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) @@ -261,13 +261,4 @@ } } } - - Connections { target: _GuiView - function onDidActionReceive( vAction, vData ) { - // DEBUG: console.debug("onDidActionReceive", vAction, vData) - if (vAction === GuiActions.ID_CANBusFaultCount ) { - _canbusFaultCountText.count = vData[0] - } - } - } } Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r707f492165e583964b1840c72f2d668b18525631 -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 707f492165e583964b1840c72f2d668b18525631) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) @@ -409,13 +409,4 @@ } } } - - Connections { target: _GuiView - function onDidActionReceive( vAction, vData ) { - // DEBUG: console.debug("onDidActionReceive", vAction, vData) - if (vAction === GuiActions.ID_CANBusFaultCount ) { - _canbusFaultCountText.count = vData[0] - } - } - } }