mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Accept negative number 

Expression should support negative number
This commit is contained in:
Laurent 2019-09-27 21:58:32 -04:00
parent 82b7225332
commit dbd234ef81
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sonoff/xdrv_10_rules.ino
View File

@ -919,6 +919,10 @@ bool findNextNumber(char * &pNumber, float &value)
{
bool bSucceed = false;
String sNumber = "";
if (*pNumber == '-') {
sNumber = "-";
pNumber++;
}
while (*pNumber) {
if (isdigit(*pNumber) || (*pNumber == '.')) {
sNumber += *pNumber;
@ -996,7 +1000,7 @@ bool findNextVariableValue(char * &pVarname, float &value)
/*
* Find next object in expression and evaluate it
* An object could be:
* - A float number start with a digit, like 0.787
* - A float number start with a digit or minus, like 0.787, -3
* - A variable name, like VAR1, MEM3
* - An expression enclosed with a pair of round brackets, (.....)
* Input:
@ -1018,7 +1022,7 @@ bool findNextObjectValue(char * &pointer, float &value)
pointer++;
continue;
}
if (isdigit(*pointer)) { //This object is a number
if (isdigit(*pointer) || (*pointer) == '-') { //This object is a number
bSucceed = findNextNumber(pointer, value);
break;
} else if (isalpha(*pointer)) { //Should be a variable like VAR12, MEM1