From bbb68fd93739963f866d0c95246191962b6a7f72 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 29 十月 2019 09:49:50 +0800
Subject: [PATCH] 增加基站时间同步，等待systick换成基础定时器
---
源码/核心板/Src/main.c | 101 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 21 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 db26510..3ed18c7 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"
@@ -9,13 +9,14 @@
#include "stm32f10x_it.h"
#include "serial_at_cmd_app.h"
#include "global_param.h"
-
+#include "ADC.h"
void Device_Init(void)
{
RCC_Configuration();
//SystemInit();
+ NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x5000);
Nvic_Init();
Systick_Init();
Led_Init();
@@ -23,30 +24,45 @@
DW_GPIO_Init();
Uart1_Init();
Spi_Init();
-
+ ADC_Configuration();
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
u32 dev_id;
+u8 hbsend[16];
+void HeartBeatInit(void)
+{
+ u16 checksum;
+ hbsend[0]=0x55;
+ hbsend[1]=0xAA;
+ hbsend[2]=0x2;
+ hbsend[3]=0xc;
+ memcpy(&hbsend[4],&g_com_map[DEV_ID],2);
+ checksum = Checksum_u16(&hbsend[2],12);
+ memcpy(&hbsend[14],&checksum,2);
+}
void Program_Init(void)
{uint16_t i;
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
- dev_id = g_com_map[DEV_ID_H]<<16|g_com_map[DEV_ID_L];
- #ifdef WORK_MODE_TAG
+ //deca_sleep(1000);
+ HeartBeatInit();
+ dev_id = g_com_map[DEV_ID];
+ if(g_com_map[DEV_ROLE])
+ {
printf("标签ID: %d .\r\n",dev_id);
printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
- printf("单次通讯基站数量: %d个.\r\n",REPOET_ANC_NUM);
- #else
- anchor_type = dev_id%REPOET_ANC_NUM;
+ 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",REPOET_ANC_NUM);
-
+ printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+ }
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
- #endif
+
for(i=0;i<255;i++)
{
@@ -63,7 +79,57 @@
*
* @return none
*/
+void HeatBeat(void)
+{
+UART_PushFrame(hbsend,16);
+}
+extern u8 g_start_sync_flag;
+u16 heartbeat_timer,poll_timer,sync_timer;
+void IdleTask(void)
+{
+ g_start_sync_flag=0;
+ UART_CheckReceive();
+ UART_CheckSend();
+ if(heartbeat_timer>1000)
+ {
+ heartbeat_timer=0;
+ if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
+ HeatBeat();
+ }
+ if(poll_timer>=g_com_map[COM_INTERVAL]-tag_delaytime)
+ {
+ poll_timer=0;
+ if(g_com_map[ANC_POLL]||g_com_map[DEV_ROLE])
+ {
+ if(g_com_map[DEV_ROLE]==0)
+ {int8_t correction_time;
+ correction_time=tag_timer-g_com_map[DEV_ID]*3;
+ tag_delaytime=correction_time;
+ if(tag_delaytime>g_com_map[COM_INTERVAL]/2)
+ {
+ tag_delaytime=tag_delaytime-g_com_map[COM_INTERVAL];
+ }
+ }
+ g_start_send_flag=1;
+ }
+
+ }
+ if(g_com_map[CNT_UPDATE]==1)
+ {
+ uint32_t result = 0;
+ u16 tmp = 0xAAAA;
+ __disable_irq();
+ result = FLASH_Prepare(0x8004A38, 2);
+ if(result)
+ result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
+ __enable_irq();
+ printf("进入升级模式\r\n");
+ // STMFLASH_Write_NoCheck(0x8004A38,0xAAAA);
+ // Delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
+ }
int main(void)
{
@@ -71,10 +137,6 @@
Program_Init();
Dw1000_Init();
delay_ms(10);
-#ifdef WORK_MODE_TAG
- RTC_Configuration(g_com_map[COM_INTERVAL]*20);
- tag_sleep_configuraion();
-#endif
Dw1000_App_Init();
/* Loop forever initiating ranging exchanges. */
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
@@ -82,18 +144,15 @@
usart_send[1]=0xAA;
while(1)
{
-#ifdef WORK_MODE_TAG
+ IdleTask();
if(g_start_send_flag)
{
- g_start_send_flag = 0;
+ g_start_send_flag = 0;
Tag_App();
}
-// UART_CheckReceive();
-// PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);
-#else
+
+if(g_com_map[DEV_ROLE]==0)
Anchor_App();
-#endif
-
}
}
--
Gitblit v1.9.3