安邦车载手环V1.10版本，提前search模式sleeptimeropen的时间，并修改distance的过滤逻辑，解决测距不稳定时测距变小问题，解...

chen

2024-10-15 93175ede1cf9777495df57f1e2552944e4b75bfb

 keil/include/main/main.c

@@ -62,7 +62,7 @@
#include "HIDO_Timer.h"
#include "TCPClient.h"

//#define DEBUG_MODE
#define DEBUG_MODE
extern int simple_main(void);
extern int temp_main(void);
#define TEST_UART_POLL_MODE 0
@@ -180,7 +180,7 @@
//}
extern uint8_t gps_uwb_flag;
uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1,flag_alam_state = 0;
uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count;;
uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count,delaysleep_count;
int need_open_gps_count;
void MotorPoll(void)
{
@@ -271,8 +271,8 @@
    }
    //UWB更新列表
    TagListUpdate();
    GPS_Poll();
      //gps_power_state=1;//测试gps长开
    //GPS_Poll();
      gps_power_state=1;//测试gps长开
    //UWB状态检测

    if(IfTCPConnected())
@@ -334,7 +334,8 @@
    }else{
        motor_power_state=1;
    }
 
 if(delaysleep_count>0)
        delaysleep_count--;
    //GPS工作逻辑

}
@@ -349,9 +350,9 @@
uint8_t flag_4G_recdata;
static void _4gUsart_handler(enum IO_PIN_T pin)
{
    LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
    // flag_4G_recdata = 1;
    // AIR780EUartInit();
     LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
        flag_4G_recdata = 1;
        delaysleep_count = 3;
}
extern uint16_t ip0,ip1,ip2,ip3,port;
extern uint8_t gps_4g_flag;
@@ -388,7 +389,7 @@
    ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
    ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf);
    port = g_com_map[TCP_PORT];
    g_com_map[VERSION] = (1<<8)|9;
    g_com_map[VERSION] = (1<<8)|10;
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
    LOG_INFO(TRACE_MODULE_APP,"固件版本:UWB-4G车载手环 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",ip0,ip1,ip2,ip3,port);
@@ -460,6 +461,8 @@
    uart_close(UART_ID0);//解绑原来串口0
}
uint8_t flag_4guart_needinit=0;
uint8_t index1,index2,index3;
int tt2;
int main(void)
{
    board_clock_run();
@@ -527,19 +530,29 @@
    sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
 //   board_5V_input_init(voltage_input_handler);
    board_acceleration_detection_init(move_handler);
       board_4GUsart_detection_init(_4gUsart_handler);
//       LOG_INFO(TRACE_MODULE_APP, "测试进入app");
  
    while (1)
    {
    { 
         tt2 = gpio_pin_get_val(_4G_USART_RX_Pin);
        if(flag_TCP_reconnectting||IfTCPConnected())
        {
        //    LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
            air780_led_on();
            if(flag_4guart_needinit)
           
//            if(flag_4guart_needinit)
//            {
//                flag_4guart_needinit = 0;
//                AIR780EUartInit();
//            }//yuan
                 if(flag_4G_recdata==1)
            {
                flag_4guart_needinit = 0;
                AIR780EUartInit();
                flag_4G_recdata = 2;
               
                LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll\r\n");
                Socket_RecvAll();
            }
                  air780_led_on();
            Internet_Poll();
            HIDO_ATLitePoll();
            HIDO_TimerPoll();
@@ -553,34 +566,49 @@
               
        }
        IdleTask();
        //3种情况后都要发包和休眠
        //if(send_flag){
        //message_construct();
        //send_udp;
        //air780_success_state=0;//关闭4G成功发送灯
        //blink_led(&air780_success_state);//成功测距闪烁4G状态灯
        //air780_success_state=0;
        //}
#ifndef DEBUG_MODE
//if(flag_sleeptimer)
        if(!gps_need_data_flag&&!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
//        if(!gps_need_data_flag&&!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
//        {
//                 if(!flag_4guart_needinit)
//            {
//                           LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n");
//                             board_4GUsart_detection_init(_4gUsart_handler);

//            }
//               flag_sleeptimer =0;
//            LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n");
//                flag_4guart_needinit = 1;

//        trace_flush();
//        uint32_t lock = int_lock();
//        //LOG_INFO(TRACE_MODULE_APP, "进入低功耗");
//        power_enter_power_down_mode(0);
//        int_unlock(lock);
//        }//yuan

// if(delaysleep_count==0)
index1=IfTCPConnected();
index2=AIR780E_IsIPIdle();
index3=Socket_IsSendQueueEmpty(0);
        if(!gps_power_state&&(IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0)))
        {
                 if(!flag_4guart_needinit)
            {
                           LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n");
                             board_4GUsart_detection_init(_4gUsart_handler);

            }
               flag_sleeptimer =0;
            uint32_t lock;
            flag_4guart_needinit = 1;
            Internet_Poll();
            HIDO_ATLitePoll();
            HIDO_TimerPoll();
            TCPClient_Poll();
         //   power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)_4G_USART_RX_Pin, POWER_WAKEUP_LEVEL_LOW);
            LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n");
                flag_4guart_needinit = 1;

        trace_flush();
        uint32_t lock = int_lock();
        //LOG_INFO(TRACE_MODULE_APP, "进入低功耗");
        power_enter_power_down_mode(0);
        int_unlock(lock);
           // delay_us(300000);
            trace_flush();
            lock = int_lock();            
            power_enter_power_down_mode(0);
                  uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
            int_unlock(lock);
        }

#endif
    }
}