From 5305c5dddc995ab4d2c18f5909802fefc6c4cc6a Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期一, 25 三月 2024 10:28:32 +0800 Subject: [PATCH] V1.6,加入钟工最新标签逻辑,修复休眠无法唤醒bug --- Src/main.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Src/main.c b/Src/main.c index 0b4e461..a2ccbcf 100644 --- a/Src/main.c +++ b/Src/main.c @@ -290,7 +290,8 @@ u8 active_flag,nomovesleeptime; void Program_Init(void) -{ float temp; +{ + float temp; uint16_t temp2; uint16_t i; Usart1ParseDataCallback = UsartParseDataHandler; @@ -299,7 +300,7 @@ hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2); hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4); //deca_sleep(1000); - g_com_map[VERSION] = (1<<8)|2; + g_com_map[VERSION] = (1<<8)|6; // g_com_map[DEV_ID]=1158; // #ifdef DEBUG_MODE // // g_com_map[GROUP_ID]=21; @@ -551,10 +552,14 @@ } } } +uint8_t only_one_flag; uint8_t gotosleep_flag; uint8_t usart5_state,flag_onesecond; void Jingzhi_Poll(void) { + if(only_one_flag==0) + { + only_one_flag=1; powerled=LEDOFF; loraled=LEDOFF; gpsled=LEDOFF; @@ -571,6 +576,7 @@ Set4LEDColor_Off(); //关led总电源 chongqi_flag=1; + } } void OneSecondTask(void) { @@ -1261,9 +1267,9 @@ } void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim) { -// uint8_t pinlv; + if(chongqi_flag==0) + { SystemClock_Config(); - HAL_IWDG_Refresh(&hiwdg); Set4LEDColor(powerled,loraled,gpsled,uwbled); Bat_Percent_Poll(); if(state5v==0) @@ -1296,7 +1302,8 @@ gpsled=LEDOFF; uwbled=LEDOFF; Set4LEDColor_Off(); -//delay_ms(10); + } + HAL_IWDG_Refresh(&hiwdg); } /* USER CODE END 4 */ -- Gitblit v1.9.3