andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-07 20:29:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

printex

Browse Source
This commit is contained in:
livello
2018-10-10 13:49:28 +03:00
parent b7675f8dd1
commit 5d64a72ea0
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lighthub/main.cpp
View File

@@ -453,12 +453,12 @@ void onInitialStateInitLAN() {
#if defined(ARDUINO_ARCH_ESP32) || defined(ESP8266) #if defined(ARDUINO_ARCH_ESP32) || defined(ESP8266)
if (WiFi.status() == WL_CONNECTED) { if (WiFi.status() == WL_CONNECTED) {
debugSerial<<F("WiFi connected. IP address: ")); debugSerial<<F("WiFi connected. IP address: ");
debugSerial<<WiFi.localIP()); debugSerial<<WiFi.localIP();
lanStatus = HAVE_IP_ADDRESS;//1; lanStatus = HAVE_IP_ADDRESS;//1;
} else } else
{ {
debugSerial<<F("Problem with WiFi connected")); debugSerial<<F("Problem with WiFi connected");
nextLanCheckTime = millis() + DHCP_RETRY_INTERVAL/5; nextLanCheckTime = millis() + DHCP_RETRY_INTERVAL/5;
} }
#endif #endif
@@ -535,7 +535,7 @@ void printCurentLanConfig();
#if defined(ESP8266) || defined(ARDUINO_ARCH_ESP32) #if defined(ESP8266) || defined(ARDUINO_ARCH_ESP32)
void softRebootFunc(){ void softRebootFunc(){
debugSerial<<F("ESP.restart();")); debugSerial<<F("ESP.restart();");
ESP.restart(); ESP.restart();
} }
#endif #endif
@@ -1031,14 +1031,14 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
debugSerial.printf("[HTTP] GET... code: %d\n", httpResponseCode); debugSerial.printf("[HTTP] GET... code: %d\n", httpResponseCode);
if (httpResponseCode == HTTP_CODE_OK) { if (httpResponseCode == HTTP_CODE_OK) {
String response = httpClient.getString(); String response = httpClient.getString();
debugSerial<<response); debugSerial<<response;
aJson.deleteItem(root); aJson.deleteItem(root);
root = aJson.parse((char *) response.c_str()); root = aJson.parse((char *) response.c_str());
if (!root) { if (!root) {
debugSerial<<F("Config parsing failed")); debugSerial<<F("Config parsing failed");
return READ_RE_CONFIG; return READ_RE_CONFIG;
} else { } else {
debugSerial<<F("Config OK, Applying")); debugSerial<<F("Config OK, Applying");
applyConfig(); applyConfig();
} }
} }

5
platformio.ini
View File

@@ -13,10 +13,10 @@ env_default =
; megaatmega2560 ; megaatmega2560
; megaatmega2560-net ; megaatmega2560-net
; due ; due
; esp8266 esp8266
; esp32 ; esp32
; megaatmega2560-5500 ; megaatmega2560-5500
due-5500 ; due-5500
; controllino ; controllino
; stm32 ; stm32
@@ -145,6 +145,7 @@ lib_deps =
DHT sensor library DHT sensor library
WifiManager WifiManager
https://github.com/arcao/Syslog.git https://github.com/arcao/Syslog.git
https://github.com/livello/PrintEx.git#is-select-redecl
[env:megaatmega2560-net] [env:megaatmega2560-net]
platform = atmelavr platform = atmelavr