From 2b07faacf6d1ce3de7ace73af366e5b84e652c14 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 13 十一月 2024 16:37:43 +0800
Subject: [PATCH] Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag into 免布线标签-lora-泰斗GPS
---
Src/radio/Lora.c | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index 249815e..a68095a 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -207,19 +207,19 @@
extern uint8_t lora_sendbuffer[200];
void LoraSendComMap(uint8_t cmd)
{
- uint8_t data_length = 0x28;
- uint16_t checksum = 0;
- lora_sendbuffer[MSG_TYPE_IDX] = LORA_MSGTYPE_READPARARESP;
- lora_sendbuffer[MSG_LENGTH] = data_length+9;
+ uint8_t data_length = 0x50;
+ uint16_t checksum = 0;
+ lora_sendbuffer[MSG_TYPE_IDX] = LORA_MSGTYPE_READPARARESP;
+ lora_sendbuffer[MSG_LENGTH] = data_length+11;
memcpy(&lora_sendbuffer[SOURCE_ID_IDX],&g_com_map[DEV_ID],2);
memcpy(&lora_sendbuffer[DEST_ID_IDX],&wg_report_id,2);
- lora_sendbuffer[RP_CMD_IDX] = cmd;
- lora_sendbuffer[RP_INDEX_IDX] = 2;
- lora_sendbuffer[RP_LEN_IDX] = data_length;
- memcpy(&lora_sendbuffer[7], &g_com_map[1], data_length);
- checksum = Checksum_u16(lora_sendbuffer,9+data_length);
- memcpy(&lora_sendbuffer[9+data_length],&checksum,2);
- Radio.Send(lora_sendbuffer,data_length+11);
+ lora_sendbuffer[RP_CMD_IDX] = cmd;
+ lora_sendbuffer[RP_INDEX_IDX] = 2;
+ lora_sendbuffer[RP_LEN_IDX] = data_length;
+ memcpy(&lora_sendbuffer[9], &g_com_map[1], data_length);
+ checksum = Checksum_u16(lora_sendbuffer,11+data_length);
+ memcpy(&lora_sendbuffer[11+data_length],&checksum,2);
+ Radio.Send(lora_sendbuffer,data_length+13);
// Delay_Ms(100);
}
void LoraRspWriteCommap(uint8_t index)
@@ -239,10 +239,11 @@
Radio.Send(lora_sendbuffer,data_length+11);
// Delay_Ms(100);
}
+extern uint8_t imu_enable,motor_enable;
extern u8 lora_jianting_flag,report_ancnum;
static uint16_t delaytime = 771;
static uint16_t source_id;
-uint8_t rec_index;
+uint8_t rec_index,rec_secdelay;
uint16_t rec_value,rec_delaytime,rx_count,datalen_offset;
int32_t target_count;
extern uint16_t motor_keeptime;
@@ -258,9 +259,12 @@
lora_up_rec_flag=1;
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
{
+ HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
UWB_Wkup();
+ HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_SET);
MbxTagUwbRec();
- HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
+
+ Radio.Rx(0);
}
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
{
@@ -284,13 +288,18 @@
current_count = HAL_LPTIM_ReadCounter(&hlptim1);
wg_report_freq = RX_Buffer[POLL_FREQ_IDX]+400;
memcpy(&rec_delaytime,&RX_Buffer[NEXTPOLL_TIME_IDX],2);
- if(report_ancnum<2)
- {
- datalen_offset = report_ancnum*85;
- }else{
- datalen_offset = (report_ancnum-1)*46+85;
- }
-
+ if(report_ancnum<2)
+ {
+ datalen_offset = report_ancnum*85;
+ }else{
+ datalen_offset = (report_ancnum-1)*46+85;
+ }
+ rec_secdelay = RX_Buffer[PWTAG_SECDELAY_IDX];
+ if(BufferSize!=13||rec_secdelay>20)
+ {
+ rec_secdelay = 0;
+ }
+
target_count = current_count + rec_delaytime*3.2768 - delaytime-datalen_offset;
while(target_count>=32768)
target_count-=32768;
@@ -334,7 +343,8 @@
{
memcpy(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
shengji_flag=1;
- LoraUp_flag=1;
+ LoraUp_flag=1;
+ imu_enable=0;
}
// LoraUp_Poll();
break;
@@ -343,7 +353,6 @@
}
}
}
- }
if(!no_rx_flag)
{
if(lora_jianting_flag&&LoraUp_flag==0)
@@ -352,6 +361,9 @@
Radio.Rx(0);
}
}
+}
+HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
+
}
void OnTxTimeout( void )
@@ -365,11 +377,15 @@
void OnRxTimeout( void )
{
Radio.Standby();
- current_count = HAL_LPTIM_ReadCounter(&hlptim1);
- target_count-=current_count%3276;
- while(target_count<0)
- target_count+=32768;
- __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
+
+ {
+// current_count = HAL_LPTIM_ReadCounter(&hlptim1);
+// target_count-=current_count%3276;
+ target_count-=66;//提前2ms发lora
+ while(target_count<0)
+ target_count+=32768;
+ __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
+ }
if(lora_jianting_flag)
{
SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
--
Gitblit v1.9.3