diff --git a/CMakeLists.txt b/CMakeLists.txt index 8afb984..2d901fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,7 @@ set(TARGET_SRC Src/i2c.c Src/ldc1612.c Src/tmp112.c + Src/board_config.c ) # 设置输出目录 diff --git a/Inc/board_config.h b/Inc/board_config.h index 5b43610..558409a 100644 --- a/Inc/board_config.h +++ b/Inc/board_config.h @@ -1,6 +1,10 @@ #ifndef BOARD_CONFIG_H #define BOARD_CONFIG_H +#define GD32E23XF4 0x10 +#define GD32E23XF6 0x20 +#define GD32E23XF8 0x40 + /* >>>>>>>>>>>>>>>>>>>>[RS485 PHY DEFINE]<<<<<<<<<<<<<<<<<<<< */ // #define RS485_MAX13487 // RS485 PHY : MAX13487 (AutoDir) @@ -23,6 +27,23 @@ /******************************************************************************/ +/* Dynamic USART Configuration Structure */ +typedef struct { + uint32_t rcu_usart; + uint32_t usart_periph; + IRQn_Type irq_type; + void (*irq_handler)(void); // 函数指针：指向中断处理函数 +} usart_config_t; + +extern usart_config_t g_usart_config; +extern uint8_t g_mcu_flash_size; + +/* USART中断处理函数声明 */ +void usart0_irq_handler(void); +void usart1_irq_handler(void); + +/******************************************************************************/ + #define RCU_GPIO_I2C RCU_GPIOF #define RCU_I2C RCU_I2C0 #define I2C_SCL_PORT GPIOF @@ -41,16 +62,19 @@ /******************************************************************************/ -#define RS485_RCU RCU_USART0 +#define RS485_RCU (g_usart_config.rcu_usart) #define RS485_GPIO_RCU RCU_GPIOA #define RS485_GPIO_PORT GPIOA #define RS485_TX_PIN GPIO_PIN_2 #define RS485_RX_PIN GPIO_PIN_3 -#define RS485_PHY USART0 +#define RS485_PHY (g_usart_config.usart_periph) #define RS485_BAUDRATE 115200U #define RS485_EN_PIN GPIO_PIN_1 -#define RS485_IRQ USART0_IRQn +#define RS485_IRQ (g_usart_config.irq_type) /******************************************************************************/ +void mcu_detect_and_config(void); +uint8_t get_flash_size(void); + #endif //BOARD_CONFIG_H diff --git a/LD/gd32e23x_flash.ld b/LD/gd32e23x_flash.ld index 405de65..f48d452 100644 --- a/LD/gd32e23x_flash.ld +++ b/LD/gd32e23x_flash.ld @@ -12,8 +12,8 @@ _Min_Stack_Size = 0x400; /* required amount of stack */ /* Memories definition */ MEMORY { - FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 16K - RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 4K + FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 64K + RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 8K } /* Sections */ diff --git a/Src/board_config.c b/Src/board_config.c new file mode 100644 index 0000000..a68f73e --- /dev/null +++ b/Src/board_config.c @@ -0,0 +1,52 @@ +#include "gd32e23x.h" +#include "board_config.h" +#include "systick.h" + +/******************************************************************************/ + +#define FLASH_SIZE_ADDR (*(const uint8_t *)0x1FFFF7E0) // Flash base address + +/******************************************************************************/ + +/* 前向声明中断处理函数 */ +void usart0_irq_handler(void); +void usart1_irq_handler(void); + +usart_config_t g_usart_config = { + .rcu_usart = RCU_USART1, + .usart_periph = USART1, + .irq_type = USART1_IRQn, + .irq_handler = usart1_irq_handler // 初始化函数指针 +}; + +uint8_t g_mcu_flash_size = 0; + +void mcu_detect_and_config(void) { + g_mcu_flash_size = FLASH_SIZE_ADDR; + + switch (g_mcu_flash_size) { + case GD32E23XF4: + g_usart_config.rcu_usart = RCU_USART0; + g_usart_config.usart_periph = USART0; + g_usart_config.irq_type = USART0_IRQn; + g_usart_config.irq_handler = usart0_irq_handler; // 指向USART0处理函数 + break; + case GD32E23XF6: + g_usart_config.rcu_usart = RCU_USART1; + g_usart_config.usart_periph = USART1; + g_usart_config.irq_type = USART1_IRQn; + g_usart_config.irq_handler = usart1_irq_handler; // 指向USART1处理函数 + break; + default: // Default to GD32E23XF8 + g_usart_config.rcu_usart = RCU_USART1; + g_usart_config.usart_periph = USART1; + g_usart_config.irq_type = USART1_IRQn; + g_usart_config.irq_handler = usart1_irq_handler; // 指向USART1处理函数 + break; + } + +} + +uint8_t get_flash_size(void) { + return g_mcu_flash_size; +} diff --git a/Src/gd32e23x_it.c b/Src/gd32e23x_it.c index aa19aa8..a640c63 100644 --- a/Src/gd32e23x_it.c +++ b/Src/gd32e23x_it.c @@ -37,6 +37,7 @@ OF SUCH DAMAGE. #include "uart.h" #include "uart_ring_buffer.h" #include "led.h" +#include "board_config.h" /*! \brief this function handles NMI exception @@ -102,8 +103,15 @@ void SysTick_Handler(void) { } void USART0_IRQHandler(void) { - if (RESET != usart_interrupt_flag_get(USART0, USART_INT_FLAG_RBNE)) { - uint8_t data = usart_data_receive(USART0); - (void)uart_ring_buffer_put(data); // 缓冲满时丢弃，返回值可用于统计 + // 检查当前配置是否使用USART0，并且函数指针不为空 + if(g_usart_config.usart_periph == USART0 && g_usart_config.irq_handler != 0) { + g_usart_config.irq_handler(); // 通过函数指针调用对应的处理函数 } -} \ No newline at end of file +} + +void USART1_IRQHandler(void) { + // 检查当前配置是否使用USART1，并且函数指针不为空 + if(g_usart_config.usart_periph == USART1 && g_usart_config.irq_handler != 0) { + g_usart_config.irq_handler(); // 通过函数指针调用对应的处理函数 + } +} diff --git a/Src/main.c b/Src/main.c index 9047325..9b9def8 100644 --- a/Src/main.c +++ b/Src/main.c @@ -51,12 +51,16 @@ OF SUCH DAMAGE. */ int main(void) { + led_init(); + mcu_detect_and_config(); setbuf(stdout, NULL); systick_config(); rs485_init(); - led_init(); + // led_init(); + + printf("Flash size: %d Kbytes\n", get_flash_size()); #ifdef DEBUG_VERBOSE char hello_world[] = {"Hello World!\r\n"}; diff --git a/Src/syscalls.c b/Src/syscalls.c index 46beccf..c1a1d8c 100644 --- a/Src/syscalls.c +++ b/Src/syscalls.c @@ -16,6 +16,7 @@ #include #include #include "gd32e23x_usart.h" +#include "board_config.h" #undef errno extern int errno; @@ -164,7 +165,7 @@ int _execve(char *name, char **argv, char **env) // USART0 printf重定向实现 int __io_putchar(int ch) { // 等待发送缓冲区空 - while (usart_flag_get(USART0, USART_FLAG_TBE) == RESET) {} - usart_data_transmit(USART0, (uint8_t)ch); + while (usart_flag_get(RS485_PHY, USART_FLAG_TBE) == RESET) {} + usart_data_transmit(RS485_PHY, (uint8_t)ch); return ch; } diff --git a/Src/uart.c b/Src/uart.c index 6d699c9..10f27ee 100644 --- a/Src/uart.c +++ b/Src/uart.c @@ -3,6 +3,7 @@ #include "gd32e23x_rcu.h" #include "gd32e23x_gpio.h" #include "board_config.h" +#include "uart_ring_buffer.h" void rs485_init(void) { @@ -37,7 +38,7 @@ void rs485_init(void) { usart_enable(RS485_PHY); - nvic_irq_enable(USART0_IRQn, 0); + nvic_irq_enable(RS485_IRQ, 0); usart_interrupt_enable(RS485_PHY, USART_INT_RBNE); // usart_interrupt_enable(RS485_PHY, USART_INT_IDLE); @@ -70,3 +71,37 @@ void rs485_init(void) { #endif // RS485_MAX13487 } + +/******************************************************************************/ +/* 具体的中断处理函数实现 */ +/******************************************************************************/ + +void usart0_irq_handler(void) { + // 处理USART0的接收中断 + if(usart_interrupt_flag_get(USART0, USART_INT_FLAG_RBNE)) { + uint8_t data = usart_data_receive(USART0); + // 使用原有的环形缓冲区处理逻辑 + (void)uart_ring_buffer_put(data); // 缓冲满时丢弃，返回值可用于统计 + } + + // 处理USART0的空闲中断 + if(usart_interrupt_flag_get(USART0, USART_INT_FLAG_IDLE)) { + usart_interrupt_flag_clear(USART0, USART_INT_FLAG_IDLE); + // 在这里添加空闲中断处理逻辑 + } +} + +void usart1_irq_handler(void) { + // 处理USART1的接收中断 + if(usart_interrupt_flag_get(USART1, USART_INT_FLAG_RBNE)) { + uint8_t data = usart_data_receive(USART1); + // 使用原有的环形缓冲区处理逻辑 + (void)uart_ring_buffer_put(data); // 缓冲满时丢弃，返回值可用于统计 + } + + // 处理USART1的空闲中断 + if(usart_interrupt_flag_get(USART1, USART_INT_FLAG_IDLE)) { + usart_interrupt_flag_clear(USART1, USART_INT_FLAG_IDLE); + // 在这里添加空闲中断处理逻辑 + } +}