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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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..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,7 +23,7 @@
DW_GPIO_Init();
Uart1_Init();
Spi_Init();
-
+ ADC_Configuration();
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
@@ -33,6 +33,7 @@
{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("标签ID: %d .\r\n",dev_id);
@@ -71,10 +72,10 @@
Program_Init();
Dw1000_Init();
delay_ms(10);
-#ifdef WORK_MODE_TAG
+//#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);
@@ -82,15 +83,16 @@
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