From ae0ac687e1b68ed3c067deb67dffaea9582f329c Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期四, 23 十一月 2023 16:55:35 +0800 Subject: [PATCH] V1.2 修改继电器报警错误 --- 源码/核心板/Src/main.c | 84 +++++++++++++++++++++++++++-------------- 1 files changed, 55 insertions(+), 29 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 2be0a88..c262583 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" @@ -94,13 +94,9 @@ { g_com_map[COM_INTERVAL]=100; } - if(dist_threshold<300) - {dist_threshold = 300;} - if(dist_threshold>15000) - {dist_threshold = 15000;} } u16 JDQ_time; -u16 g_commap_antdelay; +int16_t g_commap_antdelay; void Program_Init(void) { float temp; u16 temp2; @@ -109,6 +105,7 @@ parameter_init(); //deca_sleep(1000); HeartBeatInit(); + Modbus_RegMap(); #ifdef DEBUG_MODE // g_com_map[DEV_ROLE]=1; // g_com_map[DEV_ID]=1; @@ -119,41 +116,68 @@ g_com_map[ANC_FLAG]=1; save_com_map_to_flash(); #endif +// +// g_com_map[COM_INTERVAL]=100; +// g_com_map[MAX_REPORT_ANC_NUM]=10; +// g_com_map[GROUP_ID]=0; +// g_com_map[DIST_OFFSET]=-116; + +// g_com_map[DEV_ROLE] =0x0; //基站 +// +// g_com_map[ANC_POLL]=1; +// g_com_map[ALARM_DEV] = 0; +// g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm +// g_com_map[ALARM_DISTANCE2] = 900; //默认报警距离50cm +// g_com_map[ALARM_DISTANCE3] = 1400; //默认报警距离50cm +// g_com_map[RELAY2_DISTANCE1] = 0; //默认报警距离50cm +// g_com_map[RELAY2_DISTANCE2] = 900; //默认报警距离50cm +// g_com_map[RELAY2_DISTANCE3] = 1400; //默认报警距离50cm +// g_com_map[WAR_JDQ_TIME] = 1; //1秒 +// g_com_map[POWER]=30; +// g_com_map[SPEEDFILTER_THRES]=10000; +// g_com_map[FILTER_COEFFICIENT]=40; +// g_com_map[ANT_LENGTH]=0; +// g_com_map[NOMOVESLEEP_TIME]=728; + + OUT485_ENABLE; ComMapCheck(); - g_com_map[VERSION] = 0x0138; + g_com_map[VERSION] = 1<<8|2; FLASH_Read(FLASH_HARDWARE_FLAG, (uint8_t*)&g_com_map[HARDWAREFLAG_INDEX], 16); dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]); - g_commap_antdelay = (float)g_com_map[ANT_LENGTH]*5.8; + if(dist_threshold<300) + {dist_threshold = 300;} + if(dist_threshold>15000) + {dist_threshold = 15000;} + g_commap_antdelay = g_com_map[ANT_LENGTH]; JDQ_time = g_com_map[WAR_JDQ_TIME]*10; g_com_map[SW_TYPE] = SW_FANGZHUANG; dev_id = g_com_map[DEV_ID]; - group_id=g_com_map[GROUP_ID]; + group_id=g_com_map[GROUP_ID]; slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3; max_slotpos=g_com_map[COM_INTERVAL]/slottime; tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime; module_power = g_com_map[POWER]; total_slotnum = 1000/g_com_map[COM_INTERVAL]; - vel_factor=g_com_map[FILTER_COEFFICIENT]; - pos_factor=g_com_map[FILTER_COEFFICIENT]; - - if(module_power>67) - { - module_power=67; - } + vel_factor=g_com_map[FILTER_COEFFICIENT]; + pos_factor=g_com_map[FILTER_COEFFICIENT]; + if(module_power>67) + { + 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]); @@ -161,7 +185,7 @@ for(i=0;i<255;i++) { - g_Tagdist[i]=0xffff; + g_Tagdist[i]=0x1ffff; } } @@ -279,6 +303,8 @@ { SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader } + g_com_map[RELAY1_STATE_INDEX] = READ_RELAY1; + g_com_map[RELAY2_STATE_INDEX] = READ_RELAY2; } @@ -289,7 +315,7 @@ //StartUpTest(); Program_Init(); Dw1000_Init(); - delay_ms(10); + delay_ms(10); Dw1000_App_Init(); /* Loop forever initiating ranging exchanges. */ RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE); -- Gitblit v1.9.3