From 29044bd524ee76b1d20772f7c9b46934df995812 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 19 十一月 2020 15:58:21 +0800 Subject: [PATCH] V1.35 去掉恢复出厂设置功能,电梯客户测试 --- 源码/核心板/Src/application/global_param.c | 58 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) 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 6bb73ae..36b272e 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" @@ -22,35 +22,35 @@ { FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1)); - if(g_com_map[0] != 0x55AA) - { - g_com_map[0] = 0x55AA; - g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID +// if(g_com_map[0] != 0x55AA) +// { +// g_com_map[0] = 0x55AA; +// g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID - g_com_map[COM_INTERVAL]=200; - g_com_map[MAX_REPORT_ANC_NUM]=10; - g_com_map[GROUP_ID]=0; - g_com_map[DIST_OFFSET]=-31; - #ifdef WORK_MODE_TAG - g_com_map[DEV_ROLE] =0x1; //标签 - #else - g_com_map[DEV_ROLE] =0x0; //基站 - #endif - g_com_map[NEARBASE_NUM]=0; - g_com_map[ANC_POLL]=0; - g_com_map[ALARM_DEV] = 0; - g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm - g_com_map[ALARM_DISTANCE2] = 0; //默认报警距离50cm - g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm - g_com_map[HEARTBEAT]=0; - g_com_map[CNT_RESTART]=0; - g_com_map[CNT_REBOOT]=0; - g_com_map[CNT_UPDATE]=0; - g_com_map[MODBUS_MODE]=0; - g_com_map[POWER]=67; - g_com_map[FILTER_COEFFICIENT]=40; - - save_com_map_to_flash(); - } +// g_com_map[COM_INTERVAL]=200; +// g_com_map[MAX_REPORT_ANC_NUM]=10; +// g_com_map[GROUP_ID]=0; +// g_com_map[DIST_OFFSET]=-31; +// #ifdef WORK_MODE_TAG +// g_com_map[DEV_ROLE] =0x1; //标签 +// #else +// g_com_map[DEV_ROLE] =0x0; //基站 +// #endif +// g_com_map[NEARBASE_NUM]=0; +// g_com_map[ANC_POLL]=0; +// g_com_map[ALARM_DEV] = 0; +// g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm +// g_com_map[ALARM_DISTANCE2] = 0; //默认报警距离50cm +// g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm +// g_com_map[HEARTBEAT]=0; +// g_com_map[CNT_RESTART]=0; +// g_com_map[CNT_REBOOT]=0; +// g_com_map[CNT_UPDATE]=0; +// g_com_map[MODBUS_MODE]=0; +// g_com_map[POWER]=67; +// g_com_map[FILTER_COEFFICIENT]=40; +// +// save_com_map_to_flash(); +// } } -- Gitblit v1.9.3