diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino index 5040d38cb..d76954715 100755 --- a/tasmota/xdrv_10_scripter.ino +++ b/tasmota/xdrv_10_scripter.ino @@ -1181,6 +1181,12 @@ chknext: } } } +#ifdef ESP32 + if (!strncmp(vname,"core",4)) { + fvar=xPortGetCoreID(); + goto exit; + } +#endif break; case 'd': if (!strncmp(vname,"day",3)) { @@ -1705,6 +1711,12 @@ chknext: fvar=999; goto exit; } +#ifdef ESP32 + if (!strncmp(vname,"pheap",5)) { + fvar=ESP.getFreePsram(); + goto exit; + } +#endif if (!strncmp(vname,"prefix1",7)) { if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX1),glob_script_mem.max_ssize); goto strexit; @@ -5235,7 +5247,9 @@ bool Xdrv10(uint8_t function) break; #ifdef USE_SCRIPT_WEB_DISPLAY case FUNC_WEB_ADD_MAIN_BUTTON: - ScriptWebShow('&'); + if (bitRead(Settings.rule_enabled, 0)) { + ScriptWebShow('&'); + } break; #endif // USE_SCRIPT_WEB_DISPLAY case FUNC_WEB_ADD_HANDLER: diff --git a/tasmota/xdrv_39_webcam.ino b/tasmota/xdrv_39_webcam.ino index 377d420ae..f85a543b7 100644 --- a/tasmota/xdrv_39_webcam.ino +++ b/tasmota/xdrv_39_webcam.ino @@ -878,13 +878,13 @@ bool Xdrv39(uint8_t function) { wc_pic_setup(); break; case FUNC_WEB_ADD_MAIN_BUTTON: - //if (Settings.esp32_webcam_resolution) { -#ifndef USE_SCRIPT + if (Settings.esp32_webcam_resolution) { +//#ifndef USE_SCRIPT WcStreamControl(Settings.esp32_webcam_resolution); delay(50); // Give the webcam webserver some time to prepare the stream wc_show_stream(); -#endif - //} +//#endif + } break; case FUNC_COMMAND: result = DecodeCommand(kWCCommands, WCCommand);