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 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/keil/include/main/main.c b/keil/include/main/main.c index 1bcc551..9825302 100644 --- a/keil/include/main/main.c +++ b/keil/include/main/main.c @@ -315,13 +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) @@ -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)|13; LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id); @@ -713,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(); @@ -742,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(); -- Gitblit v1.9.3