From b30026ab8adb4baa197a90e5fd117a03fd0128d8 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 23 七月 2025 14:01:08 +0800
Subject: [PATCH] 初步增加新的lora网关升级功能，但lora功率不对，不可用的测试版
---
keil/include/main/main.c | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 03c07bf..3f54715 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,9 +377,12 @@
// Disable watchdog timer
wdt_close(WDT_ID0);
LOG_INFO(TRACE_MODULE_APP, "UCI FiRa example\r\n");
-
- if(gpio_pin_get_val(SLEEP_PIN))
- {
+// 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))//记得改回来与正式的相反
{
LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_Air_tag模式 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
@@ -475,16 +484,21 @@
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();
- SwitchLoraSettings(478,7,22);
+ LOG_INFO(TRACE_MODULE_APP," 切换6\r\n");
+// SwitchLoraSettings(478,7,22);
Uwb_init();//默认为我们测距配置
OpenUWB();
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
@@ -507,24 +521,30 @@
//Lora_Tx_Poll();
}
Lora_Tx_Poll();
+ //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休眠
-// LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
+// //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");
- //gpio_pin_clr(LORA_NRST);//lora休眠
-// spi_close(SPI_ID0);
- lora_in_sleep();
- 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