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 | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 1e0b193..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;
@@ -58,8 +59,8 @@
{
g_com_map[COM_INTERVAL]=1000;
}
- if(module_power>67)
- {module_power=67;}
+ if(module_power>MAX_RFPOWER)
+ {module_power=MAX_RFPOWER;}
if(module_power<0)
{module_power=0;}
if(g_com_map[MAX_REPORT_ANC_NUM]>10)
@@ -86,19 +87,24 @@
// g_com_map[MAX_REPORT_ANC_NUM]=3;
// g_com_map[NEARBASE_NUM]=1;
// g_com_map[NEARBASE_ID1]=2;
- g_com_map[ANC_FLAG]=1;
- save_com_map_to_flash();
+// g_com_map[ANC_FLAG]=1;
+// save_com_map_to_flash();
+ g_com_map[BASESYNCSEQ]=1;
+ g_com_map[SYNCBASEID]=1;
#endif
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x0200;
+ 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;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
module_power = g_com_map[POWER];
total_slotnum = 1000/g_com_map[COM_INTERVAL];
+ anchor_type = dev_id%3;
+
+
if(g_com_map[DEV_ROLE])
{
printf("标签ID: %d .\r\n",dev_id);
@@ -106,7 +112,6 @@
printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
}else{
- anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
printf("基站ID: %x .\r\n",dev_id);
printf("基站类型: %c .\r\n",anchor_type+0x41);
printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
@@ -131,8 +136,17 @@
*
* @return none
*/
+extern u16 synclost_count;
void HeatBeat(void)
-{
+{ u16 checksum;
+ if(synclost_count>5)
+ {
+ hbsend[6] = 0;
+ }else{
+ hbsend[6] = 1;
+ }
+checksum = Checksum_u16(&hbsend[2],12);
+memcpy(&hbsend[14],&checksum,2);
UART_PushFrame(hbsend,16);
}
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
@@ -145,8 +159,10 @@
void IdleTask(void)
{
- UART_CheckReceive();
- UART_CheckSend();
+ UART_CheckReceive();
+ UART_CheckSend();
+ UART2_CheckReceive();
+
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
@@ -232,7 +248,7 @@
usart_send[1]=0xAA;
usart_send_anc[0]=0x55;
usart_send_anc[1]=0xAA;
-
+ //SendComMap(50, 0);
while(1)
{
g_start_sync_flag=0;
--
Gitblit v1.9.3