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

Refactored core fix

Browse Source
This commit is contained in:
Andrey Klimov
2021-08-21 03:06:41 +03:00
parent 674a438bde
commit bbf8f4d46e
5 changed files with 226 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-flags/build_flags_mega2560slim2
View File

@@ -17,7 +17,7 @@
-DMOTOR_DISABLE -DMOTOR_DISABLE
#-DWiz5100 #-DWiz5100
-DARDUINO_OTA_MDNS_DISABLE -DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE #-DMDNS_ENABLE
# Example of UARTBRIDGE configuration # Example of UARTBRIDGE configuration
#-DUARTBRIDGE_ENABLE #-DUARTBRIDGE_ENABLE

BIN
compiled/lighthub21/firmware.bin
View File

Binary file not shown.

9
lighthub/inputs.cpp
View File

@@ -641,16 +641,22 @@ if (newState!=store->state && cause!=CHECK_INTERRUPT) debugSerial<<F("#")<<pin<<
else else
{ {
//Postpone actual execution //Postpone actual execution
if (newState != store->state)
{
store->reqState=newState; store->reqState=newState;
store->delayedState=true; store->delayedState=true;
}
return true; return true;
} }
} }
static volatile uint8_t contactPollBusy = 0;
void Input::contactPoll(short cause) { void Input::contactPoll(short cause) {
boolean currentInputState; boolean currentInputState;
if (!store) return; if (!store || contactPollBusy) return;
contactPollBusy++;
changeState(IS_REQSTATE,cause); //Check for postponed states transitions changeState(IS_REQSTATE,cause); //Check for postponed states transitions
@@ -853,6 +859,7 @@ if (cause != CHECK_INTERRUPT) switch (store->state) //Timer based transitions
} }
} else // no change } else // no change
store->bounce = SAME_STATE_ATTEMPTS; store->bounce = SAME_STATE_ATTEMPTS;
contactPollBusy--;
} }

340
lighthub/item.cpp
View File

