From 53267df53898af998cbd17676c05588a9a19c9c8 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 15 四月 2020 08:38:02 +0800
Subject: [PATCH] V1.10 增加标签和基站不同固件模式
---
源码/核心板/Src/main.c | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 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 959776b..e1de736 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,43 @@
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] = 0x0109;
+ 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;
+
+ #ifdef WORK_MODE_TAG
+ g_com_map[DEV_ROLE] =0x1; //标签
+ #else
+ g_com_map[DEV_ROLE] =0x0; //基站
+ #endif
+
+ if(g_com_map[ANC_FLAG]==0xffff)
+ {g_com_map[DEV_ROLE]=1;}
+
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]);
@@ -117,6 +140,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
@@ -138,13 +164,13 @@
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