From 5a577b9f27adb2e9fc23f3776153999e18c97e9a Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 31 三月 2025 13:39:07 +0800
Subject: [PATCH] 1.33，加入1s一次跟3s一次 通过勾选modbus模式来区别 不勾选是1s一次
---
Src/radio/Lora.c | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index c4fe696..db21e96 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -239,6 +239,7 @@
Radio.Send(lora_sendbuffer,data_length+11);
// Delay_Ms(100);
}
+extern uint8_t lora_busy_flag;
extern uint8_t imu_enable,motor_enable;
extern u8 lora_jianting_flag,report_ancnum;
static uint16_t delaytime = 771;
@@ -257,12 +258,12 @@
Radio.Standby();
no_rx_flag = 0;
lora_up_rec_flag=1;
- if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
- {
- UWB_Wkup();
- MbxTagUwbRec();
- HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
- }
+// if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
+// {
+// UWB_Wkup();
+// MbxTagUwbRec();
+// HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
+// }
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
{
checksum1=Checksum_u16(RX_Buffer,BufferSize-2);
@@ -279,6 +280,7 @@
if(!memcmp(&wg_report_id,&RX_Buffer[SOURCE_ID_IDX],2))
{
wg_lost_count = 0;
+// HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
switch(RX_Buffer[PWTAG_RW_FLAG_IDX])
{
case WGRSP_RWTAG_NONE:
@@ -349,23 +351,25 @@
break;
}
}
+ lora_busy_flag=0;
}
}
- if(!no_rx_flag)
- {
- if(lora_jianting_flag&&LoraUp_flag==0)
- {
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
- Radio.Rx(0);
- }
- }
+// if(!no_rx_flag)
+// {
+// if(lora_jianting_flag&&LoraUp_flag==0)
+// {
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+// Radio.Rx(0);
+// }
+// }
}
void OnTxTimeout( void )
{
Radio.Standby();
- if(lora_jianting_flag)
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+// if(lora_jianting_flag)
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+ lora_busy_flag=0;
}
uint8_t tm;
uint16_t Lora_rece_error;
@@ -380,19 +384,22 @@
target_count+=32768;
__HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
}
+// HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
if(lora_jianting_flag)
{
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
- Radio.Rx(0);
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+// Radio.Rx(0);
}
+ lora_busy_flag=0;
}
void OnRxError( void )
{
Radio.Standby();
- if(lora_jianting_flag)
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+ lora_busy_flag=0;
+// if(lora_jianting_flag)
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
}
uint16_t freq_test;
@@ -431,13 +438,13 @@
RadioEvents.RxError = OnRxError;
Radio.Init( &RadioEvents );
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],5,0); //切换lora接收频点
- if(active_flag)
- {
- Radio.Rx( 0 );
- }else{
- Radio.Sleep();
- }
+ SwitchLoraSettings(REPORT_MANGE_CHANNEL_FRQ,7,22); //切换lora接收频点
+// if(active_flag)
+// {
+// Radio.Rx( 0 );
+// }else{
+// Radio.Sleep();
+// }
// Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
}
--
Gitblit v1.9.3