From cb5ff916850a3ab91774f6125cc3e73a04e6d754 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 17 四月 2022 17:26:15 +0800
Subject: [PATCH] v1.72
---
源码/核心板/Src/main.c | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index f667421..c093b2d 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -143,7 +143,7 @@
OUT485_ENABLE;
- g_com_map[VERSION] = (1<<8)|(68);
+ g_com_map[VERSION] = (1<<8)|(72);
FLASH_Read(FLASH_HARDWARE_FLAG, (uint8_t*)&g_com_map[HARDWAREFLAG_INDEX], 16);
dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
g_commap_antdelay = g_com_map[ANT_LENGTH];
@@ -207,6 +207,24 @@
memcpy(&hbsend[24],&checksum,2);
UART_PushFrame(hbsend,26);
}
+void ClearUartUserData(void)
+{
+ u8 i;
+ for(i=0;i<USERDATA_MAXLEN;i++)
+ {
+ uartrec_userdata[i] = 0;
+ }
+ usartrec_userdatalen = 0;
+}
+void ClearUWBUserData(void)
+{
+ u8 i;
+ for(i=0;i<USERDATA_MAXLEN;i++)
+ {
+ uwbrec_userdata[i] = 0;
+ }
+ uwbrec_userdatalen = 0;
+}
uint16_t temp;
float dw_vbat;
void StartUpTest(void)
@@ -236,6 +254,11 @@
{
heartbeat_timer=0;
HeatBeat();
+ }
+ if(userdata_timer>=200)
+ {
+ userdata_timer = 0;
+ ClearUartUserData();
}
// }
if(flag_newsecond)
@@ -331,13 +354,15 @@
while(1)
{
g_start_sync_flag=0;
- if(g_start_send_flag)
- {
- g_start_send_flag = 0;
- Tag_App();
- }
+
+ if(g_start_send_flag)
+ {
+ g_start_send_flag = 0;
+ Tag_App();
+ }
+
IdleTask();
-if(g_com_map[DEV_ROLE]==0)
+ if(g_com_map[DEV_ROLE]==0)
Anchor_App();
}
--
Gitblit v1.9.3