diff --git a/code/espurna/button.cpp b/code/espurna/button.cpp index 0df4983e..4826e7a5 100644 --- a/code/espurna/button.cpp +++ b/code/espurna/button.cpp @@ -658,6 +658,7 @@ unsigned long repeatDelay(size_t index) { return internal::indexedThenGlobal(keys::RepeatDelay, index, build::repeatDelay(index)); } +[[gnu::unused]] size_t relay(size_t index) { return getSetting({keys::Relay, index}, build::relay(index)); } diff --git a/code/espurna/domoticz.cpp b/code/espurna/domoticz.cpp index bce86d8d..40bcf9f9 100644 --- a/code/espurna/domoticz.cpp +++ b/code/espurna/domoticz.cpp @@ -317,7 +317,10 @@ void callback(unsigned int type, espurna::StringView topic, espurna::StringView } #endif +#if RELAY_SUPPORT espurna::domoticz::relay::status(idx, nvalue > 0); +#endif + return; } } @@ -344,6 +347,7 @@ void send(Idx idx, int nvalue, const char* svalue) { mqttSendRaw(settings::topicIn().c_str(), payload); } +[[gnu::unused]] void send(Idx idx, int nvalue) { send(idx, nvalue, ""); } @@ -458,12 +462,14 @@ void onConnected(JsonObject& root) { root[FPSTR(settings::keys::LightIdx)] = settings::lightIdx().value(); #endif +#if RELAY_SUPPORT const size_t Relays { relayCount() }; JsonArray& relays = root.createNestedArray(F("dczRelays")); for (size_t id = 0; id < Relays; ++id) { relays.add(settings::relayIdx(id).value()); } +#endif #if SENSOR_SUPPORT sensorWebSocketMagnitudes(root, PSTR("dcz"), [](JsonArray& out, size_t index) { diff --git a/code/espurna/led.cpp b/code/espurna/led.cpp index a3fff6ba..539217ce 100644 --- a/code/espurna/led.cpp +++ b/code/espurna/led.cpp @@ -543,10 +543,14 @@ LedMode mode(size_t id) { return getSetting({keys::Mode, id}, build::mode(id)); } +#if RELAY_SUPPORT + size_t relay(size_t id) { return getSetting({keys::Relay, id}, build::relay(id)); } +#endif + Pattern pattern(size_t id) { return Pattern(getSetting({keys::Pattern, id})); } @@ -602,7 +606,10 @@ String NAME (size_t id) {\ ID_VALUE(pin) ID_VALUE(inverse) ID_VALUE(mode) + +#if RELAY_SUPPORT ID_VALUE(relay) +#endif #undef ID_VALUE diff --git a/code/espurna/thingspeak.cpp b/code/espurna/thingspeak.cpp index 0ce6a6b9..82de1ba1 100644 --- a/code/espurna/thingspeak.cpp +++ b/code/espurna/thingspeak.cpp @@ -704,10 +704,12 @@ void onConnected(JsonObject& root) { root[FPSTR(settings::keys::ClearCache)] = settings::clearCache(); root[FPSTR(settings::keys::Address)] = settings::address(); +#if RELAY_SUPPORT JsonArray& relays = root.createNestedArray(F("tspkRelays")); for (size_t i = 0; i < relayCount(); ++i) { relays.add(settings::relay(i)); } +#endif #if SENSOR_SUPPORT sensorWebSocketMagnitudes(root, Prefix, [](JsonArray& out, size_t index) {