From 38ee5f2e88aeba329f35bae9cc0d455e4892a9d1 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 05 九月 2023 15:17:00 +0800
Subject: [PATCH] 版本v1.0，修改灯的顺序，修改gps与灯冲突bug
---
Core/Src/main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Core/Src/main.c b/Core/Src/main.c
index d65546f..d55f25d 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)|71;
+ g_com_map[VERSION] = (1<<8)|0;
if(g_com_map[GPS_ONTIME]==0)
{
g_com_map[GPS_ONTIME]=3600;
@@ -837,6 +837,7 @@
nomove_time++;//设备没有移动的时间
if(nomove_time>g_com_map[NOMOVESLEEP_TIME])
{nomove_flag=1;}
+// {}
else
{nomove_flag=0;}
if(lora_sendfinal_rx_bag_flag==1)//如果进入lora等待接收回复的状态
--
Gitblit v1.9.3