From c7bcc24c444c9b9197beb9ce6541f85e6b4f8c5c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 06 四月 2021 11:00:08 +0800
Subject: [PATCH] 增加WIFI串口输出模式，待测试
---
源码/核心板/Src/main.c | 15 ++++++++-------
1 files changed, 8 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 a842d31..3b3dd22 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"
@@ -88,12 +88,12 @@
// g_com_map[NEARBASE_ID1]=2;
// g_com_map[ANC_FLAG]=1;
// save_com_map_to_flash();
- g_com_map[BASESYNCSEQ]=0;
- g_com_map[SYNCBASEID]=0x9751;
+ g_com_map[BASESYNCSEQ]=1;
+ g_com_map[SYNCBASEID]=1;
#endif
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x0207;
+ g_com_map[VERSION] = 0x020f;
dev_id = g_com_map[DEV_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
@@ -102,8 +102,7 @@
total_slotnum = 1000/g_com_map[COM_INTERVAL];
anchor_type = dev_id%3;
-// g_com_map[BASESYNCSEQ]=0;
-// g_com_map[SYNCBASEID]=2;
+
if(g_com_map[DEV_ROLE])
{
@@ -159,8 +158,10 @@
void IdleTask(void)
{
- UART_CheckReceive();
- UART_CheckSend();
+ UART_CheckReceive();
+ UART_CheckSend();
+ UART_CheckReceive();
+
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
--
Gitblit v1.9.3