From a6ddff5c49ef22b708bd739c83648af738b8f598 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 15 十月 2024 14:47:00 +0800
Subject: [PATCH] 2.13，修复跟主基站测距131071，修复切换主机占测距跟id不匹配的bug
---
Src/main.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 41e2657..8301615 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -241,7 +241,11 @@
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)|7;
+#ifdef QIYA_JIZHAN
+ g_com_map[VERSION] = (2<<8)|1;
+#else
+ g_com_map[VERSION] = (2<<8)|13;
+#endif
ErrorConfig_Handler();
//g_com_map[DEV_ID]=0x9444;
#ifdef DEBUG_MODE
@@ -290,7 +294,11 @@
{
Error_Handler();
}
- printf("固件版本:L051-嘉峪关-定位标签防撞基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+#ifdef QIYA_JIZHAN
+ printf("固件版本:L051-嘉峪关-气压基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+#else
+ printf("固件版本:L051-嘉峪关-定位标签防撞基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+#endif
//g_com_map[NOMOVESLEEP_TIME]=5;
// printf("标签ID: %d .\r\n",dev_id);
// printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
@@ -479,6 +487,7 @@
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
// LED_TR_BLINK;
+
__disable_irq();
if(bat_percent>15)
{ LED_TB_ON;
@@ -496,7 +505,7 @@
{
waitusart_timer--;
}
-
+
}else{
IdleTask();
}
--
Gitblit v1.9.3