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

1.更新iq;2.修改集中发送;3.参数重置;

Browse Source
This commit is contained in:
payton 2023-06-19 13:40:22 +08:00
parent 5ba773299f
commit 8c1c8dcfd4
20 changed files with 178 additions and 1242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/application/source/sf_app/code/include/sf_service.h
View File

@ -50,6 +50,7 @@ SINT32 app_RegisterNet_start(void);
void app_FileSend_start(void); void app_FileSend_start(void);
SINT32 app_t110(void); SINT32 app_t110(void);
SINT32 sf_app_to_cardv_capture(void); SINT32 sf_app_to_cardv_capture(void);
SINT32 sf_module_reboot_reg_net(void);
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
} }

60
code/application/source/sf_app/code/source/4gMng/sf_ftp.c
View File

@ -44,6 +44,7 @@ extern "C" {
#include "sf_fileMng.h" #include "sf_fileMng.h"
#include "sf_file.h" #include "sf_file.h"
#include "sf_storeMng.h" #include "sf_storeMng.h"
#include "sf_service.h"
/************************************************************************** /**************************************************************************
* C O N S T A N T S * * C O N S T A N T S *
**************************************************************************/ **************************************************************************/
@ -3332,11 +3333,16 @@ SINT32 sf_concentrated_ftp_send(void)
SINT32 ret = SF_SUCCESS; SINT32 ret = SF_SUCCESS;
UINT8 csqlevel = 0; UINT8 csqlevel = 0;
UINT8 sendFailFlag = 0;
UINT8 sendAlreadyFlag = 0;
UINT8 timeoutCnt = 0;
SINT64 sendStartTime = 0;
SINT64 sendEndTime = 0;
sf_custom_str_get(CamNameStr); sf_custom_str_get(CamNameStr);
sf_4G_signal_level_get(pPara->NetGeneration,sf_get_cq_signal(),&csqlevel); sf_4G_signal_level_get(pPara->NetGeneration,sf_get_cq_signal(),&csqlevel);
sendStartTime = sf_sys_os_utime_get()/1000;
ret1 = sf_ftp_config(ssl, gprsMode, timeout); ret1 = sf_ftp_config(ssl, gprsMode, timeout);
if(SF_SUCCESS == ret1) if(SF_SUCCESS == ret1)
@ -3345,7 +3351,9 @@ SINT32 sf_concentrated_ftp_send(void)
{ {
snprintf((char *)ftpFileName, sizeof(ftpFileName), "%s", pThumbFileCfg->stfileattr[piccount].thumbfileName); snprintf((char *)ftpFileName, sizeof(ftpFileName), "%s", pThumbFileCfg->stfileattr[piccount].thumbfileName);
snprintf((char *)filePath, sizeof(filePath), "%s", pThumbFileCfg->stfileattr[piccount].thumbfilePath); snprintf((char *)filePath, sizeof(filePath), "%s", pThumbFileCfg->stfileattr[piccount].thumbfilePath);
SF_CONCENTRATED_MODULE_REBOOT://Restart the module once.
sf_set_del_flag(FALSE); sf_set_del_flag(FALSE);
ret1 = sf_quectel_upload_file_to_module(filePath, ftpFileName); ret1 = sf_quectel_upload_file_to_module(filePath, ftpFileName);
@ -3376,14 +3384,44 @@ SINT32 sf_concentrated_ftp_send(void)
if(ret1 == SF_SUCCESS) if(ret1 == SF_SUCCESS)
{ {
SF_CONCENTRATED_RE://Try again once
ret1 = sf_ftp_send(ftpFileName, filePath, timeout); ret1 = sf_ftp_send(ftpFileName, filePath, timeout);
if(SF_SUCCESS != ret1) if(SF_SUCCESS != ret1)
{ {
printf("%s:%d err ret: [0x%08X] ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ret, ftpFileName, filePath); printf("%s:%d err ret: [0x%08X] ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ret, ftpFileName, filePath);
if(!sendFailFlag){
sendFailFlag++;
goto SF_CONCENTRATED_RE;
}
else if(1 == sendFailFlag){
sendEndTime = sf_sys_os_utime_get()/1000;
pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime;
pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime;
if(sf_ttyusb_restart() != SUCCESS)
{
printf("%s:%d restart tty usb err\n", __FUNCTION__, __LINE__);
SLOGI("Concentrated Send MODULE REBOOT error\n");
goto SF_CONCENTRATED_END;
}
if(sf_module_reboot_reg_net() != SUCCESS)
{
printf("%s:%d restart net err\n", __FUNCTION__, __LINE__);
SLOGI("Concentrated Send MODULE REBOOT Net error\n");
goto SF_CONCENTRATED_END;
}
goto SF_CONCENTRATED_MODULE_REBOOT;
}
timeoutCnt++;
goto SF_CONCENTRATED_END; goto SF_CONCENTRATED_END;
} }
else { else {
sendFailFlag = 0;
piccount++; piccount++;
pSifarPara->picSendMax++;
sendAlreadyFlag++;
} }
} }
if(battery <= 0) if(battery <= 0)
@ -3394,6 +3432,12 @@ SINT32 sf_concentrated_ftp_send(void)
} }
SF_CONCENTRATED_END: SF_CONCENTRATED_END:
sendEndTime = sf_sys_os_utime_get()/1000;
pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime;
pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime;
printf("[%s:%d] : sendStartTime:%d sendEndTime:%d\n\n", __FUNCTION__, __LINE__, sendStartTime, sendEndTime);
if(!(((piccount+1) <= SendFileTotal) && ((pSifarPara->picSendMax < pPara->SendMaxNum) || (pPara->SendMaxNum == 0)))) if(!(((piccount+1) <= SendFileTotal) && ((pSifarPara->picSendMax < pPara->SendMaxNum) || (pPara->SendMaxNum == 0))))
{ {
sf_delete_send_flie_list(); sf_delete_send_flie_list();
@ -3407,6 +3451,16 @@ SF_CONCENTRATED_END:
#if SF_TEST_ERROR_CODE #if SF_TEST_ERROR_CODE
sf_set_code_err_flag(0); sf_set_code_err_flag(0);
#endif #endif
if(SendFileTotal)
{
SLOGI("Concentrated Send end.\n");
pSifarPara->picSendCount += (piccount+1);
pSifarPara->sendThumbnailCount += (piccount+1);
pSifarPara->picSendSucessCount += sendAlreadyFlag;
pSifarPara->picSendFailCount += ((piccount + 1) - sendAlreadyFlag);
pSifarPara->sendThumbnailFailCount += ((piccount + 1) - sendAlreadyFlag);
pSifarPara->picSendTimeoutCount += timeoutCnt;
}
printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2); printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2);
if(ret1 != SF_SUCCESS) if(ret1 != SF_SUCCESS)

24
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -30,6 +30,7 @@
#include "sf_storeMng.h" #include "sf_storeMng.h"
#include "sf_systemMng.h" #include "sf_systemMng.h"
#include "sf_type.h"
#if defined(CFG_LIVE_ENBLE) #if defined(CFG_LIVE_ENBLE)
#include "sf_liveMng.h" #include "sf_liveMng.h"
@ -1513,6 +1514,29 @@ SINT32 sf_app_to_cardv_capture(void) {
return s32ret; return s32ret;
} }
SINT32 sf_module_reboot_reg_net(void)
{
UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get();
SINT32 s32ret = 0;
SF_FN_PARAM_S stpfncallback = {0};
stpfncallback.pstParam = sf_customer_param_get();
stpfncallback.pstaticParam = sf_app_ui_para_get();
// stpfncallback.pstaticParam = sf_statistics_param_get();
stpfncallback.pfn_AT_instruction_exit = (void *)app_disconnect_4g_module;
#if SF_QLOG_ENABLE
if (pCustomerParam->QLogSwitch == 1)
app_Qlog_procress();
#endif
s32ret = sf_4G_sim_init(&stpfncallback);
SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
s32ret = sf_4G_register_net_manual(&stpfncallback);
sf_share_mem_customer_down(1);
SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
return s32ret;
}
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
} }

