From ee92c0770f3d386bdd58189f1b395b342f79ec34 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 10 八月 2022 16:37:28 +0800
Subject: [PATCH] V1.67 测试完成
---
源码/核心板/Src/main.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 b592840..8a2e4a7 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"
@@ -82,10 +82,10 @@
void ComMapCheck(void)
{
- if(g_com_map[ANT_LENGTH]>10000)
- {
- g_com_map[ANT_LENGTH] = 0;
- }
+// if(g_com_map[ANT_LENGTH]>10000)
+// {
+// g_com_map[ANT_LENGTH] = 0;
+// }
if(g_com_map[WAR_JDQ_TIME]>1000||g_com_map[WAR_JDQ_TIME]<0)
{
g_com_map[WAR_JDQ_TIME] = 1;
@@ -99,7 +99,7 @@
if(dist_threshold>15000)
{dist_threshold = 15000;}
}
-u16 JDQ_time;
+u16 JDQ_time,supergroupid;
int16_t g_commap_antdelay;
void Program_Init(void)
{ float temp;
@@ -145,7 +145,8 @@
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x013a;
+ g_com_map[VERSION] = (1<<8)|67;
+ supergroupid = g_com_map[IMU_THRES];
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];
@@ -305,7 +306,7 @@
}
}
-
+extern uint8_t dissucc_times;
int main(void)
{
@@ -327,8 +328,9 @@
g_start_sync_flag=0;
if(g_start_send_flag)
{
- g_start_send_flag = 0;
- Tag_App();
+ g_start_send_flag = 0;
+ if(dissucc_times<2)
+ Tag_App();
}
IdleTask();
if(g_com_map[DEV_ROLE]==0)
--
Gitblit v1.9.3