From cb5ff916850a3ab91774f6125cc3e73a04e6d754 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 17 四月 2022 17:26:15 +0800
Subject: [PATCH] v1.72
---
源码/核心板/Src/main.c | 137 ++++++++++++++++++++++++++++-----------------
1 files changed, 84 insertions(+), 53 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 803e9d4..c093b2d 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"
@@ -55,23 +55,21 @@
Uart1_Init();
Spi_Init();
ADC_Configuration();
- IWDG_Config(IWDG_Prescaler_128 ,4095); //10s
- IWDG_Feed();
+// IWDG_Config(IWDG_Prescaler_128 ,4095); //10s
+// IWDG_Feed();
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
u32 dev_id;
-u8 hbsend[16];
+u8 hbsend[26];
void HeartBeatInit(void)
{
u16 checksum;
hbsend[0]=0x55;
hbsend[1]=0xAA;
hbsend[2]=0x2;
- hbsend[3]=0xc;
+ hbsend[3]=0x16;
memcpy(&hbsend[4],&g_com_map[DEV_ID],2);
- checksum = Checksum_u16(&hbsend[2],12);
- memcpy(&hbsend[14],&checksum,2);
}
uint16_t vel_factor,pos_factor;
@@ -100,7 +98,7 @@
{dist_threshold = 15000;}
}
u16 JDQ_time;
-u16 g_commap_antdelay;
+int16_t g_commap_antdelay;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -119,40 +117,40 @@
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[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;
+// 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;
- 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;
- JDQ_time = g_com_map[WAR_JDQ_TIME]*10;
+
+ 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]);
+ 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;
@@ -160,7 +158,7 @@
total_slotnum = 1000/g_com_map[COM_INTERVAL];
vel_factor=g_com_map[FILTER_COEFFICIENT];
pos_factor=g_com_map[FILTER_COEFFICIENT];
-
+ComMapCheck();
if(module_power>67)
{
module_power=67;
@@ -172,8 +170,7 @@
// 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];
+// 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]);
@@ -185,7 +182,7 @@
for(i=0;i<255;i++)
{
- g_Tagdist[i]=0xffff;
+ g_Tagdist[i]=0x1ffff;
}
}
@@ -198,9 +195,35 @@
*
* @return none
*/
+u8 selftest[2];
void HeatBeat(void)
{
-UART_PushFrame(hbsend,16);
+ u16 checksum;
+ selftest[0]=1;
+ selftest[1]=0;
+ memcpy(&hbsend[6],selftest,2);
+ memcpy(&hbsend[14],uartrec_userdata,10);
+ checksum = Checksum_u16(&hbsend[2],22);
+ memcpy(&hbsend[24],&checksum,2);
+ UART_PushFrame(hbsend,26);
+}
+void ClearUartUserData(void)
+{
+ u8 i;
+ for(i=0;i<USERDATA_MAXLEN;i++)
+ {
+ uartrec_userdata[i] = 0;
+ }
+ usartrec_userdatalen = 0;
+}
+void ClearUWBUserData(void)
+{
+ u8 i;
+ for(i=0;i<USERDATA_MAXLEN;i++)
+ {
+ uwbrec_userdata[i] = 0;
+ }
+ uwbrec_userdatalen = 0;
}
uint16_t temp;
float dw_vbat;
@@ -225,13 +248,19 @@
UART_CheckReceive();
UART_CheckSend();
-
- if(heartbeat_timer>1000)
- {
- heartbeat_timer=0;
- if(g_com_map[HEARTBEAT])
- HeatBeat();
- }
+// if(g_com_map[HEARTBEAT])
+// {
+ if(heartbeat_timer>=200)
+ {
+ heartbeat_timer=0;
+ HeatBeat();
+ }
+ if(userdata_timer>=200)
+ {
+ userdata_timer = 0;
+ ClearUartUserData();
+ }
+// }
if(flag_newsecond)
{
uint32_t temp23;
@@ -325,13 +354,15 @@
while(1)
{
g_start_sync_flag=0;
- if(g_start_send_flag)
- {
- g_start_send_flag = 0;
- Tag_App();
- }
+
+ if(g_start_send_flag)
+ {
+ g_start_send_flag = 0;
+ Tag_App();
+ }
+
IdleTask();
-if(g_com_map[DEV_ROLE]==0)
+ if(g_com_map[DEV_ROLE]==0)
Anchor_App();
}
--
Gitblit v1.9.3