From fc89f1e7e828ce2045d9744ab4816b30d72e4c22 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期三, 07 五月 2025 10:25:44 +0800
Subject: [PATCH] 1.12添加无测距休眠30秒开一次测距
---
keil/include/main/main.c | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 6794335..1bcc551 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -44,7 +44,7 @@
#define UWB_OPEN_COUNT 1
#define UWB_MEASUREMENT_INTERVAL 5
-#define UWB_MEASUREMENT_INTERVAL_SLEEP 60
+#define UWB_MEASUREMENT_INTERVAL_SLEEP 30
extern uint8_t mUsartReceivePack[100];
extern uint8_t mUsart2ReceivePack[150];
@@ -79,11 +79,7 @@
} Operation_step;
Operation_step UWB_work_state;
-// 定义状态
-typedef enum {
- STATE_NORMAL, // 正常状态，3秒测距上传一次
- STATE_SLEEP // 休眠状态，1分钟测距上传一次
-} CountState_t;
+
uint32_t uwb_time_count = 0; // 定时器计数值
//uint32_t step_count = 0; // 步数计数
@@ -114,7 +110,7 @@
.flow = UART_FLOW_CONTROL_NONE,
.rx_level = UART_RXFIFO_CHAR_1,
.tx_level = UART_TXFIFO_EMPTY,
- .baud = BAUD_9600,
+ .baud = BAUD_115200,
#if (TEST_UART_MODE == TEST_UART_POLL_MODE)
.dma_en = false,
.int_rx = false,
@@ -307,7 +303,7 @@
}
uint8_t tt=1;
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag;
-uint8_t uwb_enable_flag=0;
+uint8_t uwb_offtime_count=0;
uint8_t input5v_time;
extern uint8_t taglist_num;
uint8_t gps_ntripsend;
@@ -320,6 +316,12 @@
#ifdef UWB_1_5HZ
uwb_time_count++;
#endif
+ uwb_offtime_count++;
+ if(uwb_offtime_count>30)
+ {
+ uwb_offtime_count=0;
+ current_state = STATE_SLEEP;
+ }
if(!read_5v_input_pca())
{
if(bat_percent>15)
@@ -431,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)|8;
+ g_com_map[VERSION] = (1<<8)|12;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -630,6 +632,7 @@
break;
case UWB_MEASUREMENT_INTERVAL:
+ taglist_num = 0;
OpenUWB();
// uwbled = WHITE;
state_start_time = uwb_time_count;
@@ -642,14 +645,13 @@
switch(elapsed_time_jibu)
{
case UWB_OPEN_COUNT:
-
- CloseUWB();
+ CloseUWB();
+ UWBSendUDPTask();
break;
case UWB_MEASUREMENT_INTERVAL_SLEEP:
-
- OpenUWB();
- state_start_time = uwb_time_count;
+ OpenUWB();
+ state_start_time = uwb_time_count;
break;
}
break;
--
Gitblit v1.9.3