From 951fa34fadd06abb53484eb5bdf74892e4f751cf Mon Sep 17 00:00:00 2001 From: gaoyang3513 Date: Wed, 24 Jul 2024 23:01:39 +0800 Subject: [PATCH] =?UTF-8?q?[Mod]=20=E8=A7=A3=E5=86=B3=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NSPE/CMakeLists.txt | 1 + NSPE/Firmware/CMSIS/ARM/cmsis/cmsis_gcc.h | 24 +++---- NSPE/WIFI_IOT/app/CMakeLists.txt | 1 + NSPE/WIFI_IOT/app/main.c | 26 +++++-- .../Uart_PingPong/ebyte/ebyte_port.c | 67 +++++++++---------- .../IAR_for_Stm8/Uart_PingPong/ebyte_e48.h | 6 ++ .../IAR_for_Stm8/Uart_PingPong/main.c | 5 +- .../2_Ebyte_Board_Support/E15-EVB02/board.c | 17 +++-- .../2_Ebyte_Board_Support/E15-EVB02/board.h | 64 +++++++++--------- .../E15-EVB02/board_mini_printf.h | 6 +- .../E48xMx/ebyte_e48x.c | 18 ++--- .../E48xMx/radio.c | 50 +++++++------- .../E48xMx/radio_hal.c | 11 ++- NSPE/WIFI_IOT/bsp/drivers/CMakeLists.txt | 11 ++- 14 files changed, 169 insertions(+), 138 deletions(-) create mode 100644 NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte_e48.h diff --git a/NSPE/CMakeLists.txt b/NSPE/CMakeLists.txt index 0aa3fed..5035261 100644 --- a/NSPE/CMakeLists.txt +++ b/NSPE/CMakeLists.txt @@ -48,6 +48,7 @@ target_link_libraries(${TARGET_EXE} wifi os cmsis + cmt2310 ) target_link_options(${TARGET_EXE} diff --git a/NSPE/Firmware/CMSIS/ARM/cmsis/cmsis_gcc.h b/NSPE/Firmware/CMSIS/ARM/cmsis/cmsis_gcc.h index c1b1bed..6696a40 100644 --- a/NSPE/Firmware/CMSIS/ARM/cmsis/cmsis_gcc.h +++ b/NSPE/Firmware/CMSIS/ARM/cmsis/cmsis_gcc.h @@ -46,9 +46,9 @@ #ifndef __STATIC_INLINE #define __STATIC_INLINE static inline #endif -#ifndef __STATIC_FORCEINLINE +#ifndef __STATIC_FORCEINLINE #define __STATIC_FORCEINLINE __attribute__((always_inline)) static inline -#endif +#endif #ifndef __NO_RETURN #define __NO_RETURN __attribute__((__noreturn__)) #endif @@ -126,23 +126,23 @@ \details This default implementations initialized all data and additional bss sections relying on .copy.table and .zero.table specified properly in the used linker script. - + */ __STATIC_FORCEINLINE __NO_RETURN void __cmsis_start(void) { extern void _start(void) __NO_RETURN; - + typedef struct { uint32_t const* src; uint32_t* dest; uint32_t wlen; } __copy_table_t; - + typedef struct { uint32_t* dest; uint32_t wlen; } __zero_table_t; - + extern const __copy_table_t __copy_table_start__; extern const __copy_table_t __copy_table_end__; extern const __zero_table_t __zero_table_start__; @@ -153,16 +153,16 @@ __STATIC_FORCEINLINE __NO_RETURN void __cmsis_start(void) pTable->dest[i] = pTable->src[i]; } } - + for (__zero_table_t const* pTable = &__zero_table_start__; pTable < &__zero_table_end__; ++pTable) { for(uint32_t i=0u; i<(pTable->wlen/sizeof(pTable->dest)); ++i) { pTable->dest[i] = 0u; } } - + _start(); } - + #define __PROGRAM_START __cmsis_start #endif @@ -652,7 +652,7 @@ __STATIC_FORCEINLINE void __TZ_set_FAULTMASK_NS(uint32_t faultMask) Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure Stack Pointer Limit register hence zero is returned always in non-secure mode. - + \details Returns the current value of the Process Stack Pointer Limit (PSPLIM). \return PSPLIM Register value */ @@ -697,7 +697,7 @@ __STATIC_FORCEINLINE uint32_t __TZ_get_PSPLIM_NS(void) Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure Stack Pointer Limit register hence the write is silently ignored in non-secure mode. - + \details Assigns the given value to the Process Stack Pointer Limit (PSPLIM). \param [in] ProcStackPtrLimit Process Stack Pointer Limit value to set */ @@ -834,7 +834,7 @@ __STATIC_FORCEINLINE uint32_t __get_FPSCR(void) { #if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \ (defined (__FPU_USED ) && (__FPU_USED == 1U)) ) -#if __has_builtin(__builtin_arm_get_fpscr) +#if __has_builtin(__builtin_arm_get_fpscr) // Re-enable using built-in when GCC has been fixed // || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2) /* see https://gcc.gnu.org/ml/gcc-patches/2017-04/msg00443.html */ diff --git a/NSPE/WIFI_IOT/app/CMakeLists.txt b/NSPE/WIFI_IOT/app/CMakeLists.txt index fbe62c6..21edc51 100644 --- a/NSPE/WIFI_IOT/app/CMakeLists.txt +++ b/NSPE/WIFI_IOT/app/CMakeLists.txt @@ -49,6 +49,7 @@ target_link_libraries(app wifi_api os_api cmsis_api + cmt2310_api $<$:alicloud> $<$:iperf3> $<$:iperf3_api> diff --git a/NSPE/WIFI_IOT/app/main.c b/NSPE/WIFI_IOT/app/main.c index 07e5bc2..5355d84 100644 --- a/NSPE/WIFI_IOT/app/main.c +++ b/NSPE/WIFI_IOT/app/main.c @@ -54,6 +54,7 @@ OF SUCH DAMAGE. #if defined (CONFIG_GY3513) #include #endif // CONFIG_GY3513 +#include "ebyte_e48.h" /*============================ MACROS ========================================*/ /*============================ MACRO FUNCTIONS ===============================*/ @@ -116,6 +117,19 @@ __WEAK void app_init(void) /* User application entry */ } +/*! + \brief start task + \param[in] p_arg: the pointer of parameters + \param[out] none + \retval none +*/ +void sub1g_task(void *p_arg) +{ + ebyte_main(); + + sys_task_delete(NULL); +} + /*! \brief start task \param[in] p_arg: the pointer of parameters @@ -131,10 +145,6 @@ void start_task(void *p_arg) const char *filename; #endif // CONFIG_GY3513 - sys_reset_flag_check(); - sys_os_misc_init(); - systick_delay_init(); - wifi_management_init(); #ifdef CONFIG_FATFS_SUPPORT rcu_periph_clock_enable(RCU_CRC); @@ -171,7 +181,11 @@ int main(void) DEBUGPRINT("SDK version: V%d.%d.%d\r\n", (RE_NSPE_VERSION >> 24), ((RE_NSPE_VERSION & 0xFF0000) >> 16), (RE_NSPE_VERSION & 0xFFFF)); DEBUGPRINT("SDK build date: "BUILD_DATE" \r\n"); + sys_reset_flag_check(); sys_os_init(); + sys_os_misc_init(); + + systick_delay_init(); #if defined (CONFIG_GY3513) #define LED_TASK_STK_SIZE 256 @@ -183,6 +197,10 @@ int main(void) } #endif // CONFIG_GY3513 + if (NULL == sys_task_create(NULL, (const uint8_t *)"sub1g_task", NULL, START_TASK_STK_SIZE, 0, START_TASK_PRIO, sub1g_task, NULL)) { + DEBUGPRINT("ERROR: create start task failed\r\n"); + } + if (NULL == sys_task_create(NULL, (const uint8_t *)"start_task", NULL, START_TASK_STK_SIZE, 0, START_TASK_PRIO, start_task, NULL)) { DEBUGPRINT("ERROR: create start task failed\r\n"); } diff --git a/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte/ebyte_port.c b/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte/ebyte_port.c index d8fe985..eaba0ec 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte/ebyte_port.c +++ b/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte/ebyte_port.c @@ -1,20 +1,20 @@ /** ********************************************************************************** * @file ebyte_port.h - * @brief EBYTE驱动库的硬件接口层 由客户自己提供IO接口 - * @details 详情请参见 https://www.ebyte.com/ - * @author JiangHeng - * @date 2021-05-13 - * @version 1.0.0 + * @brief EBYTE驱动库的硬件接口层 由客户自己提供IO接口 + * @details 详情请参见 https://www.ebyte.com/ + * @author JiangHeng + * @date 2021-05-13 + * @version 1.0.0 ********************************************************************************** - * @copyright BSD License - * 成都亿佰特电子科技有限公司 - * ______ ____ __ __ _______ ______ + * @copyright BSD License + * 成都亿佰特电子科技有限公司 + * ______ ____ __ __ _______ ______ * | ____| | _ \ \ \ / / |__ __| | ____| - * | |__ | |_) | \ \_/ / | | | |__ - * | __| | _ < \ / | | | __| - * | |____ | |_) | | | | | | |____ - * |______| |____/ |_| |_| |______| + * | |__ | |_) | \ \_/ / | | | |__ + * | __| | _ < \ / | | | __| + * | |____ | |_) | | | | | | |____ + * |______| |____/ |_| |_| |______| * ********************************************************************************** */ @@ -26,9 +26,9 @@ /*==================================================================*/ /* ! - * @brief 配置目标硬件平台SPI接口收发函数 - * - * @param send EBYTE驱动库上层调用需要传输的数据 1 Byte + * @brief 配置目标硬件平台SPI接口收发函数 + * + * @param send EBYTE驱动库上层调用需要传输的数据 1 Byte * @return SPI接收的数据 1 Byte * @note 当目标平台采用硬件SPI_NSS时，请配置 ebyte_conf.h文件 关闭驱动库的软件控制SPI_CS(NSS) * 当目标平台采用软件SPI_NSS时，还需额外配置 Ebyte_Port_SpiCsIoControl() 具体请查阅函数说明 @@ -36,16 +36,16 @@ uint8e_t Ebyte_Port_SpiTransmitAndReceivce( uint8e_t send ) { uint8e_t result = 0; - + /* !必须提供: SPI接口 */ result = Ebyte_BSP_SpiTransAndRecv( send ); - + return result; } /* ! - * @brief (可选)配置目标硬件平台SPI_CS(NSS)函数 - * + * @brief (可选)配置目标硬件平台SPI_CS(NSS)函数 + * * @param cmd EBYTE驱动库上层期望的控制指令 * @arg 0: 期望CS(NSS)引脚输出低电平逻辑信号 EBYTE模块SPI接口为低电平选中 * @arg 1: 期望CS(NSS)引脚输出高电平逻辑信号 @@ -56,12 +56,12 @@ void Ebyte_Port_SpiCsIoControl( uint8e_t cmd ) { if ( cmd == 1 ) { - /* !可选: SPI CS控制 高电平未选中 */ - Ebyte_BSP_RfSpiUnselected(); + /* !可选: SPI CS控制 高电平未选中 */ + Ebyte_BSP_RfSpiUnselected(); } else { - /* !可选: SPI CS控制 低电平选中 */ + /* !可选: SPI CS控制 低电平选中 */ Ebyte_BSP_RfSpiSelected( ); } } @@ -70,29 +70,28 @@ void Ebyte_Port_SpiCsIoControl( uint8e_t cmd ) /* ! * @brief 配置目标硬件平台延时函数 - * - * @param time 期望延时毫秒 + * + * @param time 期望延时毫秒 * @note 请注意时序，模块初始化时将调用此函数，请注意中断是否会影响到此函数 */ void Ebyte_Port_DelayMs( uint16e_t time ) { /* !必须提供: 延时函数 */ - + uint16e_t i,n; - - while(time--)//这里示范了STM8L 16M时钟前提下的粗略软件延时 + + while(time--)//这里示范了STM8L 16M时钟前提下的粗略软件延时 { for(i=900;i>0;i--) { - for( n=1 ;n>0 ;n--) - { - asm("nop"); - asm("nop"); - asm("nop"); - asm("nop"); + for( n=1 ;n>0 ;n--) { + __NOP(); + __NOP(); + __NOP(); + __NOP(); } } - } + } } diff --git a/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte_e48.h b/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte_e48.h new file mode 100644 index 0000000..e9847d4 --- /dev/null +++ b/NSPE/WIFI_IOT/bsp/drivers/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte_e48.h @@ -0,0 +1,6 @@ +#ifndef __EBYTE_E48_H__ +#define __EBYTE_E48_H__ + +int ebyte_main( void ); + +#endif /* __EBYTE_E48_H__ */ 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 bdc5bf8..6afca41 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 @@ -51,11 +51,10 @@ uint8_t PC_isConnected = 0; static BSP_BTN_EVENT_t BTN_Event; - /* ! * @brief 主函数 */ -int main( void ) +int ebyte_main( void ) { /* 板载硬件资源 初始化 */ // Ebyte_BSP_Init(); @@ -83,9 +82,7 @@ int main( void ) /* 任务:EBYTE驱动库必须的周期执行任务 客户无需修改 */ Ebyte_RF.StartPollTask(); - } - } /* ! diff --git a/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board.c b/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board.c index fc97df4..a03fe32 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board.c +++ b/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board.c @@ -22,6 +22,7 @@ #include "board.h" #include "ebyte_port.h" #include "ebyte_conf.h" +#include "platform_def.h" BSP_BTN_FIFO_t BSP_BTN_FIFO; @@ -216,8 +217,8 @@ void Ebyte_BSP_LedControl( BSP_LED_t LEDx , BSP_LED_Ctl_t ctl) { switch( LEDx ) { - case BSP_LED_1 : GPIO_ToggleBits( BSP_GPIO_PORT_LED_1, BSP_GPIO_PIN_LED_1); break; - case BSP_LED_2 : GPIO_ToggleBits( BSP_GPIO_PORT_LED_2, BSP_GPIO_PIN_LED_2); break; + case BSP_LED_1 : gpio_bit_toggle( BSP_GPIO_PORT_LED_1, BSP_GPIO_PIN_LED_1); break; + case BSP_LED_2 : gpio_bit_toggle( BSP_GPIO_PORT_LED_2, BSP_GPIO_PIN_LED_2); break; default: break; } } @@ -225,8 +226,8 @@ void Ebyte_BSP_LedControl( BSP_LED_t LEDx , BSP_LED_Ctl_t ctl) { switch( LEDx ) { - case BSP_LED_1 : GPIO_WriteBit( BSP_GPIO_PORT_LED_1, BSP_GPIO_PIN_LED_1, (BitAction)ctl); break; - case BSP_LED_2 : GPIO_WriteBit( BSP_GPIO_PORT_LED_2, BSP_GPIO_PIN_LED_2, (BitAction)ctl); break; + case BSP_LED_1 : gpio_bit_write( BSP_GPIO_PORT_LED_1, BSP_GPIO_PIN_LED_1, (BitAction)ctl); break; + case BSP_LED_2 : gpio_bit_write( BSP_GPIO_PORT_LED_2, BSP_GPIO_PIN_LED_2, (BitAction)ctl); break; default: break; } } @@ -289,13 +290,11 @@ uint8_t Ebyte_BSP_ReadButton( BSP_BUTTON_t btn ) */ void Ebyte_BSP_UartTransmit( uint8_t *buffer , uint16_t length ) { - uint8_t i; - for( i = 0; i < length; i++ ) - { - while ( USART_GetFlagStatus( USART1, USART_FLAG_TBE ) == RESET ); - USART_SendData8( USART1, *buffer++ ); + for( i = 0; i < length; i++ ) { + while(RESET == usart_flag_get(LOG_UART, USART_FLAG_TBE)); + usart_data_transmit(LOG_UART, *buffer); } } diff --git a/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board.h b/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board.h index 59ce610..5e0b3f1 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board.h +++ b/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board.h @@ -18,6 +18,8 @@ * ********************************************************************************** */ +#ifndef __EBYTE_BOARD_H__ +#define __EBYTE_BOARD_H__ #include //#include "stm8l15x_conf.h" @@ -78,42 +80,42 @@ /* 参数配置 SPI */ #define BSP_RF_SPI SPI1 #define BSP_RF_SPI_CLOCK CLK_Peripheral_SPI1 -#define Ebyte_BSP_RfSpiSelected() GPIO_WriteBit( BSP_GPIO_PORT_SPI_NSS , BSP_GPIO_PIN_SPI_NSS, RESET ) -#define Ebyte_BSP_RfSpiUnselected() GPIO_WriteBit( BSP_GPIO_PORT_SPI_NSS , BSP_GPIO_PIN_SPI_NSS, SET ) +#define Ebyte_BSP_RfSpiSelected() gpio_bit_write( BSP_GPIO_PORT_SPI_NSS , BSP_GPIO_PIN_SPI_NSS, RESET ) +#define Ebyte_BSP_RfSpiUnselected() gpio_bit_write( BSP_GPIO_PORT_SPI_NSS , BSP_GPIO_PIN_SPI_NSS, SET ) /* 参数配置 无线模块控制IO */ -/* E07 */ -#define Ebyte_BSP_RfBusyIoRead() GPIO_ReadInputDataBit( BSP_GPIO_PORT_BUSY , BSP_GPIO_PIN_BUSY) -#define Ebyte_BSP_RfGdo0IoRead() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E07_GDO0 , BSP_GPIO_PIN_E07_GDO0) -#define Ebyte_BSP_RfGdo1IoRead() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E07_GDO1 , BSP_GPIO_PIN_E07_GDO1) -/* E10 */ -#define Ebyte_BSP_E10IrqIoRead() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E10_IRQ , BSP_GPIO_PIN_E10_IRQ) -#define Ebyte_BSP_E10Dio2Read() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E10_DIO2 , BSP_GPIO_PIN_E10_DIO2) -#define Ebyte_BSP_E10Dio3Read() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E10_DIO3 , BSP_GPIO_PIN_E10_DIO3) -#define Ebyte_BSP_E10SdnIoLow() GPIO_WriteBit( BSP_GPIO_PORT_E10_SDN , BSP_GPIO_PIN_E10_SDN, RESET ) -#define Ebyte_BSP_E10SdnIoHigh() GPIO_WriteBit( BSP_GPIO_PORT_E10_SDN , BSP_GPIO_PIN_E10_SDN, SET ) -/* E49 */ -#define Ebyte_BSP_E49Dio1IoRead() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E49_DIO1 , BSP_GPIO_PIN_E49_DIO1) -#define Ebyte_BSP_E49Dio2IoRead() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E49_DIO2 , BSP_GPIO_PIN_E49_DIO2) -#define Ebyte_BSP_E49FcsbIoLow() GPIO_WriteBit( BSP_GPIO_PORT_E49_FCSB , BSP_GPIO_PIN_E49_FCSB, RESET ) -#define Ebyte_BSP_E49FcsbIoHigh() GPIO_WriteBit( BSP_GPIO_PORT_E49_FCSB , BSP_GPIO_PIN_E49_FCSB, SET ) -#define Ebyte_BSP_E49CsbIoLow() GPIO_WriteBit( BSP_GPIO_PORT_E49_CSB , BSP_GPIO_PIN_E49_CSB, RESET ) -#define Ebyte_BSP_E49CsbIoHigh() GPIO_WriteBit( BSP_GPIO_PORT_E49_CSB , BSP_GPIO_PIN_E49_CSB, SET ) -#define Ebyte_BSP_E49SlckIoLow() GPIO_WriteBit( BSP_GPIO_PORT_E49_SLCK , BSP_GPIO_PIN_E49_SLCK, RESET ) -#define Ebyte_BSP_E49SlckIoHigh() GPIO_WriteBit( BSP_GPIO_PORT_E49_SLCK , BSP_GPIO_PIN_E49_SLCK, SET ) -#define Ebyte_BSP_E49SdioIoLow() GPIO_WriteBit( BSP_GPIO_PORT_E49_SDIO , BSP_GPIO_PIN_E49_SDIO, RESET ) -#define Ebyte_BSP_E49SdioIoHigh() GPIO_WriteBit( BSP_GPIO_PORT_E49_SDIO , BSP_GPIO_PIN_E49_SDIO, SET ) -#define Ebyte_BSP_E49SdioIoOutput() GPIO_Init( BSP_GPIO_PORT_E49_SDIO, BSP_GPIO_PIN_E49_SDIO, GPIO_Mode_Out_PP_High_Fast ) -#define Ebyte_BSP_E49SdioIoInput() GPIO_Init( BSP_GPIO_PORT_E49_SDIO, BSP_GPIO_PIN_E49_SDIO, GPIO_Mode_In_FL_No_IT ) -#define Ebyte_BSP_E49SdioIoRead() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E49_SDIO , BSP_GPIO_PIN_E49_SDIO) +///* E07 */ +//#define Ebyte_BSP_RfBusyIoRead() gpio_input_bit_get( BSP_GPIO_PORT_BUSY , BSP_GPIO_PIN_BUSY) +//#define Ebyte_BSP_RfGdo0IoRead() gpio_input_bit_get( BSP_GPIO_PORT_E07_GDO0 , BSP_GPIO_PIN_E07_GDO0) +//#define Ebyte_BSP_RfGdo1IoRead() gpio_input_bit_get( BSP_GPIO_PORT_E07_GDO1 , BSP_GPIO_PIN_E07_GDO1) +///* E10 */ +//#define Ebyte_BSP_E10IrqIoRead() gpio_input_bit_get( BSP_GPIO_PORT_E10_IRQ , BSP_GPIO_PIN_E10_IRQ) +//#define Ebyte_BSP_E10Dio2Read() gpio_input_bit_get( BSP_GPIO_PORT_E10_DIO2 , BSP_GPIO_PIN_E10_DIO2) +//#define Ebyte_BSP_E10Dio3Read() gpio_input_bit_get( BSP_GPIO_PORT_E10_DIO3 , BSP_GPIO_PIN_E10_DIO3) +//#define Ebyte_BSP_E10SdnIoLow() gpio_bit_write( BSP_GPIO_PORT_E10_SDN , BSP_GPIO_PIN_E10_SDN, RESET ) +//#define Ebyte_BSP_E10SdnIoHigh() gpio_bit_write( BSP_GPIO_PORT_E10_SDN , BSP_GPIO_PIN_E10_SDN, SET ) +///* E49 */ +//#define Ebyte_BSP_E49Dio1IoRead() gpio_input_bit_get( BSP_GPIO_PORT_E49_DIO1 , BSP_GPIO_PIN_E49_DIO1) +//#define Ebyte_BSP_E49Dio2IoRead() gpio_input_bit_get( BSP_GPIO_PORT_E49_DIO2 , BSP_GPIO_PIN_E49_DIO2) +//#define Ebyte_BSP_E49FcsbIoLow() gpio_bit_write( BSP_GPIO_PORT_E49_FCSB , BSP_GPIO_PIN_E49_FCSB, RESET ) +//#define Ebyte_BSP_E49FcsbIoHigh() gpio_bit_write( BSP_GPIO_PORT_E49_FCSB , BSP_GPIO_PIN_E49_FCSB, SET ) +//#define Ebyte_BSP_E49CsbIoLow() gpio_bit_write( BSP_GPIO_PORT_E49_CSB , BSP_GPIO_PIN_E49_CSB, RESET ) +//#define Ebyte_BSP_E49CsbIoHigh() gpio_bit_write( BSP_GPIO_PORT_E49_CSB , BSP_GPIO_PIN_E49_CSB, SET ) +//#define Ebyte_BSP_E49SlckIoLow() gpio_bit_write( BSP_GPIO_PORT_E49_SLCK , BSP_GPIO_PIN_E49_SLCK, RESET ) +//#define Ebyte_BSP_E49SlckIoHigh() gpio_bit_write( BSP_GPIO_PORT_E49_SLCK , BSP_GPIO_PIN_E49_SLCK, SET ) +//#define Ebyte_BSP_E49SdioIoLow() gpio_bit_write( BSP_GPIO_PORT_E49_SDIO , BSP_GPIO_PIN_E49_SDIO, RESET ) +//#define Ebyte_BSP_E49SdioIoHigh() gpio_bit_write( BSP_GPIO_PORT_E49_SDIO , BSP_GPIO_PIN_E49_SDIO, SET ) +//#define Ebyte_BSP_E49SdioIoOutput() gpio_mode_set( BSP_GPIO_PORT_E49_SDIO, BSP_GPIO_PIN_E49_SDIO, GPIO_Mode_Out_PP_High_Fast ) +//#define Ebyte_BSP_E49SdioIoInput() GPIO_Init( BSP_GPIO_PORT_E49_SDIO, BSP_GPIO_PIN_E49_SDIO, GPIO_Mode_In_FL_No_IT ) +//#define Ebyte_BSP_E49SdioIoRead() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E49_SDIO , BSP_GPIO_PIN_E49_SDIO) /* E48 */ -#define Ebyte_BSP_E48GPIO4Read() GPIO_ReadInputDataBit( BSP_GPIO_PORT_E48_GP4 , BSP_GPIO_PIN_E48_GP4) +#define Ebyte_BSP_E48GPIO4Read() gpio_input_bit_get( BSP_GPIO_PORT_E48_GP4 , BSP_GPIO_PIN_E48_GP4) /* 全局中断 */ -#define Ebyte_BSP_GlobalIntEnable() __enable_interrupt() -#define Ebyte_BSP_GlobalIntDisable() __disable_interrupt() +#define Ebyte_BSP_GlobalIntEnable() __enable_irq() +#define Ebyte_BSP_GlobalIntDisable() __disable_irq() /* 参数配置 UART */ #define BSP_USER_UART USART1 @@ -171,4 +173,6 @@ uint8_t Ebyte_BSP_SpiTransAndRecv( uint8_t data ); uint8_t Ebyte_BTN_FIFO_Push(BSP_BTN_FIFO_t *fifo, BSP_BTN_EVENT_t event); uint8_t Ebyte_BTN_FIFO_Pop(BSP_BTN_FIFO_t *fifo, BSP_BTN_EVENT_t *event); -uint32_t Ebyte_BSP_TimerGetTick(void); \ No newline at end of file +uint32_t Ebyte_BSP_TimerGetTick(void); + +#endif // !__EBYTE_BOARD_H__ \ No newline at end of file diff --git a/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board_mini_printf.h b/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board_mini_printf.h index a4de959..7fb5778 100755 --- a/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board_mini_printf.h +++ b/NSPE/WIFI_IOT/bsp/drivers/2_Ebyte_Board_Support/E15-EVB02/board_mini_printf.h @@ -1,2 +1,6 @@ +#ifndef __BOARD_PRINTF_H__ +#define __BOARD_PRINTF_H__ -void mprintf(char * Data, ...); \ No newline at end of file +void mprintf(char * Data, ...); + +#endif // !__BOARD_PRINTF_H__ 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 090b332..084bb46 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 @@ -8,16 +8,16 @@ /* 辅助识别模块频段 */ #if defined(EBYTE_E48_433M20S) - #define EBYTE_E48_FREQUENCY_TYPE 0x00000433 + #define EBYTE_E48_FREQUENCY_TYPE 0x00000433 #elif defined(EBYTE_E48_900M20S) - #define EBYTE_E48_FREQUENCY_TYPE 0x00000900 + #define EBYTE_E48_FREQUENCY_TYPE 0x00000900 -#endif +#endif /* 辅助识别驱动程序版本号 */ -#define EBYTE_E48_PROGRAM_TYPE 0x10 +#define EBYTE_E48_PROGRAM_TYPE 0x10 #include "board.h" @@ -51,7 +51,7 @@ void Ebyte_E48x_SetSleep( uint8_t cmd ) void Ebyte_E48x_IntOrPollTask( void ) { - radio_rece_data_flag = GPIO_ReadInputDataBit( BSP_GPIO_PORT_E48_GP4 , BSP_GPIO_PIN_E48_GP4); + radio_rece_data_flag = gpio_input_bit_get( BSP_GPIO_PORT_E48_GP4 , BSP_GPIO_PIN_E48_GP4); /* 有接收数据 */ if( radio_rece_data_flag != RESET ) { @@ -69,8 +69,8 @@ void Ebyte_E48x_InterruptTrigger( void ) /* ! * @brief 获取模块类型 - * - * @return 32位的编码 + * + * @return 32位的编码 * @note 高16位代表模块名 例如0x0220 代表E22模块 * 低16位代表频段名 例如0x0400 代表400频段 */ @@ -81,8 +81,8 @@ uint32_t Ebyte_E48x_GetName(void) /* ! * @brief 获取模块程序版本 - * - * @return 8位的编码 + * + * @return 8位的编码 * @note 例如0x10 代表V1.0 */ uint8_t Ebyte_E48x_GetDriverVersion(void) 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 1b0c271..340b8a3 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 @@ -71,23 +71,23 @@ const uint8_t cmt2310a_power[55][7] = { ********************************/ void vRadioInit( void ) { - byte fw_rev; + byte fw_rev; vRadioSoftReset(); vRadioConfigPageReg( 0, g_cmt2310a_page0, CMT2310A_PAGE0_SIZE ); //config page 0 vRadioConfigPageReg( 1, g_cmt2310a_page1, CMT2310A_PAGE1_SIZE ); //config page 1 vRadioSetNirq( CMT2310A_nIRQ_TCXO ); //for TCXO need cofig as nIRQ pin at first vRadioTcxoDrvSel( 0 ); //drive power - + fw_rev = (byte)g_chip_id; //dealwith Xtal switch(fw_rev) { - case 0xC0: - vRadioXoWaitCfg(RADIO_CGU_DIV4); + case 0xC0: + vRadioXoWaitCfg(RADIO_CGU_DIV4); break; default: break; - } - + } + vRadioPowerUpBoot(); delay1ms( 10 ); bRadioGoStandby(); @@ -187,7 +187,7 @@ void vRadioInit( void ) //packet frame format g_radio.frame_cfg.DATA_MODE = 2; //0=direct mode, 2=packet mode g_radio.frame_cfg.FRAME_CFG1_u._BITS.PKT_TYPE = 1; //0=fixd-length packet mode 1=可变长 - g_radio.frame_cfg.FRAME_CFG1_u._BITS.PAYLOAD_BIT_ORDER = 0; //msb first + g_radio.frame_cfg.FRAME_CFG1_u._BITS.PAYLOAD_BIT_ORDER = 0; //msb first g_radio.frame_cfg.FRAME_CFG1_u._BITS.ADDR_LEN_CONF = 0; g_radio.frame_cfg.FRAME_CFG1_u._BITS.PAGGYBACKING_EN = 0; g_radio.frame_cfg.FRAME_CFG1_u._BITS.LENGTH_SIZE = 0; @@ -226,9 +226,9 @@ void vRadioInit( void ) g_radio.word_mode_cfg.WORK_MODE_CFG5_u._BITS.CSMA_CCA_WIN_SEL = 0; g_radio.word_mode_cfg.WORK_MODE_CFG5_u._BITS.CSMA_CCA_INT_SEL = 0; g_radio.word_mode_cfg.WORK_MODE_CFG5_u._BITS.CSMA_PERSIST_EN = 0; - + g_radio.word_mode_cfg.WORK_MODE_CFG6_u._BITS.FREQ_HOP_MANU_EN = 1;//使能手动快速跳频，不使能手动跳频无法使用 - + g_radio.word_mode_cfg.FREQ_CHANL_NANU = 92;//手动跳频信道0~255 g_radio.word_mode_cfg.FREQ_DONE_TIMES = 0; g_radio.word_mode_cfg.FREQ_SPACE = 250;//跳频信道间隔0~255 KHz @@ -327,7 +327,7 @@ void vRadioReceive(void) vRadioSetPayloadLength(&g_radio.frame_cfg); vRadioSetInt1Sel(CMT2310A_INT_PKT_DONE); vRadioSetInt2Sel(CMT2310A_INT_RX_FIFO_WBYTE); - bRadioGoRx(); + bRadioGoRx(); } void vRadioTransmit(uint8_t* buffer, uint8_t length ) @@ -340,19 +340,19 @@ void vRadioTransmit(uint8_t* buffer, uint8_t length ) // vRadioReadTxFifo(radio_rx_buf, 20); // vRadioManualResetTxFifoPointer(); bRadioGoTx(); - - while ( GPIO_ReadInputDataBit( BSP_GPIO_PORT_E48_GP4 , BSP_GPIO_PIN_E48_GP4) == RESET); + + while ( gpio_input_bit_get( BSP_GPIO_PORT_E48_GP4 , BSP_GPIO_PIN_E48_GP4) == RESET); bRadioGoStandby(); vRadioClearTxFifo(); - vRadioClearInterrupt(); - - vRadioReceive(); + vRadioClearInterrupt(); + + vRadioReceive(); } uint8_t vRadioGetPacket(uint8_t *buffer,uint8_t *length) { uint8_t rx_length; - + if( g_radio.crc_cfg.CRC_CFG_u._BITS.CRC_EN == 1 ) { vRadioInterruptSoucreFlag( &g_radio.int_src_flag ); @@ -365,15 +365,15 @@ uint8_t vRadioGetPacket(uint8_t *buffer,uint8_t *length) { // g_rx_count++; } - + vRadioReadFifo(&rx_length, 1); - + vRadioReadFifo(buffer, rx_length); *length = rx_length; - vRadioClearRxFifo(); - vRadioClearInterrupt(); - bRadioGoRx(); - + vRadioClearRxFifo(); + vRadioClearInterrupt(); + bRadioGoRx(); + return 0; } @@ -384,15 +384,15 @@ void vRadioCheckLink(void) while(1) { vRadioSoftReset(); - vRadioPowerUpBoot(); + vRadioPowerUpBoot(); delay1ms(10); - g_chip_id = lRadioChipVersion(); + g_chip_id = lRadioChipVersion(); if(0x00231000==(g_chip_id&0x00FFFF00)) break; DEBUG( "Link Error.....\r\n" ); delay1ms(500); i++; - if(i >= 20) while(1); + if(i >= 20) while(1); } DEBUG( "Link Device:E48-XXXM20S....\r\n" ); } 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 19a7b1a..e0e54dc 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 @@ -8,15 +8,12 @@ void delay1ms(uint16_t cnt) void delay10us(uint32_t cnt) { uint8_t i; - - while( cnt-- ) - { + + while( cnt-- ) { i = 20; while(i--) - { - asm("nop"); - } - } + __NOP(); + } } /****************************** diff --git a/NSPE/WIFI_IOT/bsp/drivers/CMakeLists.txt b/NSPE/WIFI_IOT/bsp/drivers/CMakeLists.txt index 03a20f2..012cf2c 100644 --- a/NSPE/WIFI_IOT/bsp/drivers/CMakeLists.txt +++ b/NSPE/WIFI_IOT/bsp/drivers/CMakeLists.txt @@ -64,13 +64,18 @@ target_include_directories(cmt2310 ${CMAKE_CURRENT_SOURCE_DIR}/1_Middleware/Produce/ ${CMAKE_CURRENT_SOURCE_DIR}/2_Ebyte_Board_Support/E15-EVB02/ ${CMAKE_CURRENT_SOURCE_DIR}/3_Ebyte_WirelessModule_Drivers/E48xMx/ - ${CMAKE_CURRENT_SOURCE_DIR}/4_STM8_L15x_StdPeriph_Drivers/ - ${CMAKE_CURRENT_SOURCE_DIR}/4_STM8_L15x_StdPeriph_Drivers/inc/ +# ${CMAKE_CURRENT_SOURCE_DIR}/4_STM8_L15x_StdPeriph_Drivers/ +# ${CMAKE_CURRENT_SOURCE_DIR}/4_STM8_L15x_StdPeriph_Drivers/inc/ ) target_include_directories(cmt2310_api INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte/ebyte_core.h + ${CMAKE_CURRENT_SOURCE_DIR}/0_Project/IAR_for_Stm8/Uart_PingPong/ + ${CMAKE_CURRENT_SOURCE_DIR}/0_Project/IAR_for_Stm8/Uart_PingPong/ebyte/ + ${CMAKE_CURRENT_SOURCE_DIR}/1_Middleware/Kfifo/ + ${CMAKE_CURRENT_SOURCE_DIR}/1_Middleware/Produce/ + ${CMAKE_CURRENT_SOURCE_DIR}/2_Ebyte_Board_Support/E15-EVB02/ + ${CMAKE_CURRENT_SOURCE_DIR}/3_Ebyte_WirelessModule_Drivers/E48xMx/ ) target_link_libraries(cmt2310