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

Retained MQTT topics logic developed, unused sources (SD & extra 1-wire) moved to spare folders to save static RAM

Browse Source
This commit is contained in:
Andrey Klimov
2018-03-27 04:14:34 +03:00
parent e4f47cdef3
commit ec840f784a
11 changed files with 102 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lighthub/inputs.cpp
View File

@@ -71,7 +71,7 @@ void Input::Parse()
s = aJson.getObjectItem(inputObj,"S");
if (!s) { Serial.print("In: ");Serial.print(pin);Serial.print("/");Serial.println(inType);
if (!s) { Serial.print(F("In: "));Serial.print(pin);Serial.print(F("/"));Serial.println(inType);
aJson.addNumberToObject(inputObj,"S", 0);
s = aJson.getObjectItem(inputObj,"S");
}
@@ -110,7 +110,7 @@ int Input::Poll()
void Input::Changed (int val)
{
Serial.print(pin);Serial.print("=");Serial.println(val);
Serial.print(pin);Serial.print(F("="));Serial.println(val);
aJsonObject * item = aJson.getObjectItem(inputObj,"item");
aJsonObject * scmd = aJson.getObjectItem(inputObj,"scmd");
aJsonObject * rcmd = aJson.getObjectItem(inputObj,"rcmd");
@@ -121,11 +121,11 @@ void Input::Changed (int val)
if (val)
{ //send set command
if (!scmd) mqttClient.publish(emit->valuestring,"ON"); else if (strlen(scmd->valuestring)) mqttClient.publish(emit->valuestring,scmd->valuestring);
if (!scmd) mqttClient.publish(emit->valuestring,"ON",true); else if (strlen(scmd->valuestring)) mqttClient.publish(emit->valuestring,scmd->valuestring,true);
}
else
{ //send reset command
if (!rcmd) mqttClient.publish(emit->valuestring,"OFF"); else if (strlen(rcmd->valuestring)) mqttClient.publish(emit->valuestring,rcmd->valuestring);
if (!rcmd) mqttClient.publish(emit->valuestring,"OFF",true); else if (strlen(rcmd->valuestring)) mqttClient.publish(emit->valuestring,rcmd->valuestring,true);
}
}