28
code/application/source/sf_app/code/source/paramMng/sf_param_common.c
View File

@ -953,7 +953,35 @@ void sf_statistics_param_reset(SF_PDT_PARAM_STATISTICS_S *pSfPara)
pSfPara->LowPowerAlarmFlag = 0; pSfPara->LowPowerAlarmFlag = 0;
pSfPara->LoginACMFailedCnt = 0; pSfPara->LoginACMFailedCnt = 0;
pSfPara->bindFlag = 0; pSfPara->bindFlag = 0;
pSfPara->picSendCount = 0;
pSfPara->sendThumbnailCount = 0;
pSfPara->picSendSucessCount = 0;
pSfPara->picSendTimeoutCount = 0;
pSfPara->picSendFailCount = 0;
pSfPara->sendThumbnailFailCount = 0;
pSfPara->picSendTimeCount = 0;
pSfPara->sendThumbnailTimeCount = 0;
pSfPara->videoSendCount = 0;
pSfPara->videoSendTimeCount = 0;
pSfPara->videoSendFailCount = 0;
pSfPara->videoSendSucessCount = 0;
pSfPara->TirgNum = 0;
pSfPara->NewFlieCount = 0;
pSfPara->picSendMax = 0;
pSfPara->subscribeSendCnt = 0;
pSfPara->subscribeVideoSendCnt = 0;
pSfPara->GpsSearchFailCnt = 0;/*dailyReport mode, search gps fail cnt*/
pSfPara->SmsFlag = 0;
pSfPara->SmsNumber = 0;
memset(pSfPara->SmsStr, '\0', sizeof(pSfPara->SmsStr));
#ifdef SF_VERSION_RELEASE #ifdef SF_VERSION_RELEASE
sprintf(pSfPara->WebIP, "%s", "a-cen.wuyuantech.com"); sprintf(pSfPara->WebIP, "%s", "a-cen.wuyuantech.com");
#else #else

