From 94bc1e6d21904fd32d8eb6fac2d33e7ff1853191 Mon Sep 17 00:00:00 2001 From: gaoyang3513 Date: Wed, 24 Jul 2024 23:12:37 +0800 Subject: [PATCH] =?UTF-8?q?[Mod]=20sub1g=5Ftask=20=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IAR_for_Stm8/Uart_PingPong/main.c | 22 +++++++++---------- .../E15-EVB02/board_mini_printf.c | 5 +++-- .../E48xMx/ebyte_e48x.c | 3 +-- .../E48xMx/radio.c | 4 ++-- .../E48xMx/radio_hal.c | 3 +-- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/main.c b/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/main.c index 6afca41..892248f 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/main.c +++ b/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/main.c @@ -22,6 +22,7 @@ #include "ebyte_core.h" #include "ebyte_kfifo.h" #include "ebyte_debug.h" +#include "wrapper_os.h" void Task_Transmit( void ); void Task_Button( void ); @@ -58,30 +59,29 @@ int ebyte_main( void ) { /* 板载硬件资源 初始化 */ // Ebyte_BSP_Init(); - /* (可选) 串口中断接收FIFO 可根据需要自行处理 */ - Ebyte_FIFO_Init( &hfifo, EBYTE_FIFO_SIZE ); - +// Ebyte_FIFO_Init( &hfifo, EBYTE_FIFO_SIZE ); /* EBYTE 无线模块初始化 */ - Ebyte_RF.Init(); +// Ebyte_RF.Init(); /* 启用无线模块接收 */ - Ebyte_RF.EnterReceiveMode( 0 ); +// Ebyte_RF.EnterReceiveMode( 0 ); /* MCU 开全局中断 */ - Ebyte_BSP_GlobalIntEnable(); +// Ebyte_BSP_GlobalIntEnable(); DEBUG( "Start PingPong.....\r\n" ); DEBUG( "Please push button1 or button2.....\r\n" ); - while( 1 ) - { + while( 1 ) { /* 按键事件响应 */ - Task_Button(); +// Task_Button(); /* 任务:检测串口数据并无线发送 客户请按需自定义 */ - Task_Transmit(); +// Task_Transmit(); /* 任务:EBYTE驱动库必须的周期执行任务 客户无需修改 */ - Ebyte_RF.StartPollTask(); +// Ebyte_RF.StartPollTask(); + + sys_ms_sleep(100); } } diff --git a/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board_mini_printf.c b/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board_mini_printf.c index 9db0853..85f8cd4 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board_mini_printf.c +++ b/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board_mini_printf.c @@ -3,6 +3,7 @@ #include "gd32w51x.h" //#include "stm8l15x_usart.h" #include "board_mini_printf.h" +#include "platform_def.h" /* ! * @brief 目标硬件串口通信接口 @@ -11,8 +12,8 @@ */ static void send_uart_data(uint8_t data) { -// while (USART_GetFlagStatus(USART1, USART_FLAG_TXE) == RESET); -// USART_SendData8(USART1,data); + while(RESET == usart_flag_get(LOG_UART, USART_FLAG_TBE)); + usart_data_transmit(LOG_UART, data); } /* diff --git a/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/ebyte_e48x.c b/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/ebyte_e48x.c index 084bb46..eba44b4 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/ebyte_e48x.c +++ b/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/ebyte_e48x.c @@ -53,8 +53,7 @@ void Ebyte_E48x_IntOrPollTask( void ) { radio_rece_data_flag = gpio_input_bit_get( BSP_GPIO_PORT_E48_GP4 , BSP_GPIO_PIN_E48_GP4); /* 有接收数据 */ - if( radio_rece_data_flag != RESET ) - { + if( radio_rece_data_flag != RESET ) { vRadioGetPacket(rf_rxbuffer,&rf_rxsize); Ebyte_Port_ReceiveCallback(0x0002,rf_rxbuffer,rf_rxsize); } diff --git a/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/radio.c b/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/radio.c index 340b8a3..e12e9b2 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/radio.c +++ b/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/radio.c @@ -381,8 +381,8 @@ uint8_t vRadioGetPacket(uint8_t *buffer,uint8_t *length) void vRadioCheckLink(void) { uint8_t i = 0; - while(1) - { + + while(1) { vRadioSoftReset(); vRadioPowerUpBoot(); delay1ms(10); diff --git a/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/radio_hal.c b/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/radio_hal.c index e0e54dc..71a8235 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/radio_hal.c +++ b/NSPE/WIFI_IOT/bsp/drivers/3_Ebyte_WirelessModule_Drivers/E48xMx/radio_hal.c @@ -455,11 +455,10 @@ void vRadioPowerUpBoot( void ) void vRadioSoftReset( void ) { uint8_t i; + bRadioWriteReg( CMT2310A_SOFT_RST, 0xFF ); for( i = 0; i < 20; i++ ) - { delay10us( 100 ); - } } /******************************