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

timer refactoring

Browse Source 
INCREASE/DECREASE postref fix
mbus write if not configured corruption fixed
This commit is contained in:
Andrey
2025-03-20 00:33:18 +03:00
parent 6019aa41bb
commit 6cba90f7dd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lighthub/item.cpp
View File

@@ -1052,7 +1052,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion, bool authorized
if (subItem && subItem[0] == '$') {debugSerial<<F("Skipped homie stuff")<<endl;return -4; } if (subItem && subItem[0] == '$') {debugSerial<<F("Skipped homie stuff")<<endl;return -4; }
if (!itemArr) return -1; if (!itemArr) return -1;
if (!suffixCode && cmd.isCommand()) suffixCode=S_CMD; if (!suffixCode && cmd.isCommand() && cmd.getCmd()!=CMD_UP && cmd.getCmd()!=CMD_DN) suffixCode=S_CMD;
switch (suffixCode) switch (suffixCode)
{ {
case S_CMD: case S_CMD:
@@ -1200,6 +1200,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion, bool authorized
switch (suffixCode) switch (suffixCode)
{ {
case S_NOTFOUND: case S_NOTFOUND:
// case S_CMD:
toExecute=true; toExecute=true;
case S_SET: case S_SET:
{ {
@@ -1207,6 +1208,8 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion, bool authorized
//if (limit && suffixCode==S_NOTFOUND) limit = 100; //if (limit && suffixCode==S_NOTFOUND) limit = 100;
if (cmd.incrementPercents(step,limit)) if (cmd.incrementPercents(step,limit))
{ {
debugSerial<<"INCREASED: ";
cmd.debugOut();
status2Send |= FLAG_PARAMETERS | FLAG_SEND_DEFFERED; status2Send |= FLAG_PARAMETERS | FLAG_SEND_DEFFERED;
} else {cmd=fallbackCmd;invalidArgument=true;} } else {cmd=fallbackCmd;invalidArgument=true;}
} }
@@ -1605,6 +1608,7 @@ if ((!driver || driver->isAllowed(cmd))
{ {
// UPDATE internal variables // UPDATE internal variables
if (status2Send) cmd.saveItem(this,status2Send); if (status2Send) cmd.saveItem(this,status2Send);
else debugSerial<<"NOT SAVED"<<endl;
res = driver->Ctrl(cmd, subItem, toExecute,authorized); res = driver->Ctrl(cmd, subItem, toExecute,authorized);
if (driver->getChanType() == CH_THERMO) status2Send |= FLAG_SEND_IMMEDIATE; if (driver->getChanType() == CH_THERMO) status2Send |= FLAG_SEND_IMMEDIATE;