From d715e84d0578eebc57d6393fb8eff70ff58acad1 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 25 七月 2025 17:24:42 +0800
Subject: [PATCH] Merge branch 'MK_IPhone_测试' of http://47.108.70.204:60062/r/ChinaUWBProject into MK_IPhone_测试
---
keil/include/main/main.c | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 03c07bf..1183646 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -130,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)
@@ -138,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--;
}
@@ -313,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)
@@ -371,7 +377,10 @@
// Disable watchdog timer
wdt_close(WDT_ID0);
LOG_INFO(TRACE_MODULE_APP, "UCI FiRa example\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(MODE_CHANGE_PIN))//记得改回来与正式的相反
@@ -475,15 +484,20 @@
power_manage();
if(!gpio_pin_get_val(SLEEP_PIN))
{
- gpio_pin_clr(LORA_NRST);//lora休眠
- 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();
@@ -507,20 +521,26 @@
//Lora_Tx_Poll();
}
Lora_Tx_Poll();
-// if(!gpio_pin_get_val(SLEEP_PIN))
-// {
-// //gpio_pin_clr(LORA_NRST);//lora休眠
-// 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{
-//delay_ms(300);
- LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
+
+delay_ms(300);
+ //LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");//会打断休眠
//gpio_pin_clr(LORA_NRST);//lora休眠
-// spi_close(SPI_ID0);
+ //spi_close(SPI_ID0);
lora_in_sleep();
power_init();
mcu_deep_sleep();
--
Gitblit v1.9.3