From 8840cff9aa35428f8551024219bc7dea61f4b35c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 07 五月 2025 14:44:03 +0800
Subject: [PATCH] 1.13，加入不开uwb的宏定义，gps 1s上传一次 工卡测试功耗为70ma
---
keil/include/main/main.c | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 7923559..9825302 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; // 步数计数
@@ -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;
@@ -319,7 +315,13 @@
flag_secondtask = 1;
#ifdef UWB_1_5HZ
uwb_time_count++;
- #endif
+ uwb_offtime_count++;
+ if(uwb_offtime_count>30)
+ {
+ uwb_offtime_count=0;
+ current_state = STATE_SLEEP;
+ }
+ #endif
if(!read_5v_input_pca())
{
if(bat_percent>15)
@@ -336,9 +338,9 @@
input5v_time=1;
if(taglist_num==0)
{
- CloseUWB();
- Uwb_init();
- OpenUWB();
+// CloseUWB();
+// Uwb_init();
+// OpenUWB();
}
upload_apppoll();
}else{
@@ -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)|13;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -624,14 +626,15 @@
{
case UWB_OPEN_COUNT:
CloseUWB();
- uwbled = LEDOFF;
+// uwbled = LEDOFF;
UWBSendUDPTask();
GPS_UPLOAD_FLAG=1;
break;
case UWB_MEASUREMENT_INTERVAL:
+ taglist_num = 0;
OpenUWB();
- uwbled = BLUE;
+// uwbled = WHITE;
state_start_time = uwb_time_count;
break;
@@ -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;
@@ -711,6 +713,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();
@@ -740,6 +743,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();
@@ -756,7 +762,7 @@
flag_secondtask = 0;
SecondTask();
}
- IMUTask();
+ IMUTask();
IdleTask();
}
}
--
Gitblit v1.9.3