From 755f0e3a86e41e9e3cb98f36578b3199c6206e59 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期三, 23 四月 2025 11:14:46 +0800
Subject: [PATCH] 蓝牙现在通过PCA9555关闭使能，反初始化串口，拉低PCA中断脚，现在是0.8v
---
keil/include/src/Radio/lora_1268.c | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/keil/include/src/Radio/lora_1268.c b/keil/include/src/Radio/lora_1268.c
index d5e534b..7a1fb3b 100644
--- a/keil/include/src/Radio/lora_1268.c
+++ b/keil/include/src/Radio/lora_1268.c
@@ -15,6 +15,7 @@
#include "HIDO_TypeDef.h"
#include "PCA9555.h"
#include "mk_misc.h"
+//#include "lis3dh_driver.c"
/********************************************结构体**************************************************************/
typedef enum
{
@@ -183,6 +184,8 @@
extern uint8_t stationary_flag;
extern uint8_t SOS_KEY_STATE;
uint32_t LORA_POLL_COUNT=0;
+extern uint32_t step_count;
+//extern u16_m f_step;
void LoraReportPoll(void)
{
// delay_ms(100);
@@ -195,13 +198,13 @@
printf("气压值：%d",intheight);
#endif
-// TagListUpdate();
+ TagListUpdate();
LoraReportFreqPoll();
flag_getwgresp = 0;
- SwitchLoraSettings(wg_report_freq,REPORT_CHANNEL_SF,g_com_map[LORA_POWER]);
-
+ SwitchLoraSettings(wg_report_freq,REPORT_CHANNEL_SF,22);
+ mir3da_get_step();
if(heatbeat_count++>HEATBEAT_UPDATE_TIME && WG_Connected == wg_state) //如果心跳包到达上传时间，并且网关处于链接状态，就上传心跳包
{
heatbeat_count = 0;
@@ -543,7 +546,7 @@
// }
// if(abs(sleep_time_count_LAST-sleep_time_count)>2000||REV_WG_pack==1)
// {
- sleep_timer_start(sleep_time_count);
+// sleep_timer_start(sleep_time_count);
time_count++;
// }
break;
@@ -592,6 +595,17 @@
break;
}
}
+ if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
+ {
+
+// uwb_open();
+
+//// UwbRange();
+
+// uwb_ceju_count++;
+ }
+
+
}
}
--
Gitblit v1.9.3