From f15f5d28c8d3bb30dd61b3234bbb7a06d124daf0 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 17 六月 2025 14:57:06 +0800
Subject: [PATCH] 修改功耗版本
---
keil/include/main/main.c | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 0417d55..ef59210 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -170,12 +170,12 @@
port = g_com_map[TCP_PORT];
g_com_map[VERSION] = (1<<8)|0;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
- 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);
- else{
- LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_免布线模式 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
- }
- //LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
+// 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);
+// else{
+// LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_免布线模式 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+// }
+ LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
}
void MinuteTask(void)
{
@@ -306,13 +306,13 @@
#else
spi_init();
- // 模式判断脚和spi nrst脚初始化
+// // 模式判断脚和spi nrst脚初始化
board_mode_pin_init();
Program_Init();
-// board_led_on(BOARD_LED_1);
+ //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 +351,16 @@
}
uint8_t bat_percent;
uint8_t stationary_flag;
+void mcu_deep_sleep(void)
+{
+ uint32_t lock;
+ trace_flush();
+
+ lock = int_lock();
+ sleep_timer_stop();
+ power_enter_power_down_mode(1);
+ int_unlock(lock);
+}
int main(void)
{
// Initialize MCU system
@@ -358,8 +368,15 @@
// 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");//测试
+// 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);
// Platform init for WSF
PalSysInit();
@@ -455,16 +472,15 @@
while (1)
{
wsfOsDispatcher();
-#ifdef MY_MODE
- if(normal_flag)
- {
- IdleTask();
- }
-#endif
power_manage();
+ if(!gpio_pin_get_val(SLEEP_PIN))
+ {
+ LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
+ mcu_deep_sleep();
+ }
}
- }else{
-
+ }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);
@@ -478,8 +494,6 @@
while (1)
{
uwb_app_poll();//我们的测距逻辑
-
-
if(flag_secondtask)
{
flag_secondtask = 0;
@@ -487,11 +501,20 @@
//Lora_Tx_Poll();
}
Lora_Tx_Poll();
-
+ if(!gpio_pin_get_val(SLEEP_PIN))
+ {
+ LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
+ mcu_deep_sleep();
+ }
IdleTask();
}
}
-
+}else{
+//delay_ms(300);
+ LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
+ power_init();
+ mcu_deep_sleep();
+}
}
void app_restore_from_power_down(void)
--
Gitblit v1.9.3