From 5b6fe0edc2790d1948c09b191a2a565e8874f875 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 24 五月 2022 09:57:23 +0800
Subject: [PATCH] V1.64 只和3个基站测距
---
源码/核心板/Src/main.c | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 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 664f759..2218dec 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"
@@ -45,7 +45,7 @@
memcpy(&hbsend[14],&checksum,2);
}
uint16_t vel_factor,pos_factor;
-u16 tyncpoll_time,dist_threshold;
+u16 tyncpoll_time;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
@@ -72,16 +72,10 @@
{
g_com_map[COM_INTERVAL]=100;
}
-
- g_com_map[VERSION] = 0x012a;
-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_com_map[VERSION] = 0x0140;
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;
+ slottime=4;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
module_power = g_com_map[POWER];
@@ -162,16 +156,16 @@
}
if(flag_newsecond)
{
- uint32_t temp23;
- temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
- if(temp23!=0x4A480022)
- {
- temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
- if(temp23!=0x4A480022)
- {
- NVIC_SystemReset();
- }
- }
+// uint32_t temp23;
+// temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
+// if(temp23!=0x4A480022)
+// {
+// temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
+// if(temp23!=0x4A480022)
+// {
+// NVIC_SystemReset();
+// }
+// }
flag_newsecond=0;
tagpos_binary=0;
memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
@@ -229,12 +223,12 @@
delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
+ if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- }
+ }
int main(void)
{
--
Gitblit v1.9.3