From e8fae59212dd962e2f13137f53d70bd1625891fb Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 28 二月 2025 13:56:50 +0800
Subject: [PATCH] 修改串口蓝牙转发
---
keil/lora_3029.h | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/keil/lora_3029.h b/keil/lora_3029.h
index a4a81d9..556da34 100644
--- a/keil/lora_3029.h
+++ b/keil/lora_3029.h
@@ -2,13 +2,17 @@
#define __LORA_3029_H
#include "mk_io.h"
-#define LORA_CS IO_PIN_14
+//BT板子更改了片选角
+
+//#define LORA_CS IO_PIN_14
+#define LORA_CS IO_PIN_8
#define LORA_MOSI IO_PIN_11
#define LORA_MISO IO_PIN_12
#define LORA_CLK IO_PIN_13
-#define LORA_DIO IO_PIN_4
+#define LORA_DIO IO_PIN_7
+//#define LORA_DIO IO_PIN_4
#define ANC_MAX_NUM 50
-#define LORA_REPORT_MAXANC_NUM 7
+#define LORA_REPORT_MAXANC_NUM 10
//#define TEST_FREQ
#ifdef TEST_FREQ
#define LORA_UPCHANNEL_FRQ 456
@@ -25,7 +29,7 @@
#define REPORT_CHANNEL_SF 7
#else
#define LORA_UPCHANNEL_FRQ 476
-#define LORA_UPCHANNEL_SF 7
+#define LORA_UPCHANNEL_SF 8
#define UWB_CHANNEL_FRQ 470
#define UWB_CHANNEL_SF 5
@@ -35,6 +39,10 @@
#define LR_DATA_CHANNEL_FRQ 475
#define LR_DATA_CHANNEL_SF 9
+
+//#define TEST_MANAGE_CHANNEL_FRQ 457
+//#define TEST_MANAGE_CHANNEL_SF 5
+
#endif
//LORA 数据格式
@@ -50,6 +58,9 @@
#define LORA_MSGTYPE_ANCHEARTBEAT_POLL 7//网关回复基站升级文件内容
#define LORA_MSGTYPE_TAGMSGTOWG 0x22//标签距离信息发给网关
#define LORA_MSGTYPE_TAGMSGTOWG_GPS 0x23//标签距离信息发给网关
+
+#define LORA_MSGTYPE_TAGMSGTOWG_BT 0x26//标签距离信息蓝牙距离信息，信号强度，发给网关
+
#define LORA_MSGTYPE_WGRESPTAG 8//网关回复标签测距定位报文
#define LORA_MSGTYPE_TAGHEARTBEAT 0x33//标签心跳包上传
#define LORA_MSGTYPE_READPARARESP 0x39 //标签基站回复网关读取配置指令
@@ -99,8 +110,12 @@
#define BAT_IDX 7 //标签电量
#define STATE_IDX 8
#define BAR_HEIGHT_IDX 9 //气压高度
+ #define GATEWAY_CHANL 9
+ #define CHANL_NUM 10
#define ANCNUM_IDX 11
#define ANCID_IDX 12 //校验在4*ancnum+ANCID_IDX 位置
+// #define LORA_RETRANSNUSSION_BT 13 //LORA转发蓝牙协议标识符
+
#endif
//#define LORA_MSGTYPE_WGRESPTAG 8//网关回复标签测距定位报文 格式
@@ -142,5 +157,11 @@
WG_Connected,// 上报中 和网关通讯正常
}wg_state_enum;
-void Lora_UploadHeartBeartPoll(void);
+void LoraHeartBeartPoll(void);
+void Lora_Tx_Poll();
+void OnMaster();
+int LORA_3029_SINGLE_SEND(uint8_t *buffer, uint8_t size,uint8_t time);
+int LORA_3029_CONTINOUS_SEND(uint8_t *buffer, uint8_t size);
+
+
#endif
\ No newline at end of file
--
Gitblit v1.9.3