SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

merge

Browse Source
This commit is contained in:
unknown
2020-03-04 19:53:18 +01:00
parent a8daa51413 9d9bdc192f
commit e2f7d72cb3
3 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
_FIRMWARE/firmwares/Shelly1/Shelly1_v2/Shelly1_v2/Shelly1_v2.ino
View File

@@ -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();
}
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;
}
}