diff --git a/bsp/dsp_can.c b/bsp/dsp_can.c
index 2b69d10..ced82fa 100644
--- a/bsp/dsp_can.c
+++ b/bsp/dsp_can.c
@@ -28,12 +28,25 @@ CAN_RxHeaderTypeDef g_canx_rxheader; /*
*/
/* can_init(CAN_SJW_1TQ, CAN_BS2_8TQ, CAN_BS1_9TQ, 4, CAN_MODE_LOOPBACK); /* CAN初始化, 回环模式, 波特率500Kbps */
uint8_t can_init(uint32_t tsjw, uint32_t tbs2, uint32_t tbs1, uint16_t brp, uint32_t mode)
-{
- g_canx_handler.Instance = CAN1;
- g_canx_handler.Init.Prescaler = 4; /*brp; */ /* 分频系数(Fdiv)为brp+1 */
- g_canx_handler.Init.Mode = CAN_MODE_LOOPBACK; /*mode;*/ /* 模式设置 */
- g_canx_ha`ISABLE; /* 优先级由报文标识符决定 */
-
+{
+ g_canx_handler.Instance = CAN1;
+ g_canx_handler.Init.Mode = CAN_MODE_LOOPBACK;
+
+
+ /*设置波特率 */
+ g_canx_handler.Init.Prescaler = 4; /*brp; */ /* 分频系数(Fdiv)为brp+1 */
+ g_canx_handler.Init.TimeSeg1 = CAN_BS1_9TQ ; /*tbs1; */ /* tbs1范围CAN_BS1_1TQ~CAN_BS1_16TQ */
+ g_canx_handler.Init.TimeSeg2 = CAN_BS2_8TQ; /*tbs2; */ /* tbs2范围CAN_BS2_1TQ~CAN_BS2_8TQ */
+ g_canx_handler.Init.SyncJumpWidth = CAN_SJW_1TQ ;/*tsjw; */ /* 重新同步跳跃宽度(Tsjw)为tsjw+1个时间单位 CAN_SJW_1TQ~CAN_SJW_4TQ */
+
+ /*设置CAN功能 */
+ g_canx_handler.Init.AutoBusOff = DISABLE; /* 软件自动离线管理 */
+ g_canx_handler.Init.AutoWakeUp = DISABLE; /* 睡眠模式通过软件唤醒(清除CAN->MCR的SLEEP位) */
+ g_canx_handler.Init.AutoRetransmission = ENABLE; /* 禁止报文自动传送 */
+ g_canx_handler.Init.ReceiveFifoLocked = DISABLE; /* 报文不锁定,新的覆盖旧的 */
+ g_canx_handler.Init.TimeTriggeredMode = DISABLE; /* 非时间触发通信模式 */
+ g_canx_handler.Init.TransmitFifoPriority = DISABLE; /* 优先级由报文标识符决定 */
+
if (HAL_CAN_Init(&g_canx_handler) != HAL_OK)
{
return 1;
diff --git a/drv/drv_gpio.c b/drv/drv_gpio.c
index e69de29..75de451 100644
--- a/drv/drv_gpio.c
+++ b/drv/drv_gpio.c
@@ -0,0 +1,58 @@
+#include "drv_sys.h"
+#include "drv_gpio.h"
+
+// 在这个数组中配置所有需要初始化的GPIO引脚
+GPIOConfig gpio_config[] = {
+ // 高边输出
+ {GPIOG, GPIO_PIN_4, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOG, GPIO_PIN_5, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOG, GPIO_PIN_6, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOG, GPIO_PIN_7, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOD, GPIO_PIN_10, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOD, GPIO_PIN_11, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOD, GPIO_PIN_12, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOD, GPIO_PIN_13, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ // 低边输出
+ {GPIOG, GPIO_PIN_8, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOA, GPIO_PIN_8, GPIO_MODE_OUTPUT_PP, GPIO_PULLUP, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ // 高边反馈
+ {GPIOD, GPIO_PIN_14, GPIO_MODE_INPUT, GPIO_NOPULL, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOD, GPIO_PIN_15, GPIO_MODE_INPUT, GPIO_NOPULL, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOG, GPIO_PIN_2, GPIO_MODE_INPUT, GPIO_NOPULL, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOG, GPIO_PIN_3, GPIO_MODE_INPUT, GPIO_NOPULL, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ // 低边反馈
+ {GPIOC, GPIO_PIN_6, GPIO_MODE_INPUT, GPIO_NOPULL, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+ {GPIOC, GPIO_PIN_7, GPIO_MODE_INPUT, GPIO_NOPULL, GPIO_SPEED_FREQ_VERY_HIGH, 0},
+};
+
+
+// 初始化所有配置的GPIO引脚
+void InitGPIOs(void) {
+ // 启用所需的GPIO时钟
+ __HAL_RCC_GPIOA_CLK_ENABLE();
+ __HAL_RCC_GPIOB_CLK_ENABLE();
+ __HAL_RCC_GPIOC_CLK_ENABLE();
+ __HAL_RCC_GPIOH_CLK_ENABLE();
+ __HAL_RCC_GPIOD_CLK_ENABLE();
+ __HAL_RCC_GPIOE_CLK_ENABLE();
+ __HAL_RCC_GPIOF_CLK_ENABLE();
+ __HAL_RCC_GPIOI_CLK_ENABLE();
+ __HAL_RCC_GPIOG_CLK_ENABLE();
+ // 如果使用其他GPIO端口，需要启用相应的时钟
+
+ GPIO_InitTypeDef GPIO_InitStruct;
+
+ // 遍历配置数组并初始化每个引脚
+ for (int i = 0; i < sizeof(gpio_config) / sizeof(GPIOConfig); i++)
+ {
+ // 配置GPIO初始化结构体
+ GPIO_InitStruct.Pin = gpio_config[i].pin;
+ GPIO_InitStruct.Mode = gpio_config[i].mode;
+ GPIO_InitStruct.Pull = gpio_config[i].pull;
+ GPIO_InitStruct.Speed = gpio_config[i].speed;
+ GPIO_InitStruct.Alternate = gpio_config[i].alternate;
+
+ // 初始化GPIO引脚
+ HAL_GPIO_Init(gpio_config[i].port, &GPIO_InitStruct);
+ }
+}
\ No newline at end of file
diff --git a/drv/drv_gpio.h b/drv/drv_gpio.h
index e69de29..7ad200b 100644
--- a/drv/drv_gpio.h
+++ b/drv/drv_gpio.h
@@ -0,0 +1,22 @@
+#ifndef _DRV_GPIO_H
+#define _DRV_GPIO_H
+
+#include "stdio.h"
+#include "drv_sys.h"
+
+#include "stm32f4xx_hal.h"
+
+// 定义一个结构体来描述每个GPIO引脚的配置
+typedef struct {
+ GPIO_TypeDef* port; // GPIO端口
+ uint16_t pin; // GPIO引脚号
+ uint32_t mode; // GPIO模式
+ uint32_t pull; // 上拉/下拉设置
+ uint32_t speed; // 切换速度
+ uint32_t alternate; // 复用功能
+} GPIOConfig;
+
+// 声明初始化所有配置的GPIO引脚函数
+void InitGPIOs(void);
+
+#endif // GPIO_CONFIG_H
\ No newline at end of file
diff --git a/prj/MDK-ARM/Objects/HF_BCU_APP.build_log.htm b/prj/MDK-ARM/Objects/HF_BCU_APP.build_log.htm
index 7166d94..90b04b9 100644
--- a/prj/MDK-ARM/Objects/HF_BCU_APP.build_log.htm
+++ b/prj/MDK-ARM/Objects/HF_BCU_APP.build_log.htm
@@ -30,32 +30,33 @@ Build target 'stm32f407'
compiling app_demo.c...
"no source": Error: #5: cannot open source input file "..\..\app\app_demo.c": No such file or directory
..\..\app\app_demo.c: 0 warnings, 1 error
-compiling dsp_can.c...
-..\..\bsp\dsp_can.c(95): warning: #223-D: function "CAN_RX_GPIO_CLK_ENABLE" declared implicitly
- CAN_RX_GPIO_CLK_ENABLE(); /* CAN_RX脚时钟使能 */
-..\..\bsp\dsp_can.c(96): warning: #223-D: function "CAN_TX_GPIO_CLK_ENABLE" declared implicitly
- CAN_TX_GPIO_CLK_ENABLE(); /* CAN_TX脚时钟使能 */
-..\..\bsp\dsp_can.c(101): error: #20: identifier "CAN_TX_GPIO_PIN" is undefined
- gpio_initure.Pin = CAN_TX_GPIO_PIN;
-..\..\bsp\dsp_can.c(105): error: #20: identifier "CAN_TX_GPIO_PORT" is undefined
- HAL_GPIO_Init(CAN_TX_GPIO_PORT, &gpio_initure); /* CAN_TX脚 模式设置 */
-..\..\bsp\dsp_can.c(107): error: #20: identifier "CAN_RX_GPIO_PIN" is undefined
- gpio_initure.Pin = CAN_RX_GPIO_PIN;
-..\..\bsp\dsp_can.c(108): error: #20: identifier "GPIO_MODE_AF_INPUT" is undefined
- gpio_initure.Mode = GPIO_MODE_AF_INPUT;
-..\..\bsp\dsp_can.c(109): error: #20: identifier "CAN_RX_GPIO_PORT" is undefined
- HAL_GPIO_Init(CAN_RX_GPIO_PORT, &gpio_initure); /* CAN_RX脚 必须设置成输入模式 */
-..\..\bsp\dsp_can.c(197): warning: #1-D: last line of file ends without a newline
+compiling drv_gpio.c...
+..\..\drv\drv_gpio.h(22): warning: #1-D: last line of file ends without a newline
+ #endif // GPIO_CONFIG_H
+..\..\drv\drv_gpio.c(35): warning: #1-D: last line of file ends without a newline
}
-..\..\bsp\dsp_can.c: 3 warnings, 5 errors
-compiling bsp_task.c...
-compiling main.c...
-..\..\main\main.c(43): warning: #223-D: function "task1" declared implicitly
- task1(baseTime);
-..\..\main\main.c(48): warning: #223-D: function "task2" declared implicitly
- task2(baseTime);
-..\..\main\main.c: 2 warnings, 0 errors
-".\Objects\HF_BCU_APP.axf" - 5 Error(s), 5 Warning(s).
+..\..\drv\drv_gpio.c: 2 warnings, 0 errors
+compiling dsp_can.c...
+..\..\bsp\dsp_can.c(29): warning: #9-D: nested comment is not allowed
+ /* can_init(CAN_SJW_1TQ, CAN_BS2_8TQ, CAN_BS1_9TQ, 4, CAN_MODE_LOOPBACK); /* CAN初始化, 回环模式, 波特率500Kbps */
+..\..\bsp\dsp_can.c(101): warning: #223-D: function "CAN_RX_GPIO_CLK_ENABLE" declared implicitly
+ CAN_RX_GPIO_CLK_ENABLE(); /* CAN_RX脚时钟使能 */
+..\..\bsp\dsp_can.c(102): warning: #223-D: function "CAN_TX_GPIO_CLK_ENABLE" declared implicitly
+ CAN_TX_GPIO_CLK_ENABLE(); /* CAN_TX脚时钟使能 */
+..\..\bsp\dsp_can.c(107): error: #20: identifier "CAN_TX_GPIO_PIN" is undefined
+ gpio_initure.Pin = CAN_TX_GPIO_PIN;
+..\..\bsp\dsp_can.c(111): error: #20: identifier "CAN_TX_GPIO_PORT" is undefined
+ HAL_GPIO_Init(CAN_TX_GPIO_PORT, &gpio_initure); /* CAN_TX脚 模式设置 */
+..\..\bsp\dsp_can.c(113): error: #20: identifier "CAN_RX_GPIO_PIN" is undefined
+ gpio_initure.Pin = CAN_RX_GPIO_PIN;
+..\..\bsp\dsp_can.c(114): error: #20: identifier "GPIO_MODE_AF_INPUT" is undefined
+ gpio_initure.Mode = GPIO_MODE_AF_INPUT;
+..\..\bsp\dsp_can.c(115): error: #20: identifier "CAN_RX_GPIO_PORT" is undefined
+ HAL_GPIO_Init(CAN_RX_GPIO_PORT, &gpio_initure); /* CAN_RX脚 必须设置成输入模式 */
+..\..\bsp\dsp_can.c(203): warning: #1-D: last line of file ends without a newline
+ }
+..\..\bsp\dsp_can.c: 4 warnings, 5 errors
+".\Objects\HF_BCU_APP.axf" - 5 Error(s), 6 Warning(s).
Software Packages used:
@@ -70,7 +71,7 @@ Package Vendor: Keil
Collection of Component Files used:
Target not created.
-Build Time Elapsed: 00:00:06
+Build Time Elapsed: 00:00:08