From 7ff7ce16ea9febfd11db4ff61e13d112d4b2ba02 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期六, 06 五月 2023 15:16:41 +0800
Subject: [PATCH] V1.72 测试完成
---
源码/核心板/Src/main.c | 108 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 31 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 f4eee9c..a572102 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"
@@ -2,6 +2,7 @@
#include "Rcc_Nvic_Systick.h"
#include "Usart.h"
#include "Spi.h"
+#include "Flash.h"
#include "led.h"
#include "beep.h"
#include "dw_driver.h"
@@ -72,11 +73,30 @@
checksum = Checksum_u16(&hbsend[2],12);
memcpy(&hbsend[14],&checksum,2);
}
+
uint16_t vel_factor,pos_factor;
-u16 tyncpoll_time,dist_threshold;
+u16 tyncpoll_time,dist_threshold,group_id;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
+void ComMapCheck(void)
+{
+
+ if(g_com_map[ANT_LENGTH]>10000)
+ {
+ g_com_map[ANT_LENGTH] = 0;
+ }
+ if(g_com_map[WAR_JDQ_TIME]>1000||g_com_map[WAR_JDQ_TIME]<0)
+ {
+ g_com_map[WAR_JDQ_TIME] = 1;
+ }
+ if(g_com_map[COM_INTERVAL]==0)
+ {
+ g_com_map[COM_INTERVAL]=100;
+ }
+}
+u16 JDQ_time;
+int16_t g_commap_antdelay;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -85,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;
@@ -95,45 +116,68 @@
g_com_map[ANC_FLAG]=1;
save_com_map_to_flash();
#endif
- OUT485_ENABLE;
- if(g_com_map[COM_INTERVAL]==0)
- {
- g_com_map[COM_INTERVAL]=100;
- }
+//
+// 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[VERSION] = 0x012e;
-dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
- if(dist_threshold<300)
+// 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] = 1<<8|72;
+ 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]);
+ 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];
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]);
@@ -141,7 +185,7 @@
for(i=0;i<255;i++)
{
- g_Tagdist[i]=0xffff;
+ g_Tagdist[i]=0x1ffff;
}
}
@@ -185,7 +229,7 @@
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
- if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
+ if(g_com_map[HEARTBEAT])
HeatBeat();
}
if(flag_newsecond)
@@ -259,13 +303,15 @@
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+ g_com_map[RELAY1_STATE_INDEX] = READ_RELAY1;
+ g_com_map[RELAY2_STATE_INDEX] = READ_RELAY2;
}
int main(void)
{
- Device_Init();
+ Device_Init();
//StartUpTest();
Program_Init();
Dw1000_Init();
--
Gitblit v1.9.3