进一步迭代优化统一管理

2026-01-23 14:35:51 +08:00
parent 988cc7ad4a
commit 075e8299cf
36 changed files with 6146 additions and 1590 deletions
--- a/BSP/Src/bsp_init.c
+++ b/BSP/Src/bsp_init.c
@ -16,20 +16,29 @@

 /**
 * @brief Initialize board support package
+ * @retval HAL status code
 */
-void bsp_init(void) {
+hal_ret_t bsp_init(void) {
    /* Get board configuration */
    const bsp_board_config_t* board_config = bsp_board_get_config();
+    hal_ret_t status = HAL_RET_OK;
+    uint8_t i;
    
    /* Initialize HAL layer */
-    hal_init();
+    status = hal_init();
+    if (status != HAL_RET_OK) {
+        return status;
+    }
    
    /* Initialize peripherals based on configuration */
    
    /* Initialize LED */
-    if (board_config->led_init != NULL) {
-        board_config->led_init(&board_config->led);
-    } else {
+    if (board_config->led.enable && board_config->init_funcs.led_init != NULL) {
+        status = board_config->init_funcs.led_init(&board_config->led);
+        if (status != HAL_RET_OK) {
+            return status;
+        }
+    } else if (board_config->led.enable) {
        /* Use default initialization if no function provided */
        hal_gpio_config_t gpio_config = {
            .port = board_config->led.port,
@ -38,53 +47,204 @@ void bsp_init(void) {
            .speed = board_config->led.speed,
            .pull = board_config->led.pull
        };
-        hal_gpio_configure_pin(&gpio_config);
+        status = hal_gpio_configure_pin(&gpio_config);
+        if (status != HAL_RET_OK) {
+            return status;
+        }
    }
    
    /* Initialize Buttons */
-    if (board_config->button_init != NULL) {
-        board_config->button_init(&board_config->buttons);
+    if (board_config->buttons.enable && board_config->init_funcs.button_init != NULL) {
+        status = board_config->init_funcs.button_init(&board_config->buttons);
+        if (status != HAL_RET_OK) {
+            return status;
+        }
    }
    
-    /* Initialize UART */
-    if (board_config->uart_init != NULL) {
-        board_config->uart_init(&board_config->uart);
+    /* Initialize UARTs */
+    if (board_config->init_funcs.uart_init != NULL) {
+        for (i = 0; i < board_config->periphs.uart_count; i++) {
+            if (board_config->periphs.uarts[i].enable) {
+                status = board_config->init_funcs.uart_init(&board_config->periphs.uarts[i]);
+                if (status != HAL_RET_OK) {
+                    return status;
+                }
+            }
+        }
    }
    
-    /* Initialize W25QXX if available */
-    if (board_config->w25qxx_init != NULL) {
-        board_config->w25qxx_init(&board_config->w25qxx);
+    /* Initialize SPIs */
+    if (board_config->init_funcs.spi_init != NULL) {
+        for (i = 0; i < board_config->periphs.spi_count; i++) {
+            if (board_config->periphs.spis[i].enable) {
+                status = board_config->init_funcs.spi_init(&board_config->periphs.spis[i]);
+                if (status != HAL_RET_OK) {
+                    return status;
+                }
+            }
+        }
    }
+    
+    /* Initialize I2Cs */
+    if (board_config->init_funcs.i2c_init != NULL) {
+        for (i = 0; i < board_config->periphs.i2c_count; i++) {
+            if (board_config->periphs.i2cs[i].enable) {
+                status = board_config->init_funcs.i2c_init(&board_config->periphs.i2cs[i]);
+                if (status != HAL_RET_OK) {
+                    return status;
+                }
+            }
+        }
+    }
+    
+    /* Initialize CANs */
+    if (board_config->init_funcs.can_init != NULL) {
+        for (i = 0; i < board_config->periphs.can_count; i++) {
+            if (board_config->periphs.cans[i].enable) {
+                status = board_config->init_funcs.can_init(&board_config->periphs.cans[i]);
+                if (status != HAL_RET_OK) {
+                    return status;
+                }
+            }
+        }
+    }
+    
+    /* Initialize ADCs */
+    if (board_config->init_funcs.adc_init != NULL) {
+        for (i = 0; i < board_config->periphs.adc_count; i++) {
+            if (board_config->periphs.adcs[i].enable) {
+                status = board_config->init_funcs.adc_init(&board_config->periphs.adcs[i]);
+                if (status != HAL_RET_OK) {
+                    return status;
+                }
+            }
+        }
+    }
+    
+    /* Initialize W25QXX if available and enabled */
+    if (board_config->w25qxx.enable && board_config->init_funcs.w25qxx_init != NULL) {
+        status = board_config->init_funcs.w25qxx_init(&board_config->w25qxx);
+        if (status != HAL_RET_OK) {
+            return status;
+        }
+    }
+    
+    return status;
 }

 /**
 * @brief Initialize board GPIO using configuration
+ * @retval HAL status code
 */
-void bsp_gpio_init(void) {
+hal_ret_t bsp_gpio_init(void) {
    /* Get board configuration */
    const bsp_board_config_t* board_config = bsp_board_get_config();
+    hal_ret_t status = HAL_RET_OK;
    uint8_t i;
    
    /* Initialize LED GPIO */
-    hal_gpio_config_t gpio_config = {
-        .port = board_config->led.port,
-        .pin = board_config->led.pin,
-        .mode = board_config->led.mode,
-        .speed = board_config->led.speed,
-        .pull = board_config->led.pull
-    };
-    hal_gpio_configure_pin(&gpio_config);
+    if (board_config->led.enable) {
+        hal_gpio_config_t gpio_config = {
+            .port = board_config->led.port,
+            .pin = board_config->led.pin,
+            .mode = board_config->led.mode,
+            .speed = board_config->led.speed,
+            .pull = board_config->led.pull
+        };
+        status = hal_gpio_configure_pin(&gpio_config);
+        if (status != HAL_RET_OK) {
+            return status;
+        }
+    }
    
    /* Initialize Buttons GPIO */
-    for (i = 0; i < board_config->buttons.count; i++) {
-        const bsp_button_config_t* button = &board_config->buttons.buttons[i];
-        gpio_config.port = button->port;
-        gpio_config.pin = button->pin;
-        gpio_config.mode = button->mode;
-        gpio_config.speed = button->speed;
-        gpio_config.pull = button->pull;
-        hal_gpio_configure_pin(&gpio_config);
+    if (board_config->buttons.enable) {
+        for (i = 0; i < board_config->buttons.count; i++) {
+            const bsp_button_config_t* button = &board_config->buttons.buttons[i];
+            hal_gpio_config_t gpio_config = {
+                .port = button->port,
+                .pin = button->pin,
+                .mode = button->mode,
+                .speed = button->speed,
+                .pull = button->pull
+            };
+            status = hal_gpio_configure_pin(&gpio_config);
+            if (status != HAL_RET_OK) {
+                return status;
+            }
+        }
    }
+    
+    /* Initialize UART GPIOs */
+    for (i = 0; i < board_config->periphs.uart_count; i++) {
+        if (board_config->periphs.uarts[i].enable) {
+            /* Initialize TX pin */
+            hal_gpio_config_t gpio_config = {
+                .port = board_config->periphs.uarts[i].tx_port,
+                .pin = board_config->periphs.uarts[i].tx_pin,
+                .mode = HAL_GPIO_MODE_AF_PP,
+                .speed = HAL_GPIO_SPEED_HIGH,
+                .pull = HAL_GPIO_PULL_NO
+            };
+            status = hal_gpio_configure_pin(&gpio_config);
+            if (status != HAL_RET_OK) {
+                return status;
+            }
+            
+            /* Initialize RX pin */
+            gpio_config.port = board_config->periphs.uarts[i].rx_port;
+            gpio_config.pin = board_config->periphs.uarts[i].rx_pin;
+            gpio_config.mode = HAL_GPIO_MODE_AF_PP;
+            gpio_config.speed = HAL_GPIO_SPEED_HIGH;
+            gpio_config.pull = HAL_GPIO_PULL_UP;
+            status = hal_gpio_configure_pin(&gpio_config);
+            if (status != HAL_RET_OK) {
+                return status;
+            }
+        }
+    }
+    
+    /* Initialize SPI GPIOs */
+    for (i = 0; i < board_config->periphs.spi_count; i++) {
+        if (board_config->periphs.spis[i].enable) {
+            /* Initialize SCK pin */
+            hal_gpio_config_t gpio_config = {
+                .port = board_config->periphs.spis[i].sck_port,
+                .pin = board_config->periphs.spis[i].sck_pin,
+                .mode = HAL_GPIO_MODE_AF_PP,
+                .speed = HAL_GPIO_SPEED_HIGH,
+                .pull = HAL_GPIO_PULL_NO
+            };
+            status = hal_gpio_configure_pin(&gpio_config);
+            if (status != HAL_RET_OK) {
+                return status;
+            }
+            
+            /* Initialize MISO pin */
+            gpio_config.port = board_config->periphs.spis[i].miso_port;
+            gpio_config.pin = board_config->periphs.spis[i].miso_pin;
+            gpio_config.mode = HAL_GPIO_MODE_AF_PP;
+            gpio_config.speed = HAL_GPIO_SPEED_HIGH;
+            gpio_config.pull = HAL_GPIO_PULL_UP;
+            status = hal_gpio_configure_pin(&gpio_config);
+            if (status != HAL_RET_OK) {
+                return status;
+            }
+            
+            /* Initialize MOSI pin */
+            gpio_config.port = board_config->periphs.spis[i].mosi_port;
+            gpio_config.pin = board_config->periphs.spis[i].mosi_pin;
+            gpio_config.mode = HAL_GPIO_MODE_AF_PP;
+            gpio_config.speed = HAL_GPIO_SPEED_HIGH;
+            gpio_config.pull = HAL_GPIO_PULL_NO;
+            status = hal_gpio_configure_pin(&gpio_config);
+            if (status != HAL_RET_OK) {
+                return status;
+            }
+        }
+    }
+    
+    return status;
 }

 /**