From 15b206e26c18916b34578ae1521cc13274fb8340 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 27 六月 2025 18:49:04 +0800
Subject: [PATCH] 加入delay去掉进入休眠打印(会导致无法休眠),lora加mk进入休眠功耗16ua左右

---
 keil/include/main/main.c |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index ef59210..6aa3fef 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.
@@ -312,7 +313,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 +352,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,8 +371,8 @@
 	 // 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))
@@ -475,6 +478,7 @@
         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();
 				}
@@ -493,6 +497,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,17 +510,21 @@
 					//Lora_Tx_Poll();
         }
 				Lora_Tx_Poll();	
-				if(!gpio_pin_get_val(SLEEP_PIN))
-				{
-				LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
-				mcu_deep_sleep();
-				}
+//				if(!gpio_pin_get_val(SLEEP_PIN))
+//				{
+//				//gpio_pin_clr(LORA_NRST);//lora休眠
+//				LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");
+//				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);
+	lora_in_sleep();
 	 power_init();
 	mcu_deep_sleep();
 }

--
Gitblit v1.9.3