[Mod] CMT2310 跳转前切换至Standby,成功免初始化
1. 新增Standby切换入口; 2. ping接收打印优化;
This commit is contained in:
@ -73,7 +73,7 @@ void Ebyte_Port_ReceiveCallback( uint16_t state, uint8_t *buffer, uint8_t lengt
|
|||||||
{
|
{
|
||||||
uint8_t j, pcEchoLength;
|
uint8_t j, pcEchoLength;
|
||||||
uint8_t *p;
|
uint8_t *p;
|
||||||
int8_t rx_data[32] = {0};
|
uint8_t rx_data[32] = {0};
|
||||||
|
|
||||||
/* <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD> */
|
/* <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD> */
|
||||||
if( state &= 0x0002 ) {
|
if( state &= 0x0002 ) {
|
||||||
@ -115,7 +115,7 @@ void Ebyte_Port_ReceiveCallback( uint16_t state, uint8_t *buffer, uint8_t lengt
|
|||||||
if( ! PC_isConnected ) {
|
if( ! PC_isConnected ) {
|
||||||
is_jump_main = 1;
|
is_jump_main = 1;
|
||||||
snprintf(rx_data, sizeof(rx_data), "%s", buffer);
|
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 );
|
Ebyte_BSP_LedControl( BSP_LED_1, OFF );
|
||||||
|
|||||||
@ -1,20 +1,20 @@
|
|||||||
/**
|
/**
|
||||||
**********************************************************************************
|
**********************************************************************************
|
||||||
* @file ebyte_core.c
|
* @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>
|
* @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/
|
* @details <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>μ<EFBFBD> https://www.ebyte.com/
|
||||||
* @author JiangHeng
|
* @author JiangHeng
|
||||||
* @date 2021-05-13
|
* @date 2021-05-13
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
**********************************************************************************
|
**********************************************************************************
|
||||||
* @copyright BSD License
|
* @copyright BSD License
|
||||||
* <20>ɶ<EFBFBD><C9B6>ڰ<EFBFBD><DAB0>ص<EFBFBD><D8B5>ӿƼ<D3BF><C6BC><EFBFBD><EFBFBD><EFBFBD>˾
|
* <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_Init,
|
||||||
Ebyte_E48x_SendPayload,
|
Ebyte_E48x_SendPayload,
|
||||||
|
Ebyte_E48x_SetStandby,
|
||||||
Ebyte_E48x_SetSleep,
|
Ebyte_E48x_SetSleep,
|
||||||
Ebyte_E48x_SetRx,
|
Ebyte_E48x_SetRx,
|
||||||
Ebyte_E48x_IntOrPollTask,
|
Ebyte_E48x_IntOrPollTask,
|
||||||
Ebyte_E48x_InterruptTrigger,
|
Ebyte_E48x_InterruptTrigger,
|
||||||
Ebyte_E48x_GetName,
|
Ebyte_E48x_GetName,
|
||||||
|
|||||||
@ -32,6 +32,7 @@ typedef struct
|
|||||||
{
|
{
|
||||||
void ( *Init )( void );
|
void ( *Init )( void );
|
||||||
void ( *Send )( uint8e_t *buffer, uint8e_t size , uint32e_t timeout);
|
void ( *Send )( uint8e_t *buffer, uint8e_t size , uint32e_t timeout);
|
||||||
|
void ( *EnterStandby )( uint8e_t command);
|
||||||
void ( *EnterSleepMode )( uint8e_t command);
|
void ( *EnterSleepMode )( uint8e_t command);
|
||||||
void ( *EnterReceiveMode )( uint32e_t timeout );
|
void ( *EnterReceiveMode )( uint32e_t timeout );
|
||||||
void ( *StartPollTask)( void );
|
void ( *StartPollTask)( void );
|
||||||
|
|||||||
@ -69,8 +69,6 @@ int ebyte_main( void )
|
|||||||
Ebyte_RF.Init();
|
Ebyte_RF.Init();
|
||||||
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||||
Ebyte_RF.EnterReceiveMode( 0 );
|
Ebyte_RF.EnterReceiveMode( 0 );
|
||||||
/* MCU <20><>ȫ<EFBFBD><C8AB><EFBFBD>ж<EFBFBD> */
|
|
||||||
// Ebyte_BSP_GlobalIntEnable();
|
|
||||||
|
|
||||||
EBYTE_LOG( "Start PingPong.....\r\n" );
|
EBYTE_LOG( "Start PingPong.....\r\n" );
|
||||||
EBYTE_LOG( "Please push button1 or button2.....\r\n" );
|
EBYTE_LOG( "Please push button1 or button2.....\r\n" );
|
||||||
@ -88,7 +86,8 @@ int ebyte_main( void )
|
|||||||
delay_1ms(100);
|
delay_1ms(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
Ebyte_BSP_GlobalIntDisable();
|
Ebyte_RF.EnterStandby(0);
|
||||||
|
|
||||||
Ebyte_BSP_Deinit();
|
Ebyte_BSP_Deinit();
|
||||||
systick_deinit();
|
systick_deinit();
|
||||||
}
|
}
|
||||||
@ -147,7 +146,7 @@ void Task_Transmit( void )
|
|||||||
{
|
{
|
||||||
pongLength = 5;
|
pongLength = 5;
|
||||||
}else{
|
}else{
|
||||||
EBYTE_LOG( "\r\n Echo : pong \r\n" );
|
EBYTE_LOG( " Echo : pong \r\n" );
|
||||||
pongLength = 4;
|
pongLength = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -64,6 +64,11 @@ void Ebyte_E48x_SetRx( uint32_t timeout )
|
|||||||
vRadioReceive();
|
vRadioReceive();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Ebyte_E48x_SetStandby( uint8_t cmd )
|
||||||
|
{
|
||||||
|
vRadioStandby();
|
||||||
|
}
|
||||||
|
|
||||||
void Ebyte_E48x_SetSleep( uint8_t cmd )
|
void Ebyte_E48x_SetSleep( uint8_t cmd )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -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_SendPayload( uint8_t *payload, uint8_t size, uint32_t timeout );
|
||||||
void Ebyte_E48x_SetRx( uint32_t timeout );
|
void Ebyte_E48x_SetRx( uint32_t timeout );
|
||||||
void Ebyte_E48x_SetSleep( uint8_t cmd );
|
void Ebyte_E48x_SetSleep( uint8_t cmd );
|
||||||
|
void Ebyte_E48x_SetStandby( uint8_t cmd );
|
||||||
void Ebyte_E48x_IntOrPollTask( void );
|
void Ebyte_E48x_IntOrPollTask( void );
|
||||||
void Ebyte_E48x_InterruptTrigger( void );
|
void Ebyte_E48x_InterruptTrigger( void );
|
||||||
uint32_t Ebyte_E48x_GetName(void);
|
uint32_t Ebyte_E48x_GetName(void);
|
||||||
|
|||||||
@ -360,6 +360,14 @@ void vRadioTransmit(uint8_t* buffer, uint8_t length )
|
|||||||
vRadioReceive();
|
vRadioReceive();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void vRadioStandby( void )
|
||||||
|
{
|
||||||
|
bRadioGoStandby();
|
||||||
|
vRadioClearTxFifo();
|
||||||
|
vRadioClearRxFifo();
|
||||||
|
vRadioClearInterrupt();
|
||||||
|
}
|
||||||
|
|
||||||
uint8_t vRadioGetPacket(uint8_t *buffer,uint8_t *length)
|
uint8_t vRadioGetPacket(uint8_t *buffer,uint8_t *length)
|
||||||
{
|
{
|
||||||
uint8_t rx_length;
|
uint8_t rx_length;
|
||||||
|
|||||||
@ -26,8 +26,9 @@ extern void vRadioGoRxInit( void );
|
|||||||
|
|
||||||
extern void vRadioTransmit(uint8_t* buffer, uint8_t length );
|
extern void vRadioTransmit(uint8_t* buffer, uint8_t length );
|
||||||
extern void vRadioReceive(void);
|
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);
|
extern void vRadioCheckLink(void);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user