From d1563a9cafa83f7b4932e7885d5cb1b52f108375 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 13 七月 2019 23:02:37 +0800
Subject: [PATCH] 广州200套出货程序，修改通讯时间参数
---
源码/核心板/Src/main.c | 28 +++++++++++++++++-----------
1 files changed, 17 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 b47d1c0..7c54e8e 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,24 +23,30 @@
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++)
@@ -84,7 +90,7 @@
Tag_App();
}
// UART_CheckReceive();
- PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);
+ //PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);
#else
Anchor_App();
#endif
--
Gitblit v1.9.3