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

Merge pull request #12123 from gemu2015/script_status 

restore USE_SCRIPT_STATUS
This commit is contained in:
Theo Arends 2021-05-17 10:13:43 +02:00 committed by GitHub
parent 05f2dd74a7 ac52259dc8
commit e28006f2c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/support_command.ino
View File

@ -642,10 +642,6 @@ void CmndStatus(void)
} }
#endif #endif
#ifdef USE_SCRIPT_STATUS
if (bitRead(Settings.rule_enabled, 0)) { Run_Scripter(">U", 2, TasmotaGlobal.mqtt_data); }
#endif
ResponseClear(); ResponseClear();
} }

8
tasmota/xdrv_10_scripter.ino
View File

@ -8410,7 +8410,15 @@ bool Xdrv10(uint8_t function)
break; break;
case FUNC_RULES_PROCESS: case FUNC_RULES_PROCESS:
if (bitRead(Settings.rule_enabled, 0)) { if (bitRead(Settings.rule_enabled, 0)) {
#ifdef USE_SCRIPT_STATUS
if (!strncmp_P(TasmotaGlobal.mqtt_data, PSTR("{\"Status"), 8)) {
Run_Scripter(">U", 2, TasmotaGlobal.mqtt_data);
} else {
Run_Scripter(">E", 2, TasmotaGlobal.mqtt_data);
}
#else
Run_Scripter(">E", 2, TasmotaGlobal.mqtt_data); Run_Scripter(">E", 2, TasmotaGlobal.mqtt_data);
#endif
result = glob_script_mem.event_handeled; result = glob_script_mem.event_handeled;
} }
break; break;