From 4a87204e165040566e8a23307a39af78589d6f3d Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Fri, 23 Aug 2019 23:03:55 +0200
Subject: [PATCH] Sonoff basic, s20 firmware update

---
 .../{ESP_END_POINT.ino => Sonoff_Basic.ino}   |  0
 .../ESP_END_POINT.ino => Sonoff_S20.ino}      | 60 +++++++++----------
 api.php                                       | 20 +++----
 3 files changed, 37 insertions(+), 43 deletions(-)
 rename _FIRMWARE/firmwares/Sonoff_Basic/{ESP_END_POINT.ino => Sonoff_Basic.ino} (100%)
 rename _FIRMWARE/firmwares/Sonoff_S20/{ESP_END_POINT/ESP_END_POINT.ino => Sonoff_S20.ino} (64%)

diff --git a/_FIRMWARE/firmwares/Sonoff_Basic/ESP_END_POINT.ino b/_FIRMWARE/firmwares/Sonoff_Basic/Sonoff_Basic.ino
similarity index 100%
rename from _FIRMWARE/firmwares/Sonoff_Basic/ESP_END_POINT.ino
rename to _FIRMWARE/firmwares/Sonoff_Basic/Sonoff_Basic.ino
diff --git a/_FIRMWARE/firmwares/Sonoff_S20/ESP_END_POINT/ESP_END_POINT.ino b/_FIRMWARE/firmwares/Sonoff_S20/Sonoff_S20.ino
similarity index 64%
rename from _FIRMWARE/firmwares/Sonoff_S20/ESP_END_POINT/ESP_END_POINT.ino
rename to _FIRMWARE/firmwares/Sonoff_S20/Sonoff_S20.ino
index 3d5321b..5949108 100644
--- a/_FIRMWARE/firmwares/Sonoff_S20/ESP_END_POINT/ESP_END_POINT.ino
+++ b/_FIRMWARE/firmwares/Sonoff_S20/Sonoff_S20.ino
@@ -20,7 +20,7 @@ int reconectAtemptsMax = 10; //time to wait before restart
 void setup() {
     Serial.begin(9600);
     delay(10);
-  Serial.println('\n');
+    Serial.println('\n');
     Serial.println("HW: " + String(hwId));
     
     pinMode(SONOFF, OUTPUT);
@@ -32,31 +32,31 @@ void setup() {
     
     WiFi.begin(ssid, pasw);
     Serial.print("Connecting to ");
-  Serial.print(ssid); Serial.println(" ...");
-
-  int i = 0;
-  while (WiFi.status() != WL_CONNECTED) { // Wait for the Wi-Fi to connect
-    delay(1000);
-    Serial.print(++i); Serial.print(' ');
-  }
-
-  Serial.println('\n');
-  Serial.println("Connection established!");  
-  Serial.print("IP address:\t");
-  Serial.println(WiFi.localIP());   
+    Serial.print(ssid); Serial.println(" ...");
+    
+    int i = 0;
+    while (WiFi.status() != WL_CONNECTED) { // Wait for the Wi-Fi to connect
+        delay(1000);
+        Serial.print(++i); Serial.print(' ');
+    }
+    
+    Serial.println('\n');
+    Serial.println("Connection established!");  
+    Serial.print("IP address:\t");
+    Serial.println(WiFi.localIP());   
 }
 
 void loop() {
-    
-    Serial.println("CONECED");
-    bool buttonState = !digitalRead(SONOFF_BUT);
-    Serial.println("CONECED" + String(buttonState));
-
     StaticJsonDocument<200> jsonContent;
     jsonContent["token"] = hwId;
     
     if (!digitalRead(SONOFF_BUT)){
         jsonContent["values"]["on/off"]["value"] = (int) !lastState;
+        if (!lastState == 1) {
+            digitalWrite(SONOFF, HIGH)
+        } else if (!lastState == 0){
+            digitalWrite(SONOFF, LOW)
+        }
         while(!digitalRead(SONOFF_BUT)) {
             delay(100);
         }
@@ -65,7 +65,7 @@ void loop() {
     String requestJson = "";
     serializeJson(jsonContent, requestJson);
     Serial.println("JSON: " + requestJson);
-
+    
     HTTPClient http;
     http.begin(server);
     http.addHeader("Content-Type", "text/plain");  //Specify content-type header
@@ -77,24 +77,18 @@ void loop() {
     Serial.println("HTTP BODY: " + String(payload) + "");  //Print request response payload
     
     deserializeJson(jsonContent, payload);
-    
     String hostname = jsonContent["device"]["hostname"];
-    
+    int state = jsonContent["value"];
     WiFi.hostname(hostname);
     
-    int state = jsonContent["value"];
     if (state !=  lastState){
-      if (state == 1 && lastState == 0) {
-          Serial.println("ON");
-          digitalWrite(SONOFF, HIGH);   // Turn the LED on by making the voltage LOW
-          digitalWrite(SONOFF_LED, LOW);   // Turn the LED on by making the voltage LOW
-      } else {
-          Serial.println("OFF");
-          digitalWrite(SONOFF, LOW);   // Turn the LED on by making the voltage LOW
-          digitalWrite(SONOFF_LED, HIGH);   // Turn the LED on by making the voltage LOW
-      }
+        if (state == 1 && lastState == 0) {
+            Serial.println("ON");
+            digitalWrite(SONOFF, HIGH);   // Turn the LED on by making the voltage LOW
+        } else {
+            Serial.println("OFF");
+            digitalWrite(SONOFF, LOW);   // Turn the LED on by making the voltage LOW
+        }
     }
-    
     lastState = state;
-    delay(1000);
 }
diff --git a/api.php b/api.php
index b3ff8ca..30301ce 100644
--- a/api.php
+++ b/api.php
@@ -15,16 +15,16 @@ foreach (["class", "views"] as $dir) {
 Db::connect (DBHOST, DBUSER, DBPASS, DBNAME);
 
 //Filtrování IP adress
-if (DEBUGMOD != 1) {
-	if (!in_array($_SERVER['REMOTE_ADDR'], HOMEIP)) {
-		echo json_encode(array(
-			'state' => 'unsuccess',
-			'errorMSG' => "Using API from your IP insn´t alowed!",
-		));
-		header("HTTP/1.1 401 Unauthorized");
-		exit();
-	}
+/*if (DEBUGMOD != 1) {
+if (!in_array($_SERVER['REMOTE_ADDR'], HOMEIP)) {
+echo json_encode(array(
+'state' => 'unsuccess',
+'errorMSG' => "Using API from your IP insn´t alowed!",
+));
+header("HTTP/1.1 401 Unauthorized");
+exit();
 }
+}*/
 
 
 
@@ -41,7 +41,7 @@ if (isset($obj['user']) && $obj['user'] != ''){
 }
 
 //automationExecution
-AutomationManager::executeAll();
+//AutomationManager::executeAll();
 
 //Record Cleaning
 RecordManager::clean(RECORDTIMOUT);