From 776aa7daebf676ee6cc210844a89a1ac66dc887b Mon Sep 17 00:00:00 2001 From: alisa Date: Wed, 13 Sep 2023 10:43:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=B8=9A=E5=8A=A1]1.merg=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/application/source/sf_app/code/include/sf_eg91_gps.h | 0 .../source/sf_app/code/source/4gMng/sf_4G_auto_operation.c | 0 code/application/source/sf_app/code/source/4gMng/sf_eg91_gps.c | 0 code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 code/application/source/sf_app/code/include/sf_eg91_gps.h mode change 100644 => 100755 code/application/source/sf_app/code/source/4gMng/sf_4G_auto_operation.c mode change 100644 => 100755 code/application/source/sf_app/code/source/4gMng/sf_eg91_gps.c mode change 100644 => 100755 code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c diff --git a/code/application/source/sf_app/code/include/sf_eg91_gps.h b/code/application/source/sf_app/code/include/sf_eg91_gps.h old mode 100644 new mode 100755 diff --git a/code/application/source/sf_app/code/source/4gMng/sf_4G_auto_operation.c b/code/application/source/sf_app/code/source/4gMng/sf_4G_auto_operation.c old mode 100644 new mode 100755 diff --git a/code/application/source/sf_app/code/source/4gMng/sf_eg91_gps.c b/code/application/source/sf_app/code/source/4gMng/sf_eg91_gps.c old mode 100644 new mode 100755 diff --git a/code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c b/code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c old mode 100644 new mode 100755 From 75c2e7335751b4cf8909814c52e3666250fedeb3 Mon Sep 17 00:00:00 2001 From: alisa Date: Fri, 15 Sep 2023 00:06:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[sim]1.=E4=BF=AE=E6=94=B9sim=E5=8D=A1?= =?UTF-8?q?=EF=BC=8Cversion=E5=92=8C=E5=85=B6=E4=BB=96=E5=8D=A1=E4=B8=8D?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=A8=A1=E5=9D=97PDP=E9=93=BE=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h | 2 +- .../source/sf_app/code/include/sf_eg91_sim.h | 2 +- .../source/sf_app/code/include/sf_hal_ttyusb.h | 2 +- .../sf_app/code/source/4gMng/sf_4G_auto_operation.c | 3 ++- .../source/sf_app/code/source/4gMng/sf_eg91_sim.c | 12 ++++++++++-- .../source/sf_app/code/source/4gMng/sf_opera_adapt.c | 3 ++- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h index 400b0f54b..2e30fd94f 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h @@ -197,7 +197,7 @@ #else #define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO// #define DEFAULT_NET_WORK_NEED_SEARCH SF_ON -#define DEFAULT_AUTO_OFF_SWITCH SF_OFF +#define DEFAULT_AUTO_OFF_SWITCH SF_ON #define DEFAULT_PIR_SWITCH SF_ON #define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7 #define DEFAULT_TIMELAPSE_SWITCH SF_OFF diff --git a/code/application/source/sf_app/code/include/sf_eg91_sim.h b/code/application/source/sf_app/code/include/sf_eg91_sim.h index 80abb7280..f90497a10 100755 --- a/code/application/source/sf_app/code/include/sf_eg91_sim.h +++ b/code/application/source/sf_app/code/include/sf_eg91_sim.h @@ -23,7 +23,7 @@ extern "C" { #define SF_NTP_SITE2 "time.nist.gov" #define APN_4G_USCC "uscc" -#define APN_4G_ATT "nxtgenphone" +#define APN_4G_ATT "iot0120.com.attz" #define APN_4G_VERIZON "vzwinternet" #define APN_4G_TMOBBILE "fast.t-mobile.com" diff --git a/code/application/source/sf_app/code/include/sf_hal_ttyusb.h b/code/application/source/sf_app/code/include/sf_hal_ttyusb.h index 5d22cfa66..ceca11920 100755 --- a/code/application/source/sf_app/code/include/sf_hal_ttyusb.h +++ b/code/application/source/sf_app/code/include/sf_hal_ttyusb.h @@ -42,7 +42,7 @@ extern "C" { #define GPRS_MODULE_TYPE_EG915Q "EG915Q" -#define A_MODULE_APN "nxtgenphone" +#define A_MODULE_APN "iot0120.com.attz" #define V_MODULE_APN "vzwinternet" diff --git a/code/application/source/sf_app/code/source/4gMng/sf_4G_auto_operation.c b/code/application/source/sf_app/code/source/4gMng/sf_4G_auto_operation.c index b95e4342d..b8a1b49ea 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_4G_auto_operation.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_4G_auto_operation.c @@ -66,7 +66,8 @@ UINT32 sf_auto_operation_adjust(void) } else if((SF_STRNCMP(puiPara->OperatorCode, "46003", 5) == 0) || (SF_STRNCMP(puiPara->OperatorCode, "46005", 5) == 0) || (SF_STRNCMP(puiPara->OperatorCode, "46011", 5) == 0))//china Telecom { - SF_STRCPY(puiPara->Sim4gApn, "vzwinternet"); + SF_STRCPY(puiPara->Sim4gApn, "CTNET"); + //SF_STRCPY(puiPara->Sim4gApn, "iot0120.com.attz"); SF_STRCPY(puiPara->Sim4gUsr, "\0"); SF_STRCPY(puiPara->Sim4gPwd, "\0"); 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 bdd607a2c..e67a7fed9 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 @@ -3423,7 +3423,6 @@ SINT32 sf_net_regist_manual(void) //callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ sprintf((char *)gsmPara, "%s", "AT+CGDCONT=1,\"IPV4V6\",\"\"\r"); eNetRegLocation = QUECTEL_NETREG_CGDCONT; - } } else @@ -4950,7 +4949,16 @@ SINT32 sf_get_ntp(SINT32 value, SF_PARA_TIME_S *current_time) case SMS_SIM_INIT_QIDEACT: SF_GEN_NTP_QIDEACT: - sprintf((char *)gsmPara, "AT+QIDEACT=%d\r", pdpIndex); + 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); + } ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); eSmsLocation = SMS_SIM_INIT_EXIT; diff --git a/code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c b/code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c index fdf70f324..a257f3b2a 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c @@ -75,7 +75,8 @@ SINT32 sf_auto_operation_adaptation(SF_CHAR *operatorName, UIMenuStoreInfo *sim_ } else if((strncmp(operatorName, "46003", 5) == 0) || (strncmp(operatorName, "46005", 5) == 0) || (strncmp(operatorName, "46011", 5) == 0))//china telcom { - strcpy(sim_info_t->Sim4gApn, "vzwinternet"); + //strcpy(sim_info_t->Sim4gApn, "vzwinternet"); + strcpy(sim_info_t->Sim4gApn, "CTNET"); strcpy(sim_info_t->Sim4gUsr, "\0"); strcpy(sim_info_t->Sim4gPwd, "\0"); From 497fb019f7008643918ad1d2982eb1ad833406f6 Mon Sep 17 00:00:00 2001 From: alisa Date: Fri, 15 Sep 2023 00:09:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[sifarsdk]1.sifarsdk=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/application/sifarsdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/application/sifarsdk b/code/application/sifarsdk index 670d2f3fc..f79d6d619 160000 --- a/code/application/sifarsdk +++ b/code/application/sifarsdk @@ -1 +1 @@ -Subproject commit 670d2f3fc39f4803f5a72bf125c0aea7a146a100 +Subproject commit f79d6d619d115e71b587713446161653d33ad321