jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-22 18:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix recursion

Browse Source
This commit is contained in:
gemu2015 2022-12-07 08:52:13 +01:00
parent 9cce6ad0eb
commit 237695de22
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
View File

@ -6025,7 +6025,9 @@ int16_t retval;
if (!glob_script_mem.scriptptr) { if (!glob_script_mem.scriptptr) {
return -99; return -99;
} }
if (tasm_cmd_activ && tlen > 0) return 0; //if (tasm_cmd_activ && tlen > 0) return 0;
if (tasm_cmd_activ) return 0;
struct GVARS gv; struct GVARS gv;
gv.jo = 0; gv.jo = 0;
retval = Run_script_sub(type, tlen, &gv); retval = Run_script_sub(type, tlen, &gv);
@ -6040,7 +6042,8 @@ int16_t retval;
return -99; return -99;
} }
if (tasm_cmd_activ && tlen>0) return 0; //if (tasm_cmd_activ && tlen>0) return 0;
if (tasm_cmd_activ) return 0;
struct GVARS gv; struct GVARS gv;
@ -7712,14 +7715,14 @@ else light_status += "true";
light_status += ","; light_status += ",";
break; break;
*/ */
String GetHueDeviceId(uint16_t id, uint8_t ep);
void Script_HueStatus(String *response, uint16_t hue_devs) { void Script_HueStatus(String *response, uint16_t hue_devs) {
if (hue_script[hue_devs].type=='p') { if (hue_script[hue_devs].type=='p') {
*response += FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON2); *response += FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON2);
response->replace("{j1", hue_script[hue_devs].name); response->replace("{j1", hue_script[hue_devs].name);
response->replace("{j2", GetHueDeviceId(hue_devs)); response->replace("{j2", GetHueDeviceId(hue_devs, 0));
uint8_t pwr = glob_script_mem.fvars[hue_script[hue_devs].index[0] - 1]; uint8_t pwr = glob_script_mem.fvars[hue_script[hue_devs].index[0] - 1];
response->replace("{state}", (pwr ? "true" : "false")); response->replace("{state}", (pwr ? "true" : "false"));
return; return;
@ -7793,7 +7796,7 @@ void Script_HueStatus(String *response, uint16_t hue_devs) {
response->replace("{light_status}", light_status); response->replace("{light_status}", light_status);
response->replace("{j1", hue_script[hue_devs].name); response->replace("{j1", hue_script[hue_devs].name);
response->replace("{j2", GetHueDeviceId(hue_devs)); response->replace("{j2", GetHueDeviceId(hue_devs, 0));
} }