2
code/hdal/vendor/isp/configs/dtsi/os05b10_ae_0.dtsi vendored
View File

@ -7,7 +7,7 @@
version-info = [00 01 00 01]; version-info = [00 01 00 01];
ae_expect_lum { ae_expect_lum {
size = [b0 00 00 00]; size = [b0 00 00 00];
data = [3c 00 00 00 3c 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 44 00 00 00 44 00 00 00 44 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 3c 00 00 00 46 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00]; data = [3c 00 00 00 3c 00 00 00 26 00 00 00 26 00 00 00 26 00 00 00 26 00 00 00 26 00 00 00 26 00 00 00 27 00 00 00 2c 00 00 00 32 00 00 00 3a 00 00 00 44 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 3c 00 00 00 46 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00];
}; };
ae_la_clamp { ae_la_clamp {
size = [50 01 00 00]; size = [50 01 00 00];

2
code/hdal/vendor/isp/configs/dtsi/os05b10_awb_0.dtsi vendored
View File

@ -35,7 +35,7 @@
}; };
awb_expand_block { awb_expand_block {
size = [90 00 00 00]; size = [90 00 00 00];
data = [02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0a 00 00 00 06 00 00 00 06 00 00 00 06 00 00 00 14 00 00 00 0a 00 00 00 0a 00 00 00 0a 00 00 00 05 00 00 00 05 00 00 00 05 00 00 00 05 00 00 00 f5 00 00 00 f5 00 00 00 f5 00 00 00 f5 00 00 00 6e 00 00 00 69 00 00 00 5b 00 00 00 72 00 00 00 82 00 00 00 7a 00 00 00 69 00 00 00 80 00 00 00 c8 ff ff ff 38 00 00 00 12 00 00 00 20 00 00 00 f6 ff ff ff 4a 00 00 00 20 00 00 00 cb ff ff ff]; data = [00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0a 00 00 00 06 00 00 00 06 00 00 00 06 00 00 00 10 00 00 00 0a 00 00 00 0a 00 00 00 0a 00 00 00 05 00 00 00 05 00 00 00 05 00 00 00 05 00 00 00 f5 00 00 00 f5 00 00 00 f5 00 00 00 f5 00 00 00 69 00 00 00 69 00 00 00 5b 00 00 00 72 00 00 00 78 00 00 00 7a 00 00 00 69 00 00 00 80 00 00 00 05 00 00 00 38 00 00 00 12 00 00 00 20 00 00 00 19 00 00 00 4a 00 00 00 20 00 00 00 cb ff ff ff];
}; };
awb_luma_weight { awb_luma_weight {
size = [44 00 00 00]; size = [44 00 00 00];

16
code/hdal/vendor/isp/configs/dtsi/os05b10_iq_0.dtsi vendored
View File

File diff suppressed because one or more lines are too long

16
code/hdal/vendor/isp/configs/dtsi/os05b10_iq_0_cap.dtsi vendored
View File

File diff suppressed because one or more lines are too long

16
code/hdal/vendor/isp/configs/dtsi/os05b10_iq_0_vid.dtsi vendored
View File

File diff suppressed because one or more lines are too long

BIN
code/hdal/vendor/output/libvendor_ai2_pub.a vendored
View File

Binary file not shown.

BIN
code/hdal/vendor/output/libvendor_ai2_pub2.a vendored
View File

Binary file not shown.

BIN
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.dtb
View File

Binary file not shown.

1181
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.tmp.dts
View File

File diff suppressed because it is too large Load Diff

2
rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c
View File

@ -690,7 +690,7 @@ static void MovieFast_OnRecStart(void)
mask <<= 1; mask <<= 1;
} }
nvt_cmdsys_runcmd("venc info"); //nvt_cmdsys_runcmd("venc info");
} }
static void MovieFast_OnRecStop(void) static void MovieFast_OnRecStop(void)

