diff --git a/code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c b/code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c index f424f24ff..f40410766 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c @@ -3296,7 +3296,7 @@ SINT32 sf_net_regist_manual(void) char *pTemp = NULL; char *delim = NULL; UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); - SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 500, .len = 3, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; + SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 500, .len = 255, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; SF_LOG(" s\n"); @@ -4998,7 +4998,7 @@ SINT32 sf_get_utc(VOID) printf("[%s:%d] s\n", __FUNCTION__, __LINE__); UIMenuStoreInfo *pPara = sf_app_ui_para_get(); - SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 1000, .len = 3, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; + SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 1000, .len = 255, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; sf_gsm_para_buff_clear(); @@ -5135,7 +5135,7 @@ SINT32 sf_get_ntp(SINT32 value, SF_PARA_TIME_S *current_time) printf("[%s:%d] s\n", __FUNCTION__, __LINE__); UIMenuStoreInfo *pPara = sf_app_ui_para_get(); - SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 1000, .len = 3, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; + SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 1000, .len = 255, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; // SF_DEBUG("Sim4gApn=%s", pPara->Sim4gApn); @@ -5292,15 +5292,16 @@ SINT32 sf_get_ntp(SINT32 value, SF_PARA_TIME_S *current_time) case SMS_SIM_INIT_QIDEACT: SF_GEN_NTP_QIDEACT: // SF_DEBUG("modeule ver:%s", pPara->ModuleVer); - if(SF_STRNCMP(pPara->ModuleVer, GPRS_MODULE_TYPE_EG915Q, 6) == 0) - { - //eg915q not eact pdp - sprintf((char *)gsmPara, "AT\r"); - } - else - { - sprintf((char *)gsmPara, "AT+QIDEACT=%d\r", pdpIndex); - } + // if(SF_STRNCMP(pPara->ModuleVer, GPRS_MODULE_TYPE_EG915Q, 6) == 0) + // { + // //eg915q not eact pdp + // sprintf((char *)gsmPara, "AT\r"); + // } + // else + // { + // sprintf((char *)gsmPara, "AT+QIDEACT=%d\r", pdpIndex); + // } + sprintf((char *)gsmPara, "AT\r"); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); eSmsLocation = SMS_SIM_INIT_EXIT; @@ -5473,7 +5474,7 @@ UINT32 sf_sim_qsclk(UINT8 mode) //mode = 2, gprsmode = 1 SF_SIM_E eSmsLocation = SMS_SIM_INIT_DTRUP; int ttyRet = 0; UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); - SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 1000, .len = 3, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; + SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 1000, .len = 255, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; printf("[%s:%d] s\n", __FUNCTION__, __LINE__); diff --git a/code/application/source/sf_app/code/source/4gMng/sf_sms.c b/code/application/source/sf_app/code/source/4gMng/sf_sms.c index 27a12d9fb..f69418aca 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_sms.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_sms.c @@ -43,7 +43,7 @@ #include "sf_battery.h" #include "sf_system.h" #include "sf_4G_sms_lpa_cmd.h" - +#include "sf_otamng.h" /************************************************************************** * C O N S T A N T S * **************************************************************************/ @@ -1473,7 +1473,7 @@ SINT32 sf_sms_read_message(void) int msmtmp[255] = { 0 }; int msmmb = 0; //static int testflag = 0; - SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 2000, .len = 3, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; + SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 2000, .len = 255, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; UIMenuStoreInfo *pPara = sf_app_ui_para_get(); SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get(); @@ -2505,7 +2505,7 @@ SINT32 sf_power_off_module_ota(void) else { ret = sf_4g_module_ota_ftp();//need restart module - + // ret = sf_module_ota_ftp(); //if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT) { if(CameraCmd.setPara)