merge

_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino

@@ -70,6 +70,10 @@ void loop() {
       ESP.restart();
     }
     if (buttonActive) {
+<<<<<<< HEAD
+=======
+      realState = !state;
+>>>>>>> 9d9bdc192f48b909e5406167be3e532d9b5d07e5
       jsonContent = {};
       jsonContent["token"] = apiToken;
       requestJson = "";
@@ -79,8 +83,9 @@ void loop() {
       EEPROM.commit();
       sendDataToWeb();
       buttonActive = false;
-    }
+    } else {
       loadDataFromWeb();
+    }
   } else {
     server.handleClient();
   }
@@ -108,6 +113,7 @@ bool wifiVerify(int t) {
 }
 
 void loadDataFromWeb() {
+  delay(500);
   jsonContent = {};
   jsonContent["token"] = apiToken;
   requestJson = "";
@@ -137,6 +143,7 @@ void loadDataFromWeb() {
   }
 
   WiFi.hostname(hostName);
+<<<<<<< HEAD
   Serial.println("state: " + (String)state;
   if (!buttonActive) {
     if (state == 1) {
@@ -146,7 +153,16 @@ void loadDataFromWeb() {
     }
     digitalWrite(RELAY, state);
     EEPROM.write(0, state);
+=======
+  Serial.println("state: " + (String)state + ", realState: " + (String)realState);
+  if (state != realState && !buttonActive) {
+    realState = state;
+    digitalWrite(RELAY, realState);
+    EEPROM.write(0, realState);
+>>>>>>> 9d9bdc192f48b909e5406167be3e532d9b5d07e5
     EEPROM.commit();
+  } else {
+    state = realState;
   }
 }
 

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);