[Mod] CMT2310 跳转前切换至Standby，成功免初始化

1. 新增Standby切换入口；
2. ping接收打印优化；

MBL/platform/gdm32/systick.c

@@ -66,9 +66,11 @@ void systick_config(void)
 */
 void systick_deinit(void)
 {
-	SysTick_Config(1);
-
 	NVIC_SetPriority(SysTick_IRQn, priority_orig);
+
+    SysTick->LOAD  = 0UL;                         /* set reload register */
+    SysTick->VAL   = 0UL;                         /* Load the SysTick Counter Value */
+    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;   /* Enable SysTick IRQ and SysTick Timer */
 }
 
 /*!

MBL/source_ns/drivers/CMT2310/0_Project/Uart_PingPong/ebyte/ebyte_callback.c

@@ -73,7 +73,7 @@ void Ebyte_Port_ReceiveCallback(  uint16_t state, uint8_t *buffer, uint8_t lengt
 {
 	uint8_t  j,  pcEchoLength;
 	uint8_t *p;
-	int8_t rx_data[32] = {0};
+	uint8_t rx_data[32] = {0};
 
 	/* <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD> */
 	if( state &= 0x0002 ) {
@@ -115,7 +115,7 @@ void Ebyte_Port_ReceiveCallback(  uint16_t state, uint8_t *buffer, uint8_t lengt
 		if( ! PC_isConnected ) {
 			is_jump_main = 1;
 			snprintf(rx_data, sizeof(rx_data), "%s", buffer);
-			EBYTE_LOG("\r\n Receive Data: %s", rx_data);
+			EBYTE_LOG(" Receive Data: %s\r\n", rx_data);
 		}
 
 		Ebyte_BSP_LedControl( BSP_LED_1, OFF );

MBL/source_ns/drivers/CMT2310/0_Project/Uart_PingPong/ebyte/ebyte_core.c

@@ -1,20 +1,20 @@
 /**
   **********************************************************************************
   * @file      ebyte_core.c
-  * @brief     EBYTE<54><45><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϲ<EFBFBD>API<50><49>װ<EFBFBD><D7B0> <20><><EFBFBD><EFBFBD><EFBFBD>ͻ<EFBFBD><CDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ײ<EFBFBD><D7B2>߼<EFBFBD>    
-  * @details   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>μ<EFBFBD> https://www.ebyte.com/       
-  * @author    JiangHeng     
-  * @date      2021-05-13     
-  * @version   1.0.0     
+  * @brief     EBYTE<54><45><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϲ<EFBFBD>API<50><49>װ<EFBFBD><D7B0> <20><><EFBFBD><EFBFBD><EFBFBD>ͻ<EFBFBD><CDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ײ<EFBFBD><D7B2>߼<EFBFBD>
+  * @details   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>μ<EFBFBD> https://www.ebyte.com/
+  * @author    JiangHeng
+  * @date      2021-05-13
+  * @version   1.0.0
   **********************************************************************************
-  * @copyright BSD License 
-  *            <20>ɶ<EFBFBD><C9B6>ڰ<EFBFBD><DAB0>ص<EFBFBD><D8B5>ӿƼ<D3BF><C6BC><EFBFBD><EFBFBD>޹<EFBFBD>˾  
-  *   ______   ____   __     __  _______   ______ 
+  * @copyright BSD License
+  *            <20>ɶ<EFBFBD><C9B6>ڰ<EFBFBD><DAB0>ص<EFBFBD><D8B5>ӿƼ<D3BF><C6BC><EFBFBD><EFBFBD>޹<EFBFBD>˾
+  *   ______   ____   __     __  _______   ______
   *  |  ____| |  _ \  \ \   / / |__   __| |  ____|
-  *  | |__    | |_) |  \ \_/ /     | |    | |__   
-  *  |  __|   |  _ <    \   /      | |    |  __|  
-  *  | |____  | |_) |    | |       | |    | |____ 
-  *  |______| |____/     |_|       |_|    |______| 
+  *  | |__    | |_) |  \ \_/ /     | |    | |__
+  *  |  __|   |  _ <    \   /      | |    |  __|
+  *  | |____  | |_) |    | |       | |    | |____
+  *  |______| |____/     |_|       |_|    |______|
   *
   **********************************************************************************
   */
@@ -29,8 +29,9 @@ const Ebyte_RF_t Ebyte_RF =
 {
   Ebyte_E48x_Init,
   Ebyte_E48x_SendPayload,
+  Ebyte_E48x_SetStandby,
   Ebyte_E48x_SetSleep,
-  Ebyte_E48x_SetRx,  
+  Ebyte_E48x_SetRx,
   Ebyte_E48x_IntOrPollTask,
   Ebyte_E48x_InterruptTrigger,
   Ebyte_E48x_GetName,

MBL/source_ns/drivers/CMT2310/0_Project/Uart_PingPong/ebyte/ebyte_core.h

@@ -32,6 +32,7 @@ typedef struct
 {
     void   ( *Init )( void );
     void   ( *Send )( uint8e_t *buffer, uint8e_t size , uint32e_t timeout);
+    void   ( *EnterStandby )( uint8e_t command);
     void   ( *EnterSleepMode )( uint8e_t command);
     void   ( *EnterReceiveMode )( uint32e_t timeout );
     void   ( *StartPollTask)( void );

MBL/source_ns/drivers/CMT2310/0_Project/Uart_PingPong/main.c

@@ -61,7 +61,6 @@ int ebyte_main( void )
 {
 	/* Init Systick */
 	systick_config();
-#if 0
 	/* <20><><EFBFBD><EFBFBD>Ӳ<EFBFBD><D3B2><EFBFBD><EFBFBD>Դ <20><>ʼ<EFBFBD><CABC> */
 	Ebyte_BSP_Init();
 	/* (<28><>ѡ) <20><><EFBFBD><EFBFBD><EFBFBD>жϽ<D0B6><CFBD><EFBFBD>FIFO <20>ɸ<EFBFBD><C9B8><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD>д<EFBFBD><D0B4><EFBFBD> */
@@ -70,8 +69,6 @@ int ebyte_main( void )
 	Ebyte_RF.Init();
 	/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
 	Ebyte_RF.EnterReceiveMode( 0 );
-	/* MCU <20><>ȫ<EFBFBD><C8AB><EFBFBD>ж<EFBFBD> */
-	Ebyte_BSP_GlobalIntEnable();
 
 	EBYTE_LOG( "Start PingPong.....\r\n" );
 	EBYTE_LOG( "Please push button1 or button2.....\r\n" );
@@ -89,8 +86,9 @@ int ebyte_main( void )
 		delay_1ms(100);
 	}
 
-	Ebyte_BSP_GlobalIntDisable();
-#endif
+	Ebyte_RF.EnterStandby(0);
+
+	Ebyte_BSP_Deinit();
 	systick_deinit();
 }
 
@@ -148,7 +146,7 @@ void Task_Transmit( void )
         {
             pongLength = 5;
         }else{
-            EBYTE_LOG( "\r\n Echo : pong \r\n" );
+            EBYTE_LOG( " Echo : pong \r\n" );
             pongLength = 4;
         }
 

MBL/source_ns/drivers/CMT2310/2_Ebyte_Board_Support/E15-EVB02/board.c

@@ -23,6 +23,10 @@
 #include "ebyte_port.h"
 #include "ebyte_conf.h"
 #include "gd32w51x_gpio.h"
+#include "gd32w51x_misc.h"
+#include "gd32w51x_rcu.h"
+#include "gd32w51x_spi.h"
+#include "gd32w51x_timer.h"
 #include "platform_def.h"
 
 BSP_BTN_FIFO_t BSP_BTN_FIFO;
@@ -43,7 +47,6 @@ void Ebyte_BSP_HSI_Init(void)
 //  CLK_SYSCLKDivConfig( CLK_SYSCLKDiv_1 );
 }
 
-
 void Ebyte_BSP_E48xGPIO_Init(void)
 {
     rcu_periph_clock_enable(BSP_GPIO_RCU_E48_GPIO);
@@ -54,6 +57,12 @@ void Ebyte_BSP_E48xGPIO_Init(void)
     gpio_mode_set( BSP_GPIO_PORT_E48_GP4,  GPIO_MODE_INPUT, GPIO_PUPD_NONE,   BSP_GPIO_PIN_E48_GP4);
     gpio_mode_set( BSP_GPIO_PORT_E48_GP5,  GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, BSP_GPIO_PIN_E48_GP5);
 }
+
+void Ebyte_BSP_E48xGPIO_Deinit(void)
+{
+    rcu_periph_clock_disable(BSP_GPIO_RCU_E48_GPIO);
+}
+
 /* !
  * @brief <20><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IO
  *
@@ -77,6 +86,23 @@ void Ebyte_BSP_GPIO_Init(void)
 //    GPIO_Init( BSP_GPIO_PORT_BUTTON_2, BSP_GPIO_PIN_BUTTON_2, GPIO_Mode_In_PU_No_IT );
 }
 
+/* !
+ * @brief <20><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IO
+ *
+ * @note  Ŀ<><C4BF>Ӳ<EFBFBD><D3B2>: EBYTE E15-EVB02
+ */
+void Ebyte_BSP_GPIO_Deinit(void)
+{
+    /* Button */
+    rcu_periph_clock_disable(BSP_GPIO_RCU_E48_BUTTON);
+
+    /* LED */
+    rcu_periph_clock_disable(BSP_GPIO_RCU_E48_LED);
+
+    /* E48 */
+    Ebyte_BSP_E48xGPIO_Deinit();
+}
+
 /* !
  * @brief ͨ<>Ŵ<EFBFBD><C5B4>ڳ<EFBFBD>ʼ<EFBFBD><CABC>
  *
@@ -146,6 +172,21 @@ void Ebyte_BSP_SPI_Init( void )
     spi_enable(BSP_RF_SPI);
 }
 
+/* !
+ * @brief <20><><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3>ͨ<EFBFBD><CDA8>SPI<50>ӿڳ<D3BF>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ */
+void Ebyte_BSP_SPI_Deinit( void )
+{
+    /* SPI enable */
+    spi_disable(BSP_RF_SPI);
+
+    spi_i2s_deinit(BSP_RF_SPI);
+
+    spi_parameter_struct spi_init_struct;
+
+    rcu_periph_clock_disable(BSP_RF_SPI_CLOCK);
+}
+
 /* !
  * @brief RFģ<46><C4A3>SPIͨ<49><CDA8><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
  *
@@ -210,6 +251,31 @@ void Ebyte_BSP_TIMER_Init( void )
     nvic_irq_enable(TIMER2_IRQn, 0, 0);
 }
 
+/* !
+ * @brief <20><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC>
+ *
+ * @note  ʹ<><CAB9><EFBFBD><EFBFBD>TIM3<4D><33><EFBFBD><EFBFBD>1ms<6D><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
+ *        TIM3<4D><33><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>ΪHSI 16MHz, 128<32><38>Ƶ<EFBFBD><C6B5>Ϊ 16 MHz / 128 = 125 000 Hz
+ *        Ŀ<>궨ʱ1ms <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڼ<EFBFBD>Ϊ ( 0.001 x 125000 - 1) = 124
+ */
+void Ebyte_BSP_TIMER_Deinit( void )
+{
+    nvic_irq_disable(TIMER2_IRQn);
+
+    /* enable a TIMER */
+    timer_disable(BSP_RF_TIMER);
+    /* enable the TIMER interrupt */
+    timer_interrupt_disable(BSP_RF_TIMER, TIMER_INT_UP);
+    /* clear interrupt bit */
+    timer_interrupt_flag_clear(BSP_RF_TIMER, TIMER_INT_FLAG_UP);
+
+    /* enable the peripherals clock */
+    rcu_periph_clock_disable(BSP_RF_TIMER_RCU);
+
+    /* deinit a TIMER */
+    timer_deinit(BSP_RF_TIMER);
+}
+
 /* !
  * @brief E15-EVB02 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>ʼ<EFBFBD><CABC>
  *
@@ -241,6 +307,31 @@ void Ebyte_BSP_Init( void )
     Ebyte_BTN_FIFO_Init( &BSP_BTN_FIFO );
 }
 
+/* !
+ * @brief E15-EVB02 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>ʼ<EFBFBD><CABC>
+ *
+ * @note  <20>ڲ<EFBFBD>ʱ<EFBFBD><CAB1>HSI  x 16MHz
+ *        <20>û<EFBFBD>ͨ<EFBFBD>Ŵ<EFBFBD><C5B4><EFBFBD> x USART1
+ *        <20><><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3>ͨ<EFBFBD>Žӿ<C5BD> x SPI1
+ *        <20><>ʱ<EFBFBD><CAB1>  x TIM3
+ *        <20><><EFBFBD><EFBFBD>    x 2
+ *        ָʾ<D6B8><CABE>  x 2
+ */
+void Ebyte_BSP_Deinit( void )
+{
+    /* <20><>ʱ<EFBFBD><CAB1>   <20><>ʼ<EFBFBD><CABC> */
+    Ebyte_BSP_TIMER_Deinit();
+
+    /* SPI<50>ӿ<EFBFBD>  <20><>ʼ<EFBFBD><CABC>   */
+    Ebyte_BSP_SPI_Deinit();
+
+    /* <20><><EFBFBD><EFBFBD>     <20><>ʼ<EFBFBD><CABC> */
+//    Ebyte_BSP_UART_Init();
+
+    /* IO       <20><>ʼ<EFBFBD><CABC> */
+    Ebyte_BSP_GPIO_Deinit();
+}
+
 /* !
  * @brief <20><><EFBFBD><EFBFBD>LED <20><>/<2F><>/<2F><>ת
  *

MBL/source_ns/drivers/CMT2310/2_Ebyte_Board_Support/E15-EVB02/board.h

@@ -164,6 +164,7 @@ typedef struct
 extern BSP_BTN_FIFO_t BSP_BTN_FIFO;
 
 void Ebyte_BSP_Init( void );
+void Ebyte_BSP_Deinit( void );
 void Ebyte_BTN_FIFO_Init(BSP_BTN_FIFO_t *fifo);
 void Ebyte_BSP_DelayMs( volatile uint32_t nTime );
 void Ebyte_BSP_TimerDecrement(void);

MBL/source_ns/drivers/CMT2310/3_Ebyte_WirelessModule_Drivers/E48xMx/ebyte_e48x.c

@@ -64,6 +64,11 @@ void Ebyte_E48x_SetRx( uint32_t timeout )
   vRadioReceive();
 }
 
+void Ebyte_E48x_SetStandby( uint8_t  cmd )
+{
+	vRadioStandby();
+}
+
 void Ebyte_E48x_SetSleep( uint8_t  cmd )
 {
   return;

MBL/source_ns/drivers/CMT2310/3_Ebyte_WirelessModule_Drivers/E48xMx/ebyte_e48x.h

@@ -14,6 +14,7 @@ void Ebyte_E48x_Init( void );
 void Ebyte_E48x_SendPayload( uint8_t *payload, uint8_t size, uint32_t timeout );
 void Ebyte_E48x_SetRx( uint32_t timeout );
 void Ebyte_E48x_SetSleep( uint8_t  cmd );
+void Ebyte_E48x_SetStandby( uint8_t  cmd );
 void Ebyte_E48x_IntOrPollTask( void );
 void Ebyte_E48x_InterruptTrigger( void );
 uint32_t Ebyte_E48x_GetName(void);

MBL/source_ns/drivers/CMT2310/3_Ebyte_WirelessModule_Drivers/E48xMx/radio.c

@@ -360,6 +360,14 @@ void vRadioTransmit(uint8_t* buffer, uint8_t length )
     vRadioReceive();
 }
 
+void vRadioStandby( void )
+{
+    bRadioGoStandby();
+    vRadioClearTxFifo();
+    vRadioClearRxFifo();
+    vRadioClearInterrupt();
+}
+
 uint8_t vRadioGetPacket(uint8_t *buffer,uint8_t *length)
 {
     uint8_t rx_length;

MBL/source_ns/drivers/CMT2310/3_Ebyte_WirelessModule_Drivers/E48xMx/radio.h

@@ -26,8 +26,9 @@ extern void vRadioGoRxInit( void );
 
 extern void vRadioTransmit(uint8_t* buffer, uint8_t length );
 extern void vRadioReceive(void);
-extern uint8_t vRadioGetPacket(uint8_t *buffer,uint8_t *length);
+extern void vRadioStandby(void);
 
+extern uint8_t vRadioGetPacket(uint8_t *buffer,uint8_t *length);
 
 extern void vRadioCheckLink(void);
 

MBL/source_ns/mbl_ns.c

@@ -75,7 +75,7 @@ static void jump_to_main_image(uint32_t msp, uint32_t reset)
 
     img_reset = (img_fptr_t)reset;
 
-    __disable_irq();
+//    __disable_irq();
 #if defined(__ARM_ARCH_8M_MAIN__) || defined(__ARM_ARCH_8M_BASE__)
     /* Restore the Main Stack Pointer Limit register's reset value
      * before passing execution to runtime firmware to make the