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

Critical: discrete outputs initialization after reboot added

Browse Source
This commit is contained in:
Andrey Klimov
2018-04-15 21:03:35 +03:00
parent bbbf0e056c
commit bc1eb86a34
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lighthub/main.cpp
View File

@@ -586,6 +586,34 @@ void applyConfig() {
} }
#endif #endif
items = aJson.getObjectItem(root, "items"); items = aJson.getObjectItem(root, "items");
// Digital output related Items initialization
{
aJsonObject * item = items->child;
while (items && item)
if (item->type == aJson_Array && aJson.getArraySize(item)>1) {
int cmd = CMD_OFF;
int pin = aJson.getArrayItem(item, I_ARG)->valueint;
if (aJson.getArraySize(item) > I_CMD) cmd = aJson.getArrayItem(item, I_CMD)->valueint;
switch (aJson.getArrayItem(item, I_TYPE)->valueint) {
case CH_RELAY:
case CH_THERMO:
{
int k;
pinMode(pin, OUTPUT);
digitalWrite(pin, k = ((cmd == CMD_ON) ? HIGH : LOW));
Serial.print(F("Pin:"));
Serial.print(pin);
Serial.print(F("="));
Serial.println(k);
}
break;
} //switch
item = item->next;
} //if
}
pollingItem = items->child; pollingItem = items->child;
inputs = aJson.getObjectItem(root, "in"); inputs = aJson.getObjectItem(root, "in");
mqttArr = aJson.getObjectItem(root, "mqtt"); mqttArr = aJson.getObjectItem(root, "mqtt");
@@ -751,13 +779,13 @@ int getConfig(int arg_cnt, char **args)
FILE *result; FILE *result;
//byte hserver[] = { 192,168,88,2 }; //byte hserver[] = { 192,168,88,2 };
wdt_dis(); wdt_dis();
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
result = hclient.getURI(URI); result = hclient.getURI(URI);
responseStatusCode = hclient.getLastReturnCode(); responseStatusCode = hclient.getLastReturnCode();
wdt_en(); wdt_en();
if (result != NULL) { if (result != NULL) {
if (responseStatusCode == 200) { if (responseStatusCode == 200) {

2
lighthub/options.h
View File

@@ -1,6 +1,6 @@
// Configuration of drivers enabled // Configuration of drivers enabled
#ifndef PIO_SRC_REV #ifndef PIO_SRC_REV
#define PIO_SRC_REV v0.995 #define PIO_SRC_REV v0.996
#endif #endif
#define TXEnablePin 13 #define TXEnablePin 13