mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-28 23:22:19 +03:00
Compare commits
2 Commits
2.2_esp32
...
2.3_esp826
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
60e2ada31a | ||
|
|
0064e557f1 |
@@ -5,10 +5,11 @@ void initUpgrade() {
|
|||||||
new_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt");
|
new_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt");
|
||||||
#endif
|
#endif
|
||||||
#ifdef ESP8266
|
#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
|
#endif
|
||||||
|
|
||||||
Serial.println(new_version);
|
Serial.println("[i] Last firmware version: ");
|
||||||
|
Serial.print(new_version);
|
||||||
|
|
||||||
String tmp = "{}";
|
String tmp = "{}";
|
||||||
|
|
||||||
|
|||||||
@@ -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"}
|
|
||||||
1
data/config-my.json
Normal file
1
data/config-my.json
Normal file
@@ -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"}
|
||||||
@@ -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"}
|
{"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"}
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "h4",
|
"type": "h4",
|
||||||
"title": "SPIFFS version: 2.2"
|
"title": "SPIFFS version: 2.3"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "link",
|
"type": "link",
|
||||||
|
|||||||
@@ -60,7 +60,17 @@ void setup() {
|
|||||||
|
|
||||||
getMemoryLoad("[i] After loading");
|
getMemoryLoad("[i] After loading");
|
||||||
|
|
||||||
ts.add(TEST, 14400, [&](void*) {
|
#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, statistics_update, [&](void*) {
|
||||||
|
|
||||||
statistics();
|
statistics();
|
||||||
|
|
||||||
|
|||||||
3
set.h
3
set.h
@@ -1,4 +1,4 @@
|
|||||||
String firmware_version = "2.2";
|
String firmware_version = "2.3";
|
||||||
String new_version;
|
String new_version;
|
||||||
|
|
||||||
|
|
||||||
@@ -24,6 +24,7 @@ String new_version;
|
|||||||
#define dhtT_update_int 10000
|
#define dhtT_update_int 10000
|
||||||
#define dhtH_update_int 10000
|
#define dhtH_update_int 10000
|
||||||
#define dht_calculation_update_int 10000
|
#define dht_calculation_update_int 10000
|
||||||
|
#define statistics_update 1000 * 60 * 60 * 12
|
||||||
//-----------------------------------------------------------------
|
//-----------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user