From 2708bb705860a113282682b2512af4f139c12888 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 20 五月 2025 18:31:36 +0800
Subject: [PATCH] 初步移植过来lora基础包协议格式，不能和网关通信未解决
---
keil/include/main/main.c | 10 ++++++++--
pin_config.c | 3 ---
keil/include/drivers/uwb_app.c | 2 ++
keil/include/board/board.c | 5 ++++-
user_config.h | 1 +
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index 0368072..302905e 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -407,7 +407,10 @@
}
void board_mode_pin_init(void)
-{
+{
+ //配置spi片选脚
+ gpio_pin_set_dir(LORA_CS , GPIO_DIR_OUT, 0);
+ io_pull_set(LORA_CS, IO_HIGH_Z, IO_PULL_UP_NONE);
// 判断是Airtag还是免布线模式
io_pin_mux_set(MODE_CHANGE_PIN, IO_FUNC0);
gpio_pin_set_dir( MODE_CHANGE_PIN, GPIO_DIR_IN, 0);
diff --git a/keil/include/drivers/uwb_app.c b/keil/include/drivers/uwb_app.c
index ca02d07..0ee9813 100644
--- a/keil/include/drivers/uwb_app.c
+++ b/keil/include/drivers/uwb_app.c
@@ -529,6 +529,8 @@
enumwltagstate wltag_state=RANGE;
uint32_t wltag_statetimer,wltag_uwbtimer;
uint32_t uwbtasktimer=0,uwbtagsendtimer=0;
+uint8_t report_ancnum;
+uint16_t report_ancdist[ANC_MAX_NUM],report_ancid[ANC_MAX_NUM];
void IdleTask(void)
{UART_CheckReceive();
//if(read_5v_input_pca())
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 4399dbf..0131fcc 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -137,6 +137,7 @@
}else{
flag_secondtask = 0;
}
+ lora_tx_flag=1;
// if(delaysleep_count>0)
// delaysleep_count--;
}
@@ -187,7 +188,8 @@
second_count = 0;
MinuteTask();
}
- lora_tx_flag=1;
+
+
//Lora_Tx_Poll();
// //UWB状态检测
//if(!power_low_flag)//低供电下不需要检测重连
@@ -338,6 +340,7 @@
}
uint8_t bat_percent;
+uint8_t stationary_flag;
int main(void)
{
// Initialize MCU system
@@ -465,13 +468,16 @@
while (1)
{
uwb_app_poll();//我们的测距逻辑
- Lora_Tx_Poll();
+
if(flag_secondtask)
{
flag_secondtask = 0;
SecondTask();
+ //Lora_Tx_Poll();
}
+
+ Lora_Tx_Poll();
IdleTask();
}
}
diff --git a/pin_config.c b/pin_config.c
index 11f6a63..0384fd8 100644
--- a/pin_config.c
+++ b/pin_config.c
@@ -82,9 +82,6 @@
//增加SPI初始化
//SPI0/MOSI/MISO/CLK/CS
io_pin_mux_set(LORA_CS, IO_FUNC0);
- gpio_pin_set_dir(LORA_CS , GPIO_DIR_OUT, 0);
- io_pull_set(LORA_CS, IO_HIGH_Z, IO_PULL_UP_NONE);
-
io_pin_mux_set(LORA_MOSI, IO_FUNC2);
io_pin_mux_set(LORA_MISO, IO_FUNC2);
io_pin_mux_set(LORA_CLK, IO_FUNC2);
diff --git a/user_config.h b/user_config.h
index 154f145..79fa190 100644
--- a/user_config.h
+++ b/user_config.h
@@ -336,6 +336,7 @@
#define LORA_IRQ IO_PIN_7
#define LORA_BUSY IO_PIN_2
#define LORA_NRST IO_PIN_4
+#define SOS_PIN IO_PIN_4 //这个未定义
/* =========================================================================================================================== */
/* ================ End ================ */
/* =========================================================================================================================== */
--
Gitblit v1.9.3