From 083ca82eb09340e71de8694fbb5bae9b99489b38 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 21 六月 2021 17:01:45 +0800
Subject: [PATCH] 67 功率
---
源码/核心板/Src/main.c | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 fbfc77a..297b1ce 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;
+u16 tyncpoll_time,dist_threshold;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
@@ -72,7 +72,13 @@
{
g_com_map[COM_INTERVAL]=100;
}
- g_com_map[VERSION] = 0x0129;
+
+ g_com_map[VERSION] = 0x0132;
+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[SW_TYPE] = SW_FANGZHUANG;
dev_id = g_com_map[DEV_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
@@ -157,15 +163,15 @@
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();
- }
- }
+// 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);
@@ -244,7 +250,7 @@
usart_send[1]=0xAA;
usart_send_anc[0]=0x55;
usart_send_anc[1]=0xAA;
-
+ NearPoll();
while(1)
{
g_start_sync_flag=0;
--
Gitblit v1.9.3