From ae0b42614c7f3de6f13c2ebacd3c1b46662ed9e9 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期一, 23 六月 2025 17:26:33 +0800
Subject: [PATCH] 现场试用版
---
keil/include/src/Radio/lora_1268.c | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/keil/include/src/Radio/lora_1268.c b/keil/include/src/Radio/lora_1268.c
index 851e435..4845108 100644
--- a/keil/include/src/Radio/lora_1268.c
+++ b/keil/include/src/Radio/lora_1268.c
@@ -3,7 +3,6 @@
#include "sx126x.h"
#include "sx126x-board.h"
#include "lora_1268.h"
-//#include "lora_3029.h""
#include "user.h"
#include "sx126x-board.h"
#include "string.h"
@@ -207,7 +206,7 @@
flag_getwgresp = 0;
SwitchLoraSettings(wg_report_freq,REPORT_CHANNEL_SF,22);
- mir3da_get_step();
+// mir3da_get_step();
if(heatbeat_count++>HEATBEAT_UPDATE_TIME && WG_Connected == wg_state) //如果心跳包到达上传时间，并且网关处于链接状态，就上传心跳包
{
heatbeat_count = 0;
@@ -301,6 +300,19 @@
Radio.Send(lora_sendbuffer,BT_SEND_lenth);
LORA_POLL_COUNT++;
+//#ifdef CESHIGUJIAN
+// uint16_t log_info_bt[10];
+// uint16_t log_info_uwb[10];
+// memcpy(log_info_bt,&lora_sendbuffer[LORA_RETRANSNUSSION_BT+1],BT_NUM*2+1);
+// memcpy(log_info_uwb,&lora_sendbuffer[BT_ANCID_IDX+1],report_ancnum*2);
+//
+// uint16_t corrected_value =(log_info_bt[0] << 8) | (log_info_bt[0] >> 8);
+// uint16_t corrected_value2 =(log_info_bt[1] << 8) | (log_info_bt[1] >> 8);
+// LOG_INFO(TRACE_MODULE_APP,"BTNUM：%d,基站ID1: %04x ,基站ID2: %04x 运动状态:%d,步数: %d\r\n",BT_NUM,corrected_value,corrected_value2,lora_sendbuffer[EXERCISE_STATE],lora_sendbuffer[STEP_COUNT]);
+// LOG_INFO(TRACE_MODULE_APP,"UWBNUM：%d,基站ID1: %x,基站ID2: %x \r\n",report_ancnum,log_info_uwb[0],log_info_uwb[1]);
+// memset(log_info_uwb,0,10);
+// taglist_num==0;
+//#endif
// LORA_3029_SINGLE_SEND(lora_sendbuffer,ANCID_IDX+report_ancnum*4+BT_NUM*4+4,0);
// }
// else
@@ -357,8 +369,7 @@
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);
-// LORA_3029_SINGLE_SEND(lora_sendbuffer,data_length+13,0);
-// Radio.Send(lora_sendbuffer,data_length+13);
+ Radio.Send(lora_sendbuffer,data_length+13);
//++;
// Delay_Ms(100);
}
@@ -376,10 +387,7 @@
memcpy(&lora_sendbuffer[7], &g_com_map[index/2], 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_3029_SINGLE_SEND(lora_sendbuffer,data_length+11,0);
- // Delay_Ms(100);
+ Radio.Send(lora_sendbuffer,data_length+11);
}
uint8_t t22[20],ti;
uint8_t no_yingdaflag;
--
Gitblit v1.9.3