From 55e36bbbabc1afed172689543d507b6a25d3932c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 07 八月 2021 09:25:22 +0800
Subject: [PATCH] 1

---
 源码/核心板/Src/main.c |  139 +++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 117 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 6b3c117..0e4fb68 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;
@@ -46,6 +47,31 @@
 }
 u16 tyncpoll_time;
 u16 slottime,max_slotpos;
+extern u8 module_power;
+extern u16 total_slotnum;
+void ComMapCheck(void)
+{
+	if(g_com_map[COM_INTERVAL]<10)
+	{
+	  g_com_map[COM_INTERVAL]=500;
+	}
+			if(g_com_map[COM_INTERVAL]>1000)
+	{
+	  g_com_map[COM_INTERVAL]=1000;
+	}
+	 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)
+//		{g_com_map[MAX_REPORT_ANC_NUM]=10;}
+//		if(g_com_map[MAX_REPORT_ANC_NUM]<1)
+//		{g_com_map[MAX_REPORT_ANC_NUM]=1;}
+		if(g_com_map[IMU_THRES]>10)
+		{g_com_map[IMU_THRES]=10;}
+		if(g_com_map[IMU_THRES]<1)
+		{g_com_map[IMU_THRES]=1;}
+}
 void Program_Init(void)
 {	float temp;
 	u16 temp2;
@@ -61,17 +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;
-	g_com_map[VERSION] = 0x010b;	
+	ComMapCheck();
+	g_com_map[VERSION] = 0x0218;	
 	dev_id = g_com_map[DEV_ID];
-	slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/3)+1;
+	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);
@@ -79,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]);
@@ -91,7 +123,7 @@
 	
 	for(i=0;i<255;i++)
 	{
-		g_Tagdist[i]=0xffff;
+		g_Tagdist[i]=0x1ffff;
 	}
 }
 
@@ -104,34 +136,74 @@
  *
  * @return none
  */
+extern float GetPressAndHeight(void);
+extern u16 synclost_count;
+extern float Height;
+int32_t intheight;
 void HeatBeat(void)
-{ 
+{ u16 checksum;
+    GetPressAndHeight();
+    intheight = Height*100;//+g_com_map[MAX_REPORT_ANC_NUM];
+	if(synclost_count>5)
+	{
+		hbsend[6] = 0;
+	}else{
+		hbsend[6] = 1;
+	}
+    if(intheight!=0)
+        intheight+=(int16_t)g_com_map[MAX_REPORT_ANC_NUM];
+   memcpy(&hbsend[7],&intheight,4); 
+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;
-u16 heartbeat_timer,poll_timer,sync_timer;
+u16 heartbeat_timer,poll_timer;
+int16_t sync_timer;
+extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
+uint32_t tagpos_binary;
+extern u16 ancidlist_rec[20],ancidlist_send[20];
+extern u16 target_time;
 void IdleTask(void)
 {
-	g_start_sync_flag=0;
-			UART_CheckReceive();
-		UART_CheckSend();
+		
+	UART_CheckReceive();
+	UART_CheckSend();
+    UART2_CheckReceive();
+ 
 	if(heartbeat_timer>1000)
 	{
 		heartbeat_timer=0;
 		if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
 		HeatBeat();
 	}
-
+//	if(flag_newsecond)
+//	{
+//	  flag_newsecond=0;
+//		tagpos_binary=0;
+//		memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
+//		ancidlist_num=0;
+//		for(u8 i=0;i<max_slotpos;i++)
+//		{
+//			if(tagpos_rec[i])
+//				tagpos_binary|=1<<i;
+//			tagpos_rec[i] = 0;
+//		}
+//	}
+	if(target_time>1000)
+	{target_time-=1000;}
+	#ifdef USART_INTEGRATE_OUTPUT
 	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);
+				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;		
 	}
+	#endif
 	if(g_com_map[CNT_UPDATE]==1)
 	{
 	uint32_t result = 0;
@@ -149,6 +221,25 @@
 		//	Delay_ms(100);
 			SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
 	}
+//			if(g_com_map[CNT_REBOOT]==1)
+//		{
+//			g_com_map[CNT_REBOOT]=0;
+//			g_com_map[MAP_SIGN_INDEX]=0;
+//			save_com_map_to_flash();
+//			delay_ms(100);
+//			SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
+//		}
+		if(g_com_map[CNT_RESTART]==1)
+		{
+			g_com_map[CNT_RESTART]=0;
+			save_com_map_to_flash();
+			delay_ms(100);
+				SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
+		}
+				if(g_com_map[MAP_SIGN_INDEX]!=0x55AA)
+		{
+				SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
+		}
 
 	}
 int main(void)
@@ -157,16 +248,19 @@
 	Device_Init();
 	Program_Init();
 	Dw1000_Init();
+    BarInit();
   delay_ms(10);	
 	Dw1000_App_Init();
     /* Loop forever initiating ranging exchanges. */
 	RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
 	usart_send[0]=0x55;
 	usart_send[1]=0xAA;
-	
+	usart_send_anc[0]=0x55;
+	usart_send_anc[1]=0xAA;
+  //SendComMap(50, 0);
 	while(1)
 	{
-	
+	g_start_sync_flag=0;
 	if(g_start_send_flag)
 	{
 		g_start_send_flag = 0;		
@@ -175,6 +269,7 @@
 		IdleTask();		
 if(g_com_map[DEV_ROLE]==0)
 		Anchor_App();
+
 	}
 }
 

--
Gitblit v1.9.3