From b85907abb200e19f362959e8c6c6fe0d91d22180 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 09 五月 2025 09:37:38 +0800
Subject: [PATCH] 修改了1分钟休眠机制现在收到消息就会继续测距不唤醒
---
keil/include/main/main.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 1bcc551..932dd86 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -315,9 +315,9 @@
flag_secondtask = 1;
#ifdef UWB_1_5HZ
uwb_time_count++;
- #endif
- uwb_offtime_count++;
- if(uwb_offtime_count>30)
+ #endif
+ uwb_offtime_count++;
+ if(uwb_offtime_count>60)
{
uwb_offtime_count=0;
current_state = STATE_SLEEP;
@@ -433,7 +433,7 @@
}
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|12;
+ g_com_map[VERSION] = (1<<8)|14;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -615,11 +615,10 @@
void upload_apppoll()
{
uint32_t elapsed_time_jibu;
-#ifdef UWB_1_5HZ
-
switch (current_state)
{
+#ifdef UWB_1_5HZ
case STATE_NORMAL:
elapsed_time_jibu = uwb_time_count - state_start_time;
switch(elapsed_time_jibu)
@@ -628,7 +627,7 @@
CloseUWB();
// uwbled = LEDOFF;
UWBSendUDPTask();
- GPS_UPLOAD_FLAG=1;
+
break;
case UWB_MEASUREMENT_INTERVAL:
@@ -640,23 +639,25 @@
break;
}
break;
+#endif
case STATE_SLEEP:
elapsed_time_jibu = uwb_time_count - state_start_time;
switch(elapsed_time_jibu)
{
case UWB_OPEN_COUNT:
CloseUWB();
- UWBSendUDPTask();
+ UWBSendUDPTask();
break;
case UWB_MEASUREMENT_INTERVAL_SLEEP:
+ taglist_num = 0;
OpenUWB();
state_start_time = uwb_time_count;
break;
}
break;
}
-#endif
+
}
uint8_t flag_4guart_needinit=0;
@@ -713,6 +714,7 @@
IIC2_Init();
Accelerometer_Init();
PCA9555_init();
+ WT588E02B_Init();
adc_open(&usr_adc_cfg);
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
power_init();
@@ -742,6 +744,9 @@
gps_prase_flag=1;//恢复gps解析
uart1_change_from_debug_to_gps();//测试
PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
+ #ifdef UWB_CG
+ CloseUWB();
+ #endif
while (1)
{
uwb_app_poll();
--
Gitblit v1.9.3