From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误
---
keil/include/main/main.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 0b5a648..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;
// }
@@ -586,7 +588,7 @@
// }
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|22;
+ g_com_map[VERSION] = (1<<8)|23;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -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