From 39516883b210d0aa525ce1872b49c4b35e6eb27b Mon Sep 17 00:00:00 2001 From: Lizongdi <1210855344@qq.com> Date: Tue, 16 Jun 2026 13:54:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8A=A0=E4=BA=86=E4=B8=80=E5=B1=82=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 6 +++--- {RBcore => project/RBcore}/BHBF_robot.c | 0 {RBcore => project/RBcore}/CMakeLists.txt | 2 +- {RBcore => project/RBcore}/drv_interface.c | 0 {RBcore => project/RBcore}/include/BHBF_robot.h | 0 {RBcore => project/RBcore}/include/drv_interface.h | 0 {Spoolend => project/Spoolend}/CMakeLists.txt | 2 +- {Spoolend => project/Spoolend}/Spoolend.c | 0 {Spoolold => project/Spoolold}/CMakeLists.txt | 2 +- {Spoolold => project/Spoolold}/Spoolold.c | 0 {Spoolold => project/Spoolold}/dmk.c | 0 {Spoolold => project/Spoolold}/flash_operation.c | 0 {Spoolold => project/Spoolold}/include/dmk.h | 0 {Spoolold => project/Spoolold}/include/flash_operation.h | 0 {Spoolold => project/Spoolold}/include/modbus.h | 0 {Spoolold => project/Spoolold}/modbus.c | 0 16 files changed, 6 insertions(+), 6 deletions(-) rename {RBcore => project/RBcore}/BHBF_robot.c (100%) rename {RBcore => project/RBcore}/CMakeLists.txt (79%) rename {RBcore => project/RBcore}/drv_interface.c (100%) rename {RBcore => project/RBcore}/include/BHBF_robot.h (100%) rename {RBcore => project/RBcore}/include/drv_interface.h (100%) rename {Spoolend => project/Spoolend}/CMakeLists.txt (79%) rename {Spoolend => project/Spoolend}/Spoolend.c (100%) rename {Spoolold => project/Spoolold}/CMakeLists.txt (80%) rename {Spoolold => project/Spoolold}/Spoolold.c (100%) rename {Spoolold => project/Spoolold}/dmk.c (100%) rename {Spoolold => project/Spoolold}/flash_operation.c (100%) rename {Spoolold => project/Spoolold}/include/dmk.h (100%) rename {Spoolold => project/Spoolold}/include/flash_operation.h (100%) rename {Spoolold => project/Spoolold}/include/modbus.h (100%) rename {Spoolold => project/Spoolold}/modbus.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef7ff08..a017c61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,10 +117,10 @@ add_module(ringbuffer library/ringbuffer OFF OFF) add_module(peripheral peripheral OFF ON) add_module(lua lua OFF ON) add_module(bspMCU bspMCU OFF OFF) -add_module(RBcore RBcore OFF OFF) +add_module(RBcore project/RBcore OFF OFF) add_module(optional optional OFF OFF) -add_module(Spoolend Spoolend OFF OFF) -add_module(Spoolold Spoolold OFF OFF) +add_module(Spoolend project/Spoolend OFF OFF) +add_module(Spoolold project/Spoolold OFF OFF) if(A_BUILD_MAIN) add_subdirectory(main) diff --git a/RBcore/BHBF_robot.c b/project/RBcore/BHBF_robot.c similarity index 100% rename from RBcore/BHBF_robot.c rename to project/RBcore/BHBF_robot.c diff --git a/RBcore/CMakeLists.txt b/project/RBcore/CMakeLists.txt similarity index 79% rename from RBcore/CMakeLists.txt rename to project/RBcore/CMakeLists.txt index a246184..5febc02 100644 --- a/RBcore/CMakeLists.txt +++ b/project/RBcore/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10) -set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt") +set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../library/CMakeLists.txt") if(EXISTS ${COMMON_CMAKE_PATH}) include(${COMMON_CMAKE_PATH}) diff --git a/RBcore/drv_interface.c b/project/RBcore/drv_interface.c similarity index 100% rename from RBcore/drv_interface.c rename to project/RBcore/drv_interface.c diff --git a/RBcore/include/BHBF_robot.h b/project/RBcore/include/BHBF_robot.h similarity index 100% rename from RBcore/include/BHBF_robot.h rename to project/RBcore/include/BHBF_robot.h diff --git a/RBcore/include/drv_interface.h b/project/RBcore/include/drv_interface.h similarity index 100% rename from RBcore/include/drv_interface.h rename to project/RBcore/include/drv_interface.h diff --git a/Spoolend/CMakeLists.txt b/project/Spoolend/CMakeLists.txt similarity index 79% rename from Spoolend/CMakeLists.txt rename to project/Spoolend/CMakeLists.txt index 6129aa2..0392850 100644 --- a/Spoolend/CMakeLists.txt +++ b/project/Spoolend/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10) -set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt") +set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../library/CMakeLists.txt") if(EXISTS ${COMMON_CMAKE_PATH}) include(${COMMON_CMAKE_PATH}) diff --git a/Spoolend/Spoolend.c b/project/Spoolend/Spoolend.c similarity index 100% rename from Spoolend/Spoolend.c rename to project/Spoolend/Spoolend.c diff --git a/Spoolold/CMakeLists.txt b/project/Spoolold/CMakeLists.txt similarity index 80% rename from Spoolold/CMakeLists.txt rename to project/Spoolold/CMakeLists.txt index 48e6597..9f9bfb3 100644 --- a/Spoolold/CMakeLists.txt +++ b/project/Spoolold/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10) -set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt") +set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../library/CMakeLists.txt") if(EXISTS ${COMMON_CMAKE_PATH}) include(${COMMON_CMAKE_PATH}) diff --git a/Spoolold/Spoolold.c b/project/Spoolold/Spoolold.c similarity index 100% rename from Spoolold/Spoolold.c rename to project/Spoolold/Spoolold.c diff --git a/Spoolold/dmk.c b/project/Spoolold/dmk.c similarity index 100% rename from Spoolold/dmk.c rename to project/Spoolold/dmk.c diff --git a/Spoolold/flash_operation.c b/project/Spoolold/flash_operation.c similarity index 100% rename from Spoolold/flash_operation.c rename to project/Spoolold/flash_operation.c diff --git a/Spoolold/include/dmk.h b/project/Spoolold/include/dmk.h similarity index 100% rename from Spoolold/include/dmk.h rename to project/Spoolold/include/dmk.h diff --git a/Spoolold/include/flash_operation.h b/project/Spoolold/include/flash_operation.h similarity index 100% rename from Spoolold/include/flash_operation.h rename to project/Spoolold/include/flash_operation.h diff --git a/Spoolold/include/modbus.h b/project/Spoolold/include/modbus.h similarity index 100% rename from Spoolold/include/modbus.h rename to project/Spoolold/include/modbus.h diff --git a/Spoolold/modbus.c b/project/Spoolold/modbus.c similarity index 100% rename from Spoolold/modbus.c rename to project/Spoolold/modbus.c