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

core fixes

Browse Source
This commit is contained in:
Andrey Klimov
2022-04-22 14:51:43 +03:00
parent 4c80f435e5
commit 81edb7f86e
5 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lighthub/item.cpp
View File

@@ -368,8 +368,8 @@ float Item::getFloatArg(short n) //Return arg float or first array element if Ar
if ((itemArg->type == aJson_Array) && ( n < aJson.getArraySize(itemArg)))
{
aJsonObject * obj = aJson.getArrayItem(itemArg, n);
if (obj->type == aJson_Int) return obj->valueint;
if (obj->type == aJson_Float) return obj->valuefloat;
if (obj && obj->type == aJson_Int) return obj->valueint;
if (obj && obj->type == aJson_Float) return obj->valuefloat;
return 0;
}
@@ -908,11 +908,14 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
case S_NOTFOUND:
toExecute=true;
case S_SET:
if (cmd.incrementPercents(step,(suffixCode==S_NOTFOUND)?100:limitSetValue()))
{
long limit = limitSetValue();
if (limit && suffixCode==S_NOTFOUND) limit = 100;
if (cmd.incrementPercents(step,limit))
{
status2Send |= SEND_PARAMETERS | SEND_DEFFERED;
} else {cmd=fallbackCmd;invalidArgument=true;}
}
break;
case S_HUE:

20
lighthub/itemCmd.cpp
View File

@@ -253,11 +253,25 @@ bool itemCmd::incrementPercents(long int dif, long int limit )
case ST_INT32:
case ST_UINT32:
if (dif<TENS_BASE) // Step < 1 - convert to tens
{
par=param.asInt32*TENS_BASE;
par+=dif;
if (limit && par>limit*TENS_BASE) par=limit*TENS_BASE;
if (limit && par<0) par=0;
param.asInt32=par;
cmd.itemArgType=ST_TENS;
}
else
{
par=param.asInt32;
par+=dif/TENS_BASE;
if (par>limit) par=limit;
if (limit && par>limit) par=limit;
if (limit && par<0) par=0;
param.asInt32=par;
}
break;
case ST_FLOAT:
@@ -274,8 +288,8 @@ bool itemCmd::incrementPercents(long int dif, long int limit )
par=param.asInt32;
par+=dif;
// if (par>100*TENS_BASE) par=100*TENS_BASE;
// if (par<0) par=0;
if (limit && par>limit*TENS_BASE) par=limit*TENS_BASE;
if (limit && par<0) par=0;
param.asInt32=par;
break;

5
lighthub/main.cpp
View File

@@ -143,9 +143,10 @@ int8_t mqttErrorRate=0;
void watchdogSetup(void) {} //Do not remove - strong re-definition WDT Init for DUE
#endif
void cleanConf()
bool cleanConf()
{
if (!root) return;
bool clean = true;
debugSerial<<F("Unlocking config ...")<<endl;
uint32_t stamp=millis();
while (configLocked && !isTimeOver(stamp,millis(),10000))
@@ -167,6 +168,7 @@ while (configLocked && !isTimeOver(stamp,millis(),10000))
if (configLocked)
{
errorSerial<<F("Not unlocked in 10s - continue ...")<<endl;
clean = false;
}
debugSerial<<F("Stopping channels ...")<<endl;
@@ -219,6 +221,7 @@ debugSerial<<F("Deleting conf. RAM was:")<<freeRam();
configOk=false;
timerHandlerBusy--;
return clean;
}
bool isNotRetainingStatus() {

6
lighthub/modules/out_counter.cpp
View File

@@ -44,14 +44,14 @@ int out_counter::Poll(short cause)
uint32_t timer = item->getExt();
if (timer && isTimeOver(timer,millis(),period))
if (timer && period && isTimeOver(timer,millis(),period))
{
item->setExt(millisNZ());
itemCmd st;
st.loadItem(item);
st.loadItem(item,SEND_PARAMETERS|SEND_COMMAND);
float val = st.getFloat();
//short cmd = st.getCmd();
val+=period;
val+=impulse;
st.Float(val);
st.saveItem(item);
}

15
lighthub/modules/out_modbus.cpp
View File

@@ -315,11 +315,14 @@ int out_Modbus::findRegister(int registerNum, int posInBuffer, int regType)
//Retrive previous data
aJsonObject *lastMeasured = aJson.getObjectItem(execObj,"@S");
if (lastMeasured)
{
if (lastMeasured->valueint == param)
submitParam=false; //supress repeating execution for same val
else lastMeasured->valueint=param;
}
{
if (lastMeasured->type == aJson_Int)
{
if (lastMeasured->valueint == param)
submitParam=false; //supress repeating execution for same val
else lastMeasured->valueint=param;
}
}
else //No container to store value yet
{
debugSerial<<F("Add @S: ")<<paramObj->name<<endl;
@@ -614,7 +617,7 @@ if (itemParametersObj && itemParametersObj->type ==aJson_Object)
if (execObj && execObj->type == aJson_Object)
{
aJsonObject *polledValue = aJson.getObjectItem(execObj,"@S");
if (polledValue && (polledValue->valueint == Value))
if (polledValue && polledValue->type == aJson_Int && (polledValue->valueint == Value))
{
debugSerial<<F("Ignored - not changed")<<endl;
}