From 562254e0f3c501306147bd88807596ee51c0390e Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 25 十二月 2024 10:12:07 +0800
Subject: [PATCH] 调试完成,功耗可以  目前是5分钟上发一次心跳包

---
 APL/App.c |  146 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 94 insertions(+), 52 deletions(-)

diff --git a/APL/App.c b/APL/App.c
index 73bd1b4..1582cbf 100644
--- a/APL/App.c
+++ b/APL/App.c
@@ -205,58 +205,58 @@
         {
             powerled = RED;
         }            
-        if(receive1_gotosleep_flag||receive2_gotosleep_flag)    
-        {
-            if(receive1_gotosleep_flag)
-            {
-            uwbled=LEDOFF;
-            Stop_chongdian_Mode_Poll();
-            HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
-               if(chongman_flag)  //充满电重启,重启外设。
-               {HAL_NVIC_SystemReset();}
-            }
-            if(receive2_gotosleep_flag)
-            {
-            uwbled=LEDOFF;
-            Stop_chongdian_Mode_Poll();
-            HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
-            }
-        }
-        else
-        {
-        Internet_Poll();
-        HIDO_TimerPoll();
-        HIDO_ATLitePoll();
-        UDPClient_Poll();
-            GPS_Poll();
-                if(taglist_num>0)
-                {
-                    if(work_time>=YUNDONG_UWB_TIME)
-                    {
-                        work_time=0;
-                        Uwb_Zubao_Poll();
-                        UDPClient_UploadGPS((char*)GPS_data);
-                        HexToAsciiSendUDP(uwb_send,19+5*taglist_num);
-                        taglist_num=0;
-                    }
-                }
-                else
-                {
-                        if(work_time>=g_com_map[GPS_HZ])
-                        {
-                            work_time=0;
-                            if(GPS_successful_flag)
-                            {
-                                UDPClient_UploadGPS((char*)GPS_data);
-                            }
-                            else
-                            {
-                                Module_GetLBSLocationAsync(LBSLocationCallback, HIDO_NULL);
-                            }
-                        }
-                    
-                }
-            }
+//        if(receive1_gotosleep_flag||receive2_gotosleep_flag)    
+//        {
+//            if(receive1_gotosleep_flag)
+//            {
+//            uwbled=LEDOFF;
+//            Stop_chongdian_Mode_Poll();
+//            HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+//               if(chongman_flag)  //充满电重启,重启外设。
+//               {HAL_NVIC_SystemReset();}
+//            }
+//            if(receive2_gotosleep_flag)
+//            {
+//            uwbled=LEDOFF;
+//            Stop_chongdian_Mode_Poll();
+//            HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+//            }
+//        }
+//        else
+//        {
+//        Internet_Poll();
+//        HIDO_TimerPoll();
+//        HIDO_ATLitePoll();
+//        UDPClient_Poll();
+//            GPS_Poll();
+//                if(taglist_num>0)
+//                {
+//                    if(work_time>=YUNDONG_UWB_TIME)
+//                    {
+//                        work_time=0;
+//                        Uwb_Zubao_Poll();
+//                        UDPClient_UploadGPS((char*)GPS_data);
+//                        HexToAsciiSendUDP(uwb_send,19+5*taglist_num);
+//                        taglist_num=0;
+//                    }
+//                }
+//                else
+//                {
+//                        if(work_time>=g_com_map[GPS_HZ])
+//                        {
+//                            work_time=0;
+//                            if(GPS_successful_flag)
+//                            {
+//                                UDPClient_UploadGPS((char*)GPS_data);
+//                            }
+//                            else
+//                            {
+//                                Module_GetLBSLocationAsync(LBSLocationCallback, HIDO_NULL);
+//                            }
+//                        }
+//                    
+//                }
+//            }
         }
         
     }
@@ -418,8 +418,44 @@
         uwbchecksum = Checksum_u16(&uwb_send[2],15+5*taglist_num);
         memcpy(&uwb_send[17+5*taglist_num],&uwbchecksum,2);
 }
+extern uint32_t main_time;
 extern uint16_t testlorarecve;
+uint8_t delaysleep_count;
+char str[17]= {"AT+IPR=9600;&W\r\n"};
+extern  UART_HandleTypeDef huart5;
 void Main_Poll()
+{    
+    if(main_time>10&&only_one_flag==0)
+    {
+        only_one_flag=1;
+      Uart_ReConfigBaudRate(UART_ID_4G,115200);
+    HAL_UART_Transmit(&huart5, str,17,1000);
+    Uart_ReConfigBaudRate(UART_ID_4G,9600);
+    }
+    PowerLedTask();
+    DBG_Poll();
+    IdleTask();
+    GPS_Poll();
+    Internet_Poll();
+    HIDO_TimerPoll();
+    HIDO_ATLitePoll();
+    UDPClient_Poll();
+    HAL_IWDG_Refresh(&hiwdg); 
+    
+
+//    if(AIR780E_IsIPIdle() && Socket_IsSendQueueEmpty(0))
+//    {
+//        HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+//    }
+    if(delaysleep_count==0/*&&!gps_need_data_flag*/)
+    if(((IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0))/*||((!flag_TCP_reconnectting)&&!IfTCPConnected())*/))
+    {
+         HAL_IWDG_Refresh(&hiwdg); 
+        printf("要进入休眠了,当前时间戳%d\r\n",HIDO_TimerGetTick());
+    HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+    }
+}
+void Main_Poll_666()
 {
     u16 uwbchecksum;
     IdleTask();
@@ -429,6 +465,12 @@
         PowerLedTask();
         DBG_Poll();
         IdleTask();
+        GPS_Poll();
+        Internet_Poll();
+        HIDO_TimerPoll();
+        HIDO_ATLitePoll();
+        UDPClient_Poll();
+        
     }
     else   
     {

--
Gitblit v1.9.3