From bd14152dbd589434f5d9d9138caa05607fed127d Mon Sep 17 00:00:00 2001 From: dianjixz <18637716021@163.com> Date: Mon, 10 Nov 2025 19:02:00 +0800 Subject: [PATCH] [update] update ax_msp kconfig bsp version,pzmq add NotAction dec,static_lib add libfmt --- ext_components/StackFlow/stackflow/pzmq.hpp | 2 +- ext_components/ax_msp/Kconfig | 18 ++++++++++++------ projects/llm_framework/SConstruct | 2 +- projects/llm_framework/config_defaults.mk | 1 + 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ext_components/StackFlow/stackflow/pzmq.hpp b/ext_components/StackFlow/stackflow/pzmq.hpp index 97c902c..8a29bd1 100644 --- a/ext_components/StackFlow/stackflow/pzmq.hpp +++ b/ext_components/StackFlow/stackflow/pzmq.hpp @@ -382,7 +382,7 @@ public: std::unique_lock lock(zmq_fun_mtx_); retval = zmq_fun_.at(msg_ptr->string())(this, msg1_ptr); } catch (...) { - retval = "NotAction"; + retval = msg_ptr->string() + " NotAction"; } zmq_send(zmq_socket_, retval.c_str(), retval.length(), 0); msg1_ptr.reset(); diff --git a/ext_components/ax_msp/Kconfig b/ext_components/ax_msp/Kconfig index ce8206e..ef6a29d 100644 --- a/ext_components/ax_msp/Kconfig +++ b/ext_components/ax_msp/Kconfig @@ -25,17 +25,23 @@ menuconfig AX_MSP_ENABLED choice prompt "choice common version" default MSP_V2_0_0_ENABLED - depends on AX_MSP_ENABLED - config MSP_V3_6_2_ENABLED - bool "enable v3.6.2 bsp" - help - build by m5stack! + depends on AX_MSP_ENABLED && AX_620E_MSP_ENABLED config MSP_V2_0_0_ENABLED bool "enable v2.0.0 bsp" help build by m5stack! endchoice - + + choice + prompt "choice common version" + default MSP_V3_6_2_ENABLED + depends on AX_MSP_ENABLED && AX_650C_MSP_ENABLED + config MSP_V3_6_2_ENABLED + bool "enable v3.6.2 bsp" + help + build by m5stack! + endchoice + config SAMPLE_COMMON_ENABLED bool "Enable sample common" default n diff --git a/projects/llm_framework/SConstruct b/projects/llm_framework/SConstruct index 26ed734..b6c85da 100644 --- a/projects/llm_framework/SConstruct +++ b/projects/llm_framework/SConstruct @@ -5,7 +5,7 @@ import shutil os.environ['SDK_PATH'] = os.path.normpath(str(Path(os.getcwd())/'..'/'..'/'SDK')) os.environ['EXT_COMPONENTS_PATH'] = os.path.normpath(str(Path(os.getcwd())/'..'/'..'/'ext_components')) -version = 'v0.1.1' +version = 'v0.1.2' static_lib = 'static_lib' update = False diff --git a/projects/llm_framework/config_defaults.mk b/projects/llm_framework/config_defaults.mk index 09d6a4b..898c48a 100644 --- a/projects/llm_framework/config_defaults.mk +++ b/projects/llm_framework/config_defaults.mk @@ -23,3 +23,4 @@ CONFIG_SINGLE_HEADER_LIBS_ENABLED=y CONFIG_AX_SAMPLES_ENABLED=y CONFIG_SIMDJSON_COMPENENT_ENABLED=y CONFIG_SAMPLE_COMMON_ENABLED=y +CONFIG_MODBUS_ENABLED=y \ No newline at end of file