payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Branch_S530' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S530

Browse Source
This commit is contained in:
payton 2023-09-15 09:47:23 +08:00
commit 4b7b30d76a
7 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/sifarsdk

@ -1 +1 @@
Subproject commit 670d2f3fc39f4803f5a72bf125c0aea7a146a100 Subproject commit f79d6d619d115e71b587713446161653d33ad321

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h
View File

@ -197,7 +197,7 @@
#else #else
#define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO// #define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO//
#define DEFAULT_NET_WORK_NEED_SEARCH SF_ON #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_SWITCH SF_ON
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7 #define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7
#define DEFAULT_TIMELAPSE_SWITCH SF_OFF #define DEFAULT_TIMELAPSE_SWITCH SF_OFF

2
code/application/source/sf_app/code/include/sf_eg91_sim.h
View File

@ -23,7 +23,7 @@ extern "C" {
#define SF_NTP_SITE2 "time.nist.gov" #define SF_NTP_SITE2 "time.nist.gov"
#define APN_4G_USCC "uscc" #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_VERIZON "vzwinternet"
#define APN_4G_TMOBBILE "fast.t-mobile.com" #define APN_4G_TMOBBILE "fast.t-mobile.com"

2
code/application/source/sf_app/code/include/sf_hal_ttyusb.h
View File

@ -42,7 +42,7 @@ extern "C" {
#define GPRS_MODULE_TYPE_EG915Q "EG915Q" #define GPRS_MODULE_TYPE_EG915Q "EG915Q"
#define A_MODULE_APN "nxtgenphone" #define A_MODULE_APN "iot0120.com.attz"
#define V_MODULE_APN "vzwinternet" #define V_MODULE_APN "vzwinternet"

3
code/application/source/sf_app/code/source/4gMng/sf_4G_auto_operation.c
View File

@ -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 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->Sim4gUsr, "\0");
SF_STRCPY(puiPara->Sim4gPwd, "\0"); SF_STRCPY(puiPara->Sim4gPwd, "\0");

12
code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c
View File

@ -3423,7 +3423,6 @@ SINT32 sf_net_regist_manual(void)
//callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ //callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/
sprintf((char *)gsmPara, "%s", "AT+CGDCONT=1,\"IPV4V6\",\"\"\r"); sprintf((char *)gsmPara, "%s", "AT+CGDCONT=1,\"IPV4V6\",\"\"\r");
eNetRegLocation = QUECTEL_NETREG_CGDCONT; eNetRegLocation = QUECTEL_NETREG_CGDCONT;
} }
} }
else else
@ -4950,7 +4949,16 @@ SINT32 sf_get_ntp(SINT32 value, SF_PARA_TIME_S *current_time)
case SMS_SIM_INIT_QIDEACT: case SMS_SIM_INIT_QIDEACT:
SF_GEN_NTP_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)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
eSmsLocation = SMS_SIM_INIT_EXIT; eSmsLocation = SMS_SIM_INIT_EXIT;

3
code/application/source/sf_app/code/source/4gMng/sf_opera_adapt.c
View File

@ -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 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->Sim4gUsr, "\0");
strcpy(sim_info_t->Sim4gPwd, "\0"); strcpy(sim_info_t->Sim4gPwd, "\0");