iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

some fix

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-03-18 09:57:46 +01:00
parent 5fcb68ac65
commit 857177b5b7
21 changed files with 491 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
esp32-esp8266_iot-manager_modules_firmware.ino
View File

@@ -8,6 +8,8 @@ void setup() {
//--------------------------------------------------------------
SPIFFS.begin();
configSetup = readFile("config.json", 4096);
configSetup.replace(" ", "");
configSetup.replace("\r\n", "");
Serial.println(configSetup);
jsonWrite(configJson, "SSDP", jsonRead(configSetup, "SSDP"));
jsonWrite(configJson, "lang", jsonRead(configSetup, "lang"));
@@ -20,7 +22,7 @@ void setup() {
#endif
#ifdef ESP8266
chipID = String( ESP.getChipId() ) + "-" + String( ESP.getFlashChipId());
chipID = String( ESP.getChipId() ) + "-" + String(ESP.getFlashChipId());
jsonWrite(configSetup, "chipID", chipID);
Serial.setDebugOutput(0);
#endif
@@ -39,24 +41,25 @@ void setup() {
WIFI_init();
Serial.println("[V] WIFI_init");
//--------------------------------------------------------------
Web_server_init();
Serial.println("[V] Web_server_init");
//--------------------------------------------------------------
Time_Init();
Serial.println("[V] Time_Init");
//--------------------------------------------------------------
MQTT_init();
Serial.println("[V] MQTT_init");
//--------------------------------------------------------------
Push_init();
Serial.println("[V] Push_init");
//--------------------------------------------------------------
statistics_init();
Serial.println("[V] statistics_init");
//--------------------------------------------------------------
initUpgrade();
Serial.println("[V] initUpgrade");
//--------------------------------------------------------------
//Web_server_init();
//Serial.println("[V] Web_server_init");
//--------------------------------------------------------------
MQTT_init();
Serial.println("[V] MQTT_init");
//--------------------------------------------------------------
Time_Init();
Serial.println("[V] Time_Init");
//--------------------------------------------------------------
Push_init();
Serial.println("[V] Push_init");
//--------------------------------------------------------------
Serial.print("[i] Date compiling: ");
Serial.println(DATE_COMPILING);
@@ -71,8 +74,11 @@ void setup() {
Serial.print("[i] Last firmware version: ");
Serial.println(new_version);
}
void loop() {
#ifdef OTA_enable