From 27956a4435c7cc37eee8fb908565b4ca8b1119ae Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 28 二月 2023 16:15:07 +0800
Subject: [PATCH] V1.47 2
---
Src/main.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 41ba20d..ad838ac 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -115,10 +115,10 @@
float motor_keeptime;
void IdleTask(void)
{u16 current_time;
-if(huart1.Instance->ISR&USART_ISR_FE)
- {
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
- }
+//if(huart1.Instance->ISR&USART_ISR_FE)
+// {
+// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+// }
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
@@ -269,8 +269,7 @@
printf("标签ID: %d .\r\n",dev_id);
printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
-
-
+ memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
@@ -428,7 +427,7 @@
}
if(m_bEUARTTxEn==0&&waitusart_timer==0)
{
- if(memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
+ if(memcmp(g_com_map2,g_com_map,200)!=0)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
--
Gitblit v1.9.3