Skip to content

Commit d3cc108

Browse files
committed
main函数改为由bsp提供
1 parent 32084f6 commit d3cc108

File tree

17 files changed

+114
-42
lines changed

17 files changed

+114
-42
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ project(
1313
DESCRIPTION "MCU for Robomaster"
1414
VERSION 2022.0.0
1515
LANGUAGES C CXX ASM)
16+
17+
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build)
1618
# ---------------------------------------------------------------------------------------
1719
# Tools
1820
include(${CMAKE_CURRENT_SOURCE_DIR}/utils/CMake/tools.cmake)

hw/bsp/MiniPC/board.cmake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,21 @@ set(BOARD_NAME MiniPC)
55
set(BOARD_DIR ${BSP_DIR}/${BOARD_NAME})
66

77
add_subdirectory(${BOARD_DIR}/drivers)
8+
9+
add_executable(${PROJECT_NAME}.elf ${BOARD_DIR}/main.cpp)
10+
11+
target_link_libraries(
12+
${PROJECT_NAME}.elf
13+
PUBLIC bsp
14+
PUBLIC system
15+
PUBLIC robot
16+
)
17+
18+
19+
target_include_directories(
20+
${PROJECT_NAME}.elf
21+
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
22+
PRIVATE $<TARGET_PROPERTY:bsp,INTERFACE_INCLUDE_DIRECTORIES>
23+
PRIVATE $<TARGET_PROPERTY:system,INTERFACE_INCLUDE_DIRECTORIES>
24+
PRIVATE $<TARGET_PROPERTY:robot,INTERFACE_INCLUDE_DIRECTORIES>
25+
)

hw/bsp/MiniPC/debug/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"name": "(gdb) 启动",
99
"type": "cppdbg",
1010
"request": "launch",
11-
"program": "${workspaceRoot}/build/src/xrobot.elf",
11+
"program": "${workspaceRoot}/build/xrobot.elf",
1212
"args": [],
1313
"stopAtEntry": true,
1414
"cwd": "${fileDirname}",

hw/bsp/MiniPC/main.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include "bsp.h"
2+
#include "robot.hpp"
3+
#include "thread.hpp"
4+
5+
int main() {
6+
bsp_init();
7+
robot_init();
8+
System::Thread::StartKernel();
9+
}

hw/bsp/Webots/board.cmake

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,20 @@ set(USE_SIMULATOR true)
1111
add_compile_definitions(USE_SIMULATOR)
1212

1313
add_subdirectory(${BOARD_DIR}/drivers)
14+
15+
add_executable(${PROJECT_NAME}.elf ${BOARD_DIR}/main.cpp)
16+
17+
target_link_libraries(
18+
${PROJECT_NAME}.elf
19+
PUBLIC bsp
20+
PUBLIC system
21+
PUBLIC robot)
22+
23+
24+
target_include_directories(
25+
${PROJECT_NAME}.elf
26+
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
27+
PRIVATE $<TARGET_PROPERTY:bsp,INTERFACE_INCLUDE_DIRECTORIES>
28+
PRIVATE $<TARGET_PROPERTY:system,INTERFACE_INCLUDE_DIRECTORIES>
29+
PRIVATE $<TARGET_PROPERTY:robot,INTERFACE_INCLUDE_DIRECTORIES>
30+
)

hw/bsp/Webots/debug/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"name": "(gdb) 启动",
99
"type": "cppdbg",
1010
"request": "launch",
11-
"program": "${workspaceRoot}/build/src/xrobot.elf",
11+
"program": "${workspaceRoot}/build/xrobot.elf",
1212
"args": [],
1313
"stopAtEntry": true,
1414
"cwd": "${fileDirname}",

hw/bsp/Webots/main.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include "bsp.h"
2+
#include "robot.hpp"
3+
#include "thread.hpp"
4+
5+
int main() {
6+
bsp_init();
7+
robot_init();
8+
System::Thread::StartKernel();
9+
}

hw/bsp/node_imu/board.cmake

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,20 @@ include(${MCU_DIR}/st/cmake/mcu_stm32f3.cmake)
1313
include(${MCU_DIR}/st/cmake/toolchain_utils.cmake)
1414

1515
add_subdirectory(${BOARD_DIR}/drivers)
16+
17+
add_executable(${PROJECT_NAME}.elf ${BOARD_DIR}/main.cpp)
18+
19+
target_link_libraries(
20+
${PROJECT_NAME}.elf
21+
PUBLIC bsp
22+
PUBLIC system
23+
PUBLIC robot)
24+
25+
26+
target_include_directories(
27+
${PROJECT_NAME}.elf
28+
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
29+
PRIVATE $<TARGET_PROPERTY:bsp,INTERFACE_INCLUDE_DIRECTORIES>
30+
PRIVATE $<TARGET_PROPERTY:system,INTERFACE_INCLUDE_DIRECTORIES>
31+
PRIVATE $<TARGET_PROPERTY:robot,INTERFACE_INCLUDE_DIRECTORIES>
32+
)

hw/bsp/node_imu/debug/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "ARM-Debug",
55
"cwd": "${workspaceRoot}",
6-
"executable": "${workspaceRoot}/build/src/xrobot.elf",
6+
"executable": "${workspaceRoot}/build/xrobot.elf",
77
"request": "launch",
88
"type": "cortex-debug",
99
"servertype": "jlink",

hw/bsp/node_imu/main.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include "bsp.h"
2+
#include "robot.hpp"
3+
#include "thread.hpp"
4+
5+
int main() {
6+
bsp_init();
7+
robot_init();
8+
System::Thread::StartKernel();
9+
}

0 commit comments

Comments
 (0)