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

Environment nrf52840 [SUCCESS]

Browse Source 
Environment esp32               [SUCCESS]
Environment due                 [SUCCESS]
Environment megaatmega2560      [SUCCESS]
Environment esp8266             [SUCCESS]
Environment megaatmega2560-net  [SUCCESS]
Environment due-5500            [SUCCESS]
Environment controllino         [SUCCESS]
Environment stm32               [SUCCESS]
This commit is contained in:
Andrey Klimov
2019-04-07 00:43:48 +03:00
parent 5d46dd5807
commit 2c2657799d
3 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lighthub/item.cpp
View File

@@ -671,10 +671,11 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int subItemN)
digitalWrite(iaddr, k = ((cmd == CMD_ON || cmd == CMD_XON) ? HIGH : LOW));
debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl;
break;
case CH_THERMO:
///thermoSet(name,cmd,Par1); all cativities done - update temp & cmd
}
case CH_THERMO:
///thermoSet(name,cmd,Par1); all activities done - update temp & cmd
break;
}
case CH_PWM: {
int k;
short inverse = 0;

24
lighthub/main.cpp
View File

@@ -175,25 +175,17 @@ void cleanConf()
debugSerial<<F("Deleting conf. RAM was:")<<freeRam();
aJson.deleteItem(root);
root = NULL;
//aJson.deleteItem(inputs);
inputs = NULL;
//aJson.deleteItem(items);
items = NULL;
//aJson.deleteItem(topics);
topics = NULL;
//aJson.deleteItem(mqttArr);
mqttArr = NULL;
#ifndef DMX_DISABLE
//aJson.deleteItem(dmxArr);
inputs = NULL;
items = NULL;
topics = NULL;
mqttArr = NULL;
#ifdef _dmxout
dmxArr = NULL;
#endif
#ifndef OWIRE_DISABLE
//aJson.deleteItem(owArr);
#ifdef _owire
owArr = NULL;
#endif
#ifndef MODBUS_DISABLE
//aJson.deleteItem(modbusArr);
modbusArr = NULL;
#endif
debugSerial<<F(" is ")<<freeRam()<<endl;
@@ -1242,7 +1234,7 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
//debugSerial<<"GET Response: ");
if (responseStatusCode == 200) {
cleanConf()
cleanConf();
root = aJson.parse((char *) response.c_str());
if (!root) {
@@ -1274,7 +1266,7 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
if (httpResponseCode == HTTP_CODE_OK) {
String response = httpClient.getString();
debugSerial<<response;
cleanConf()
cleanConf();
root = aJson.parse((char *) response.c_str());
if (!root) {
debugSerial<<F("Config parsing failed\n");