jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

sml individual decimal precision on insertion, comments in >W and >J

Browse Source
This commit is contained in:
gemu2015 2019-09-08 12:14:28 +02:00
parent 3d9a73f826
commit c2f560312d
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sonoff/xdrv_10_scripter.ino
View File

@ -2031,6 +2031,7 @@ void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize) {
char *cp;
uint16_t count;
uint8_t vtype;
uint8_t dprec=glob_script_mem.script_dprec;
float fvar;
cp=srcbuf;
struct T_INDEX ind;
@ -2041,13 +2042,16 @@ void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize) {
if (*cp=='%') {
dstbuf[count]=*cp++;
} else {
//char *scp=cp;
if (isdigit(*cp)) {
dprec=*cp&0xf;
cp++;
}
cp=isvar(cp,&vtype,&ind,&fvar,string,0);
if (vtype!=VAR_NV) {
// found variable as result
if (vtype==NUM_RES || (vtype&STYPE)==0) {
// numeric result
dtostrfd(fvar,glob_script_mem.script_dprec,string);
dtostrfd(fvar,dprec,string);
} else {
// string result
}
@ -2650,7 +2654,7 @@ int16_t Run_Scripter(const char *type, int8_t tlen, char *js) {
switch (lastop) {
case OPER_EQU:
if (glob_script_mem.var_not_found) {
if (!js) toLog("var not found\n");
if (!js) toLogEOL("var not found: ",lp);
goto next_line;
}
*dfvar=fvar;
@ -3587,7 +3591,7 @@ void ScriptWebShow(void) {
if (!*lp || *lp=='#' || *lp=='>') {
break;
}
if (*lp!=';') {
// send this line to web
memcpy(line,lp,sizeof(line));
line[sizeof(line)-1]=0;
@ -3599,11 +3603,9 @@ void ScriptWebShow(void) {
}
cp++;
}
Replace_Cmd_Vars(line,tmp,sizeof(tmp));
WSContentSend_PD(PSTR("{s}%s{e}"),tmp);
next_line:
}
if (*lp==SCRIPT_EOL) {
lp++;
} else {
@ -3630,7 +3632,7 @@ void ScriptJsonAppend(void) {
if (!*lp || *lp=='#' || *lp=='>') {
break;
}
if (*lp!=';') {
// send this line to mqtt
memcpy(line,lp,sizeof(line));
line[sizeof(line)-1]=0;
@ -3642,11 +3644,9 @@ void ScriptJsonAppend(void) {
}
cp++;
}
Replace_Cmd_Vars(line,tmp,sizeof(tmp));
ResponseAppend_P(PSTR("%s"),tmp);
next_line:
}
if (*lp==SCRIPT_EOL) {
lp++;
} else {