按照文档修改4G下发指令，杨总测试过的版本V1.25

zhangbo

4 天以前 6777eb77964fa79e39cb34112d23d8a3acae1ef3

 keil/include/main/main.c

@@ -147,52 +147,17 @@
//                  gps_air780_power_change(0,0);//关闭gps，4G 
                PCA9555_Set_One_Value_Output(LED_POWER,0);//输出低电平关闭LED
            PCA9555_Set_One_Value_Output(GPS_POWER,0);//关闭gps，4G 


            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);
////            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();
//            if(onlyoneflag)
//            {
//            onlyoneflag=0;
//            userkey_state=4;
//            heartbeasend_flag = 1;
//            sleepflag=1;
//            sleepflagtime=HIDO_TimerGetTick();
//            }
//            if(sleepflag)
//            {
//             if(HIDO_TimerGetTick() - sleepflagtime>3)  
//             {
//              PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭gps，4G 
//             }         
//            }
//    
////            PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭gps，4G 
//	          
////                  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);			 
}
uint8_t jiancebat_percent_flag;
static void adc_callback(void *data, uint32_t number)
@@ -255,6 +220,7 @@
        userkey_state=4;
        heartbeasend_flag = 1;
        sleepflag=1;
        
        sleepflagtime=HIDO_TimerGetTick();
        }
   }
@@ -301,6 +267,7 @@
       keystarttime3 =  HIDO_TimerGetTick(); 
     }
} 
uint8_t user_Power_keyflag=0;
void PowerTask(void)
{
     if(read_powerkey_input_pca())
@@ -320,9 +287,12 @@
//            PCA9555_Set_One_Value_Output(GPS_POWER,0);//关GPS
//            PCA9555_Set_One_Value_Output(PWR_ENABLE,0);//低电平关闭
              heartbeasend_flag = 1;
              user_Power_keyflag=1;
              guanjiflag=1;
              userkey_state = 2;
              guanjiflagtime=HIDO_TimerGetTick();
              g_com_map[KEY_POWERON] = user_Power_keyflag;
              save_com_map_to_flash();
        }
     }else
     {
@@ -541,6 +511,10 @@
    {
    g_com_map[UWBFrequency]=1;
    }
    if(g_com_map[URT_BQ]>1)
    {
    g_com_map[URT_BQ]=0;
    }
//    g_com_map[IP_0]=111;
//    g_com_map[IP_1]=198;
//    g_com_map[IP_2]=60;
@@ -589,7 +563,7 @@
//      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|24;
    g_com_map[VERSION] = (1<<8)|25;
          
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -600,6 +574,7 @@
    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);
//    LOG_INFO(TRACE_MODULE_APP,"充电是否开机标志位: %d .\r\n",g_com_map[URT_BQ]);
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
    {
    LOG_INFO(TRACE_MODULE_APP,"TCP_RTCM模式,服务器地址: %d.%d.%d.%d:%d.\r\n",g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);
@@ -628,6 +603,14 @@
extern uint8_t jiancebat_percent_flag;
void IdleTask(void)
{
//    if(g_com_map[URT_BQ])
//    {}
//    else
//    {
//    
//    
//    }   
    
if(read_5v_input_pca())
      {
            if(state5v==0)
@@ -764,8 +747,13 @@
        powerled=0;
        Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF); 
        }
             if(bat_percent<5&&jiancebat_percent_flag)
              {
                 WT588E_PLAY(14);
              }
         if(bat_percent<1&&bat_percent_only_one&&jiancebat_percent_flag)
         {
                    WT588E_PLAY(15);
                userkey_state=3;
                heartbeasend_flag = 1;
                guanjiflag=1;
@@ -781,6 +769,7 @@
              Set4LEDColor(uwbled,rtkled,led4g,powerled);
             if(HIDO_TimerGetTick() - guanjiflagtime>3)  
             {
                    PCA9555_Set_One_Value_Output(TTS_ENABLE,0);     //关闭语音输入
                PCA9555_Set_One_Value_Output(LED_POWER,0);//输出低电平关闭LED
                PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);
                PCA9555_Set_One_Value_Output(GPS_POWER,0);//关GPS
@@ -977,6 +966,16 @@
    uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
    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();