From 92ffaba03621e312b0620f22cd1f184522ee8f3e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 22 六月 2019 16:21:20 +0800
Subject: [PATCH] 32位ID
---
源码/核心板/Src/main.c | 21 +++++++++++++--------
1 files changed, 13 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 b47d1c0..d5ac21f 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"
@@ -27,20 +27,25 @@
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
-
+u8 anchor_type;
+u32 dev_id;
void Program_Init(void)
{uint16_t i;
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
+ 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++)
--
Gitblit v1.9.3