From e5f73b1e954eb54e0af326b3a5aee5fab719f0ce Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 08 六月 2019 10:06:45 +0800
Subject: [PATCH] 6月7号

---
 源码/核心板/Src/main.c |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 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 673affa..b47d1c0 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"
@@ -10,18 +10,14 @@
 #include "serial_at_cmd_app.h"
 #include "global_param.h"
 
-#define WORK_MODE_TAG
-//#define WORK_MODE_ANCHOR
+
 
 void Device_Init(void)
 {
-//	Rcc_Init();
-	SystemInit();
+	RCC_Configuration();
+	//SystemInit();
 	Nvic_Init();
 	Systick_Init();
-#ifdef WORK_MODE_TAG	
-	RTC_Configuration();
-#endif
 	Led_Init();
 	Beep_Init();
 	DW_GPIO_Init();
@@ -33,9 +29,24 @@
 }
 
 void Program_Init(void)
-{
+{uint16_t i;
 	Usart1ParseDataCallback = UsartParseDataHandler;
 	parameter_init();
+	#ifdef WORK_MODE_TAG	
+	printf("DEVICE MODE: TAG .\r\n");
+	printf("DEVICE ID: %d .\r\n",g_com_map[DEV_ID]);
+	printf("DEVICE INTERVAL: %d .\r\n",g_com_map[COM_INTERVAL]);
+	#else
+	printf("DEVICE MODE: ANCHOR .\r\n");
+	printf("DEVICE ID: %d .\r\n",g_com_map[DEV_ID]);
+	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++)
+	{
+		g_Tagdist[i]=0xffff;
+	}
 }
 
 /*! ------------------------------------------------------------------------------------------------------------------
@@ -50,16 +61,20 @@
 
 int main(void)
 {
-
+ 
 	Device_Init();
 	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)
 	{
 #ifdef WORK_MODE_TAG
@@ -69,7 +84,6 @@
 		Tag_App();
 	}
 //	UART_CheckReceive();
-	RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
 	PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);	
 #else 
 		Anchor_App();

--
Gitblit v1.9.3