From 8eeb0e8fbbde5e9cb33d895223322449fd58f345 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期一, 15 六月 2020 21:28:29 +0800 Subject: [PATCH] V1.18,武汉测试不错版本,为上一版本修改间隔到DELAY_BETWEEN_TWO_FRAME_UUS 300us --- 源码/核心板/Src/main.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 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 7978b01..a145aa0 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" @@ -65,25 +65,25 @@ save_com_map_to_flash(); #endif OUT485_ENABLE; - g_com_map[VERSION] = 0x010e; + g_com_map[VERSION] = 0x0112; dev_id = g_com_map[DEV_ID]; slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/4)+4; max_slotpos=g_com_map[COM_INTERVAL]/slottime; tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime; - if(g_com_map[DEV_ROLE]) - { - printf("标签ID: %d .\r\n",dev_id); - printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]); - printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]); - }else{ - - anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM]; - printf("基站ID: %x .\r\n",dev_id); - printf("基站类型: %c .\r\n",anchor_type+0x41); - printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]); - } +// if(g_com_map[DEV_ROLE]) +// { +// printf("标签ID: %d .\r\n",dev_id); +// printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]); +// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]); +// }else{ +// +// anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM]; +// printf("基站ID: %x .\r\n",dev_id); +// printf("基站类型: %c .\r\n",anchor_type+0x41); +// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]); +// } OUT485_DISABLE; // 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]); -- Gitblit v1.9.3