From 028d147bf8c2c8e6e23479fcc20e8125cc802fc3 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 23 七月 2025 18:23:04 +0800
Subject: [PATCH] lora距离功率初步调好有些逻辑未改完整，测试可用版
---
keil/include/main/main.c | 66 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index ef59210..09239b7 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -118,6 +118,7 @@
uint8_t group_id,enable_sleep_count;
uint32_t dev_id;
uint16_t disoffset;
+uint16_t set_mk_time;
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count;
float nomove_count;
// Default pool descriptor.
@@ -129,6 +130,8 @@
{
// LOG_INFO(TRACE_MODULE_APP, "Wake up by sleep timer %d\r\n", time);
}
+extern uint8_t start_wait_flag;
+extern int16_t end_count1;
static void sleep_timer_callback_normal(void *dev, uint32_t time)
{
if(secondtask_count++%2==0)
@@ -137,7 +140,11 @@
}else{
flag_secondtask = 0;
}
-
+ if(start_wait_flag)//lora升级等待超时标志
+ {
+ if(end_count1--<=0)
+ start_wait_flag=0;
+ }
// if(delaysleep_count>0)
// delaysleep_count--;
}
@@ -312,7 +319,7 @@
//board_led_on(BOARD_LED_1);
#endif
Board_LORA_NVIC_Init(Lora_irq_handler);
-// board_configure();
+ board_configure();
}
void app_process_handle(uint8_t msg_id, const void *param)
@@ -351,6 +358,8 @@
}
uint8_t bat_percent;
uint8_t stationary_flag;
+extern uint8_t send_flag;
+extern uint8_t txdone;
void mcu_deep_sleep(void)
{
uint32_t lock;
@@ -368,12 +377,12 @@
// Disable watchdog timer
wdt_close(WDT_ID0);
LOG_INFO(TRACE_MODULE_APP, "UCI FiRa example\r\n");
-// delay_ms(300);
-// LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");//测试
+// delay_ms(500);
+// lora_in_sleep();
// power_init();
// mcu_deep_sleep();
- if(gpio_pin_get_val(SLEEP_PIN))
- {
+// if(gpio_pin_get_val(SLEEP_PIN))
+// {
if(gpio_pin_get_val(MODE_CHANGE_PIN))//记得改回来与正式的相反
{
LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_Air_tag模式 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
@@ -475,14 +484,20 @@
power_manage();
if(!gpio_pin_get_val(SLEEP_PIN))
{
- LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
- mcu_deep_sleep();
+ delay_ms(300);
+ //LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");//会打断休眠
+ //gpio_pin_clr(LORA_NRST);//lora休眠
+ //spi_close(SPI_ID0);
+ lora_in_sleep();
+ power_init();
+ mcu_deep_sleep();
}
}
}else{
LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_免布线模式 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
uart0_Init_normal();
Lora_1268_Init();
+ LOG_INFO(TRACE_MODULE_APP," 切换6\r\n");
SwitchLoraSettings(478,7,22);
Uwb_init();//默认为我们测距配置
OpenUWB();
@@ -493,6 +508,11 @@
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
while (1)
{
+ if(send_flag)
+ {
+ LOG_INFO(TRACE_MODULE_APP,"发送数量%d. \r\n",txdone);
+ send_flag=0;
+ }
uwb_app_poll();//我们的测距逻辑
if(flag_secondtask)
{
@@ -501,20 +521,30 @@
//Lora_Tx_Poll();
}
Lora_Tx_Poll();
- if(!gpio_pin_get_val(SLEEP_PIN))
- {
- LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
- mcu_deep_sleep();
- }
+ //LoraUp_Poll();//网关升级
+// if(!gpio_pin_get_val(SLEEP_PIN))
+// {
+// delay_ms(300);
+// //LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");//会打断休眠
+// //gpio_pin_clr(LORA_NRST);//lora休眠
+// //spi_close(SPI_ID0);
+// lora_in_sleep();
+// power_init();
+// mcu_deep_sleep();
+// }
IdleTask();
}
}
-}else{
+//}else{
+//
//delay_ms(300);
- LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
- power_init();
- mcu_deep_sleep();
-}
+// //LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");//会打断休眠
+// //gpio_pin_clr(LORA_NRST);//lora休眠
+// //spi_close(SPI_ID0);
+// lora_in_sleep();
+// power_init();
+// mcu_deep_sleep();
+//}
}
void app_restore_from_power_down(void)
--
Gitblit v1.9.3