20
rtos/code/driver/na51089/source/mcu/sf_mcu.c
View File

@ -2124,10 +2124,17 @@ void sf_add_file_name_to_send_list(char *sendfname)
char sendListName[64] = {0}; char sendListName[64] = {0};
char buff[SF_SEND_LIST_ITEM_LENGTH+1] = {0}; char buff[SF_SEND_LIST_ITEM_LENGTH+1] = {0};
int fd = 0; int fd = 0;
struct stat st;
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
#if SF_IQ_TEST != ENABLE #if SF_IQ_TEST != ENABLE
FileSys_SetAttrib(PHOTO_THUMB_PATH, FST_ATTRIB_HIDDEN/* | FST_ATTRIB_SYSTEM*/, TRUE); INT32 uiStatus = 0;
UINT8 ucAttrib = 0;
uiStatus = FileSys_GetAttrib(PHOTO_THUMB_PATH, &ucAttrib);
if (uiStatus == FST_STA_OK) {
if(!(ucAttrib&FST_ATTRIB_HIDDEN)){
FileSys_SetAttrib(PHOTO_THUMB_PATH, FST_ATTRIB_HIDDEN/* | FST_ATTRIB_SYSTEM*/, TRUE);
}
}
#endif #endif
if(strlen(sendfname) != SF_SEND_LIST_ITEM_LENGTH-3) //3 ->CamMode \r\n if(strlen(sendfname) != SF_SEND_LIST_ITEM_LENGTH-3) //3 ->CamMode \r\n
@ -2144,18 +2151,21 @@ void sf_add_file_name_to_send_list(char *sendfname)
} }
if(access(sendListName, F_OK) == 0) if(access(sendListName, F_OK) == 0)
{ {
printf("sendListName:%s\n",sendListName);
fd = open(sendListName, O_APPEND | O_WRONLY); fd = open(sendListName, O_APPEND | O_WRONLY);
} }
else { else {
fd = open(sendListName, O_APPEND | O_WRONLY | O_CREAT); fd = open(sendListName, O_APPEND | O_WRONLY | O_CREAT);
} }
if(fd) if(fd)
{ {
sprintf(buff, "%d%s\r\n", puiPara->CamMode, sendfname); fstat(fd, &st);
lseek(fd, 0, SEEK_END);
snprintf(buff, sizeof(buff), "%d%s\r\n", puiPara->CamMode, sendfname);
write(fd, buff, SF_SEND_LIST_ITEM_LENGTH); write(fd, buff, SF_SEND_LIST_ITEM_LENGTH);
close(fd); close(fd);
printf("Add Success\n"); printf("Add Success st_size:%ld\n", st.st_size);
} }
} }

