From 33a728fdc172f59a313cee92da153b37c14c450e Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期四, 12 六月 2025 15:25:33 +0800 Subject: [PATCH] 修改sleep引脚版本,并且成功打印log版本 --- keil/include/main/main.c | 17 ++++++++--------- user_config.h | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/keil/include/main/main.c b/keil/include/main/main.c index 9c9f2c8..7b8836d 100644 --- a/keil/include/main/main.c +++ b/keil/include/main/main.c @@ -355,8 +355,8 @@ { uint32_t lock; trace_flush(); + lock = int_lock(); - LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n"); sleep_timer_stop(); power_enter_power_down_mode(1); int_unlock(lock); @@ -368,7 +368,7 @@ // Disable watchdog timer wdt_close(WDT_ID0); LOG_INFO(TRACE_MODULE_APP, "UCI FiRa example\r\n"); - delay_ms(300);//使log打印完毕 + //delay_ms(300);//使log打印完毕 if(gpio_pin_get_val(SLEEP_PIN)) { if(gpio_pin_get_val(MODE_CHANGE_PIN))//记得改回来与正式的相反 @@ -472,10 +472,11 @@ 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(); @@ -499,19 +500,17 @@ Lora_Tx_Poll(); if(!gpio_pin_get_val(SLEEP_PIN)) { + LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n"); mcu_deep_sleep(); } IdleTask(); } } }else{ - -// while(1) -// { -// LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n"); -// } +//delay_ms(300); + LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n"); power_init(); -mcu_deep_sleep(); + mcu_deep_sleep(); } } diff --git a/user_config.h b/user_config.h index 9ca9821..ac507c0 100644 --- a/user_config.h +++ b/user_config.h @@ -337,7 +337,7 @@ #define LORA_BUSY IO_PIN_2 #define LORA_NRST IO_PIN_4 #define SOS_PIN IO_PIN_4 //这个未定义 -#define SLEEP_PIN IO_PIN_3 +#define SLEEP_PIN IO_PIN_17 /* =========================================================================================================================== */ /* ================ End ================ */ /* =========================================================================================================================== */ -- Gitblit v1.9.3