|
@@ -16,7 +16,7 @@ static uint8_t rfRxBuffer[255];
|
|
|
static uint32_t rf_handle;
|
|
|
static uint8_t rf_workProcess;
|
|
|
static uint8_t chipType;
|
|
|
-static uint8_t rfModuleMode = RF_MM_MODE_LORA;
|
|
|
+static uint8_t rfModuleMode = RF_MM_MODE_FLRC;
|
|
|
/**-------------------------radio params----------------------------------**/
|
|
|
ModulationParams_t modulationParams;
|
|
|
rfRxPacket_ts rfRxPacket;
|
|
@@ -110,7 +110,7 @@ const fastloraBaudrateFrame_ts fastLoraConfigList[] =
|
|
|
/*!
|
|
|
* \brief Number of tick size steps for tx timeout
|
|
|
*/
|
|
|
-#define TX_TIMEOUT_VALUE 1000 // ms
|
|
|
+#define TX_TIMEOUT_VALUE 3000 // ms
|
|
|
|
|
|
/*!
|
|
|
* \brief Number of tick size steps for rx timeout
|
|
@@ -238,7 +238,7 @@ void myRadio_delay(uint32_t time_ms)
|
|
|
i = time_ms;
|
|
|
while (i --)
|
|
|
{
|
|
|
- for ( j = 0; j < 2000; j++)
|
|
|
+ for ( j = 0; j < 1000; j++)
|
|
|
{
|
|
|
;
|
|
|
}
|
|
@@ -276,7 +276,8 @@ void myRadio_init(int agr0, void *agr1_ptr)
|
|
|
Radio.Init( &Callbacks );
|
|
|
Radio.SetRegulatorMode( USE_DCDC ); // Can also be set in LDO mode but consume more power
|
|
|
{
|
|
|
- ver = Radio.GetFirmwareVersion();//获取芯片信息 0xA9B5 可用于测试SPI的读写情况
|
|
|
+
|
|
|
+ ver = Radio.GetFirmwareVersion();//获取芯片信息 0xA9B5 可用于测试SPI的读写情况
|
|
|
}
|
|
|
if (rfModuleMode == RF_MM_MODE_BLE)
|
|
|
{
|
|
@@ -365,7 +366,10 @@ void myRadio_init(int agr0, void *agr1_ptr)
|
|
|
packetParams.Params.Flrc.Whitening = RADIO_WHITENING_OFF;
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
// #elif defined( MODE_GFSK )
|
|
|
|
|
|
// #elif defined( MODE_LORA )
|
|
@@ -382,9 +386,9 @@ void myRadio_init(int agr0, void *agr1_ptr)
|
|
|
Radio.SetPacketType( modulationParams.PacketType );
|
|
|
Radio.SetModulationParams( &modulationParams );
|
|
|
Radio.SetPacketParams( &packetParams );
|
|
|
- Radio.SetRfFrequency( RF_FREQUENCY ); //频点设置
|
|
|
+ Radio.SetRfFrequency( RF_FREQUENCY );//频点设置
|
|
|
Radio.SetBufferBaseAddresses( 0x00, 0x00 );
|
|
|
- Radio.SetTxParams( TX_OUTPUT_POWER, RADIO_RAMP_02_US ); //功率设置
|
|
|
+ Radio.SetTxParams( TX_OUTPUT_POWER, RADIO_RAMP_02_US );//功率设置
|
|
|
|
|
|
// Radio.SetInterruptMode();
|
|
|
Radio.SetPollingMode();
|
|
@@ -593,7 +597,6 @@ void myRadio_transmit(rfTxPacket_ts *packet)
|
|
|
}
|
|
|
TickTime_t TickTime ={ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE };
|
|
|
Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
|
|
|
- packet->len = 64;
|
|
|
if(rfModuleMode == RF_MM_MODE_GFSK)
|
|
|
{
|
|
|
packetParams.Params.Gfsk.PayloadLength = packet->len;
|