jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-02 07:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6452 from gemu2015/scripter-bugs

Browse Source 
scripter bugs
This commit is contained in:
Theo Arends 2019-09-18 19:35:33 +02:00 committed by GitHub
commit e4ab7ebfe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sonoff/xdrv_10_scripter.ino
View File

@ -718,7 +718,7 @@ float DoMedian5(uint8_t index, float in) {
} }
#ifdef USE_LIGHT #ifdef USE_LIGHT
#ifdef USE_WS2812 //#ifdef USE_WS2812
uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value) { uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value) {
float r = 0, g = 0, b = 0; float r = 0, g = 0, b = 0;
struct HSV { struct HSV {
@ -801,7 +801,7 @@ if (hsv.S == 0) {
return rgb; return rgb;
} }
#endif #endif
#endif //#endif
// vtype => ff=nothing found, fe=constant number,fd = constant string else bit 7 => 80 = string, 0 = number // vtype => ff=nothing found, fe=constant number,fd = constant string else bit 7 => 80 = string, 0 = number
// no flash strings here for performance reasons!!! // no flash strings here for performance reasons!!!
@ -1339,8 +1339,17 @@ chknext:
} }
goto strexit; goto strexit;
} }
if (!strncmp(vname,"hx(",3)) {
lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
lp++;
len=0;
if (sp) {
sprintf(sp,"%08x",(uint32_t)fvar);
}
goto strexit;
}
#ifdef USE_LIGHT #ifdef USE_LIGHT
#ifdef USE_WS2812 //#ifdef USE_WS2812
if (!strncmp(vname,"hsvrgb(",7)) { if (!strncmp(vname,"hsvrgb(",7)) {
lp=GetNumericResult(lp+7,OPER_EQU,&fvar,0); lp=GetNumericResult(lp+7,OPER_EQU,&fvar,0);
if (fvar<0 || fvar>360) fvar=0; if (fvar<0 || fvar>360) fvar=0;
@ -1361,7 +1370,7 @@ chknext:
len=0; len=0;
goto exit; goto exit;
} }
#endif //#endif
#endif #endif
break; break;
case 'i': case 'i':
@ -1903,6 +1912,11 @@ char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo) {
char str[SCRIPT_MAXSSIZE],str1[SCRIPT_MAXSSIZE]; char str[SCRIPT_MAXSSIZE],str1[SCRIPT_MAXSSIZE];
while (1) { while (1) {
lp=isvar(lp,&vtype,&ind,0,str1,jo); lp=isvar(lp,&vtype,&ind,0,str1,jo);
if (vtype!=STR_RES && !(vtype&STYPE)) {
// numeric type
glob_script_mem.glob_error=1;
return lp;
}
switch (lastop) { switch (lastop) {
case OPER_EQU: case OPER_EQU:
strlcpy(str,str1,sizeof(str)); strlcpy(str,str1,sizeof(str));
@ -2015,13 +2029,13 @@ struct T_INDEX ind;
char *ForceStringVar(char *lp,char *dstr) { char *ForceStringVar(char *lp,char *dstr) {
float fvar; float fvar;
char *slp=lp; char *slp=lp;
glob_script_mem.var_not_found=0; glob_script_mem.glob_error=0;
lp=GetStringResult(lp,OPER_EQU,dstr,0); lp=GetStringResult(lp,OPER_EQU,dstr,0);
if (glob_script_mem.var_not_found) { if (glob_script_mem.glob_error) {
// mismatch // mismatch
lp=GetNumericResult(slp,OPER_EQU,&fvar,0); lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
dtostrfd(fvar,6,dstr); dtostrfd(fvar,6,dstr);
glob_script_mem.var_not_found=0; glob_script_mem.glob_error=0;
} }
return lp; return lp;
} }
@ -2718,14 +2732,14 @@ int16_t Run_Scripter(const char *type, int8_t tlen, char *js) {
sindex=index; sindex=index;
// string result // string result
char str[SCRIPT_MAXSSIZE]; char str[SCRIPT_MAXSSIZE];
char *slp=lp;
lp=getop(lp,&lastop); lp=getop(lp,&lastop);
char *slp=lp;
lp=GetStringResult(lp,OPER_EQU,str,jo); lp=GetStringResult(lp,OPER_EQU,str,jo);
if (!js && glob_script_mem.var_not_found) { if (!js && glob_script_mem.glob_error) {
// mismatch // mismatch
lp=GetNumericResult(slp,OPER_EQU,&fvar,0); lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
dtostrfd(fvar,6,str); dtostrfd(fvar,6,str);
glob_script_mem.var_not_found=0; glob_script_mem.glob_error=0;
} }
if (!glob_script_mem.var_not_found) { if (!glob_script_mem.var_not_found) {
@ -3954,12 +3968,16 @@ bool Xdrv10(uint8_t function)
break; break;
#ifdef SUPPORT_MQTT_EVENT #ifdef SUPPORT_MQTT_EVENT
case FUNC_MQTT_DATA: case FUNC_MQTT_DATA:
result = ScriptMqttData(); if (bitRead(Settings.rule_enabled, 0)) {
result = ScriptMqttData();
}
break; break;
#endif //SUPPORT_MQTT_EVENT #endif //SUPPORT_MQTT_EVENT
#ifdef USE_SCRIPT_WEB_DISPLAY #ifdef USE_SCRIPT_WEB_DISPLAY
case FUNC_WEB_SENSOR: case FUNC_WEB_SENSOR:
ScriptWebShow(); if (bitRead(Settings.rule_enabled, 0)) {
ScriptWebShow();
}
break; break;
#endif //USE_SCRIPT_WEB_DISPLAY #endif //USE_SCRIPT_WEB_DISPLAY