未修改室内外版本

zhangbo

2025-05-13 1f4cdd2361ab73f24f104d608421124140f54c51

 keil/include/main/main.c

@@ -178,16 +178,20 @@
            bat_percent = ((fVoltage_mv - 3300) /8);
        }
    }
            if(fVoltage_mv<3300)
            {
               //power_low_flag=1;
               //gps_air780_power_change(gps_power_state,0);//gps原样，关闭4G 
//               LOG_INFO(TRACE_MODULE_APP, "电池电压低于3.3V，4G，GPS停止工作\r\n");
            }else{
               //power_low_flag=0;
               //gps_air780_power_change(gps_power_state,1);//gps原样,开启4G
//               LOG_INFO(TRACE_MODULE_APP, "电池电压正常,4G，GPS,正常工作\r\n");
            }
      if(bat_percent>100)
         bat_percent=100;
     if(bat_percent<0)
         bat_percent=0;
//            if(fVoltage_mv<3300)
//            {
//               //power_low_flag=1;
//               //gps_air780_power_change(gps_power_state,0);//gps原样，关闭4G 
////               LOG_INFO(TRACE_MODULE_APP, "电池电压低于3.3V，4G，GPS停止工作\r\n");
//            }else{
//               //power_low_flag=0;
//               //gps_air780_power_change(gps_power_state,1);//gps原样,开启4G
////               LOG_INFO(TRACE_MODULE_APP, "电池电压正常,4G，GPS,正常工作\r\n");
//            }
      PCA9555_Set_One_Value_Output(ADC_MINIUS,1);//拉高
}
extern uint8_t gps_uwb_flag,gps_need_data_flag;
@@ -330,7 +334,7 @@
           if(uwb_offtime_count>60)
            {
             uwb_offtime_count=0;
//             current_state = STATE_SLEEP;
             current_state = STATE_SLEEP;
            }
        if(!read_5v_input_pca())
        {
@@ -443,7 +447,7 @@
      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|14;
    g_com_map[VERSION] = (1<<8)|16;
         
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -567,7 +571,8 @@
                }
                }
            }
            NVIC_SystemReset();
//            NVIC_SystemReset();
//                  PCA9555_Set_One_Value_Output(PWR_ENABLE,0);
            input5vflag=1;
      }
        else 
@@ -579,7 +584,13 @@
                state5V_prase_flag=state5v;
                gps_prase_flag=1;//恢复gps解析
                uart1_change_from_debug_to_gps();//测试
                PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
//                PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
            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
            PCA9555_Set_One_Value_Output(PWR_ENABLE,0);//低电平关闭
                     delay_us(1000000);
							  
            }
        }
      UART_CheckReceive();