diff --git a/Upgrade.ino b/Upgrade.ino index 17cb8875..e74c5a53 100644 --- a/Upgrade.ino +++ b/Upgrade.ino @@ -5,11 +5,12 @@ void initUpgrade() { new_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt"); #endif #ifdef ESP8266 - new_version = getURL("http://91.204.228.124:1100/update/esp8266/version.txt"); + //new_version = getURL("http://91.204.228.124:1100/update/esp8266/version.txt"); #endif - Serial.println(new_version); - + Serial.println("[i] Last firmware version: "); + Serial.print(new_version); + String tmp = "{}"; if (new_version != "error") { @@ -81,7 +82,7 @@ void upgrade_firmware() { void handle_upgrade() { if (upgrade_flag) { upgrade_flag = false; - upgrade_firmware(); + upgrade_firmware(); } } diff --git a/data/config-all.json b/data/config-all.json deleted file mode 100644 index 0479064d..00000000 --- a/data/config-all.json +++ /dev/null @@ -1 +0,0 @@ -{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"your_ssid","password":"your_pass","timezone":3,"mqttServer":"","mqttPort":0,"mqttUser":"","mqttPass":"","scenario":"1","timers":"0","pushingbox_id":"","web_login":"admin","web_pass":"admin"} \ No newline at end of file diff --git a/data/config-my.json b/data/config-my.json new file mode 100644 index 00000000..ae16f518 --- /dev/null +++ b/data/config-my.json @@ -0,0 +1 @@ +{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"rise","password":"hostel3333","timezone":3,"mqttServer":"m12.cloudmqtt.com","mqttPort":14053,"mqttUser":"lbscvzuj","mqttPass":"bLxlveOgaF8F","scenario":"1","timers":"0","pushingbox_id":"v7C133E426B0C69E","web_login":"admin","web_pass":"admin"} \ No newline at end of file diff --git a/data/config.json b/data/config.json index ae16f518..0479064d 100644 --- a/data/config.json +++ b/data/config.json @@ -1 +1 @@ -{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"rise","password":"hostel3333","timezone":3,"mqttServer":"m12.cloudmqtt.com","mqttPort":14053,"mqttUser":"lbscvzuj","mqttPass":"bLxlveOgaF8F","scenario":"1","timers":"0","pushingbox_id":"v7C133E426B0C69E","web_login":"admin","web_pass":"admin"} \ No newline at end of file +{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"your_ssid","password":"your_pass","timezone":3,"mqttServer":"","mqttPort":0,"mqttUser":"","mqttPass":"","scenario":"1","timers":"0","pushingbox_id":"","web_login":"admin","web_pass":"admin"} \ No newline at end of file diff --git a/esp32-esp8266_iot-manager_modules_firmware.ino b/esp32-esp8266_iot-manager_modules_firmware.ino index ad38568b..467f8fa6 100644 --- a/esp32-esp8266_iot-manager_modules_firmware.ino +++ b/esp32-esp8266_iot-manager_modules_firmware.ino @@ -60,6 +60,16 @@ void setup() { getMemoryLoad("[i] After loading"); +#ifdef ESP8266 + new_version = getURL("http://91.204.228.124:1100/update/esp8266/version.txt"); +#endif +#ifdef ESP32 + new_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt"); +#endif + + Serial.print("[i] Last firmware version: "); + Serial.println(new_version); + ts.add(TEST, 14400, [&](void*) { statistics();