修改语音上传bug，新增4G下发指令

zhangbo

23 小时以前 f39c69839382ee3890906e96211527dcb2eaeb51

 keil/include/main/main.c

@@ -378,6 +378,7 @@
uint8_t input5v_time;
extern uint8_t taglist_num;
uint8_t gps_ntripsend;
extern uint8_t uwb_OpenClose_flag;
static void sleep_timer_callback(void *dev, uint32_t time)
{
// powerON_Task();
@@ -408,7 +409,7 @@
//        uart_send(UART_ID1, ceshidata, 50,NULL);
        }
        input5v_time=1;
        if(taglist_num==0&&g_com_map[UWBFrequency]==1&&g_com_map[UWBENBLE]==1)
        if(taglist_num==0&&g_com_map[UWBFrequency]==1&&g_com_map[UWBENBLE]==1&&uwb_OpenClose_flag==1)
        {
        CloseUWB();
        Uwb_init();
@@ -588,7 +589,7 @@
//      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|23;
    g_com_map[VERSION] = (1<<8)|24;
          
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -807,10 +808,11 @@
extern uint32_t uwb_time_count;
uint8_t GPS_UPLOAD_FLAG=0;
uint32_t elapsed_time_jibu;
extern uint8_t uwb_OpenClose_flag;
void upload_apppoll()
{   

    if(current_state==STATE_NORMAL)
    if(current_state==STATE_NORMAL&&uwb_OpenClose_flag==1)
    {
        if(g_com_map[UWBFrequency]>1)
        {
@@ -832,7 +834,7 @@
        else
        {}
    }
    else if(current_state==STATE_SLEEP)
    else if(current_state==STATE_SLEEP&&uwb_OpenClose_flag==1)
    {
            elapsed_time_jibu = uwb_time_count - state_start_time;
            switch(elapsed_time_jibu)
@@ -969,7 +971,7 @@
    wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
    LED_output_init();//配置彩色灯引脚


    PCA9555_Set_One_Value_Output(TTS_ENABLE,1); 
    WT588E02B_Init();
    adc_open(&usr_adc_cfg);
    uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);