From a26a36940097da7c033be9199219374801d9b32c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 16 四月 2020 22:07:51 +0800
Subject: [PATCH] V1.11 修复读取参数回复BUG
---
源码/核心板/Src/main.c | 123 +++++++++++++++++++++++++++++++++-------
1 files changed, 101 insertions(+), 22 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 5cf332a..6b3c117 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,13 +11,16 @@
#include "global_param.h"
#include "ADC.h"
+//#define DEBUG_MODE
void Device_Init(void)
{
RCC_Configuration();
//SystemInit();
+ NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x5000);
Nvic_Init();
- Systick_Init();
+// Systick_Init();
+ TIM3_Int_Init();
Led_Init();
Beep_Init();
DW_GPIO_Init();
@@ -29,25 +32,62 @@
}
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);
+}
+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);
- dev_id = g_com_map[DEV_ID_H]<<16|g_com_map[DEV_ID_L];
- #ifdef WORK_MODE_TAG
+ HeartBeatInit();
+#ifdef DEBUG_MODE
+// g_com_map[DEV_ROLE]=1;
+// g_com_map[DEV_ID]=1;
+// 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] = 0x010b;
+ 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])
+ {
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]);
+ }
+ OUT485_DISABLE;
// 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++)
{
@@ -64,7 +104,53 @@
*
* @return none
*/
+void HeatBeat(void)
+{
+UART_PushFrame(hbsend,16);
+}
+extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
+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(g_com_map[DEV_ROLE]==0&&usart_send_flag)
+ {u16 checksum;
+ usart_send_flag=0;
+ usart_send[2] = 4;//正常模式
+ usart_send[3] = anc_report_num*6+2;//正常模式
+ checksum = Checksum_u16(&usart_send[2],anc_report_num*6+2);
+ memcpy(&usart_send[4+anc_report_num*6],&checksum,2);
+ UART_PushFrame(usart_send,6+anc_report_num*6);
+ anc_report_num=0;
+ }
+ 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");
+ 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
+ }
+
+ }
int main(void)
{
@@ -72,30 +158,23 @@
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);
usart_send[0]=0x55;
usart_send[1]=0xAA;
+
while(1)
{
- UART_CheckSend();
+
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);
-#ifdef WORK_MODE_ANCHOR
+ IdleTask();
+if(g_com_map[DEV_ROLE]==0)
Anchor_App();
-#endif
-
}
}
--
Gitblit v1.9.3