andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 19:59: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)); digitalWrite(iaddr, k = ((cmd == CMD_ON || cmd == CMD_XON) ? HIGH : LOW));
debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl; debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl;
break; break;
case CH_THERMO:
///thermoSet(name,cmd,Par1); all cativities done - update temp & cmd
break;
} }
case CH_THERMO:
///thermoSet(name,cmd,Par1); all activities done - update temp & cmd
break;
case CH_PWM: { case CH_PWM: {
int k; int k;
short inverse = 0; short inverse = 0;

16
lighthub/main.cpp
View File

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

5
platformio.ini
View File

@@ -9,8 +9,8 @@
; http://docs.platformio.org/page/projectconf.html ; http://docs.platformio.org/page/projectconf.html
[platformio] [platformio]
src_dir = lighthub src_dir = lighthub
;env_default = esp8266
;monitor_speed = 115200 ;monitor_speed = 115200
;env_default = megaatmega2560-net
; megaatmega2560 ; megaatmega2560
; megaatmega2560-net ; megaatmega2560-net
; due ; due
@@ -20,8 +20,7 @@ src_dir = lighthub
; due-5500 ; due-5500
; controllino ; controllino
; stm32 ; stm32
; esp32-evb ; nrf52840
; nrf52840_dk
;build_dir = /tmp/pioenvs ;build_dir = /tmp/pioenvs
;libdeps_dir = /tmp/piolibdeps ;libdeps_dir = /tmp/piolibdeps