@@ -680,7 +680,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
return -1; return -1;
} }
cmd.debugOut(); cmd.debugOut();
debugSerial<<endl; //debugSerial<<endl;
if (!itemArr) return -1; if (!itemArr) return -1;
@@ -712,6 +712,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
int8_t chActive = -1; int8_t chActive = -1;
bool toExecute = false; bool toExecute = false;
bool scale100 = false; bool scale100 = false;
bool invalidArgument = false;
int res = -1; int res = -1;
uint16_t status2Send = 0; uint16_t status2Send = 0;
uint8_t command2Set = 0; uint8_t command2Set = 0;
@@ -719,6 +720,71 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
/// Common (GRP & NO GRP) commands /// Common (GRP & NO GRP) commands
switch (cmd.getCmd()) switch (cmd.getCmd())
{ {
case CMD_VOID: // No commands, just set value
{
itemCmd stored;
if (!cmd.isValue()) break;
switch (suffixCode)
{
case S_NOTFOUND: //For empty (universal) OPENHAB suffix - turn ON/OFF automatically
toExecute=true;
scale100=true; //openHab topic format
chActive=(isActive()>0);
if (chActive>0 && !cmd.getInt()) {cmd.Cmd(CMD_OFF);status2Send |= SEND_COMMAND | SEND_IMMEDIATE;}
if (chActive==0 && cmd.getInt()) {cmd.Cmd(CMD_ON);status2Send |= SEND_COMMAND | SEND_IMMEDIATE;}
// continue processing as SET
case S_SET:
stored.loadItemDef(this);
// if previous color was in RGB notation but new value is HSV - discard previous val and change type;
if ((stored.getArgType() == ST_RGB || stored.getArgType() == ST_RGBW) &&
(cmd.getArgType() == ST_HSV255))
stored.setArgType(cmd.getArgType());
if (itemType == CH_GROUP && cmd.isColor()) stored.setArgType(ST_HSV255);//Extend storage for group channel
//Convert value to most approptiate type for channel
stored.assignFrom(cmd,getChanType());
stored.debugOut();
if ((scale100 || SCALE_VOLUME_100) && (cmd.getArgType()==ST_HSV255 || cmd.getArgType()==ST_PERCENTS255 || cmd.getArgType()==ST_INT32 || cmd.getArgType()==ST_UINT32))
stored.scale100();
cmd=stored;
status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
break;
case S_VAL:
break;
case S_SAT:
stored.loadItemDef(this);
if (stored.setS(cmd.getS()))
{
cmd=stored;
cmd.setSuffix(S_SET);
status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
} else invalidArgument=true;
break;
case S_HUE:
stored.loadItemDef(this);
if (stored.setH(cmd.getH()))
{
cmd=stored;
cmd.setSuffix(S_SET);
status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
} else invalidArgument=true;
break;
case S_TEMP:
stored.loadItemDef(this);
stored.setColorTemp(cmd.getColorTemp());
cmd=stored;
status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
}
}
break;
case CMD_TOGGLE: case CMD_TOGGLE:
chActive=(isActive()>0); chActive=(isActive()>0);
toExecute=true; toExecute=true;
@@ -731,87 +797,12 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
} }
status2Send |=SEND_COMMAND | SEND_IMMEDIATE; status2Send |=SEND_COMMAND | SEND_IMMEDIATE;
break; break;
// TBD - INCREMENT-DECREMENT
}
///
if (itemType==CH_GROUP)
{
if (allowRecursion && itemArg->type == aJson_Array && operation)
{
digGroup(itemArg,&cmd,subItem);
status2Send |= SEND_COMMAND | SEND_PARAMETERS | SEND_IMMEDIATE;
res=1;
}
// return 1;
} // GROUP
else
{ // NON GROUP part
if (chActive<0) chActive = (isActive()>0);
toExecute=chActive || toExecute; // Execute if active
if (subItem)
{
//Check if subitem is some sort of command
int subitemCmd = subitem2cmd(subItem);
short prevCmd = getCmd();
if (!prevCmd && chActive) prevCmd=CMD_ON;
if (subitemCmd) //Find some COMMAND in subitem
{
if (subitemCmd != prevCmd)
{
debugSerial<<F("Ignored, channel cmd=")<<prevCmd<<endl;
return -1;
}
subItem=NULL;
}
///
else // Fast track for commands to subitems
{
if (driver) return driver->Ctrl(cmd,subItem,toExecute);
return 0;
}
}
// Commands for NON GROUP
//threating Restore, XOFF (special conditional commands)/ convert to ON, OFF and SET values
switch (cmd.getCmd()) {
int t;
case CMD_RESTORE:
switch (t = getCmd()) {
case CMD_HALT: //previous command was HALT ?
debugSerial << F("Restored from:") << t << endl;
cmd.loadItemDef(this);
toExecute=true;
if (itemType == CH_THERMO) cmd.Cmd(CMD_AUTO); ////
else cmd.Cmd(CMD_ON); //turning on
break;
default:
return -3;
}
status2Send |= SEND_COMMAND;
break;
case CMD_XOFF:
switch (t = getCmd()) {
case CMD_XON: //previous command was CMD_XON ?
debugSerial << F("Turned off from:") << t << endl;
toExecute=true;
cmd.Cmd(CMD_OFF); //turning Off
status2Send |= SEND_COMMAND | SEND_IMMEDIATE;
break;
default:
debugSerial << F("XOFF skipped. Prev cmd:") << t <<endl;
return -3;
}
break;
case CMD_DN: case CMD_DN:
case CMD_UP: case CMD_UP:
{ {
itemCmd fallbackCmd=cmd;
short step=0; short step=0;
if (cmd.isValue()) step=cmd.getInt(); if (cmd.isValue()) step=cmd.getInt();
if (!step) step=DEFAULT_INC_STEP; if (!step) step=DEFAULT_INC_STEP;
@@ -830,7 +821,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
if (cmd.incrementPercents(step)) if (cmd.incrementPercents(step))
{ {
status2Send |= SEND_PARAMETERS | SEND_DEFFERED; status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
} } else {cmd=fallbackCmd;invalidArgument=true;}
break; break;
case S_HUE: case S_HUE:
@@ -838,82 +829,154 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
{ {
status2Send |= SEND_PARAMETERS | SEND_DEFFERED; status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
cmd.setSuffix(S_SET); cmd.setSuffix(S_SET);
} } else {cmd=fallbackCmd;invalidArgument=true;}
break; break;
case S_SAT: case S_SAT:
if (cmd.incrementS(step)) if (cmd.incrementS(step))
{ {
status2Send |= SEND_PARAMETERS | SEND_DEFFERED; status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
cmd.setSuffix(S_SET); cmd.setSuffix(S_SET);
} } else {cmd=fallbackCmd;invalidArgument=true;}
} //switch suffix } //switch suffix
} //Case UP/DOWN } //Case UP/DOWN
break; break;
case CMD_VOID: // No commands, just set value //
{
itemCmd stored;
if (!cmd.isValue()) break;
switch (suffixCode)
{
case S_NOTFOUND: //For empty (universal) OPENHAB suffix - turn ON/OFF automatically
toExecute=true;
scale100=true; //openHab topic format
if (chActive>0 && !cmd.getInt()) {cmd.Cmd(CMD_OFF);status2Send |= SEND_COMMAND | SEND_IMMEDIATE;}
if (chActive==0 && cmd.getInt()) {cmd.Cmd(CMD_ON);status2Send |= SEND_COMMAND | SEND_IMMEDIATE;}
// continue processing as SET
case S_SET:
stored.loadItemDef(this);
// if previous color was in RGB notation but new value is HSV - discard previous val and change type;
if ((stored.getArgType() == ST_RGB || stored.getArgType() == ST_RGBW) &&
(cmd.getArgType() == ST_HSV255))
stored.setArgType(cmd.getArgType());
//if (itemType == CH_GROUP && cmd.isColor()) stored.setArgType(ST_HSV255);//Extend storage for group channel
//Convert value to most approptiate type for channel
stored.assignFrom(cmd,getChanType());
if (scale100 || SCALE_VOLUME_100) stored.scale100();
cmd=stored;
status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
break;
case S_VAL:
break;
case S_SAT:
stored.loadItemDef(this);
if (stored.setS(cmd.getS()))
{
cmd=stored;
cmd.setSuffix(S_SET);
status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
} }
break; if (itemType==CH_GROUP)
case S_HUE:
stored.loadItemDef(this);
if (stored.setH(cmd.getH()))
{ {
cmd=stored; if (allowRecursion && itemArg->type == aJson_Array && operation)
cmd.setSuffix(S_SET); {
status2Send |= SEND_PARAMETERS | SEND_DEFFERED; digGroup(itemArg,&cmd,subItem);
} res=1;
break;
case S_TEMP:
stored.loadItemDef(this);
stored.setColorTemp(cmd.getColorTemp());
cmd=stored;
status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
} }
// Post-processing of group command - converting HALT,REST,XON,XOFF to conventional ON/OFF for status
switch (cmd.getCmd()) {
int t;
case CMD_RESTORE: // individual for group members
switch (t = getCmd()) {
case CMD_HALT: //previous command was HALT ?
debugSerial << F("Restored from:") << t << endl;
cmd.loadItemDef(this);
cmd.Cmd(CMD_ON); //turning on
break;
default:
return -3;
}
status2Send |= SEND_COMMAND;
break;
case CMD_XOFF: // individual for group members
switch (t = getCmd()) {
case CMD_XON: //previous command was CMD_XON ?
debugSerial << F("Turned off from:") << t << endl;
cmd.Cmd(CMD_OFF); //turning Off
status2Send |= SEND_COMMAND | SEND_IMMEDIATE;
break;
default:
debugSerial << F("XOFF skipped. Prev cmd:") << t <<endl;
return -3;
} }
break; break;
case CMD_XON: case CMD_XON:
if (!chActive) //if channel was'nt active before CMD_XON if (!chActive) //if channel was'nt active before CMD_XON
{ {
cmd.loadItemDef(this);
cmd.Cmd(CMD_ON);
command2Set=CMD_XON;
status2Send |= SEND_COMMAND | SEND_IMMEDIATE;
}
else
{
debugSerial<<F("XON:Already Active\n");
return -3;
}
break;
case CMD_HALT:
if (chActive) //if channel was active before CMD_HALT
{
cmd.Cmd(CMD_OFF);
command2Set=CMD_HALT;
status2Send |= SEND_COMMAND | SEND_IMMEDIATE;
}
else
{
debugSerial<<F("HALT:Already Inactive\n");
return -3;
}
break;
}
status2Send |= SEND_IMMEDIATE;
if (cmd.isCommand()) status2Send |= SEND_COMMAND;
if (cmd.isValue() || cmd.loadItem(this,SEND_PARAMETERS)) status2Send |= SEND_PARAMETERS; ;
} // end GROUP
else
{ // NON GROUP part
if (chActive<0) chActive = (isActive()>0);
toExecute=chActive || toExecute; // Execute if active
debugSerial<<F("Active:")<<chActive<<F( " Exec:")<<toExecute<<endl;
if (subItem)
{
//Check if subitem is some sort of command
int subitemCmd = subitem2cmd(subItem);
short prevCmd = getCmd();
if (!prevCmd && chActive) prevCmd=CMD_ON;
if (subitemCmd) //Find some COMMAND in subitem
{
if (subitemCmd != prevCmd)
{
debugSerial<<F("Ignored, channel cmd=")<<prevCmd<<endl;
return -1;
}
subItem=NULL;
}
else // Fast track for commands to subitems
{
if (driver) return driver->Ctrl(cmd,subItem,toExecute);
return 0;
}
}
// Commands for NON GROUP
//threating Restore, XOFF (special conditional commands)/ convert to ON, OFF and SET values
switch (cmd.getCmd()) {
int t;
case CMD_RESTORE: // individual for group members
switch (t = getCmd()) {
case CMD_HALT: //previous command was HALT ?
debugSerial << F("Restored from:") << t << endl;
cmd.loadItemDef(this);
toExecute=true;
if (itemType == CH_THERMO) cmd.Cmd(CMD_AUTO); ////
else cmd.Cmd(CMD_ON); //turning on
break;
default:
return -3;
}
status2Send |= SEND_COMMAND;
break;
case CMD_XOFF: // individual for group members
switch (t = getCmd()) {
case CMD_XON: //previous command was CMD_XON ?
debugSerial << F("Turned off from:") << t << endl;
toExecute=true;
cmd.Cmd(CMD_OFF); //turning Off
status2Send |= SEND_COMMAND | SEND_IMMEDIATE;
break;
default:
debugSerial << F("XOFF skipped. Prev cmd:") << t <<endl;
return -3;
}
break;
case CMD_XON:
if (!chActive) //if channel was'nt active before CMD_XON
{
cmd.loadItemDef(this);
cmd.Cmd(CMD_ON); cmd.Cmd(CMD_ON);
command2Set=CMD_XON; command2Set=CMD_XON;
status2Send |= SEND_COMMAND | SEND_IMMEDIATE; status2Send |= SEND_COMMAND | SEND_IMMEDIATE;
@@ -956,6 +1019,11 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
status2Send |= SEND_COMMAND | SEND_PARAMETERS | SEND_IMMEDIATE; status2Send |= SEND_COMMAND | SEND_PARAMETERS | SEND_IMMEDIATE;
toExecute=true; toExecute=true;
break; break;
case CMD_VOID:
case CMD_TOGGLE:
case CMD_DN:
case CMD_UP:
break;
default: default:
if (cmd.isCommand()) status2Send |= SEND_COMMAND; if (cmd.isCommand()) status2Send |= SEND_COMMAND;
@@ -963,7 +1031,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
toExecute=true; toExecute=true;
} //Switch commands } //Switch commands
} // NO GROUP } // NO GROUP
if (invalidArgument) return -4;
// UPDATE internal variables // UPDATE internal variables
if (status2Send) cmd.saveItem(this,status2Send); if (status2Send) cmd.saveItem(this,status2Send);
//debugSerial<<F("sts:")<<status2Send<<endl; //debugSerial<<F("sts:")<<status2Send<<endl;
@@ -1317,7 +1385,7 @@ int Item::SendStatus(int sendFlags) {
// myhome/s_out/item/cmd // myhome/s_out/item/cmd
// myhome/s_out/item/set // myhome/s_out/item/set
if ((sendFlags & SEND_PARAMETERS) || (sendFlags & SEND_DELAYED)) if ((st.isValue() && (sendFlags & SEND_PARAMETERS) || (sendFlags & SEND_DELAYED)))
{ {
setTopic(addrstr,sizeof(addrstr),T_OUT); setTopic(addrstr,sizeof(addrstr),T_OUT);
strncat(addrstr, itemArr->name, sizeof(addrstr)-1); strncat(addrstr, itemArr->name, sizeof(addrstr)-1);

8
lighthub/itemCmd.cpp
View File

@@ -106,7 +106,7 @@ uint8_t itemCmd::getStoragetypeByChanType(short chanType)
case CH_RELAY: case CH_RELAY:
case CH_VC: case CH_VC:
case CH_MODBUS: case CH_MODBUS:
case CH_GROUP: //case CH_GROUP:
return ST_PERCENTS255; return ST_PERCENTS255;
break; break;
default: default:
@@ -936,7 +936,7 @@ bool itemCmd::loadItem(Item * item, uint16_t optionsFlag)
{ {
cmd.itemArgType= subtype; cmd.itemArgType= subtype;
if (optionsFlag & SEND_PARAMETERS) param.asInt32 = item->getVal(); if (optionsFlag & SEND_PARAMETERS) param.asInt32 = item->getVal();
debugSerial<<F("Loaded :"); //debugSerial<<F("Loaded :");
debugOut(); debugOut();
return true; return true;
} }
@@ -947,13 +947,13 @@ bool itemCmd::loadItem(Item * item, uint16_t optionsFlag)
case aJson_Int: case aJson_Int:
Int((int32_t)item->itemVal->valueint); Int((int32_t)item->itemVal->valueint);
debugSerial<<F("Loaded Int:"); //debugSerial<<F("Loaded Int:");
debugOut(); debugOut();
return true; return true;
case aJson_Float: case aJson_Float:
Float(item->itemVal->valueint); Float(item->itemVal->valueint);
debugSerial<<F("Loaded Float:"); //debugSerial<<F("Loaded Float:");
debugOut(); debugOut();
return true; return true;
} }