diff --git a/code/application/source/sf_app/code/source/fileMng/sf_file.c b/code/application/source/sf_app/code/source/fileMng/sf_file.c index 54fd4cbb4..0fa754975 100644 --- a/code/application/source/sf_app/code/source/fileMng/sf_file.c +++ b/code/application/source/sf_app/code/source/fileMng/sf_file.c @@ -1293,14 +1293,13 @@ BOOL sf_is_4g_module_usb_update_file_exist(UINT8 *updateFname) { if(strcmp(ptr->d_name,".")==0 || strcmp(ptr->d_name,"..")==0) ///current dir OR parrent dir continue; - else if(ptr->d_type == 8) ///file + else if(ptr->d_type == 4) ///dir { if(SF_STRNCMP(ptr->d_name, puiPara->ModuleVer, 6) == 0) { SF_SPRINTF(updateFname, "%s%s", SF_SD_ROOT, ptr->d_name); closedir(dirp); - printf("updateFname:%s\n", updateFname); - + printf("[%s:%d] updateFname:%s\n", __FUNCTION__, __LINE__, updateFname); return TRUE; } } diff --git a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c index e9b189e0e..d687a5cf3 100644 --- a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c +++ b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c @@ -45,7 +45,7 @@ extern "C" { #include "sf_message_queue.h" #include "sf_param_common.h" #include "sf_storeMng.h" - +#include "FileSysTsk.h" #define MAKE_FDT_PARTITION_PATH(x) "/nor/partition_"#x #define MAKE_FDT_PARTITION_PATH_HELPER(X) MAKE_FDT_PARTITION_PATH(X) diff --git a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c index 2ccaa1d47..c5f852df0 100644 --- a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c +++ b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c @@ -30,7 +30,7 @@ #include #include #include "sf_common.h" - +#include "sf_sms.h" #ifdef __cplusplus #if __cplusplus extern "C" { @@ -363,6 +363,7 @@ unsigned char sf_mcu_reg_set(MCUParam_t attrId, unsigned char val) SINT32 isCardFull = sf_is_card_full(); //CameraBootSetting_t* pCameraBootSetting = CameraBootSettingGetHandle(); sf_set_sim_insert(1);//Remove hardware detection SIM card + //printf(LIGHT_RED "[%s:%d] Firmware compile time:%s %s VER:%s"NONE, __FUNCTION__, __LINE__, __DATE__, __TIME__,SF_BASE_VERSION); MLOGI("Firmware compile time:%s %s VER:%s\n", __DATE__, __TIME__,SF_BASE_VERSION); MLOGI("DailyReportSwitch=%d %02d:%02d\n", puiPara->DailyReportSwitch, puiPara->DailyReportTime2.Hour, puiPara->DailyReportTime2.Min); MLOGI("isUsb = %d isCard = %d isCardFull = %d val = %d simCardInsert = %d start mode = %d\n", isUsb, isCard, isCardFull, val, simCardInsert, sf_poweron_type_get()); @@ -592,9 +593,16 @@ unsigned char sf_mcu_reg_set(MCUParam_t attrId, unsigned char val) if(simCardInsert && (puiPara->NetWorkNeedSearch) && ((PowerOnMode == PWR_ON_AUTO) || (PowerOnMode == PWR_ON_SETUP) || (PowerOnMode == PWR_ON_DAILY_REPORT)))/* SET->ON, OFF->ON*/ + { temp = 1; - else if(SmsCheck) + } + else if(sf_get_camera_restart()){ + temp = 1; + } + else if(SmsCheck){ temp = 2; + + } if (!(sf_get_pir_statu_flag() || (PowerOnMode == PWR_ON_AUTO))) temp |= (val == APP_POWER_OFF_BATT_EMPTY) << 6; diff --git a/code/lib/source/sifar/code/include/sf_mcu.h b/code/lib/source/sifar/code/include/sf_mcu.h index 872c4b3f7..38761f30c 100644 --- a/code/lib/source/sifar/code/include/sf_mcu.h +++ b/code/lib/source/sifar/code/include/sf_mcu.h @@ -410,6 +410,6 @@ void sf_set_mcu_ver(unsigned short mcuVersion); SINT32 sf_sys_rtc_time_set(SF_PARA_TIME_S* pstDateTime); void sf_set_ae_night_mode(UINT8 isNightMode); UINT32 sf_get_send_pic_sieze(void); - +void sf_mcu_version_get(UINT8 *mcuVer); #endif diff --git a/code/lib/source/sifar/code/include/sf_sd_common.h b/code/lib/source/sifar/code/include/sf_sd_common.h index 513dfbc67..708c03366 100644 --- a/code/lib/source/sifar/code/include/sf_sd_common.h +++ b/code/lib/source/sifar/code/include/sf_sd_common.h @@ -10,7 +10,6 @@ typedef enum sf_MSG_FORMAT_SD_e }SF_MSG_FORMAT_SD_E; BOOL sf_is_card_full(void); -UINT32 sf_check_card_full(void); typedef BOOL (*SF_CALLBACK_SD_CMD)(void);