autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ch32v307 uart4

This commit is contained in:
huang 2024-02-22 10:00:19 +08:00
parent 1d582ebcfd
commit 38a087717c
3 changed files with 115 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Ubiquitous/XiZi_IIoT/board/ch32v307vct6/board.c
View File

@ -62,14 +62,13 @@ extern RxBuffer2;
extern uint16_t UART_ReceiveData(USART_TypeDef* USARTx); extern uint16_t UART_ReceiveData(USART_TypeDef* USARTx);
void InitBoardHardware() void InitBoardHardware()
{ {
// USART_Printf_Init(115200);
/* System Tick Configuration */
_SysTick_Config(SystemCoreClock / TICK_PER_SECOND); _SysTick_Config(SystemCoreClock / TICK_PER_SECOND);
/* initialize memory system */ /* initialize memory system */
InitBoardMemory(MEMORY_START_ADDRESS, (void*)MEMORY_END_ADDRESS); InitBoardMemory(MEMORY_START_ADDRESS, (void*)MEMORY_END_ADDRESS);
InitHwUart(); InitHwUart();
#ifdef BSP_USING_UART1 #ifdef BSP_USING_UART4
InstallConsole("uart1", "uart1_drv", "uart1_dev1"); InstallConsole("uart4", "uart4_drv", "uart4_dev4");
#endif #endif
// #ifdef BSP_USING_UART2 // #ifdef BSP_USING_UART2
// InstallConsole("uart2", "uart2_drv", "uart2_dev2"); // InstallConsole("uart2", "uart2_drv", "uart2_dev2");
@ -81,15 +80,7 @@ void InitBoardHardware()
KPrintf("consle init completed.\n"); KPrintf("consle init completed.\n");
KPrintf("board initialization......\n"); KPrintf("board initialization......\n");
// KPrintf("memory address range: [0x%08x - 0x%08x], size: %d\n", (x_ubase) MEMORY_START_ADDRESS, (x_ubase) MEMORY_END_ADDRESS, gd32vf103_SRAM_SIZE);
/* initialize memory system */
KPrintf("board init done.\n"); KPrintf("board init done.\n");
KPrintf("start okernel...\n"); KPrintf("start okernel...\n");
while (1) {
uint16_t ans = UART_ReceiveData(USART3);
KPrintf("%d\n", ans);
for (int i = 0; i < 1000; i++)
;
}
} }

15
Ubiquitous/XiZi_IIoT/board/ch32v307vct6/third_party_driver/uart/Kconfig
View File

@ -27,3 +27,18 @@ menuconfig BSP_USING_UART2
string "serial bus device name" string "serial bus device name"
default "uart2_dev2" default "uart2_dev2"
endif endif
menuconfig BSP_USING_UART4
bool "Enable UART4"
default y
if BSP_USING_UART4
config SERIAL_BUS_NAME_4
string "serial bus name"
default "uart4"
config SERIAL_DRV_NAME_4
string "serial bus driver name"
default "uart4_drv"
config SERIAL_4_DEVICE_NAME_0
string "serial bus device name"
default "uart4_dev4"
endif

179
Ubiquitous/XiZi_IIoT/board/ch32v307vct6/third_party_driver/uart/connect_uart.c
View File

