From 58aff16be174ebb2b1f7280daeac1f1a6b5f6b61 Mon Sep 17 00:00:00 2001 From: LSMushui Date: Sat, 12 Sep 2026 10:33:12 +0800 Subject: [PATCH] =?UTF-8?q?build(gitignore):=20=E4=BF=9D=E7=95=99=20CMSIS-?= =?UTF-8?q?DSP=20=E9=A2=84=E7=BC=96=E8=AF=91=E5=BA=93,=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=A2=AB=20*.lib=20=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 两个子工程的 .gitignore 来自通用 C 模板,其中的 *.lib 规则会把 Middlewares/ST/ARM/DSP/Lib 下的 arm_cortexM4lf_math.lib(CMSIS-DSP 预编译 库)一并排除。该文件是源码依赖而非构建产物,是工程链接 DSP 依赖时必须 的输入,一旦不入库,新克隆的仓库无法构建。故移除 *.lib 忽略规则。 --- 云台/.gitignore | 4 +++- 云台/Bsp/Inc/bsp_uart.h | 18 ------------------ 云台/Bsp/Src/bsp_uart.c | 28 ---------------------------- 底盘/.gitignore | 4 +++- 底盘/Bsp/Inc/bsp_uart.h | 18 ------------------ 底盘/Bsp/Src/bsp_uart.c | 24 ------------------------ 6 files changed, 6 insertions(+), 90 deletions(-) delete mode 100644 云台/Bsp/Inc/bsp_uart.h delete mode 100644 云台/Bsp/Src/bsp_uart.c delete mode 100644 底盘/Bsp/Inc/bsp_uart.h delete mode 100644 底盘/Bsp/Src/bsp_uart.c diff --git a/云台/.gitignore b/云台/.gitignore index c848d7a..4cbfb32 100644 --- a/云台/.gitignore +++ b/云台/.gitignore @@ -18,7 +18,9 @@ *.pch # Libraries -*.lib +# 注意: 不忽略 *.lib —— Middlewares/ST/ARM/DSP/Lib 下的 CMSIS-DSP 预编译库 +# (arm_cortexM4lf_math.lib)是源码依赖而非构建产物,必须入库,否则 +# 新克隆的仓库无法链接 *.a *.la *.lo diff --git a/云台/Bsp/Inc/bsp_uart.h b/云台/Bsp/Inc/bsp_uart.h deleted file mode 100644 index 8ae6513..0000000 --- a/云台/Bsp/Inc/bsp_uart.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef BSP_UART_H -#define BSP_UART_H -#include "stm32f4xx_hal.h" -#include "usart.h" - -typedef UART_HandleTypeDef huart_t; -#define UART1 huart6 //(3pin)与板上的标识相对应 -#define UART2 huart1 //(4pin)与板上的标识相对应 - -typedef enum __UartSendState { - UART_SEND_FAIL = 0, - UART_SEND_OK, -} UartSendState_e; - -extern UartSendState_e UartSendTxMessage( - UART_HandleTypeDef * huart, uint8_t * pData, uint16_t Size, uint32_t Timeout); - -#endif // BSP_UART_H diff --git a/云台/Bsp/Src/bsp_uart.c b/云台/Bsp/Src/bsp_uart.c deleted file mode 100644 index c21fdb4..0000000 --- a/云台/Bsp/Src/bsp_uart.c +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @brief uart板级支持包 - * @author Penguin - */ -#include "bsp_uart.h" - -/** - * @brief 使用uart发送数据 - * @param huart - * @param pData - * @param Size - * @param Timeout - * @return - */ -UartSendState_e UartSendTxMessage( - UART_HandleTypeDef * huart, uint8_t * pData, uint16_t Size, uint32_t Timeout) -{ - uint8_t cnt = 5; //最大重发次数 - HAL_StatusTypeDef status = HAL_UART_Transmit(huart, pData, Size, Timeout); - while (cnt-- && status != HAL_OK) { - status = HAL_UART_Transmit(huart, pData, Size, Timeout); - } - - if (status == HAL_OK) { - return UART_SEND_OK; - } - return UART_SEND_FAIL; -} diff --git a/底盘/.gitignore b/底盘/.gitignore index c848d7a..4cbfb32 100644 --- a/底盘/.gitignore +++ b/底盘/.gitignore @@ -18,7 +18,9 @@ *.pch # Libraries -*.lib +# 注意: 不忽略 *.lib —— Middlewares/ST/ARM/DSP/Lib 下的 CMSIS-DSP 预编译库 +# (arm_cortexM4lf_math.lib)是源码依赖而非构建产物,必须入库,否则 +# 新克隆的仓库无法链接 *.a *.la *.lo diff --git a/底盘/Bsp/Inc/bsp_uart.h b/底盘/Bsp/Inc/bsp_uart.h deleted file mode 100644 index 8ae6513..0000000 --- a/底盘/Bsp/Inc/bsp_uart.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef BSP_UART_H -#define BSP_UART_H -#include "stm32f4xx_hal.h" -#include "usart.h" - -typedef UART_HandleTypeDef huart_t; -#define UART1 huart6 //(3pin)与板上的标识相对应 -#define UART2 huart1 //(4pin)与板上的标识相对应 - -typedef enum __UartSendState { - UART_SEND_FAIL = 0, - UART_SEND_OK, -} UartSendState_e; - -extern UartSendState_e UartSendTxMessage( - UART_HandleTypeDef * huart, uint8_t * pData, uint16_t Size, uint32_t Timeout); - -#endif // BSP_UART_H diff --git a/底盘/Bsp/Src/bsp_uart.c b/底盘/Bsp/Src/bsp_uart.c deleted file mode 100644 index 4328a3d..0000000 --- a/底盘/Bsp/Src/bsp_uart.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "bsp_uart.h" - -/** - * @brief 使用uart发送数据 - * @param huart - * @param pData - * @param Size - * @param Timeout - * @return - */ -UartSendState_e UartSendTxMessage( - UART_HandleTypeDef * huart, uint8_t * pData, uint16_t Size, uint32_t Timeout) -{ - uint8_t cnt = 5; //最大重发次数 - HAL_StatusTypeDef status = HAL_UART_Transmit(huart, pData, Size, Timeout); - while (cnt-- && status != HAL_OK) { - status = HAL_UART_Transmit(huart, pData, Size, Timeout); - } - - if (status == HAL_OK) { - return UART_SEND_OK; - } - return UART_SEND_FAIL; -}