From 6523b55b8316968e9717057b35ad95fafb1d4437 Mon Sep 17 00:00:00 2001 From: Lizongdi <1210855344@qq.com> Date: Tue, 16 Jun 2026 11:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Espoolold=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=80=82=E9=85=8D=EF=BC=8C=E4=BB=A5=E5=90=8E=E7=9A=84=E8=80=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E4=BB=A5=E5=8F=82=E8=80=83=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakePresets.json | 19 +++++++++---------- Core/Src/main.c | 11 +++++------ robot | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 201a630..8f47664 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -39,17 +39,16 @@ } }, { - "name": "robot", - "inherits": "Spool-end", + "name": "Spool_old", + "generator": "Ninja", + "toolchainFile": "${sourceDir}/gcc-arm-none-eabi.cmake", + "inherits": "default-release", "cacheVariables": { - "BUILD_RBCORE": "ON", - "BUILD_OPTIONAL": "ON", - "IOC_100PIN": true, - "USE_LUA_ST": true, - "USE_LUA_ST_CAN": true, - "USE_TALNET": true, - "USE_LWIP": true, - "USE_FREERTOS": true + "CMAKE_BUILD_TYPE": "Debug", + "MY_BUILD_STATIC": "OFF", + "A_BUILD_MAIN_AS_STATIC_LIB": "ON", + "BUILD_COMMON": "OFF", + "BUILD_SPOOLOLD": "ON" } } ] diff --git a/Core/Src/main.c b/Core/Src/main.c index 39bcd4e..5b43ba9 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -27,7 +27,9 @@ /* Private includes ----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ +#ifdef BUILD_COMMON #include "common.h" +#endif /* USER CODE END Includes */ /* Private typedef -----------------------------------------------------------*/ @@ -105,18 +107,15 @@ int main(void) /* Infinite loop */ /* USER CODE BEGIN WHILE */ +#ifdef BUILD_COMMON RD_INIT(); void Myprint_Init(void); Myprint_Init(); +#endif SpoolendInit(); while (1) { - SpoolendTask(); - printf("Hello world\n"); - HAL_GPIO_TogglePin(LED1_GPIO_Port, LED1_Pin); - HAL_GPIO_TogglePin(LED2_GPIO_Port, LED2_Pin); - HAL_GPIO_TogglePin(LED3_GPIO_Port, LED3_Pin); - HAL_Delay(500); + SpoolendTask(); /* USER CODE END WHILE */ /* USER CODE BEGIN 3 */ diff --git a/robot b/robot index 04ae58a..a126caa 160000 --- a/robot +++ b/robot @@ -1 +1 @@ -Subproject commit 04ae58a2aae3cf19c263f25ea298fa6e81208078 +Subproject commit a126caa4e7d46c198dddc87f3de42f6bdb62870c