From 61d8b2b51dd0b154c51d79d5dbd61b2131672ff5 Mon Sep 17 00:00:00 2001 From: zafrirron Date: Sat, 24 Mar 2018 11:04:58 +0300 Subject: [PATCH] The fix after proper rebase to avoide conflicts --- code/espurna/relay.ino | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino index 1829aa9e..7bdc3f86 100644 --- a/code/espurna/relay.ino +++ b/code/espurna/relay.ino @@ -824,10 +824,9 @@ void relaySetup() { // Dummy relays for AI Light, Magic Home LED Controller, H801, // Sonoff Dual and Sonoff RF Bridge #if DUMMY_RELAY_COUNT > 0 - + unsigned int _delay_on[8] = {RELAY1_DELAY_ON, RELAY2_DELAY_ON, RELAY3_DELAY_ON, RELAY4_DELAY_ON, RELAY5_DELAY_ON, RELAY6_DELAY_ON, RELAY7_DELAY_ON, RELAY8_DELAY_ON}; + unsigned int _delay_off[8] = {RELAY1_DELAY_OFF, RELAY2_DELAY_OFF, RELAY3_DELAY_OFF, RELAY4_DELAY_OFF, RELAY5_DELAY_OFF, RELAY6_DELAY_OFF, RELAY7_DELAY_OFF, RELAY8_DELAY_OFF}; for (unsigned char i=0; i < DUMMY_RELAY_COUNT; i++) { - unsigned int _delay_on[8] = {RELAY1_DELAY_ON, RELAY2_DELAY_ON, RELAY3_DELAY_ON, RELAY4_DELAY_ON, RELAY5_DELAY_ON, RELAY6_DELAY_ON, RELAY7_DELAY_ON, RELAY8_DELAY_ON}; - unsigned int _delay_off[8] = {RELAY1_DELAY_OFF, RELAY2_DELAY_OFF, RELAY3_DELAY_OFF, RELAY4_DELAY_OFF, RELAY5_DELAY_OFF, RELAY6_DELAY_OFF, RELAY7_DELAY_OFF, RELAY8_DELAY_OFF}; _relays.push_back((relay_t) {0, RELAY_TYPE_NORMAL,0,_delay_on[i], _delay_off[i]}); }