@ -96,67 +96,6 @@ static uint32 SerialInit(struct SerialDriver* serial_drv, struct BusConfigureInf
// config serial receive sem timeout // config serial receive sem timeout
dev_param->serial_timeout = serial_cfg->data_cfg.serial_timeout; dev_param->serial_timeout = serial_cfg->data_cfg.serial_timeout;
// init usart type def
// GPIO_InitTypeDef GPIO_InitStructure;
// RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1 | RCC_APB2Periph_GPIOA, ENABLE);
// GPIO_InitStructure.GPIO_Pin = GPIO_Pin_9;
// GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
// GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
// GPIO_Init(GPIOA, &GPIO_InitStructure);
// USART_InitTypeDef USART_InitStructure;
// USART_InitStructure.USART_BaudRate = serial_cfg->data_cfg.serial_baud_rate;
// switch (serial_cfg->data_cfg.serial_data_bits) {
// case DATA_BITS_8:
// USART_InitStructure.USART_WordLength = USART_WordLength_8b;
// break;
// case DATA_BITS_9:
// USART_InitStructure.USART_WordLength = USART_WordLength_9b;
// break;
// default:
// USART_InitStructure.USART_WordLength = USART_WordLength_8b;
// break;
// }
// switch (serial_cfg->data_cfg.serial_stop_bits) {
// case STOP_BITS_1:
// USART_InitStructure.USART_StopBits = USART_StopBits_1;
// break;
// case STOP_BITS_2:
// USART_InitStructure.USART_StopBits = USART_StopBits_2;
// break;
// default:
// USART_InitStructure.USART_StopBits = USART_StopBits_1;
// break;
// }
// switch (serial_cfg->data_cfg.serial_parity_mode) {
// case PARITY_NONE:
// USART_InitStructure.USART_Parity = USART_Parity_No;
// break;
// case PARITY_ODD:
// USART_InitStructure.USART_Parity = USART_Parity_Odd;
// break;
// case PARITY_EVEN:
// USART_InitStructure.USART_Parity = USART_Parity_Even;
// break;
// default:
// USART_InitStructure.USART_Parity = USART_Parity_No;
// break;
// }
// USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx;
// USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
// USART_Init(USART1, &USART_InitStructure);
// USART_Cmd(USART1, ENABLE);
// usart_hardware_flow_rts_config(serial_cfg->hw_cfg.serial_register_base, USART_RTS_DISABLE);
// usart_hardware_flow_cts_config(serial_cfg->hw_cfg.serial_register_base, USART_CTS_DISABLE);
return EOK; return EOK;
} }
@ -228,7 +167,7 @@ static int SerialGetChar(struct SerialHardwareDevice* serial_dev)
} }
static const struct SerialDataCfg data_cfg_init = { static const struct SerialDataCfg data_cfg_init = {
.serial_baud_rate = BAUD_RATE_115200, .serial_baud_rate = 1500000,
.serial_data_bits = DATA_BITS_8, .serial_data_bits = DATA_BITS_8,
.serial_stop_bits = STOP_BITS_1, .serial_stop_bits = STOP_BITS_1,
.serial_parity_mode = PARITY_NONE, .serial_parity_mode = PARITY_NONE,
@ -305,7 +244,6 @@ struct SerialHardwareDevice serial_device_1;
void USART1_IRQHandler(void) __attribute__((interrupt())); void USART1_IRQHandler(void) __attribute__((interrupt()));
void USART1_IRQHandler(void) void USART1_IRQHandler(void)
{ {
KPrintf("uart1\n");
GET_INT_SP(); GET_INT_SP();
x_base level; x_base level;
level = DisableLocalInterrupt(); level = DisableLocalInterrupt();
@ -319,6 +257,11 @@ void USART1_IRQHandler(void)
} }
#endif #endif
uint16_t UART_ReceiveData(USART_TypeDef* USARTx)
{
return (uint16_t)(USARTx->DATAR & (uint16_t)0x01FF);
}
#ifdef BSP_USING_UART2 #ifdef BSP_USING_UART2
struct SerialDriver serial_driver_2; struct SerialDriver serial_driver_2;
struct SerialHardwareDevice serial_device_2; struct SerialHardwareDevice serial_device_2;
@ -328,10 +271,6 @@ uint16_t RxBuffer2[TxSize2] = { 0 };
uint16_t TxCnt2 = 0, RxCnt2 = 0; uint16_t TxCnt2 = 0, RxCnt2 = 0;
void USART3_IRQHandler(void) __attribute__((interrupt())); void USART3_IRQHandler(void) __attribute__((interrupt()));
uint16_t UART_ReceiveData(USART_TypeDef* USARTx)
{
return (uint16_t)(USARTx->DATAR & (uint16_t)0x01FF);
}
void USART3_IRQHandler(void) void USART3_IRQHandler(void)
{ {
@ -343,19 +282,31 @@ void USART3_IRQHandler(void)
} }
} }
} }
// void USART3_IRQHandler(void) #endif
// {
// GET_INT_SP(); #ifdef BSP_USING_UART4
// x_base level; struct SerialDriver serial_driver_4;
// level = DisableLocalInterrupt(); struct SerialHardwareDevice serial_device_4;
// isrManager.done->incCounter();
// EnableLocalInterrupt(level); #define TxSize2 100
// UartIsr(&serial_driver_2, &serial_device_2); uint16_t RxBuffer4[TxSize2] = { 0 };
// level = DisableLocalInterrupt(); uint16_t TxCnt4 = 0, RxCnt4 = 0;
// isrManager.done->decCounter();
// EnableLocalInterrupt(level); void UART4_IRQHandler(void) __attribute__((interrupt()));
// FREE_INT_SP();
// } void UART4_IRQHandler(void)
{
GET_INT_SP();
x_base level;
level = DisableLocalInterrupt();
isrManager.done->incCounter();
EnableLocalInterrupt(level);
UartIsr(&serial_driver_4, &serial_device_4);
level = DisableLocalInterrupt();
isrManager.done->decCounter();
EnableLocalInterrupt(level);
FREE_INT_SP();
}
#endif #endif
int InitHwUart(void) int InitHwUart(void)
@ -414,7 +365,7 @@ int InitHwUart(void)
GPIO_Init(GPIOA, &gpio_init_struct); GPIO_Init(GPIOA, &gpio_init_struct);
USART_InitTypeDef usart_init_struct; USART_InitTypeDef usart_init_struct;
usart_init_struct.USART_BaudRate = 115200; usart_init_struct.USART_BaudRate = 1500000;
usart_init_struct.USART_HardwareFlowControl = USART_HardwareFlowControl_None; usart_init_struct.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
usart_init_struct.USART_Mode = USART_Mode_Tx | USART_Mode_Rx; usart_init_struct.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
usart_init_struct.USART_WordLength = USART_WordLength_8b; usart_init_struct.USART_WordLength = USART_WordLength_8b;
@ -478,7 +429,7 @@ int InitHwUart(void)
GPIO_Init(GPIOB, &gpio_init_struct_2); GPIO_Init(GPIOB, &gpio_init_struct_2);
USART_InitTypeDef usart_init_struct_2; USART_InitTypeDef usart_init_struct_2;
usart_init_struct_2.USART_BaudRate = 115200; usart_init_struct_2.USART_BaudRate = 1500000;
usart_init_struct_2.USART_HardwareFlowControl = USART_HardwareFlowControl_None; usart_init_struct_2.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
usart_init_struct_2.USART_Mode = USART_Mode_Tx | USART_Mode_Rx; usart_init_struct_2.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
usart_init_struct_2.USART_WordLength = USART_WordLength_8b; usart_init_struct_2.USART_WordLength = USART_WordLength_8b;
@ -488,5 +439,69 @@ int InitHwUart(void)
USART_Cmd((USART_TypeDef*)serial_cfg_2.hw_cfg.serial_register_base, ENABLE); USART_Cmd((USART_TypeDef*)serial_cfg_2.hw_cfg.serial_register_base, ENABLE);
#endif #endif
#ifdef BSP_USING_UART4
static struct SerialBus serial_bus_4;
memset(&serial_bus_4, 0, sizeof(struct SerialBus));
memset(&serial_driver_4, 0, sizeof(struct SerialDriver));
memset(&serial_device_4, 0, sizeof(struct SerialHardwareDevice));
static struct SerialCfgParam serial_cfg_4;
memset(&serial_cfg_4, 0, sizeof(struct SerialCfgParam));
static struct SerialDevParam serial_dev_param_4;
memset(&serial_dev_param_4, 0, sizeof(struct SerialDevParam));
serial_driver_4.drv_done = &drv_done;
serial_driver_4.configure = &SerialDrvConfigure;
serial_device_4.hwdev_done = &hwdev_done;
serial_cfg_4.data_cfg = data_cfg_init;
serial_cfg_4.hw_cfg.serial_register_base = (uint32)UART4;
serial_cfg_4.hw_cfg.serial_irq_interrupt = UART4_IRQn;
serial_driver_4.private_data = (void*)&serial_cfg_4;
serial_dev_param_4.serial_work_mode = SIGN_OPER_INT_RX;
serial_device_4.haldev.private_data = (void*)&serial_dev_param_4;
ret = BoardSerialBusInit(&serial_bus_4, &serial_driver_4, SERIAL_BUS_NAME_4, SERIAL_DRV_NAME_4);
if (EOK != ret) {
KPrintf("InitHwUart 4 uarths error ret %u\n", ret);
return ERROR;
}
ret = BoardSerialDevBend(&serial_device_4, (void*)&serial_cfg_4, SERIAL_BUS_NAME_4, SERIAL_4_DEVICE_NAME_0);
if (EOK != ret) {
KPrintf("InitHwUart 4 uarths error ret %u\n", ret);
return ERROR;
}
GPIO_InitTypeDef gpio_init_struct_4;
RCC_APB1PeriphClockCmd(RCC_APB1Periph_UART4, ENABLE);
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC, ENABLE);
gpio_init_struct_4.GPIO_Pin = GPIO_Pin_10;
gpio_init_struct_4.GPIO_Speed = GPIO_Speed_50MHz;
gpio_init_struct_4.GPIO_Mode = GPIO_Mode_AF_PP;
GPIO_Init(GPIOC, &gpio_init_struct_4);
gpio_init_struct_4.GPIO_Pin = GPIO_Pin_11;
gpio_init_struct_4.GPIO_Speed = GPIO_Speed_50MHz;
gpio_init_struct_4.GPIO_Mode = GPIO_Mode_IN_FLOATING;
GPIO_Init(GPIOC, &gpio_init_struct_4);
USART_InitTypeDef usart_init_struct_4;
usart_init_struct_4.USART_BaudRate = 1500000;
usart_init_struct_4.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
usart_init_struct_4.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
usart_init_struct_4.USART_WordLength = USART_WordLength_8b;
usart_init_struct_4.USART_StopBits = USART_StopBits_1;
usart_init_struct_4.USART_Parity = USART_Parity_No;
USART_Init((USART_TypeDef*)serial_cfg_4.hw_cfg.serial_register_base, &usart_init_struct_4);
USART_Cmd((USART_TypeDef*)serial_cfg_4.hw_cfg.serial_register_base, ENABLE);
#endif
return ret; return ret;
} }