From ba153bdb2852790ebd4190885978596e6fc77a0a Mon Sep 17 00:00:00 2001 From: openshwprojects <85486843+openshwprojects@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:21:07 +0100 Subject: [PATCH] add new define: ENABLE_OBK_SCRIPTING (#1503) * add new define: ENABLE_OBK_SCRIPTING * cmd_script --- platforms/W800/Makefile | 1 + src/cmnds/cmd_main.c | 3 +-- src/obk_config.h | 11 +++++++++-- src/user_main.c | 4 +--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/platforms/W800/Makefile b/platforms/W800/Makefile index d9acbbe7d..a755c0149 100644 --- a/platforms/W800/Makefile +++ b/platforms/W800/Makefile @@ -25,6 +25,7 @@ CSRCS += $(_SHARED_APP)/cmnds/cmd_test.c CSRCS += $(_SHARED_APP)/cmnds/cmd_tcp.c CSRCS += $(_SHARED_APP)/cmnds/cmd_tokenizer.c CSRCS += $(_SHARED_APP)/cmnds/cmd_if.c +CSRCS += $(_SHARED_APP)/cmnds/cmd_script.c CSRCS += $(_SHARED_APP)/cJSON/cJSON.c CSRCS += $(_SHARED_APP)/base64/base64.c CSRCS += $(_SHARED_APP)/hal/w800/hal_adc_w800.c diff --git a/src/cmnds/cmd_main.c b/src/cmnds/cmd_main.c index d9bf68596..904c09779 100644 --- a/src/cmnds/cmd_main.c +++ b/src/cmnds/cmd_main.c @@ -876,8 +876,7 @@ void CMD_Init_Early() { CMD_RegisterCommand("IndexRefreshInterval", CMD_IndexRefreshInterval, NULL); -#if (defined WINDOWS) || (defined PLATFORM_BEKEN) || (defined PLATFORM_BL602) || (defined PLATFORM_LN882H) \ - || (defined PLATFORM_ESPIDF) || defined(PLATFORM_TR6260) || defined(PLATFORM_RTL87X0C) +#if ENABLE_OBK_SCRIPTING CMD_InitScripting(); #endif if (!bSafeMode) { diff --git a/src/obk_config.h b/src/obk_config.h index ebde3ed02..324922641 100644 --- a/src/obk_config.h +++ b/src/obk_config.h @@ -56,6 +56,7 @@ #define ENABLE_DRIVER_BMP280 1 #define OBK_OTA_EXTENSION ".img" #define ENABLE_I2C 1 +#define ENABLE_OBK_SCRIPTING 1 #elif WINDOWS @@ -113,7 +114,7 @@ #define ENABLE_DRIVER_ADCSMOOTHER 1 #define ENABLE_DRIVER_SGP 1 #define ENABLE_DRIVER_SHIFTREGISTER 1 - +#define ENABLE_OBK_SCRIPTING 1 #elif PLATFORM_BL602 @@ -140,6 +141,7 @@ #define ENABLE_DRIVER_SSDP 1 #define ENABLE_DRIVER_CHT83XX 1 #define ENABLE_DRIVER_DS1820 1 +#define ENABLE_OBK_SCRIPTING 1 #define OBK_OTA_EXTENSION ".bin.xz.ota" //#define ENABLE_I2C 1 @@ -200,6 +202,7 @@ #define ENABLE_DRIVER_CHT83XX 1 #define ENABLE_DRIVER_KP18058 1 #define ENABLE_DRIVER_ADCSMOOTHER 1 +#define ENABLE_OBK_SCRIPTING 1 //#define ENABLE_DRIVER_OPENWEATHERMAP 1 #define OBK_OTA_EXTENSION ".rbl" @@ -229,6 +232,7 @@ //#define ENABLE_DRIVER_TMGN 1 #define ENABLE_TASMOTA_JSON 1 #define ENABLE_DRIVER_DS1820 1 +#define ENABLE_OBK_SCRIPTING 1 #define OBK_OTA_EXTENSION ".bin" #define OBK_OTA_NAME_EXTENSION "_OTA" @@ -259,6 +263,7 @@ #define ENABLE_DRIVER_DDP 1 #define ENABLE_DRIVER_SSDP 1 #define ENABLE_DRIVER_CHT83XX 1 +#define ENABLE_OBK_SCRIPTING 1 #define OBK_OTA_EXTENSION ".img" #elif PLATFORM_TR6260 @@ -276,7 +281,8 @@ #define ENABLE_DRIVER_DS1820 1 #define ENABLE_DRIVER_LED 1 #define ENABLE_DRIVER_WEMO 1 -#define ENABLE_DRIVER_SSDP 1 +#define ENABLE_DRIVER_SSDP 1 +#define ENABLE_OBK_SCRIPTING 1 #elif PLATFORM_RTL87X0C @@ -303,6 +309,7 @@ #define ENABLE_DRIVER_BL0942 1 #define ENABLE_DRIVER_BL0937 1 #define ENABLE_DRIVER_CSE7766 1 +#define ENABLE_OBK_SCRIPTING 1 #else diff --git a/src/user_main.c b/src/user_main.c index c777f3bdb..8b046fd95 100644 --- a/src/user_main.c +++ b/src/user_main.c @@ -958,9 +958,7 @@ void QuickTick(void* param) g_last_time = g_time; -#if (defined WINDOWS) || (defined PLATFORM_BEKEN) || (defined PLATFORM_BL602) \ - || (defined PLATFORM_LN882H) || (defined PLATFORM_ESPIDF) || (defined PLATFORM_TR6260) \ - || (defined PLATFORM_RTL87X0C) +#if ENABLE_OBK_SCRIPTING SVM_RunThreads(g_deltaTimeMS); #endif RepeatingEvents_RunUpdate(g_deltaTimeMS * 0.001f);