From 7e864f1d0b26f0e5dd4c073f8fe764eb286fe961 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 06 五月 2021 12:59:59 +0800 Subject: [PATCH] 回退V1.41 无滤波 --- 源码/核心板/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 5242b92..003a31c 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" @@ -72,7 +72,7 @@ { g_com_map[COM_INTERVAL]=100; } - g_com_map[VERSION] = 0x0125; + g_com_map[VERSION] = 0x012a; g_com_map[SW_TYPE] = SW_FANGZHUANG; dev_id = g_com_map[DEV_ID]; slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3; @@ -88,18 +88,18 @@ module_power=67; } - 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