From a6e5c60a9ec30574bf7c3d584046444b15f8680f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 10 二月 2022 16:29:20 +0800
Subject: [PATCH] V1.61 修改成中断模式，测试不丢包。
---
源码/核心板/Src/main.c | 23 ++++++++++++++---------
1 files changed, 14 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 960746b..a6e0ca9 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"
@@ -148,7 +148,7 @@
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x013a;
+ g_com_map[VERSION] = 1<<8|61;
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];
@@ -228,7 +228,7 @@
{
UART_CheckReceive();
- UART_CheckSend();
+ // UART_CheckSend();
if(heartbeat_timer>1000)
{
@@ -307,6 +307,9 @@
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+
+ g_com_map[RELAY1_STATE_INDEX] = READ_RELAY1;
+ g_com_map[RELAY2_STATE_INDEX] = READ_RELAY2;
}
@@ -325,21 +328,23 @@
usart_send[1]=0xAA;
usart_send_anc[0]=0x55;
usart_send_anc[1]=0xAA;
-
+ dwt_setrxtimeout(0);//设定接收超时时间，0位没有超时时间
+ dwt_rxenable(0);//打开接收
while(1)
{
- g_start_sync_flag=0;
+// g_start_sync_flag=0;
if(g_start_send_flag)
{
g_start_send_flag = 0;
Tag_App();
- needanchorrx = 1;
+ //needanchorrx = 1;
}
IdleTask();
-if(g_com_map[DEV_ROLE]==0&&needanchorrx==1)
- {needanchorrx = 0;
- Anchor_Start();
- }
+//if(g_com_map[DEV_ROLE]==0)
+// {needanchorrx = 0;
+// Anchor_App();
+// // Anchor_Start();
+// }
}
}
--
Gitblit v1.9.3