From 743f4f1291c555b1facc0c34bcbb3cea3cfd41c4 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 29 七月 2019 16:54:22 +0800
Subject: [PATCH] 标签输出

---
 源码/核心板/Src/main.c |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 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 6bde235..5cf332a 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,7 +9,7 @@
 #include "stm32f10x_it.h"
 #include "serial_at_cmd_app.h"
 #include "global_param.h"
-
+#include "ADC.h"
 
 
 void Device_Init(void)
@@ -23,25 +23,32 @@
 	DW_GPIO_Init();
 	Uart1_Init();
 	Spi_Init();
-	
+	ADC_Configuration();
 	
 	GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
 }
-
+u8 anchor_type;
+u32 dev_id;
 void Program_Init(void)
 {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	
-	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]);
+	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
-	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]);
+	anchor_type = dev_id%REPOET_ANC_NUM;
+	printf("基站ID: %x .\r\n",dev_id);
+	printf("基站类型: %c .\r\n",anchor_type+0x41);
+	printf("单次通讯基站数量: %d个.\r\n",REPOET_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++)
 	{
 		g_Tagdist[i]=0xffff;
@@ -64,25 +71,28 @@
 	Device_Init();
 	Program_Init();
 	Dw1000_Init();
-  delay_ms(1000);	
-#ifdef WORK_MODE_TAG
+  delay_ms(10);	
+//#ifdef WORK_MODE_TAG
 	RTC_Configuration(g_com_map[COM_INTERVAL]*20);
-	tag_sleep_configuraion();
-#endif
+//	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
+		UART_CheckSend();
 	if(g_start_send_flag)
 	{
 		g_start_send_flag = 0;
+		
 		Tag_App();
 	}
 //	UART_CheckReceive();
-	PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);	
-#else 
+	//PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);	
+#ifdef WORK_MODE_ANCHOR
 		Anchor_App();
 #endif
 

--
Gitblit v1.9.3