From 5f233123900cccf931ee970202c12ccdecc85377 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 12 三月 2024 09:50:43 +0800
Subject: [PATCH] 版本2.7 修改灯的逻辑，充电时设备不再进入静止休眠状态，不再发射uwb lora 运行gps
---
Core/Src/main.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 15b4270..29507e6 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -126,7 +126,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] = (2<<8)|5;
+ g_com_map[VERSION] = (2<<8)|7;
if(g_com_map[GPS_ONTIME]==0/*||g_com_map[GPS_ONTIME]>10000*/)
{
g_com_map[GPS_ONTIME]=3600;
@@ -235,9 +235,10 @@
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
}
+extern uint8_t Input_5V_flag;
void Uwb_Poll(void)
{
- if(nomove_flag==0)//静止判断
+ if(nomove_flag==0&&Input_5V_flag==0)//静止判断
{
if(lp_time-uwb_timer>=g_com_map[COM_INTERVAL]/1000/*UWB_WORK_TIME_S*/) //是否到uwb工作时间了。
{
--
Gitblit v1.9.3