From 9771da4fafb275c321366a20e3a2d2e6b87abc22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Sun, 9 Dec 2018 22:20:28 +0100 Subject: [PATCH] Support for mixed combination of dummy and real relays (#1305) --- code/espurna/relay.ino | 116 +++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 56 deletions(-) diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino index 64247afd..5901720a 100644 --- a/code/espurna/relay.ino +++ b/code/espurna/relay.ino @@ -88,32 +88,41 @@ void _relayProviderStatus(unsigned char id, bool status) { #if RELAY_PROVIDER == RELAY_PROVIDER_LIGHT - // If the number of relays matches the number of light channels - // assume each relay controls one channel. - // If the number of relays is the number of channels plus 1 - // assume the first one controls all the channels and - // the rest one channel each. - // Otherwise every relay controls all channels. - // TODO: this won't work with a mixed of dummy and real relays - // but this option is not allowed atm (YANGNI) - if (_relays.size() == lightChannels()) { - lightState(id, status); - lightState(true); - } else if (_relays.size() == (lightChannels() + 1u)) { - if (id == 0) { - lightState(status); + // Support for a mixed of dummy and real relays + // Reference: https://github.com/xoseperez/espurna/issues/1305 + if (DUMMY_RELAY_COUNT > id) { + + // If the number of dummy relays matches the number of light channels + // assume each relay controls one channel. + // If the number of dummy relays is the number of channels plus 1 + // assume the first one controls all the channels and + // the rest one channel each. + // Otherwise every dummy relay controls all channels. + if (DUMMY_RELAY_COUNT == lightChannels()) { + lightState(id, status); + lightState(true); + } else if (DUMMY_RELAY_COUNT == (lightChannels() + 1u)) { + if (id == 0) { + lightState(status); + } else { + lightState(id-1, status); + } } else { - lightState(id-1, status); + lightState(status); } - } else { - lightState(status); - } - lightUpdate(true, true); + lightUpdate(true, true); + return; + + } #endif - #if RELAY_PROVIDER == RELAY_PROVIDER_RELAY + #if (RELAY_PROVIDER == RELAY_PROVIDER_RELAY) || (RELAY_PROVIDER == RELAY_PROVIDER_LIGHT) + + // If this is a light, all dummy relays have already been processed above + // we reach here if the user has toggled a physical relay + if (_relays[id].type == RELAY_TYPE_NORMAL) { digitalWrite(_relays[id].pin, status); } else if (_relays[id].type == RELAY_TYPE_INVERSE) { @@ -131,6 +140,7 @@ void _relayProviderStatus(unsigned char id, bool status) { digitalWrite(_relays[id].pin, !pulse); if (GPIO_NONE != _relays[id].reset_pin) digitalWrite(_relays[id].reset_pin, !pulse); } + #endif } @@ -1001,43 +1011,37 @@ void _relayLoop() { void relaySetup() { - // Dummy relays for AI Light, Magic Home LED Controller, H801, - // Sonoff Dual and Sonoff RF Bridge - #if DUMMY_RELAY_COUNT > 0 - - // No delay_on or off for these devices to easily allow having more than - // 8 channels. This behaviour will be recovered with v2. - for (unsigned char i=0; i < DUMMY_RELAY_COUNT; i++) { - _relays.push_back((relay_t) {GPIO_NONE, RELAY_TYPE_NORMAL, 0, 0, 0}); - } - - #else - - #if RELAY1_PIN != GPIO_NONE - _relays.push_back((relay_t) { RELAY1_PIN, RELAY1_TYPE, RELAY1_RESET_PIN, RELAY1_DELAY_ON, RELAY1_DELAY_OFF }); - #endif - #if RELAY2_PIN != GPIO_NONE - _relays.push_back((relay_t) { RELAY2_PIN, RELAY2_TYPE, RELAY2_RESET_PIN, RELAY2_DELAY_ON, RELAY2_DELAY_OFF }); - #endif - #if RELAY3_PIN != GPIO_NONE - _relays.push_back((relay_t) { RELAY3_PIN, RELAY3_TYPE, RELAY3_RESET_PIN, RELAY3_DELAY_ON, RELAY3_DELAY_OFF }); - #endif - #if RELAY4_PIN != GPIO_NONE - _relays.push_back((relay_t) { RELAY4_PIN, RELAY4_TYPE, RELAY4_RESET_PIN, RELAY4_DELAY_ON, RELAY4_DELAY_OFF }); - #endif - #if RELAY5_PIN != GPIO_NONE - _relays.push_back((relay_t) { RELAY5_PIN, RELAY5_TYPE, RELAY5_RESET_PIN, RELAY5_DELAY_ON, RELAY5_DELAY_OFF }); - #endif - #if RELAY6_PIN != GPIO_NONE - _relays.push_back((relay_t) { RELAY6_PIN, RELAY6_TYPE, RELAY6_RESET_PIN, RELAY6_DELAY_ON, RELAY6_DELAY_OFF }); - #endif - #if RELAY7_PIN != GPIO_NONE - _relays.push_back((relay_t) { RELAY7_PIN, RELAY7_TYPE, RELAY7_RESET_PIN, RELAY7_DELAY_ON, RELAY7_DELAY_OFF }); - #endif - #if RELAY8_PIN != GPIO_NONE - _relays.push_back((relay_t) { RELAY8_PIN, RELAY8_TYPE, RELAY8_RESET_PIN, RELAY8_DELAY_ON, RELAY8_DELAY_OFF }); - #endif + // Dummy relays for AI Light, Magic Home LED Controller, H801, Sonoff Dual and Sonoff RF Bridge + // No delay_on or off for these devices to easily allow having more than + // 8 channels. This behaviour will be recovered with v2. + for (unsigned char i=0; i < DUMMY_RELAY_COUNT; i++) { + _relays.push_back((relay_t) {GPIO_NONE, RELAY_TYPE_NORMAL, 0, 0, 0}); + } + // Ad-hoc relays + #if RELAY1_PIN != GPIO_NONE + _relays.push_back((relay_t) { RELAY1_PIN, RELAY1_TYPE, RELAY1_RESET_PIN, RELAY1_DELAY_ON, RELAY1_DELAY_OFF }); + #endif + #if RELAY2_PIN != GPIO_NONE + _relays.push_back((relay_t) { RELAY2_PIN, RELAY2_TYPE, RELAY2_RESET_PIN, RELAY2_DELAY_ON, RELAY2_DELAY_OFF }); + #endif + #if RELAY3_PIN != GPIO_NONE + _relays.push_back((relay_t) { RELAY3_PIN, RELAY3_TYPE, RELAY3_RESET_PIN, RELAY3_DELAY_ON, RELAY3_DELAY_OFF }); + #endif + #if RELAY4_PIN != GPIO_NONE + _relays.push_back((relay_t) { RELAY4_PIN, RELAY4_TYPE, RELAY4_RESET_PIN, RELAY4_DELAY_ON, RELAY4_DELAY_OFF }); + #endif + #if RELAY5_PIN != GPIO_NONE + _relays.push_back((relay_t) { RELAY5_PIN, RELAY5_TYPE, RELAY5_RESET_PIN, RELAY5_DELAY_ON, RELAY5_DELAY_OFF }); + #endif + #if RELAY6_PIN != GPIO_NONE + _relays.push_back((relay_t) { RELAY6_PIN, RELAY6_TYPE, RELAY6_RESET_PIN, RELAY6_DELAY_ON, RELAY6_DELAY_OFF }); + #endif + #if RELAY7_PIN != GPIO_NONE + _relays.push_back((relay_t) { RELAY7_PIN, RELAY7_TYPE, RELAY7_RESET_PIN, RELAY7_DELAY_ON, RELAY7_DELAY_OFF }); + #endif + #if RELAY8_PIN != GPIO_NONE + _relays.push_back((relay_t) { RELAY8_PIN, RELAY8_TYPE, RELAY8_RESET_PIN, RELAY8_DELAY_ON, RELAY8_DELAY_OFF }); #endif _relayBackwards();