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 | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 576a40b..932dd86 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -29,6 +29,7 @@
extern int simple_main(void);
extern int temp_main(void);
void boot_deinit(void);
+void upload_apppoll();
#define TEST_UART_POLL_MODE 0
#define TEST_UART_INTERUPT_MODE 1
#define TEST_UART_DMA_MODE 2
@@ -42,8 +43,8 @@
#define UWB_OPEN_COUNT 1
-#define UWB_MEASUREMENT_INTERVAL 3
-#define UWB_MEASUREMENT_INTERVAL_SLEEP 60
+#define UWB_MEASUREMENT_INTERVAL 5
+#define UWB_MEASUREMENT_INTERVAL_SLEEP 30
extern uint8_t mUsartReceivePack[100];
extern uint8_t mUsart2ReceivePack[150];
@@ -78,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; // 步数计数
@@ -306,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;
@@ -316,6 +313,15 @@
{
input5v_time=1;
flag_secondtask = 1;
+ #ifdef UWB_1_5HZ
+ uwb_time_count++;
+ #endif
+ uwb_offtime_count++;
+ if(uwb_offtime_count>60)
+ {
+ uwb_offtime_count=0;
+ current_state = STATE_SLEEP;
+ }
if(!read_5v_input_pca())
{
if(bat_percent>15)
@@ -332,10 +338,11 @@
input5v_time=1;
if(taglist_num==0)
{
- CloseUWB();
- Uwb_init();
- OpenUWB();
+// CloseUWB();
+// Uwb_init();
+// OpenUWB();
}
+ upload_apppoll();
}else{
flag_secondtask = 0;
}
@@ -426,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)|14;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -604,41 +611,48 @@
}
extern uint32_t uwb_time_count;
+uint8_t GPS_UPLOAD_FLAG=0;
void upload_apppoll()
{
- uint32_t elapsed_time_jibu;
+ uint32_t elapsed_time_jibu;
switch (current_state)
{
+#ifdef UWB_1_5HZ
case STATE_NORMAL:
elapsed_time_jibu = uwb_time_count - state_start_time;
switch(elapsed_time_jibu)
{
case UWB_OPEN_COUNT:
+ CloseUWB();
+// uwbled = LEDOFF;
+ UWBSendUDPTask();
- CloseUWB();
break;
case UWB_MEASUREMENT_INTERVAL:
- OpenUWB();
- state_start_time = uwb_time_count;
+ taglist_num = 0;
+ OpenUWB();
+// uwbled = WHITE;
+ state_start_time = uwb_time_count;
+
break;
}
break;
-
+#endif
case STATE_SLEEP:
elapsed_time_jibu = uwb_time_count - state_start_time;
switch(elapsed_time_jibu)
{
case UWB_OPEN_COUNT:
-
- CloseUWB();
+ CloseUWB();
+ UWBSendUDPTask();
break;
case UWB_MEASUREMENT_INTERVAL_SLEEP:
-
- OpenUWB();
- state_start_time = uwb_time_count;
+ taglist_num = 0;
+ OpenUWB();
+ state_start_time = uwb_time_count;
break;
}
break;
@@ -700,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();
@@ -709,7 +724,9 @@
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
pca_input_detection_init(pca_handler);//pca检测输入
Uwb_init();
- OpenUWB();
+ #ifdef UWB_CK
+ OpenUWB();
+ #endif
// DBG_SetMode(DBG_MODE_SHELL);
// Shell_Init();
@@ -727,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();
@@ -743,7 +763,7 @@
flag_secondtask = 0;
SecondTask();
}
- IMUTask();
+ IMUTask();
IdleTask();
}
}
--
Gitblit v1.9.3