From c7e907451040b8a049248231869e86159bac0b49 Mon Sep 17 00:00:00 2001
From: Ly Minh Phuong <ly.minh.phuong.1403@gmail.com>
Date: Sat, 21 Jan 2017 21:03:47 +0700
Subject: [PATCH] Enable revert state mode

---
 code/espurna/config/general.h   |   1 +
 code/espurna/data/index.html.gz | Bin 3969 -> 3977 bytes
 code/espurna/relay.ino          |  13 +++++++++++--
 code/html/index.html            |   1 +
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index 3d78446c..4d0e3b5a 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -14,6 +14,7 @@
 #define RELAY_MODE_OFF          0
 #define RELAY_MODE_ON           1
 #define RELAY_MODE_SAME         2
+#define RELAY_MODE_TOOGLE       3
 
 #define RELAY_SYNC_ANY          0
 #define RELAY_SYNC_NONE_OR_ONE  1
diff --git a/code/espurna/data/index.html.gz b/code/espurna/data/index.html.gz
index ef0a84a58a090b4305112cce31ed0ec9ccc410ca..4e3c56dc534d1012e5d9f9fe9ba9331624931a54 100644
GIT binary patch
delta 1880
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
S4P4OQ>H0sW5?rpmO8@|UFNmQ4

delta 1902
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

diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino
index 68a5c760..bb3149f3 100644
--- a/code/espurna/relay.ino
+++ b/code/espurna/relay.ino
@@ -212,14 +212,17 @@ void relaySave() {
     EEPROM.commit();
 }
 
-void relayRetrieve() {
+void relayRetrieve(bool invert) {
     recursive = true;
     unsigned char bit = 1;
-    unsigned char mask = EEPROM.read(0);
+    unsigned char mask = invert ? ~EEPROM.read(0) : EEPROM.read(0);
     for (unsigned int i=0; i < _relays.size(); i++) {
         relayStatus(i, ((mask & bit) == bit));
         bit += bit;
     }
+    if (invert) {
+      relaySave();
+    }
     recursive = false;
 }
 
@@ -454,7 +457,13 @@ 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();
diff --git a/code/html/index.html b/code/html/index.html
index 51556ae8..9e2448f7 100644
--- a/code/html/index.html
+++ b/code/html/index.html
@@ -201,6 +201,7 @@
                                             <option value="0">Always OFF</a>
                                             <option value="1">Always ON</a>
                                             <option value="2">Same as before</a>
+                                            <option value="3">Toogle before</a>
                                         </select>
                                     </div>
                                     <div class="pure-u-0 pure-u-md-1-4">&nbsp;</div>