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

Merge pull request #7868 from maxela/patch-2 

Optimized function 'mp'
This commit is contained in:
Theo Arends 2020-03-07 19:03:18 +01:00 committed by GitHub
parent df43217a18 2335f2fedd
commit 4094b069d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tasmota/xdrv_10_scripter.ino
View File

@ -1502,30 +1502,27 @@ chknext:
lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
SCRIPT_SKIP_SPACES
while (*lp!=')') {
char str[SCRIPT_MAXSSIZE];
lp=GetStringResult(lp,OPER_EQU,str,0);
SCRIPT_SKIP_SPACES
char *pstr=str;
pstr++;
char *opp=lp;
lp++;
float fvar2;
pstr=GetNumericResult(pstr,OPER_EQU,&fvar2,0);
while (*pstr==' ') pstr++;
lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
SCRIPT_SKIP_SPACES
fvar=fvar1;
if ((str[0]=='<' && fvar1<fvar2) ||
(str[0]=='>' && fvar1>fvar2) ||
(str[0]=='=' && fvar1==fvar2))
if ((*opp=='<' && fvar1<fvar2) ||
(*opp=='>' && fvar1>fvar2) ||
(*opp=='=' && fvar1==fvar2))
{
if (*pstr==':') {
pstr++;
while (*pstr==' ') pstr++;
if (*lp!='<' && *lp!='>' && *lp!='=' && *lp!=')' && *lp!=SCRIPT_EOL) {
float fvar3;
pstr=GetNumericResult(pstr,OPER_EQU,&fvar3,0);
lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
SCRIPT_SKIP_SPACES
fvar=fvar3;
} else {
fvar=fvar2;
}
break;
}
while (*lp!='<' && *lp!='>' && *lp!='=' && *lp!=')' && *lp!=SCRIPT_EOL) lp++;
}
len=0;
goto exit;