From 5bfa1bc693623159c5059067f8db7589fabd04a1 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 27 四月 2020 09:03:22 +0800
Subject: [PATCH] V1.22
---
源码/核心板/Src/main.c | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 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 959776b..47681a8 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"
@@ -11,6 +11,7 @@
#include "global_param.h"
#include "ADC.h"
+//#define DEBUG_MODE
void Device_Init(void)
{
@@ -44,21 +45,35 @@
memcpy(&hbsend[14],&checksum,2);
}
u16 tyncpoll_time;
+u16 slottime,max_slotpos;
void Program_Init(void)
-{uint16_t i;
+{ float temp;
+ u16 temp2;
+ uint16_t i;
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
//deca_sleep(1000);
HeartBeatInit();
- dev_id = g_com_map[DEV_ID];
+#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
// g_com_map[DEV_ID]=1;
-// g_com_map[COM_INTERVAL]=10;
+// g_com_map[COM_INTERVAL]=100;
+// 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();
+#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0103;
+ g_com_map[VERSION] = 0x010c;
+ dev_id = g_com_map[DEV_ID];
+ slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/3)+1;
+ max_slotpos=g_com_map[COM_INTERVAL]/slottime;
+ tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
+
+
if(g_com_map[DEV_ROLE])
{
- tyncpoll_time=g_com_map[DEV_ID]*g_com_map[MAX_REPORT_ANC_NUM]*4/3;
printf("标签ID: %d .\r\n",dev_id);
printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
@@ -93,7 +108,7 @@
{
UART_PushFrame(hbsend,16);
}
-extern u8 g_start_sync_flag;
+extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
u16 heartbeat_timer,poll_timer,sync_timer;
void IdleTask(void)
{
@@ -107,6 +122,16 @@
HeatBeat();
}
+ if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
+ {u16 checksum;
+ usart_send_flag=0;
+ usart_send_anc[2] = 5;//正常模式
+ usart_send_anc[3] = anc_report_num*6+2;//正常模式
+ checksum = Checksum_u16(&usart_send_anc[2],anc_report_num*6+2);
+ memcpy(&usart_send_anc[4+anc_report_num*6],&checksum,2);
+ UART_PushFrame(usart_send_anc,6+anc_report_num*6);
+ anc_report_num=0;
+ }
if(g_com_map[CNT_UPDATE]==1)
{
uint32_t result = 0;
@@ -117,6 +142,9 @@
result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
__enable_irq();
printf("进入升级模式\r\n");
+ g_com_map[CNT_UPDATE]=0;
+ save_com_map_to_flash();
+ delay_ms(100);
// STMFLASH_Write_NoCheck(0x8004A38,0xAAAA);
// Delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
@@ -135,16 +163,18 @@
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
usart_send[0]=0x55;
usart_send[1]=0xAA;
+ usart_send_anc[0]=0x55;
+ usart_send_anc[1]=0xAA;
while(1)
{
- IdleTask();
+
if(g_start_send_flag)
{
g_start_send_flag = 0;
Tag_App();
}
-
+ IdleTask();
if(g_com_map[DEV_ROLE]==0)
Anchor_App();
}
--
Gitblit v1.9.3