From ba39ac4c74b834cc69ac60a8117fc9aa0a3ff1d3 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期一, 10 六月 2019 20:19:20 +0800 Subject: [PATCH] 西安结束 --- 源码/核心板/Src/application/dw_app.h | 9 +++++++-- 源码/核心板/Src/application/global_param.c | 2 +- 源码/核心板/Src/ExternalDevices/led.h | 1 - 源码/核心板/Src/application/dw_app.c | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/led.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/led.h" index 73c0abe..a7cc6e6 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/led.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/led.h" @@ -5,7 +5,6 @@ #include "stm32f10x.h" #include "dw_app.h" -#define NEWBOARD #if defined(NEWBOARD) && defined(WORK_MODE_TAG) #define LED0_PIN GPIO_Pin_12 diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" index ffb2bc2..ddccda2 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" @@ -553,8 +553,8 @@ g_flag_Taggetdist[tag_id_recv]=0; #ifdef HEX_OUTPUT usart_send[2] = frame_seq_nb; - usart_send[6] = g_com_map[DEV_ID]; - usart_send[8] = tag_id_recv; + usart_send[6] = tag_id_recv; + usart_send[8] = g_com_map[DEV_ID]; hex_dist = dist_cm; memcpy(&usart_send[10],&hex_dist,4); checksum = Checksum_u16(&usart_send[2],12); diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" index 2183236..2c9c332 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" @@ -4,8 +4,13 @@ #include "stm32f10x.h" #include "filters.h" -#define WORK_MODE_TAG -//#define WORK_MODE_ANCHOR + +//#define NEWBOARD + +//#define WORK_MODE_TAG +#define WORK_MODE_ANCHOR + + #define HEX_OUTPUT #define REPOET_ANC_NUM 4 #define TOTAL_TAG_NUM 200 diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" index 1d194b0..835d00d 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" @@ -29,7 +29,7 @@ g_com_map[ALARM_DISTANCE2] = 600; //默认报警距离50cm g_com_map[ALARM_DISTANCE3] = 900; //默认报警距离50cm g_com_map[ALARM_DEV] = 1; - g_com_map[DEV_ID] =4;//DEFAULT_DEV_ID; //默认设备ID + g_com_map[DEV_ID] =1;//DEFAULT_DEV_ID; //默认设备ID g_com_map[COM_INTERVAL]=1000; save_com_map_to_flash(); } -- Gitblit v1.9.3