From bddf0b37dfea62d0d3f7f5f8c180c24727665b68 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 26 五月 2025 09:59:25 +0800
Subject: [PATCH] Merge branch 'MK大工卡-低精度GPS-1/5HZ' of http://47.108.70.204:60062/r/ChinaUWBProject into MK大工卡-低精度GPS-1/5HZ
---
keil/include/main/main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 939a167..f133c1e 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -275,6 +275,7 @@
}
}
+uint16_t gaodu;
uint8_t guanjiflag;
uint8_t heartbeasend_flag;
uint32_t guanjiflagtime;
@@ -366,6 +367,7 @@
HIDO_TimerTick();
// if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
nomove_count++;
+ gaodu=GetPressAndHeight()*100;
// else{
// nomove_count=g_com_map[NOMOVESLEEP_TIME]+1;
// }
@@ -902,7 +904,6 @@
int test1,test3;
uint32_t test4;
extern uint8_t receive_flag;
-uint16_t gaodu;
static void app_wdt_callback(void *dev, uint32_t status)
{
ASSERT(status, "WDT TIMEOUT，程序复位");
--
Gitblit v1.9.3