jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-24 14:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10525 from jig432/development

Browse Source 
Added support for multiple arguments to a script subroutine.
This commit is contained in:
Theo Arends 2021-01-12 10:14:12 +01:00 committed by GitHub
commit 00b8f2aaed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
tasmota/xdrv_10_scripter.ino
View File

@ -4550,53 +4550,59 @@ int16_t Run_script_sub(const char *type, int8_t tlen, JsonParserObject *jo) {
if (*ctype=='#') {
// check for parameter
ctype += tlen;
if (*ctype=='(' && *(lp+tlen)=='(') {
float fparam;
numeric = 1;
glob_script_mem.glob_error = 0;
GetNumericArgument((char*)ctype, OPER_EQU, &fparam, 0);
if (glob_script_mem.glob_error==1) {
// was string, not number
numeric = 0;
// get the string
GetStringArgument((char*)ctype + 1, OPER_EQU, cmpstr, 0);
}
lp += tlen;
if (*lp=='(') {
// fetch destination
lp++;
lp = isvar(lp, &vtype, &ind, 0, 0, 0);
if (vtype!=VAR_NV) {
// found variable as result
uint8_t index = glob_script_mem.type[ind.index].index;
if ((vtype&STYPE)==0) {
// numeric result
dfvar = &glob_script_mem.fvars[index];
if (numeric) {
*dfvar = fparam;
} else {
// mismatch
*dfvar = CharToFloat(cmpstr);
}
} else {
// string result
sindex = index;
if (!numeric) {
strlcpy(glob_script_mem.glob_snp + (sindex * glob_script_mem.max_ssize), cmpstr, glob_script_mem.max_ssize);
} else {
// mismatch
dtostrfd(fparam, 6, glob_script_mem.glob_snp + (sindex * glob_script_mem.max_ssize));
}
char nxttok = '(';
char *argptr = ctype+tlen;
lp += tlen;
do {
if (*ctype==nxttok && *lp==nxttok) {
float fparam;
numeric = 1;
glob_script_mem.glob_error = 0;
argptr = GetNumericArgument((char*)ctype + 1, OPER_EQU, &fparam, 0);
if (glob_script_mem.glob_error==1) {
// was string, not number
numeric = 0;
// get the string
argptr = GetStringArgument((char*)ctype + 1, OPER_EQU, cmpstr, 0);
}
if (*lp==nxttok) {
// fetch destination
lp++;
lp = isvar(lp, &vtype, &ind, 0, 0, 0);
if (vtype!=VAR_NV) {
// found variable as result
uint8_t index = glob_script_mem.type[ind.index].index;
if ((vtype&STYPE)==0) {
// numeric result
dfvar = &glob_script_mem.fvars[index];
if (numeric) {
*dfvar = fparam;
} else {
// mismatch
*dfvar = CharToFloat(cmpstr);
}
} else {
// string result
sindex = index;
if (!numeric) {
strlcpy(glob_script_mem.glob_snp + (sindex * glob_script_mem.max_ssize), cmpstr, glob_script_mem.max_ssize);
} else {
// mismatch
dtostrfd(fparam, 6, glob_script_mem.glob_snp + (sindex * glob_script_mem.max_ssize));
}
}
}
}
} else {
if (*ctype==nxttok || (*lp!=SCRIPT_EOL && *lp!='?')) {
// revert
section = 0;
}
}
} else {
lp += tlen;
if (*ctype=='(' || (*lp!=SCRIPT_EOL && *lp!='?')) {
// revert
section = 0;
}
}
nxttok = ' ';
ctype = argptr;
} while (*lp==' ' && (section == 1) );
}
}
}