Skip to content

Commit 0061a89

Browse files
authored
Dev (#51)
* 去除重复的代码 * 修复windows下脚本权限问题 * 更新第三方库,添加国内镜像 * 更新工作流 * 允许多次初始化submodule * 清理镜像文件 * 更新错误的链接 * 更新文档
1 parent 0e8cf40 commit 0061a89

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

CMakeLists.txt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
22
message(
33
FATAL_ERROR
4-
"In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there."
4+
"In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there."
55
)
66
endif()
77

88
cmake_minimum_required(VERSION 3.11)
99

10-
# 版本第一位与赛季年份对应,同时与branch对应 第二位代表功能变化 第三位代表bug修复
10+
# 版本第一位与年份对应 第二位代表功能变化 第三位代表bug修复
1111
project(
1212
xrobot
13-
DESCRIPTION "MCU for Robomaster"
14-
VERSION 2022.0.0
13+
DESCRIPTION "XRobot Build"
14+
VERSION 2024.1.1
1515
LANGUAGES C CXX ASM)
1616

1717
# ---------------------------------------------------------------------------------------
@@ -86,21 +86,23 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src)
8686
# Build information
8787
message(
8888
STATUS
89-
"------------------------- Host Platform ------------------------------")
89+
"------------------------- Host Platform ------------------------------")
9090

9191
string(TIMESTAMP CONFIG_TIMESTAMP "" UTC)
9292
message(STATUS "Timestamp: ${CONFIG_TIMESTAMP}")
9393
message(
9494
STATUS
95-
"Host: ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR}"
95+
"Host: ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR}"
9696
)
97+
9798
if(CMAKE_CROSSCOMPILING) # set to true by CMake if the CMAKE_SYSTEM_NAME has
98-
# been set manually
99+
# been set manually
99100
message(
100101
STATUS
101-
"Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}"
102+
"Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}"
102103
)
103104
endif()
105+
104106
message(STATUS "CMake: ${CMAKE_VERSION}")
105107
message(STATUS "CMake generator: ${CMAKE_GENERATOR}")
106108
message(STATUS "CMake build tool: ${CMAKE_BUILD_TOOL}")
@@ -112,14 +114,15 @@ endif()
112114
if(CMAKE_GENERATOR MATCHES Xcode)
113115
message(STATUS "Xcode: ${XCODE_VERSION}")
114116
endif()
117+
115118
if(NOT CMAKE_GENERATOR MATCHES "Xcode|Visual Studio")
116119
message(STATUS "Configuration: ${CMAKE_BUILD_TYPE}")
117120
endif()
118121

119122
# ---------------------------------------------------------------------------------------
120123
message(
121124
STATUS
122-
"---------------------- Compiler Linker option ------------------------")
125+
"---------------------- Compiler Linker option ------------------------")
123126

124127
message(STATUS "C standard: ${CMAKE_C_STANDARD}")
125128
message(STATUS "")

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ XRobot基本部分是一套开发板与功能模块的管理系统,能够让
107107
* CAN总线微动检测模块
108108
* 诸多商业产品案例
109109

110-
| | | |
111-
| -------------------------------------------------------------- | --------------------------------------------------------------- | --------------------------------------------------------------- |
110+
| | | |
111+
| ------------------------------------------------------------ | ------------------------------------------------------------- | ------------------------------------------------------------- |
112112
| `<img src="./doc/image/rmuc.jpg" height="210" width="265">` | `<img src="./doc/image/rmuc1.jpg" height="210" width="265">` | `<img src="./doc/image/rmuc2.jpg" height="210" width="265">` |
113113

114114
<img src="./doc/image/rmuc3.jpg" height="600" width="800">
@@ -117,8 +117,8 @@ XRobot基本部分是一套开发板与功能模块的管理系统,能够让
117117

118118
## 硬件支持
119119

120-
| MCU | Board | Image |
121-
| ----------- | --------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
120+
| MCU | Board | Image |
121+
| ----------- | ------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------- |
122122
| STM32F407IG | [Robomaster C型开发板](https://www.robomaster.com/zh-CN/products/components/general/development-board-type-c/info) | `<img src="doc/image/rm-c.png" width="500" height="220">` |
123123
| STM32F302CB | [IMU-DEV-BOARD](https://xrobot-org.github.io/1.hardware/3.IMU-DEV.html) | `<img src="doc/image/IMU-DEV-1.jpg" width="350" height="200">` |
124124
| STM32F446RE | [C-Mini](https://xrobot-org.github.io/1.hardware/1.C-MINI.html) | `<img src="doc/image/C-MINI-1.jpg" width="350" height="250">` |

0 commit comments

Comments
 (0)