V3.3 增加10分钟超时保护，确认公网专网都能升级

yincheng.zhong

昨天 81c6eacbe89801592f01f0e573b72d8547e3867b

 keil/include/main/main.c

@@ -280,12 +280,17 @@
extern uint8_t ceshidata[500];
extern uint8_t ceshichangdu;
uint8_t gps_ntripsend;
uint16_t ota_failed_timer;
static void sleep_timer_callback(void *dev, uint32_t time)
{
if(secondtask_count++%2==0)
    {   
        input5v_time=1;
        flag_secondtask = 1;
        if(ota_failed_timer++>600)
        {
         LOG_INFO(TRACE_MODULE_APP,"ota升级超时10分钟，重启\r\n");
        OTA_Failed();}
        if(!read_5v_input_pca())
        {
        if(bat_percent>15)
@@ -412,12 +417,13 @@
//      gps_open_flag=1;
//      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|3;
    log_4g_enable_flag = 1;
    DBG_SetMode(DBG_MODE_SHELL);
    g_com_map[VERSION] = (3<<8)|3;
        
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
    LOG_INFO(TRACE_MODULE_APP,"跳转OTA升级固件启动成功\r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
  //  LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
    LOG_INFO(TRACE_MODULE_APP,"OTA版本V3.3\r\n");
//    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]);
    delay_ms(500);
}
@@ -535,7 +541,7 @@
//                PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
//            }
//        }
//      UART_CheckReceive();
      UART_CheckReceive();
//        if(g_com_map[CNT_RESTART]==1)
//        {
//            g_com_map[CNT_RESTART]=0;
@@ -580,7 +586,9 @@
extern uint8_t YUANGPS_ParseGGA_data[256];
extern uint8_t YUANGPS_ParseGGA_changdu;
static HIDO_CHAR url[256 + 1]/*="http://123.57.87.125:7001/hfs/MK8000-4G工卡V1.2.Bin"*/;
//static HIDO_CHAR url[256 + 1]="http://123.57.87.125:7001/hfs/MK8000-4G工卡V1.2.Bin";
//static HIDO_CHAR url[256 + 1]="http://123.57.87.125:7001/hfs/MK8000-UBK高精-V1.22.Bin";
//static HIDO_CHAR url[256 + 1]="http://123.57.87.125:7001/hfs/r10.bin";
//$download_audio,7342,http://39.106.210.13:280/hfs/russiavoice_20241213_1.bin
//void OTA_MODE(void)
//{
//    if(g_com_map[OTA_FLAG])
@@ -629,6 +637,7 @@
//}
int main(void)
{
    __enable_irq();
    board_clock_run();
    boot_deinit();
    board_pins_config();
@@ -663,6 +672,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();
@@ -678,11 +688,14 @@
    uart1_change_from_gps_to_debug();//测试
    PCA9555_Set_One_Value_Output(MCU_A,1);//输出高电平切换为5V输入
    
    memcpy(/*(HIDO_UINT8 *)*/url,(void *)APP_CONFIG_IAP_PARAM_MAP,256);
    OTA_Start((HIDO_UINT8 *)url);
    HIDO_UINT8 type = 0;
//    type=1;
    memcpy(&type, (void *)APP_CONFIG_IAP_PARAM_MAP,1);
    memcpy(/*(HIDO_UINT8 *)*/url,(void *)APP_CONFIG_IAP_PARAM_MAP+1,255);
    OTA_Start(type, (HIDO_UINT8 *)url);
    LOG_INFO(TRACE_MODULE_APP,"获取固件地址为:%s\r\n",url);
    while (1)
    { 
    {
        OTA_Poll();
        HTTPClient_Poll();    
        Internet_Poll();
@@ -701,6 +714,6 @@
//      PowerTask();
//      IMUTask();
//      UserKeyTask();
//        IdleTask();
        IdleTask();
    }
}