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 | 110 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 40 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index f837e83..9825302 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -28,6 +28,8 @@
//#define DEBUG_MODE
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
@@ -41,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];
@@ -77,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; // 步数计数
@@ -131,22 +129,31 @@
{
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
}
+uint8_t deep_sleep_falg=1;
void mcu_deep_sleep(void)
{
- uint32_t lock;
- trace_flush();
- lock = int_lock();
-// LOG_INFO(TRACE_MODULE_APP, "进入深度休眠\r\n");
+// uint32_t lock;
+// trace_flush();
+// lock = int_lock();
+//// LOG_INFO(TRACE_MODULE_APP, "进入深度休眠\r\n");
// gps_air780_power_change(0,0);//关闭gps，4G
+ deep_sleep_falg=0;
PCA9555_Set_One_Value_Output(LED_POWER,0);//输出低电平关闭LED
PCA9555_Set_One_Value_Output(GPS_POWER,0);//关闭gps，4G
+ PCA9555_Set_One_Value_Config(MAIN_RI,0);//配置4G唤醒引脚为输入
+// PCA9555_Set_One_Value_Output(MAIN_RI,1);
+ boot_deinit();
+ CloseUWB();
PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭gps，4G
- sleep_timer_stop();
- //adc_close();
- power_enter_power_down_mode(1);
-// LOG_INFO(TRACE_MODULE_APP, "从休眠出来\r\n");
- sys_reset(0);
- int_unlock(lock);
+
+// sleep_timer_stop();
+// //adc_close();
+// power_enter_power_down_mode(1);
+// delay_us(200000);
+
+// sys_reset(0);
+//// LOG_INFO(TRACE_MODULE_APP, "从休眠出来\r\n");
+// int_unlock(lock);
}
static void adc_callback(void *data, uint32_t number)
{
@@ -296,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;
@@ -306,6 +313,15 @@
{
input5v_time=1;
flag_secondtask = 1;
+ #ifdef UWB_1_5HZ
+ uwb_time_count++;
+ 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)
@@ -322,10 +338,11 @@
input5v_time=1;
if(taglist_num==0)
{
- CloseUWB();
- Uwb_init();
- OpenUWB();
+// CloseUWB();
+// Uwb_init();
+// OpenUWB();
}
+ upload_apppoll();
}else{
flag_secondtask = 0;
}
@@ -416,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);
@@ -525,7 +542,7 @@
g_com_map[CNT_RESTART]=0;
save_com_map_to_flash();
NVIC_SystemReset();
- LOG_INFO(TRACE_MODULE_APP,"1111");
+
}
}
else
@@ -541,7 +558,6 @@
}
}
NVIC_SystemReset();
- LOG_INFO(TRACE_MODULE_APP,"2222");
input5vflag=1;
}
else
@@ -561,12 +577,11 @@
{
g_com_map[CNT_RESTART]=0;
NVIC_SystemReset();
- LOG_INFO(TRACE_MODULE_APP,"3333");
+
}
if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
{
NVIC_SystemReset();
- LOG_INFO(TRACE_MODULE_APP,"4444");
}
HIDO_TimerPoll();
if(ledonflag==1)
@@ -585,17 +600,23 @@
// UART0 TX/RX
io_pin_mux_set(IO_PIN_5, IO_FUNC0);
io_pin_mux_set(IO_PIN_6, IO_FUNC0);
+ gpio_pin_set_dir(IO_PIN_5 , GPIO_DIR_OUT, 0);
+ gpio_pin_set_dir(IO_PIN_6 , GPIO_DIR_OUT, 0);
// UART1 RX/TX
io_pin_mux_set(IO_PIN_10, IO_FUNC0);
io_pin_mux_set(IO_PIN_9, IO_FUNC0);
+
uart_close(UART_ID1);//解绑原来串口1
uart_close(UART_ID0);//解绑原来串口0
}
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;
+#ifdef UWB_1_5HZ
+
switch (current_state)
{
@@ -604,35 +625,38 @@
switch(elapsed_time_jibu)
{
case UWB_OPEN_COUNT:
-
- CloseUWB();
+ CloseUWB();
+// uwbled = LEDOFF;
+ UWBSendUDPTask();
+ GPS_UPLOAD_FLAG=1;
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;
-
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;
+ OpenUWB();
+ state_start_time = uwb_time_count;
break;
}
break;
}
-
+#endif
}
uint8_t flag_4guart_needinit=0;
@@ -689,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();
@@ -698,7 +723,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();
@@ -716,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();
@@ -732,7 +762,7 @@
flag_secondtask = 0;
SecondTask();
}
- IMUTask();
+ IMUTask();
IdleTask();
}
}
--
Gitblit v1.9.3