From 5cb269400905175cf618729ab44dfa4ccd3d0331 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期一, 21 七月 2025 17:51:51 +0800
Subject: [PATCH] 串口扫描功能调通，升级有问题

---
 keil/include/main/main.c |   59 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 9c87b99..23f0408 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -443,14 +443,14 @@
         input5v_time=1;
         if(taglist_num==0&&g_com_map[UWBFrequency]==1&&g_com_map[UWBENBLE]==1&&uwb_OpenClose_flag==1&&current_state == STATE_NORMAL)
         {
-            CloseUWB();
-            Uwb_init();
-            OpenUWB();
+//            CloseUWB();
+//            Uwb_init();
+//            OpenUWB();
         }
-        if(g_com_map[UWBENBLE]==1)
-        {
-            upload_apppoll();
-        }
+//        if(g_com_map[UWBENBLE]==1)
+//        {
+//            upload_apppoll();
+//        }
     } else {
         flag_secondtask = 0;
     }
@@ -593,9 +593,9 @@
     LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
     LOG_INFO(TRACE_MODULE_APP,"固件版本:信标升级工卡 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
     LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",g_com_map[IP_0],g_com_map[IP_1],g_com_map[IP_2],g_com_map[IP_3],g_com_map[PORT]);
-//    LOG_INFO(TRACE_MODULE_APP,"设备UWB状态: %x .\r\n",g_com_map[UWBENBLE]);
+    LOG_INFO(TRACE_MODULE_APP,"设备UWB状态: %x .\r\n",g_com_map[UWBENBLE]);
 //    LOG_INFO(TRACE_MODULE_APP,"设备GPS状态: %x .\r\n",g_com_map[GPSENBLE]);
-//    LOG_INFO(TRACE_MODULE_APP,"设备UWB工作间隔: %x .\r\n",g_com_map[UWBFrequency]);
+    LOG_INFO(TRACE_MODULE_APP,"设备UWB工作间隔: %x .\r\n",g_com_map[UWBFrequency]);
 //    LOG_INFO(TRACE_MODULE_APP,"设备GPS工作间隔: %x .\r\n",g_com_map[GPSFrequency]);
 //    LOG_INFO(TRACE_MODULE_APP,"当前GPS工作波特率: %d .\r\n",gpsbaudrate1);
 #ifdef _4G_115200
@@ -1072,7 +1072,7 @@
 }
 
 
-
+extern uint8_t shengji_flag;
 int main(void)
 {
     __enable_irq();
@@ -1133,22 +1133,22 @@
     power_init();
     Uwb_init();
     
-    if(g_com_map[KEY_POWERON]==1)
-    {
-        WT588E_PLAY(0);                           //播报开机语音
-        g_com_map[KEY_POWERON]=0;
-        save_com_map_to_flash();
-    }
-    if(g_com_map[UWBFrequency]&&g_com_map[UWBENBLE])
-    {
-        OpenUWB();
-    }
+//    if(g_com_map[KEY_POWERON]==1)
+//    {
+//        WT588E_PLAY(0);                           //播报开机语音
+//        g_com_map[KEY_POWERON]=0;
+//        save_com_map_to_flash();
+//    }
+//    if(g_com_map[UWBFrequency]&&g_com_map[UWBENBLE])
+//    {
+//        OpenUWB();
+//    }
     if(!read_5v_input_pca())
     {
         Set4LEDColor(BLUE,GREEN,WHITE,RED);
-        delay_ms(500);
+        delay_ms(200);
         Set4LEDColor(RED,WHITE,RED,WHITE);
-        delay_ms(500);
+        delay_ms(200);
         Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
     }
     g_com_map[MODBUS_MODE] = 0;
@@ -1164,10 +1164,10 @@
     PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS  
 #endif    
 
-    if(g_com_map[UWBENBLE]==0)
-    {
-        CloseUWB();
-    }
+//    if(g_com_map[UWBENBLE]==0)
+//    {
+//        CloseUWB();
+//    }
     sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
     sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
     Chuanshuwenjian_Poll();
@@ -1176,9 +1176,14 @@
     pca_input_detection_init(pca_handler);//pca检测输入
 //    GPS_Init();
 //    gaodu=GetPressAndHeight()*100;
+    OpenUWB();
     while (1)
     {
-        uwb_app_poll();
+        if(!shengji_flag)
+        {
+         uwb_app_poll();       
+        }
+
         Internet_Poll();
         HIDO_TimerPoll();
         HIDO_ATLitePoll();

--
Gitblit v1.9.3