From 5aa43d4bf1c009c2008f0d50e11ce00e82a1ff40 Mon Sep 17 00:00:00 2001 From: Maxim Prokhorov Date: Mon, 16 Aug 2021 07:15:26 +0300 Subject: [PATCH] all: suppress -Wunused-function for serialization helpers --- code/espurna/button.cpp | 3 +++ code/espurna/led.cpp | 1 + code/espurna/relay.cpp | 20 ++++++++++++++++---- code/espurna/wifi.cpp | 2 ++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/code/espurna/button.cpp b/code/espurna/button.cpp index d65cdd8c..58f39a20 100644 --- a/code/espurna/button.cpp +++ b/code/espurna/button.cpp @@ -581,6 +581,7 @@ unsigned long longLongClickDelay(size_t index) { return internal::indexedThenGlobal("btnLLclkDel", index, build::longLongClickDelay(index)); } +[[gnu::unused]] unsigned long repeatDelay() { return getSetting("btnRepDel", build::repeatDelay()); } @@ -593,10 +594,12 @@ size_t relay(size_t index) { return getSetting({"btnRelay", index}, build::relay(index)); } +[[gnu::unused]] bool mqttSendAllEvents(size_t index) { return getSetting({"btnMqttSendAll", index}, build::mqttSendAllEvents(index)); } +[[gnu::unused]] bool mqttRetain(size_t index) { return getSetting({"btnMqttRetain", index}, build::mqttRetain(index)); } diff --git a/code/espurna/led.cpp b/code/espurna/led.cpp index d68fd039..23c2de20 100644 --- a/code/espurna/led.cpp +++ b/code/espurna/led.cpp @@ -353,6 +353,7 @@ String serialize(LedMode mode) { return String(static_cast(mode), 10); } +[[gnu::unused]] String serialize(const LedPattern& pattern) { String out; diff --git a/code/espurna/relay.cpp b/code/espurna/relay.cpp index 9f36146f..d949e79e 100644 --- a/code/espurna/relay.cpp +++ b/code/espurna/relay.cpp @@ -449,6 +449,11 @@ namespace relay { namespace { namespace settings { +size_t dummyCount() { + return getSetting("relayDummy", build::dummyCount()); +} + +[[gnu::unused]] String name(size_t index) { return getSetting({"relayName", index}); } @@ -532,18 +537,22 @@ int syncMode() { return getSetting("relaySync", build::syncMode()); } +[[gnu::unused]] String payloadOn() { return getSetting("relayPayloadOn", build::payloadOn()); } +[[gnu::unused]] String payloadOff() { return getSetting("relayPayloadOff", build::payloadOff()); } +[[gnu::unused]] String payloadToggle() { return getSetting("relayPayloadToggle", build::payloadToggle()); } +#if MQTT_SUPPORT String mqttTopicSub(size_t index) { return getSetting({"relayTopicSub", index}, build::mqttTopicSub(index)); } @@ -559,10 +568,7 @@ RelayMqttTopicMode mqttTopicMode(size_t index) { PayloadStatus mqttDisconnectionStatus(size_t index) { return getSetting({"relayMqttDisc", index}, build::mqttDisconnectionStatus(index)); } - -size_t dummyCount() { - return getSetting("relayDummy", build::dummyCount()); -} +#endif } // namespace settings } // namespace @@ -945,6 +951,7 @@ bool _relayTryParseId(const char* p, size_t& id) { return tryParseId(p, relayCount, id); } +[[gnu::unused]] bool _relayTryParseIdFromPath(const String& endpoint, size_t& id) { int next_slash { endpoint.lastIndexOf('/') }; if (next_slash < 0) { @@ -987,10 +994,12 @@ bool _relayHandlePayload(size_t id, const char* payload) { return false; } +[[gnu::unused]] bool _relayHandlePayload(size_t id, const String& payload) { return _relayHandlePayload(id, payload.c_str()); } +[[gnu::unused]] bool _relayHandlePulsePayload(size_t id, const char* payload) { unsigned long pulse = 1000 * atof(payload); if (!pulse) { @@ -1008,10 +1017,12 @@ bool _relayHandlePulsePayload(size_t id, const char* payload) { return true; } +[[gnu::unused]] bool _relayHandlePulsePayload(size_t id, const String& payload) { return _relayHandlePulsePayload(id, payload.c_str()); } +[[gnu::unused]] PayloadStatus _relayInvertStatus(PayloadStatus status) { switch (status) { case PayloadStatus::On: @@ -1026,6 +1037,7 @@ PayloadStatus _relayInvertStatus(PayloadStatus status) { return PayloadStatus::Unknown; } +[[gnu::unused]] PayloadStatus _relayPayloadStatus(size_t id) { if (id < _relays.size()) { return _relays[id].current_status diff --git a/code/espurna/wifi.cpp b/code/espurna/wifi.cpp index e2e05dbd..fa60e6bd 100644 --- a/code/espurna/wifi.cpp +++ b/code/espurna/wifi.cpp @@ -2194,6 +2194,7 @@ void onAction(uint32_t client_id, const char* action, JsonObject&) { namespace debug { +[[gnu::unused]] String event(wifi::Event value) { String out; @@ -2241,6 +2242,7 @@ String event(wifi::Event value) { return out; } +[[gnu::unused]] const char* state(wifi::State value) { switch (value) { case wifi::State::Boot: