andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2026-01-26 16:19:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

ReRead config AVR/syslog

Browse Source
This commit is contained in:
Andrey Klimov
2020-10-05 17:51:26 +03:00
parent a511869498
commit 11943d4fc4
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lighthub/main.cpp
View File

@@ -240,6 +240,8 @@ debugSerial<<F("Deleting conf. RAM was:")<<freeRam();
modbusObj = NULL; modbusObj = NULL;
#endif #endif
debugSerial<<F(" is ")<<freeRam()<<endl; debugSerial<<F(" is ")<<freeRam()<<endl;
configLoaded=false;
configOk=false;
} }
bool isNotRetainingStatus() { bool isNotRetainingStatus() {
@@ -389,9 +391,9 @@ void setupSyslog()
short n = 0; short n = 0;
aJsonObject *udpSyslogArr = NULL; aJsonObject *udpSyslogArr = NULL;
if (syslogInitialized) return; if (syslogInitialized) {debugSerial<<F("Syslog: initialized")<<endl;return;};
if (lanStatus<HAVE_IP_ADDRESS) return; if (lanStatus<HAVE_IP_ADDRESS) {debugSerial<<F("Syslog: lanStatus=")<<lanStatus<<endl;return;};
if (!root) return; if (!root) {debugSerial<<F("Syslog: no root")<<endl;return;};
udpSyslogClient.begin(SYSLOG_LOCAL_SOCKET); udpSyslogClient.begin(SYSLOG_LOCAL_SOCKET);
@@ -1013,9 +1015,9 @@ topics = aJson.getObjectItem(root, "topics");
inputs = aJson.getObjectItem(root, "in"); inputs = aJson.getObjectItem(root, "in");
mqttArr = aJson.getObjectItem(root, "mqtt"); mqttArr = aJson.getObjectItem(root, "mqtt");
#ifdef SYSLOG_ENABLE
setupSyslog(); setupSyslog();
#endif
#ifdef _dmxin #ifdef _dmxin
int itemsCount; int itemsCount;
@@ -1292,7 +1294,7 @@ void cmdFunctionIp(int arg_cnt, char **args)
} }
void cmdFunctionClearEEPROM(int arg_cnt, char **args){ void cmdFunctionClearEEPROM(int arg_cnt, char **args){
for (int i = OFFSET_MAC; i < OFFSET_MAC+EEPROM_FIX_PART_LEN; i++) for (int i = OFFSET_MAC; i < OFFSET_MAC+EEPROM_FIX_PART_LEN+1; i++) //Fi[ part +{]
EEPROM.write(i, 0); EEPROM.write(i, 0);
for (int i = 0; i < EEPROM_SIGNATURE_LENGTH; i++) for (int i = 0; i < EEPROM_SIGNATURE_LENGTH; i++)
@@ -1396,12 +1398,14 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
#if defined(ARDUINO_ARCH_AVR) #if defined(ARDUINO_ARCH_AVR)
FILE *configStream; FILE *configStream;
wdt_dis(); //wdt_dis();
//if (freeRam()<512) cleanConf();
HTTPClient hclient(configServer, 80); HTTPClient hclient(configServer, 80);
// FILE is the return STREAM type of the HTTPClient // FILE is the return STREAM type of the HTTPClient
configStream = hclient.getURI(URI); configStream = hclient.getURI(URI);
responseStatusCode = hclient.getLastReturnCode(); responseStatusCode = hclient.getLastReturnCode();
wdt_en(); //wdt_en();
if (configStream != NULL) { if (configStream != NULL) {
if (responseStatusCode == 200) { if (responseStatusCode == 200) {

2
lighthub/main.h
View File

@@ -207,7 +207,7 @@ enum lan_status {
REINIT = - 11, REINIT = - 11,
DO_RECONNECT = 12, DO_RECONNECT = 12,
RECONNECT = 13, RECONNECT = 13,
READ_RE_CONFIG = -14, READ_RE_CONFIG = 14,
DO_NOTHING = -15 DO_NOTHING = -15
}; };