From d106740b60bd60d23ec3d318cb8a6a7b16633aab Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 31 一月 2024 15:17:31 +0800
Subject: [PATCH] v2.3修改因为改了频率可能会出现的bug
---
FML/Power.c | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/FML/Power.c b/FML/Power.c
index bf912e0..447eb47 100644
--- a/FML/Power.c
+++ b/FML/Power.c
@@ -13,6 +13,7 @@
#include "Uart.h"
#include "HIDO_Debug.h"
#include "WS2812.h"
+#include "GPS.h"
extern uint32_t uwbled,gpsled,loraled,powerled;
extern uint32_t lp_time;
extern uint32_t led_timer;
@@ -108,6 +109,7 @@
* Author : www.hido-studio.com
* Modified Date: : 2020年11月10日
*******************************************************************************/
+extern HIDO_VOID GPS_PowerOff(void);
HIDO_VOID Power_GPS_LoraOff(HIDO_VOID)
{
GPIO_RESET(&l_astPowerPin[POWER_PIN_GPS_LORA]);
@@ -123,6 +125,9 @@
* Author : hido.ltd
*******************************************************************************/
extern uint8_t nomove_flag;
+extern void Set4LEDColor_Off(void);
+extern void MX_Init(void);
+extern void SystemClock_Config(void);
void Power_Sleep(void)
{
extern ADC_HandleTypeDef hadc;
@@ -139,10 +144,10 @@
HAL_UART_DeInit(&huart1);
HAL_UART_DeInit(&huart2);
- if(nomove_flag==0)
+
Set4LEDColor_Off(); //关led总电源
- GPIO_InitTypeDef GPIO_InitStruct = {0};
+ GPIO_InitTypeDef GPIO_InitStruct = {0};//
GPIO_InitStruct.Pin = GPIO_PIN_4;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -191,22 +196,23 @@
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_11, GPIO_PIN_SET);//拉g adc脚
-
-// LEDON_POLL();
-if(lp_time%2==0&&lp_time!=led_timer)
+//if(g_com_map[ACTIVE_INDEX]!=0)
+//{
+if(nomove_flag==0)
{
- if(bat_percent>=20)
- {powerled=BLUE;}
- else
- {powerled=RED;}
- uwbled=LEDOFF;
- gpsled=LEDOFF;
- loraled=LEDOFF;
- Set4LEDColor(powerled,loraled,gpsled,uwbled);
- led_timer=lp_time;
+ if(lp_time%2==0&&lp_time!=led_timer)//电源灯2s闪烁一次，电量大于20闪蓝灯反之闪红灯。
+ {
+ if(bat_percent>=20)
+ {powerled=BLUE;}
+ else
+ {powerled=RED;}
+ Set4LEDColor(powerled,loraled,gpsled,uwbled);
+ led_timer=lp_time;
+ }
}
- HIDO_Debug("waku up\r\n");
- break;
+//}
+ HIDO_Debug("waku up\r\n");
+ break;
}
}
--
Gitblit v1.9.3