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

fix nodemcu

Browse Source
This commit is contained in:
Haitem 2020-03-16 17:08:47 +01:00
parent b5d48be64a
commit 8cacccbf88
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
_FIRMWARE/firmwares/NodeMCU Sensor/ESP_OS_NODE_V4/ESP_OS_NODE_V4/ESP_OS_NODE_V4.ino
View File

@ -24,6 +24,7 @@ const char* host2 = "dev.steelants.cz";
const char* url2 = "/vasek/home/update.php"; const char* url2 = "/vasek/home/update.php";
String content; String content;
String Logs;
bool conf = false; bool conf = false;
bool buttonActive = false; bool buttonActive = false;
int state = 0; int state = 0;
@ -31,7 +32,7 @@ String requestJson = "";
int unsuccessfulRounds = 0; //Unsucesful atmpt counter int unsuccessfulRounds = 0; //Unsucesful atmpt counter
ESP8266WebServer server(80); ESP8266WebServer server(80);
StaticJsonDocument<250> jsonContent; StaticJsonDocument<265> jsonContent;
DeserializationError error; DeserializationError error;
//Pins //Pins
@ -69,6 +70,7 @@ void setup() {
Serial.println(host2); Serial.println(host2);
client.setInsecure(); client.setInsecure();
if (!client.connect(host2, httpsPort)) { if (!client.connect(host2, httpsPort)) {
addLog("connection failed");
Serial.println("connection failed"); Serial.println("connection failed");
return; return;
} }
@ -76,6 +78,7 @@ void setup() {
if (client.verify(fingerprint, host2)) { if (client.verify(fingerprint, host2)) {
Serial.println("certificate matches"); Serial.println("certificate matches");
} else { } else {
addLog("certificate doesn't match");
Serial.println("certificate doesn't match"); Serial.println("certificate doesn't match");
return; return;
} }
@ -89,6 +92,7 @@ void setup() {
delay(500); delay(500);
switch(ret) { switch(ret) {
case HTTP_UPDATE_FAILED: case HTTP_UPDATE_FAILED:
addLog("HTTP_UPDATE_FAILD Error (" + (String)ESPhttpUpdate.getLastError() + ") : " + (String)ESPhttpUpdate.getLastErrorString().c_str());
Serial.printf("HTTP_UPDATE_FAILD Error (%d): %s", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str()); Serial.printf("HTTP_UPDATE_FAILD Error (%d): %s", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
Serial.println(); Serial.println();
Serial.println(); Serial.println();
@ -123,6 +127,7 @@ void setup() {
void loop() { void loop() {
if (conf) { if (conf) {
LogErrors();
if (unsuccessfulRounds >= 5) { if (unsuccessfulRounds >= 5) {
Serial.println("RESTARTING ESP"); Serial.println("RESTARTING ESP");
ESP.restart(); ESP.restart();
@ -173,6 +178,7 @@ bool wifiVerify(int t) {
void loadDataFromWeb() { void loadDataFromWeb() {
if (error.code() != DeserializationError::Ok) { if (error.code() != DeserializationError::Ok) {
addLog(error.c_str());
Serial.println(error.c_str()); Serial.println(error.c_str());
unsuccessfulRounds++; unsuccessfulRounds++;
Serial.println("UNSUCCESSFUL ROUND NUMBER " + String(unsuccessfulRounds) + "FROM 5"); Serial.println("UNSUCCESSFUL ROUND NUMBER " + String(unsuccessfulRounds) + "FROM 5");
@ -187,8 +193,10 @@ void loadDataFromWeb() {
String command = jsonContent["command"]; String command = jsonContent["command"];
if (command == "reset"){ if (command == "reset"){
command = "";
ESP.reset(); ESP.reset();
} else if (command == "config") { } else if (command == "config") {
command = "";
CleanEeprom(); CleanEeprom();
EEPROM.commit(); EEPROM.commit();
ESP.restart(); ESP.restart();
@ -242,6 +250,23 @@ String sendHttpRequest () {
return payload; return payload;
} }
void LogErrors() {
jsonContent = {};
error = deserializeJson(jsonContent, "{\"logs\":[" + Logs + "]}");
jsonContent["token"] = apiToken;
requestJson = "";
Logs = "";
sendDataToWeb();
}
void addLog(String logText) {
if (Logs == "") {
Logs = "\"" + logText + "\"";
} else {
Logs += ",\"" + logText + "\"";
}
}
void CleanEeprom() { void CleanEeprom() {
for (int i = 1; i < 100; ++i) { for (int i = 1; i < 100; ++i) {
EEPROM.write(i, 0); EEPROM.write(i, 0);