From 4cf8adc0dd1286f8585d0be7a2bf367bb8119cdc Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 06 四月 2021 16:16:38 +0800
Subject: [PATCH] V2.16 测试完成WIFI串口功能。
---
源码/核心板/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 a842d31..8857175 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"
@@ -21,13 +21,14 @@
Nvic_Init();
// Systick_Init();
TIM3_Int_Init();
- Led_Init();
+
Beep_Init();
DW_GPIO_Init();
Uart1_Init();
+ Uart2_Init();
Spi_Init();
ADC_Configuration();
-
+ Led_Init();
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
@@ -88,12 +89,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] = 0x0210;
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 +103,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 +159,10 @@
void IdleTask(void)
{
- UART_CheckReceive();
- UART_CheckSend();
+ UART_CheckReceive();
+ UART_CheckSend();
+ UART2_CheckReceive();
+
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
--
Gitblit v1.9.3