Browse Source

Merge branch 'revert-state' of https://bitbucket.org/phuonglm/espurna into revert-state

Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/relay.ino
fastled
Xose Pérez 7 years ago
parent
commit
d140d45438
1 changed files with 0 additions and 5 deletions
  1. +0
    -5
      code/espurna/relay.ino

+ 0
- 5
code/espurna/relay.ino View File

@ -457,13 +457,8 @@ void relaySetup() {
if (relayMode == RELAY_MODE_OFF) relayStatus(i, false);
if (relayMode == RELAY_MODE_ON) relayStatus(i, true);
}
<<<<<<< HEAD
if (relayMode == RELAY_MODE_SAME) relayRetrieve();
=======
if (relayMode == RELAY_MODE_SAME) relayRetrieve(false);
if (relayMode == RELAY_MODE_TOOGLE) relayRetrieve(true);
>>>>>>> Enable revert state mode
relaySetupAPI();
relaySetupMQTT();


Loading…
Cancel
Save