Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2624ed8acc30847fb38816fb4ae6073518b091f9 -re0158a66406d2280faab420f9272c8326c00e744 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e0158a66406d2280faab420f9272c8326c00e744) @@ -335,7 +335,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 -r2624ed8acc30847fb38816fb4ae6073518b091f9 -re0158a66406d2280faab420f9272c8326c00e744 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e0158a66406d2280faab420f9272c8326c00e744) @@ -457,7 +457,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; @@ -718,34 +717,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/canbus/MessageInterpreter.h =================================================================== diff -u -rd53e02ed37354a7d81d713a2c56547b669604cc0 -re0158a66406d2280faab420f9272c8326c00e744 --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision d53e02ed37354a7d81d713a2c56547b669604cc0) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision e0158a66406d2280faab420f9272c8326c00e744) @@ -66,9 +66,6 @@ bool interpretMessage_DD (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool interpretMessage_FP (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ----- Debug - bool canbusFaultCountData (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ----- Adjustments template bool notify (const Message &vMessage, QVariantList &vData, Gui::GuiActionType vIdCheck) __attribute_warn_unused_result__; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2624ed8acc30847fb38816fb4ae6073518b091f9 -re0158a66406d2280faab420f9272c8326c00e744 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e0158a66406d2280faab420f9272c8326c00e744) @@ -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/pages/settings/SettingsStack.qml =================================================================== diff -u -r72550dbbd6db8eab40aad38956b32f99416600c8 -re0158a66406d2280faab420f9272c8326c00e744 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision e0158a66406d2280faab420f9272c8326c00e744) @@ -168,7 +168,7 @@ _GuiView.doQuitApplication() } else { - _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) +// _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) } } itemsText : _root.itemsText