From 7ae7d85d691567ef9729d1f571504f6c5299dcea Mon Sep 17 00:00:00 2001 From: Lizongdi <1210855344@qq.com> Date: Wed, 17 Jun 2026 16:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A7=E5=96=B7=E6=BC=86?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakePresets.json | 29 +++++++++++++++++------------ robot | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 18df889..e4dc83f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -3,28 +3,26 @@ "configurePresets": [ { "name": "default-release", + "generator": "Ninja", + "toolchainFile": "${sourceDir}/gcc-arm-none-eabi.cmake", "hidden": true, "displayName": "Default Release Build", "description": "Default Release Build", "binaryDir": "${sourceDir}/build", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", + "CMAKE_BUILD_TYPE": "Debug", "A_BUILD_MAIN": "ON", "BUILD_COMMON": "ON", - "MY_BUILD_STATIC": "ON" + "A_BUILD_MAIN_AS_STATIC_LIB": "ON", + "MY_BUILD_STATIC": "OFF" } }, { - "name": "Spool-end", - "generator": "Ninja", - "toolchainFile": "${sourceDir}/gcc-arm-none-eabi.cmake", + "name": "rb-core", "inherits": "default-release", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", "BUILD_LUA": "ON", - "A_BUILD_MAIN_AS_STATIC_LIB": "ON", "BUILD_LUA_STANDALONE": "OFF", - "MY_BUILD_STATIC": "OFF", "BUILD_RINGBUFFER": "ON", "BUILD_PERIPHERAL": "ON", "BUILD_LIST": "ON", @@ -32,21 +30,28 @@ "MEM_POOL_TOTAL_SIZE": "46*1024", "IOC_100PIN": true, "USE_UART": true, + "BUILD_RBCORE": "ON", "USE_CAN": true } }, { - "name": "robot", - "inherits": "Spool-end", + "name": "paint_robot_new", + "inherits": "rb-core", "cacheVariables": { - "BUILD_RBCORE": "ON", "BUILD_OPTIONAL": "ON", "USE_LUA_ST": true, - "USE_LUA_ST_CAN": true, "USE_TALNET": true, "USE_LWIP": true, "USE_FREERTOS": true } + }, + { + "name": "paint_robot_old", + "inherits": "default-release", + "cacheVariables": { + "BUILD_COMMON": "OFF", + "BUILD_PAINT_ROBOT_OLD": "ON" + } } ] } \ No newline at end of file diff --git a/robot b/robot index 3951688..f000839 160000 --- a/robot +++ b/robot @@ -1 +1 @@ -Subproject commit 39516883b210d0aa525ce1872b49c4b35e6eb27b +Subproject commit f0008394ad6df4007fcf65a61cbac7c386e0f1b6