2
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_ae_0.dtsi vendored
View File

@ -7,7 +7,7 @@
version-info = [00 01 00 01]; version-info = [00 01 00 01];
ae_expect_lum { ae_expect_lum {
size = [b0 00 00 00]; size = [b0 00 00 00];
data = [3c 00 00 00 3c 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 3a 00 00 00 44 00 00 00 44 00 00 00 44 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 3c 00 00 00 46 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00]; data = [3c 00 00 00 3c 00 00 00 26 00 00 00 26 00 00 00 26 00 00 00 26 00 00 00 26 00 00 00 26 00 00 00 27 00 00 00 2c 00 00 00 32 00 00 00 3a 00 00 00 44 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 50 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 32 00 00 00 3c 00 00 00 46 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00 5a 00 00 00];
}; };
ae_la_clamp { ae_la_clamp {
size = [50 01 00 00]; size = [50 01 00 00];

2
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_awb_0.dtsi vendored
View File

@ -35,7 +35,7 @@
}; };
awb_expand_block { awb_expand_block {
size = [90 00 00 00]; size = [90 00 00 00];
data = [02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0a 00 00 00 06 00 00 00 06 00 00 00 06 00 00 00 14 00 00 00 0a 00 00 00 0a 00 00 00 0a 00 00 00 05 00 00 00 05 00 00 00 05 00 00 00 05 00 00 00 f5 00 00 00 f5 00 00 00 f5 00 00 00 f5 00 00 00 6e 00 00 00 69 00 00 00 5b 00 00 00 72 00 00 00 82 00 00 00 7a 00 00 00 69 00 00 00 80 00 00 00 c8 ff ff ff 38 00 00 00 12 00 00 00 20 00 00 00 f6 ff ff ff 4a 00 00 00 20 00 00 00 cb ff ff ff]; data = [00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0a 00 00 00 06 00 00 00 06 00 00 00 06 00 00 00 10 00 00 00 0a 00 00 00 0a 00 00 00 0a 00 00 00 05 00 00 00 05 00 00 00 05 00 00 00 05 00 00 00 f5 00 00 00 f5 00 00 00 f5 00 00 00 f5 00 00 00 69 00 00 00 69 00 00 00 5b 00 00 00 72 00 00 00 78 00 00 00 7a 00 00 00 69 00 00 00 80 00 00 00 05 00 00 00 38 00 00 00 12 00 00 00 20 00 00 00 19 00 00 00 4a 00 00 00 20 00 00 00 cb ff ff ff];
}; };
awb_luma_weight { awb_luma_weight {
size = [44 00 00 00]; size = [44 00 00 00];

16
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_iq_0.dtsi vendored
View File

File diff suppressed because one or more lines are too long

16
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_iq_0_cap.dtsi vendored
View File

File diff suppressed because one or more lines are too long

16
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_iq_0_vid.dtsi vendored
View File

File diff suppressed because one or more lines are too long