From f3ec7476b2de51504a099c6fca57829a0c001054 Mon Sep 17 00:00:00 2001
From: Kotrba Filip <kotrba@ad.i.cz>
Date: Tue, 3 Mar 2020 20:03:06 +0100
Subject: [PATCH 1/4] little edit shelly

---
 .../Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino b/_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino
index 7ca1b3b..c6e464b 100644
--- a/_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino
+++ b/_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino
@@ -78,7 +78,6 @@ void loop() {
       ESP.restart();
     }
     if (buttonActive) {
-      delay (500);
       jsonContent = {};
       jsonContent["token"] = apiToken;
       requestJson = "";
@@ -88,8 +87,9 @@ void loop() {
       EEPROM.commit();
       sendDataToWeb();
       buttonActive = false;
+    } else {
+      loadDataFromWeb();
     }
-    loadDataFromWeb();
   } else {
     server.handleClient();
   }
@@ -117,6 +117,7 @@ bool wifiVerify(int t) {
 }
 
 void loadDataFromWeb() {
+  delay(500);
   jsonContent = {};
   jsonContent["token"] = apiToken;
   requestJson = "";
@@ -148,16 +149,12 @@ void loadDataFromWeb() {
   WiFi.hostname(hostName);
   Serial.println("state: " + (String)state + ", realState: " + (String)realState);
   if (state != realState && !buttonActive) {
-    if (state == 1 && realState == 0) {
-      Serial.println("ON state: " + (String)state + ", realState: " + (String)realState);
-      realState = 1;
-    } else {
-      Serial.println("OFF");
-      realState = 0;
-    }
+    realState = state;
     digitalWrite(RELAY, realState);
     EEPROM.write(0, realState);
     EEPROM.commit();
+  } else {
+    state = realState;
   }
 }
 

From 5d25eeccaf4977e72d8a0124b58051a0beb96d90 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Wed, 4 Mar 2020 15:27:49 +0100
Subject: [PATCH 2/4] Update Shelly1_v2.ino

Double switch fix
---
 _FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino b/_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino
index c6e464b..b9e6363 100644
--- a/_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino
+++ b/_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino
@@ -78,6 +78,7 @@ void loop() {
       ESP.restart();
     }
     if (buttonActive) {
+      realState = !state;
       jsonContent = {};
       jsonContent["token"] = apiToken;
       requestJson = "";

From eb62f02510e2d45a4982d5c897a97db381ec8235 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Wed, 4 Mar 2020 15:44:55 +0100
Subject: [PATCH 3/4] ESP Updater

---
 update.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 update.php

diff --git a/update.php b/update.php
new file mode 100644
index 0000000..a98cc62
--- /dev/null
+++ b/update.php
@@ -0,0 +1,47 @@
+<?PHP
+
+header('Content-type: text/plain; charset=utf8', true);
+
+function check_header($name, $value = false)
+{
+    if (!isset($_SERVER[$name])) {
+        return false;
+    }
+    if ($value && $_SERVER[$name] != $value) {
+        return false;
+    }
+    return true;
+}
+
+function sendFile($path)
+{
+    header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK', true, 200);
+    header('Content-Type: application/octet-stream', true);
+    header('Content-Disposition: attachment; filename=' . basename($path));
+    header('Content-Length: ' . filesize($path), true);
+    header('x-MD5: ' . md5_file($path), true);
+    readfile($path);
+}
+
+if (!check_header('HTTP_USER_AGENT', 'ESP8266-http-Update')) {
+    header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden', true, 403);
+    echo "only for ESP8266 updater!\n";
+    exit();
+}
+
+if (
+    !check_header('HTTP_X_ESP8266_STA_MAC') ||
+    !check_header('HTTP_X_ESP8266_AP_MAC') ||
+    !check_header('HTTP_X_ESP8266_FREE_SPACE') ||
+    !check_header('HTTP_X_ESP8266_SKETCH_SIZE') ||
+    !check_header('HTTP_X_ESP8266_SKETCH_MD5') ||
+    !check_header('HTTP_X_ESP8266_CHIP_SIZE') ||
+    !check_header('HTTP_X_ESP8266_SDK_VERSION')
+) {
+    header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden', true, 403);
+    echo "only for ESP8266 updater! (header)\n";
+    exit();
+}
+
+$localBinary = "./app/updater/" . $_SERVER['HTTP_X_ESP8266_STA_MAC'] . ".bin";
+sendFile($localBinary);
\ No newline at end of file

From 9d9bdc192f48b909e5406167be3e532d9b5d07e5 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Wed, 4 Mar 2020 15:45:31 +0100
Subject: [PATCH 4/4] Create .gitkeep

Git keep
---
 app/updater/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/updater/.gitkeep

diff --git a/app/updater/.gitkeep b/app/updater/.gitkeep
new file mode 100644
index 0000000..e69de29