From da4b5fa9d8b0648a45e72e15bf8b2a0adb997cca Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 31 十月 2022 16:18:52 +0800
Subject: [PATCH] V1.37 修改6.5G
---
Src/application/dw_app.c | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 71a1b17..6f625c3 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -76,9 +76,9 @@
DISCPOLL,
GETNEARMSG,
NEARPOLL,
-}tag_state=GETNEARMSG;
+}tag_state=NEARPOLL;
static dwt_config_t config = {
- 2, /* Channel number. */
+ 5, /* Channel number. */
DWT_PRF_64M, /* Pulse repetition frequency. */
DWT_PLEN_128, /* Preamble length. */
DWT_PAC8, /* Preamble acquisition chunk size. Used in RX only. */
@@ -296,6 +296,7 @@
u32 rec_tagpos_binary;
int16_t offset=2700;
u8 motor_state,rec_remotepara_state,rec_remotepara[80];
+extern u16 last_lpcount;
void NearPoll(void)
{
@@ -305,7 +306,7 @@
u32 start_poll;
u8 i,j,getsync_flag=0,timeout;
dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收，并设定延迟时间
- dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);
+ dwt_setrxtimeout(10000);
tag_succ_times = 0;
//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
if(next_nearbase_num>=MAX_NEARBASE_NUM)
@@ -446,18 +447,18 @@
{flag_getresponse=1;}
lastsync_timer=sync_timer;
offsettimeus=ancsync_time-current_count*LPTIMER_LSB+offset;
- SetNextPollTime(tyncpoll_time);
- if(rec_remotepara_state==1)
- {
- memcpy(rec_remotepara,&rx_buffer[REMOTEPARA_INDEX],REMOTEPARA_LEN);
- memcpy(&g_com_map[COM_INTERVAL],&rec_remotepara[0],8);
- memcpy(&g_com_map[POWER],&rec_remotepara[8],10);
- if(g_com_map[COM_INTERVAL]>0&&g_com_map[COM_INTERVAL]<1000&&g_com_map[POWER]<67&&g_com_map[POWER]>0)
- {save_com_map_to_flash();
- delay_ms(100);
- }
- NVIC_SystemReset();
- }
+// SetNextPollTime(tyncpoll_time);
+// if(rec_remotepara_state==1)
+// {
+// memcpy(rec_remotepara,&rx_buffer[REMOTEPARA_INDEX],REMOTEPARA_LEN);
+// memcpy(&g_com_map[COM_INTERVAL],&rec_remotepara[0],8);
+// memcpy(&g_com_map[POWER],&rec_remotepara[8],10);
+// if(g_com_map[COM_INTERVAL]>0&&g_com_map[COM_INTERVAL]<1000&&g_com_map[POWER]<67&&g_com_map[POWER]>0)
+// {save_com_map_to_flash();
+// delay_ms(100);
+// }
+// NVIC_SystemReset();
+// }
}else{
rec_nearbasepos=FindNearBasePos(rec_nearbaseid);
@@ -500,18 +501,9 @@
dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR);
nearbase_num=recbase_num;
j=0;
- if(exsistbase_list[0]==0)
+ if(mainbase_lost_count>1)
{
-// u8 temp_adc,random_value;
-// random_value=0;
-// for(i=0;i<8;i++)
-// {
-// temp_adc=Get_ADC_Value();
-// random_value=random_value|((temp_adc&0x01)<<i);
-// }
- tagslotpos=GetRandomSlotPos(rec_tagpos_binary);
- tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
- SetNextPollTime(tyncpoll_time);
+ last_lpcount+= HAL_LPTIM_ReadCounter(&hlptim1)%(g_com_map[COM_INTERVAL]*16);
}
// tyncpoll_time=0;
next_nearbase_num=0;
@@ -658,5 +650,6 @@
//GPIO_WriteBit(EU_TX_GPIO, EU_RX_PIN, Bit_RESET);
break;
}
+ bat_percent=Get_Battary_UWB();
dwt_entersleep();
}
--
Gitblit v1.9.3