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

HomeKit (HomeBridge) compatible thermostat now.

Browse Source 
Small bugfixes & cleanup
This commit is contained in:
Andrey Klimov
2019-08-13 23:26:17 +03:00
parent 209cba2352
commit a001bd9e35
3 changed files with 119 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lighthub/main.cpp
View File

@@ -1744,9 +1744,10 @@ void inputSetup(void) {
}
}
#ifndef MODBUS_DISABLE
//#ifndef MODBUS_DISABLE
void pollingLoop(void) {
boolean done = false;
if (lanStatus == RETAINING_COLLECTING) return;
if (millis() > nextPollingCheck) {
while (pollingItem && !done) {
if (pollingItem->type == aJson_Array) {
@@ -1762,7 +1763,7 @@ void pollingLoop(void) {
} //while
}//if
}
#endif
//#endif
bool isThermostatWithMinArraySize(aJsonObject *item, int minimalArraySize) {
return (item->type == aJson_Array) && (aJson.getArrayItem(item, I_TYPE)->valueint == CH_THERMO) &&
@@ -1770,8 +1771,15 @@ bool isThermostatWithMinArraySize(aJsonObject *item, int minimalArraySize) {
}
bool thermoDisabledOrDisconnected(aJsonObject *thermoExtensionArray, int thermoStateCommand) {
return thermoStateCommand == CMD_OFF || thermoStateCommand == CMD_HALT ||
aJson.getArrayItem(thermoExtensionArray, IET_ATTEMPTS)->valueint == 0;
if (aJson.getArrayItem(thermoExtensionArray, IET_ATTEMPTS)->valueint == 0) return true;
switch (thermoStateCommand) {
case CMD_ON:
case CMD_XON:
case CMD_AUTO:
case CMD_HEAT:
return false;
default: return true;
}
}