Merge remote-tracking branch 'origin/Branch_S530' into branch_s530
This commit is contained in:
commit
9e588d5535
|
@ -919,9 +919,9 @@
|
|||
#define DZOOM_FUNC ENABLE
|
||||
#define HUNTING_MCU_I2C DISABLE
|
||||
#define HUNTING_MCU_UART ENABLE
|
||||
#define HUNTING_IR_LED_940 DISABLE
|
||||
#define HUNTING_IR_LED_940 ENABLE
|
||||
#define SF_EXIF_MN_BUF_SIZE 256
|
||||
#define SF_BASE_VERSION "7MD4RCwD6TB"
|
||||
#define SF_BASE_VERSION "7MD4RCwD9T1"
|
||||
#define HW_S530 1
|
||||
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
|
||||
#define DCF_FILE_NAME "SYFW" /* SYFW0001.JPG */
|
||||
|
|
|
@ -164,7 +164,12 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
|
|||
}
|
||||
|
||||
#if HUNTING_CAMERA_MCU == ENABLE
|
||||
if((FST_STA_OK != param2) && (CMD_FORMAT_SD_STA != sf_get_card_statu())){
|
||||
if((STRG_CB_MOUNT_FINISH == event) && (FST_STA_OK == param2) && (CMD_FORMAT_SD_STA != sf_get_card_statu()))
|
||||
{
|
||||
DBG_MSG("card-%d mount OK\r\n", param1 + 1);
|
||||
}
|
||||
else if((CMD_FORMAT_SD_STA != sf_get_card_statu()))
|
||||
{
|
||||
stMessageBuf.arg1 = event;
|
||||
stMessageBuf.arg2 = param1;
|
||||
stMessageBuf.arg3 = param2;
|
||||
|
|
|
@ -881,14 +881,14 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
|
|||
}
|
||||
#if HUNTING_CAMERA_MCU == ENABLE
|
||||
|
||||
if((CMD_FORMAT_SD_STA != sf_get_card_statu())){
|
||||
stMessageBuf.arg1 = STRG_CB_MOUNT_FINISH;
|
||||
stMessageBuf.arg2 = result;
|
||||
stMessageBuf.arg3 = FST_STA_OK;
|
||||
stMessageBuf.cmdId = CMD_SD;
|
||||
sf_com_message_send_to_app(&stMessageBuf);
|
||||
}
|
||||
#endif
|
||||
if((CMD_FORMAT_SD_STA != sf_get_card_statu())){
|
||||
stMessageBuf.arg1 = STRG_CB_MOUNT_FINISH;
|
||||
stMessageBuf.arg2 = result;
|
||||
stMessageBuf.arg3 = FST_STA_OK;
|
||||
stMessageBuf.cmdId = CMD_SD;
|
||||
sf_com_message_send_to_app(&stMessageBuf);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
#if defined(__FREERTOS)
|
||||
if (p_shm && p_shm->boot.LdCtrl2 & LDCF_UPDATE_FW) {
|
||||
|
@ -961,6 +961,15 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
|
|||
System_SetState(SYS_STATE_FS, FS_DISK_ERROR);
|
||||
break;
|
||||
}
|
||||
|
||||
#if HUNTING_CAMERA_MCU == ENABLE
|
||||
|
||||
if((FS_DISK_ERROR == System_GetState(SYS_STATE_FS))){
|
||||
stMessageBuf.arg1 = CMD_SD_STRG_CB_UNMOUNT_FINISH;
|
||||
stMessageBuf.cmdId = CMD_SD;
|
||||
sf_com_message_send_to_app(&stMessageBuf);
|
||||
}
|
||||
#endif
|
||||
#if (POWERON_FAST_BOOT == ENABLE)
|
||||
INIT_SETFLAG(FLGINIT_STRGATH);
|
||||
#endif
|
||||
|
|
|
@ -1623,8 +1623,9 @@ INT32 sf_net_wifi_init(UINT32 mode, UINT32 security)
|
|||
|
||||
DBG_IND("set wifi %d %d \r\n", mode, security);
|
||||
system("modprobe 8189fs");
|
||||
sleep(2);
|
||||
//usleep(2);
|
||||
system("ifconfig lo 127.0.0.1");
|
||||
DBG_IND("ifconfig\r\n");
|
||||
|
||||
memset(pwifi, 0, sizeof(nvt_wifi_settings));
|
||||
|
||||
|
|
|
@ -985,7 +985,7 @@ void UiDateImprint_AttachString(DS_STAMP_INFOR *stampInfo, HD_VIDEO_FRAME* Img,
|
|||
param_img.dst_region.y = param_img.dst_img.dim.h - param_img.dst_region.h;
|
||||
|
||||
vf_gfx_scale(¶m_img, 1);
|
||||
|
||||
hd_common_mem_free(pa, va);
|
||||
*x_curr_ofs = param_img.dst_region.x;
|
||||
}
|
||||
|
||||
|
@ -1433,7 +1433,7 @@ ER UiDateImprint_CopyData(DS_STAMP_INFOR *stampInfo,HD_VIDEO_FRAME* Img, UINT32
|
|||
//sprintf((char *)puiPara->Latitude, "3458.3100N");
|
||||
//sprintf((char *)puiPara->Longitude, "12294.4200E");
|
||||
sf_get_gps_info_str(customString, 1);
|
||||
if(0/*puiPara->GpsSwitch == SF_ON*/)
|
||||
if(0/*(puiPara->GpsSwitch == SF_ON) && (customString[0] != '\0')*/)
|
||||
{
|
||||
if(customString[0] != '\0')
|
||||
{
|
||||
|
|
|
@ -99,7 +99,7 @@ SINT32 open_gps(const SINT32 utc);
|
|||
int get_gps_location(void);
|
||||
void keep_get_gps_location(const SF_GPS_PARAM param);
|
||||
void keep_seraching_gps_location(const int timeout_ms);
|
||||
void app_RegisterNet_stop();
|
||||
void app_RegisterNet_stop(void);
|
||||
int sf_check_sd(void);
|
||||
void sf_save_camera_gps_info(void);
|
||||
|
||||
|
|
|
@ -1617,7 +1617,7 @@ SINT32 sf_check_message(void)
|
|||
SINT32 ttyRet = 0;
|
||||
char strtmp[20] = {0};
|
||||
UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
|
||||
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 = 140, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara};
|
||||
|
||||
printf("%s:%d s\n", __FUNCTION__, __LINE__);
|
||||
|
||||
|
@ -1641,7 +1641,8 @@ SINT32 sf_check_message(void)
|
|||
strcpy((char *)gsmPara, "AT+QCFG=\"sms/listmsgmap\",\"REC UNREAD\"\r");
|
||||
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara));
|
||||
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
|
||||
|
||||
ttyData.cmp = "+QCFG:";
|
||||
ttyData.len = 140;
|
||||
while(sf_app_while_flag())
|
||||
{
|
||||
time++;
|
||||
|
@ -1683,7 +1684,7 @@ SINT32 sf_check_message(void)
|
|||
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara));
|
||||
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
|
||||
ttyData.cmp = "+QCFG:";
|
||||
ttyData.len = strlen(gsmPara) + 2;
|
||||
ttyData.len = 140;
|
||||
continue;
|
||||
}
|
||||
else
|
||||
|
@ -1708,7 +1709,7 @@ SINT32 sf_check_message(void)
|
|||
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
|
||||
sf_sleep_ms(500);
|
||||
ttyData.cmp = "+QCFG:";
|
||||
ttyData.len = strlen(gsmPara) + 2;
|
||||
ttyData.len = 140;
|
||||
}
|
||||
|
||||
break;
|
||||
|
@ -1720,7 +1721,11 @@ SINT32 sf_check_message(void)
|
|||
char *temp = NULL;
|
||||
char *delim;//
|
||||
delim = "\"";
|
||||
temp = strtok((char *)gsmPara, delim);
|
||||
char *result = strstr((const char *)gsmPara, "+QCFG:");
|
||||
if(result != NULL)
|
||||
{
|
||||
temp = strtok(strstr(result, strtmp), delim);
|
||||
}
|
||||
int mm = 0;
|
||||
char strtmp[12][70] = { { 0 } };
|
||||
|
||||
|
@ -1733,7 +1738,7 @@ SINT32 sf_check_message(void)
|
|||
temp = strtok(0, delim);
|
||||
}
|
||||
|
||||
temp = strtmp[9];
|
||||
temp = strtmp[4];
|
||||
printf("temp:%s \n", temp);
|
||||
mm = 0;
|
||||
pSifarPara->SmsFlag = 0;
|
||||
|
@ -1741,7 +1746,7 @@ SINT32 sf_check_message(void)
|
|||
{
|
||||
if(*temp != '0')
|
||||
{
|
||||
printf("strtmp[9][%d]:%d\n", mm, strtmp[9][mm]);
|
||||
printf("strtmp[4][%d]:%d\n", mm, strtmp[4][mm]);
|
||||
printf("temp:%s\n", temp);
|
||||
pSifarPara->SmsFlag = 1;
|
||||
time = 0;
|
||||
|
@ -1823,7 +1828,7 @@ SINT32 sf_check_message(void)
|
|||
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara));
|
||||
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
|
||||
ttyData.cmp = "+QCFG:";
|
||||
ttyData.len = strlen(gsmPara) + 2;
|
||||
ttyData.len = 140;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1842,7 +1847,7 @@ SINT32 sf_check_message(void)
|
|||
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
|
||||
sf_sleep_ms(500);
|
||||
ttyData.cmp = "+QCFG:";
|
||||
ttyData.len = strlen(gsmPara) + 2;
|
||||
ttyData.len = 140;
|
||||
}
|
||||
|
||||
break;
|
||||
|
@ -2152,7 +2157,7 @@ SINT32 sf_simcom_check_need_send(void)
|
|||
}
|
||||
|
||||
/*************************************************
|
||||
Function: sf_check_message
|
||||
Function: sf_power_off_check_sms
|
||||
Description: Check unread and read messages.
|
||||
Input: N/A
|
||||
Output: N/A
|
||||
|
|
|
@ -1324,15 +1324,17 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
|
|||
SF_CHAR eid[40] = {0};
|
||||
SF_CHAR sim4gApn[40] = {0};
|
||||
UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get();
|
||||
|
||||
SF_STARTUP_TYPE_E startup = sf_poweron_type_get();
|
||||
sf_log_Level_set(SF_LOG_LEVEL_DEBUG);
|
||||
|
||||
if (sf_usb_IsInsert())
|
||||
return SF_SUCCESS;
|
||||
if (sf_usb_IsInsert() ||
|
||||
((0 == sf_in_card_exist()) && (SF_MCU_STARTUP_ONKEY != startup))) {
|
||||
return SF_SUCCESS;
|
||||
}
|
||||
|
||||
sf_4G_status_set(SF_4G_SEARCHING);
|
||||
|
||||
switch (sf_poweron_type_get()) {
|
||||
switch (startup) {
|
||||
case SF_MCU_STARTUP_OFF:
|
||||
break;
|
||||
|
||||
|
@ -1437,30 +1439,32 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
|
|||
serach_gps_onkey_start();
|
||||
}
|
||||
|
||||
if(sf_get_signal_ready()){
|
||||
if(SUCCESS != sf_connect_ftps_server()){
|
||||
printf("[%s:%d]open ftps fail, reconnect\n", __FUNCTION__, __LINE__);
|
||||
if(SUCCESS != sf_connect_ftps_server()){
|
||||
printf("[%s:%d]re open ftps fail, reconnect\n", __FUNCTION__, __LINE__);
|
||||
if (sf_get_signal_ready()) {
|
||||
if (SUCCESS != sf_connect_ftps_server()) {
|
||||
printf("[%s:%d]open ftps fail, reconnect\n", __FUNCTION__,
|
||||
__LINE__);
|
||||
if (SUCCESS != sf_connect_ftps_server()) {
|
||||
printf("[%s:%d]re open ftps fail, reconnect\n", __FUNCTION__,
|
||||
__LINE__);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
|
||||
|
||||
break;
|
||||
break;
|
||||
|
||||
case SF_MCU_STARTUP_NORMAL:
|
||||
break;
|
||||
case SF_MCU_STARTUP_NORMAL:
|
||||
break;
|
||||
|
||||
case SF_MCU_STARTUP_RING:
|
||||
case SF_MCU_STARTUP_RING:
|
||||
|
||||
s32ret = sf_4G_sim_IsInsert();
|
||||
if (!s32ret) {
|
||||
SF_APPCOMM_CHECK_RETURN(SF_FAILURE, SF_APP_ERROR_REQUEST);
|
||||
}
|
||||
s32ret = sf_4G_sim_IsInsert();
|
||||
if (!s32ret) {
|
||||
SF_APPCOMM_CHECK_RETURN(SF_FAILURE, SF_APP_ERROR_REQUEST);
|
||||
}
|
||||
|
||||
s32ret = app_ttyusb_IsOpen();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
s32ret = app_ttyusb_IsOpen();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
|
||||
|
||||
#if SF_QLOG_ENABLE
|
||||
|
@ -1472,31 +1476,29 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
|
|||
s32ret = sf_4G_sim_init(pfnParam);
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
|
||||
s32ret = sf_4G_register_net_auto(pfnParam);
|
||||
//sf_share_mem_customer_down(1);
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
sf_4G_usb_net_apn_cfg(pfnParam);
|
||||
set_at_parament();
|
||||
sf_USB_net_init();
|
||||
s32ret = sf_4G_register_net_auto(pfnParam);
|
||||
// sf_share_mem_customer_down(1);
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
sf_4G_usb_net_apn_cfg(pfnParam);
|
||||
set_at_parament();
|
||||
sf_USB_net_init();
|
||||
|
||||
s32ret = sf_read_message();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
if (sf_get_pic()) {
|
||||
s32ret = sf_app_to_cardv_capture();
|
||||
}
|
||||
else if(sf_get_send_hd()){
|
||||
s32ret = sf_app_to_cardv_hd_ture();
|
||||
}
|
||||
else if(sf_get_send_video()){
|
||||
s32ret = sf_video_ftp_send();
|
||||
}
|
||||
break;
|
||||
s32ret = sf_read_message();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
if (sf_get_pic()) {
|
||||
s32ret = sf_app_to_cardv_capture();
|
||||
} else if (sf_get_send_hd()) {
|
||||
s32ret = sf_app_to_cardv_hd_ture();
|
||||
} else if (sf_get_send_video()) {
|
||||
s32ret = sf_video_ftp_send();
|
||||
}
|
||||
break;
|
||||
|
||||
case SF_MCU_STARTUP_TIMELAPSE:
|
||||
case SF_MCU_STARTUP_PIR:
|
||||
if (pCustomerParam->SendType != 0) {
|
||||
break;
|
||||
}
|
||||
case SF_MCU_STARTUP_TIMELAPSE:
|
||||
case SF_MCU_STARTUP_PIR:
|
||||
if (pCustomerParam->SendType != 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
case SF_MCU_STARTUP_BATCH_SEND:
|
||||
|
||||
|
@ -1521,15 +1523,15 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
|
|||
s32ret = sf_4G_sim_init(pfnParam);
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
|
||||
s32ret = sf_4G_register_net_auto(pfnParam);
|
||||
if (s32ret != SF_SUCCESS) {
|
||||
sf_set_signal_ready_flag(TRUE);
|
||||
}
|
||||
//sf_share_mem_customer_down(1);
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
sf_4G_usb_net_apn_cfg(pfnParam);
|
||||
set_at_parament();
|
||||
sf_USB_net_init();
|
||||
s32ret = sf_4G_register_net_auto(pfnParam);
|
||||
if (s32ret != SF_SUCCESS) {
|
||||
sf_set_signal_ready_flag(TRUE);
|
||||
}
|
||||
// sf_share_mem_customer_down(1);
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
sf_4G_usb_net_apn_cfg(pfnParam);
|
||||
set_at_parament();
|
||||
sf_USB_net_init();
|
||||
|
||||
|
||||
s32ret = sf_file_send_auto();
|
||||
|
@ -1555,46 +1557,49 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
|
|||
s32ret = sf_4G_sim_init(pfnParam);
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
|
||||
s32ret = sf_4G_register_net_manual(pfnParam);
|
||||
if (s32ret != SF_SUCCESS) {
|
||||
sf_set_signal_ready_flag(TRUE);
|
||||
}
|
||||
s32ret = sf_4G_register_net_manual(pfnParam);
|
||||
if (s32ret != SF_SUCCESS) {
|
||||
sf_set_signal_ready_flag(TRUE);
|
||||
}
|
||||
|
||||
if (1 == pCustomerParam->NeedTimeSyncStartUp) {
|
||||
printf("[%s:%d]8 between A and B,no reg net again,no reset time sync.\n",
|
||||
__FUNCTION__, __LINE__);
|
||||
sf_set_dr_reset_time_sys_flag(1);
|
||||
}
|
||||
if (1 == pCustomerParam->NeedTimeSyncStartUp) {
|
||||
printf("[%s:%d]8 between A and B,no reg net again,no reset time "
|
||||
"sync.\n",
|
||||
__FUNCTION__, __LINE__);
|
||||
sf_set_dr_reset_time_sys_flag(1);
|
||||
}
|
||||
|
||||
if (0 != sf_get_cq_signal()) {
|
||||
pCustomerParam->NeedTimeSyncStartUp = 1;
|
||||
}
|
||||
if (pCustomerParam->DailyReportSwitch) {
|
||||
pCustomerParam->GpsSendFlag = 1; // indicate need send dp file in b power on.
|
||||
}
|
||||
if (0 != sf_get_cq_signal()) {
|
||||
pCustomerParam->NeedTimeSyncStartUp = 1;
|
||||
}
|
||||
if (pCustomerParam->DailyReportSwitch) {
|
||||
pCustomerParam->GpsSendFlag =
|
||||
1; // indicate need send dp file in b power on.
|
||||
}
|
||||
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
sf_4G_usb_net_apn_cfg(pfnParam);
|
||||
set_at_parament();
|
||||
sf_USB_net_init();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
sf_4G_usb_net_apn_cfg(pfnParam);
|
||||
set_at_parament();
|
||||
sf_USB_net_init();
|
||||
|
||||
s32ret = sf_get_utc();
|
||||
if ((s32ret == SF_SIM_ERROR_UTC) && (SF_ON != pCustomerParam->GpsSwitch)) {
|
||||
SF_PARA_TIME_S current_time = { 0, 0, 0, 0, 0, 0};
|
||||
s32ret = sf_get_ntp(s32ret, ¤t_time);
|
||||
}
|
||||
if ((SF_ON == pCustomerParam->GpsSwitch)) {
|
||||
s32ret = open_gps(s32ret);
|
||||
}
|
||||
s32ret = sf_get_utc();
|
||||
if ((s32ret == SF_SIM_ERROR_UTC) &&
|
||||
(SF_ON != pCustomerParam->GpsSwitch)) {
|
||||
SF_PARA_TIME_S current_time = {0, 0, 0, 0, 0, 0};
|
||||
s32ret = sf_get_ntp(s32ret, ¤t_time);
|
||||
}
|
||||
if ((SF_ON == pCustomerParam->GpsSwitch)) {
|
||||
s32ret = open_gps(s32ret);
|
||||
}
|
||||
|
||||
//sf_dailyReport_set();
|
||||
//sf_share_mem_customer_down(1);
|
||||
// sf_dailyReport_set();
|
||||
// sf_share_mem_customer_down(1);
|
||||
|
||||
break;
|
||||
case SF_MCU_STARTUP_USB:
|
||||
break;
|
||||
case SF_MCU_STARTUP_USB:
|
||||
|
||||
break;
|
||||
case SF_MCU_STARTUP_RESET:
|
||||
break;
|
||||
case SF_MCU_STARTUP_RESET:
|
||||
|
||||
s32ret = app_ttyusb_IsOpen();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
|
@ -1765,31 +1770,28 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
|
|||
gps_close();
|
||||
}
|
||||
|
||||
s32ret = sf_read_message();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
s32ret = sf_read_message();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
|
||||
pCustomerParam->NetWorkNeedSearch = 0;
|
||||
pCustomerParam->NeedTimeSyncStartUp = 0;
|
||||
pCustomerParam->NetWorkNeedSearch = 0;
|
||||
pCustomerParam->NeedTimeSyncStartUp = 0;
|
||||
|
||||
s32ret = sf_file_send_auto();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
s32ret = sf_file_send_auto();
|
||||
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
|
||||
|
||||
if (sf_get_pic()) {
|
||||
s32ret = sf_app_to_cardv_capture();
|
||||
} else if (sf_get_send_hd()) {
|
||||
s32ret = sf_app_to_cardv_hd_ture();
|
||||
} else if (sf_get_send_video()) {
|
||||
s32ret = sf_video_ftp_send();
|
||||
}
|
||||
// sf_share_mem_customer_down(1);
|
||||
break;
|
||||
|
||||
if (sf_get_pic()) {
|
||||
s32ret = sf_app_to_cardv_capture();
|
||||
default:
|
||||
break;
|
||||
}
|
||||
else if(sf_get_send_hd()){
|
||||
s32ret = sf_app_to_cardv_hd_ture();
|
||||
}
|
||||
else if(sf_get_send_video()){
|
||||
s32ret = sf_video_ftp_send();
|
||||
}
|
||||
//sf_share_mem_customer_down(1);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return s32ret;
|
||||
|
||||
|
@ -1840,7 +1842,7 @@ SINT32 app_RegisterNet_start(void) {
|
|||
return SF_SUCCESS;
|
||||
}
|
||||
|
||||
void app_RegisterNet_stop()
|
||||
void app_RegisterNet_stop(void)
|
||||
{
|
||||
printf("RegisterNetTskParam.IsRun:%d\n", RegisterNetTskParam.IsRun);
|
||||
if(RegisterNetTskParam.IsRun)
|
||||
|
@ -2134,7 +2136,8 @@ int sf_check_sd(void)
|
|||
ret = sf_sd_status_get();
|
||||
if (SF_SD_OK == ret) {
|
||||
ret = SF_SUCCESS;
|
||||
MLOGI("usb net ip up\r\n");
|
||||
MLOGI("SD\r\n");
|
||||
sf_statistics_param_load(sf_statistics_param_get());
|
||||
break;
|
||||
} else {
|
||||
sleep(1);
|
||||
|
|
|
@ -897,6 +897,10 @@ void sf_power_off(void)
|
|||
SF_MESSAGE_BUF_S stMessageBuf = {0};
|
||||
UINT8 PowerOnMode = sf_poweron_type_get();
|
||||
printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
|
||||
if(SF_FAILURE == sf_check_sd())
|
||||
{
|
||||
MLOGE("ERROR sf_check_sd\n");
|
||||
}
|
||||
//UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
|
||||
SF_PDT_PARAM_STATISTICS_S *psfPara = sf_statistics_param_get();
|
||||
|
||||
|
|
|
@ -104,7 +104,10 @@ UINT32 sf_battery_voltage_convert(UINT32 resistanceGnd, UINT32 resistanceVin, UI
|
|||
|
||||
//volt = 27 * adcVal * (resistanceGnd + resistanceVin) / resistanceGnd / 511;
|
||||
//volt = 27 * adcVal * (resistanceGnd + resistanceVin) / resistanceGnd / 2696;
|
||||
volt = (27 * adcVal + 3097) / 531;
|
||||
if(adcVal)
|
||||
{
|
||||
volt = (27 * adcVal + 554) / 539;
|
||||
}
|
||||
return volt;
|
||||
}
|
||||
|
||||
|
@ -126,7 +129,10 @@ UINT32 sf_aa_battery_voltage_convert(UINT32 resistanceGnd, UINT32 resistanceVin,
|
|||
*/
|
||||
|
||||
//volt = 27 * adcVal * (resistanceGnd + resistanceVin) / resistanceGnd / 511;
|
||||
volt = (27 * adcVal + 554) / 539;
|
||||
if(adcVal)
|
||||
{
|
||||
volt = (27 * adcVal + 3097) / 531;
|
||||
}
|
||||
return volt;
|
||||
}
|
||||
|
||||
|
@ -136,7 +142,10 @@ UINT32 sf_battery_convert_to_adc(UINT32 resistanceGnd, UINT32 resistanceVin, UIN
|
|||
|
||||
//adcVal = volt * resistanceGnd * 511 / 27 / (resistanceGnd + resistanceVin);
|
||||
//adcVal = volt * resistanceGnd * 2696 / 27 / (resistanceGnd + resistanceVin);
|
||||
adcVal = (volt * 531 - 3097) / 27;
|
||||
if(volt)
|
||||
{
|
||||
adcVal = (volt * 539 - 554) / 27;
|
||||
}
|
||||
return adcVal;
|
||||
}
|
||||
|
||||
|
@ -146,7 +155,10 @@ UINT32 sf_aa_battery_convert_to_adc(UINT32 resistanceGnd, UINT32 resistanceVin,
|
|||
|
||||
//adcVal = volt * resistanceGnd * 511 / 27 / (resistanceGnd + resistanceVin);
|
||||
//adcVal = volt * resistanceGnd * 2696 / 27 / (resistanceGnd + resistanceVin);
|
||||
adcVal = (volt * 539 - 554) / 27;
|
||||
if(volt)
|
||||
{
|
||||
adcVal = (volt * 531 - 3097) / 27;
|
||||
}
|
||||
return adcVal;
|
||||
}
|
||||
UINT32 sf_get_max_value(UINT32 *_ValueList)
|
||||
|
|
|
@ -689,13 +689,15 @@ void appCreatThumbList(S8 *fileName)//start file name example: 10010032.JPG
|
|||
|
||||
MLOGI("fileName:%s\n",fileName);
|
||||
|
||||
if(fileName != NULL && fileName[0] != '\0' && fileName[0] != '0')
|
||||
if(fileName != NULL && fileName[0] != '\0' && fileName[0] != '0' && (strstr((char *)fileName, SF_DCF_EXT_MOV) || strstr((char *)fileName, SF_DCF_EXT_PHOTO)))
|
||||
{
|
||||
MLOGI("fileName2:%s\n",fileName);
|
||||
strncpy((char *)startDirKey, (char *)fileName, 3);
|
||||
strncpy((char *)startFileKey, (char *)fileName+4, 4);
|
||||
}
|
||||
else
|
||||
{
|
||||
MLOGI("fileName3:%s\n",fileName);
|
||||
startDirKey[0] = '\0';
|
||||
startFileKey[0] = '\0';
|
||||
//strncpy((char *)startDirKey, "100", 3);
|
||||
|
@ -964,7 +966,7 @@ void sf_app_Get_Camera_Para(MSG_DEV_Param_Get_Rsp_T *CamPara)
|
|||
|
||||
CamPara->batType = puiPara->BatteryType;
|
||||
|
||||
CamPara->cameraID = puiPara->CamNameSwitch == 0 ? 1:0;
|
||||
CamPara->cameraID = puiPara->CamNameSwitch == SF_CAMID_OFF ? 0:1;
|
||||
strcpy((char *)CamPara->cameraIDstr, (char *)puiPara->CamNameStr);
|
||||
|
||||
CamPara->dateTimeAuto = puiPara->DateAuto;
|
||||
|
@ -1210,6 +1212,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
|
|||
strcpy((char *)fileName, (char *)pMsgStruct->msgBuf.getThumbList.fileName);
|
||||
MLOGI("[WIFI_GET_FILE_THUMBLIST],fileName:%s\n",fileName);
|
||||
appCreatThumbList(fileName);
|
||||
MLOGI("[WIFI_GET_FILE_THUMBLIST],fileName:%s\n",fileName);
|
||||
|
||||
memset((void *)&msgParse, 0, sizeof(msgParse));
|
||||
msgParse.magicNum = htons(MSG_PRE_FIX);
|
||||
|
@ -1652,7 +1655,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
|
|||
|
||||
case WIFI_SET_CAMERA_CameraID: //O
|
||||
MLOGI("[WIFI_SET_CAMERA_CameraID],cameraID:%d\n",pMsgStruct->msgBuf.setCameraID.cameraID);
|
||||
puiPara->CamNameSwitch = pMsgStruct->msgBuf.setCameraID.cameraID ? 0 : 1;
|
||||
puiPara->CamNameSwitch = pMsgStruct->msgBuf.setCameraID.cameraID == 0 ? SF_CAMID_OFF : SF_CAMID_ON;
|
||||
strncpy(puiPara->CamNameStr, (char *)pMsgStruct->msgBuf.setCameraID.cameraIDstr, 4); //Use SF_STRNCPY to avoid that APP has not send '\0'.
|
||||
sf_camera_name_check(puiPara->CamNameStr);
|
||||
puiPara->CamNameStr[4] = '\0';
|
||||
|
|
|
@ -151,6 +151,7 @@ UINT32 DrvGPIO_GetPhotoMovieModeFromMonitor(void)
|
|||
if(gpio_getIntStatus(GPIO_INT_USBPLUGIN) || FALSE == (gpio_getPin(GPIO_CARD_DETECT) == 0 ? TRUE : FALSE))
|
||||
{
|
||||
g_uiBootMode = DX_HUNTING_MODE_OTHER;
|
||||
Save_MenuInfo();
|
||||
return g_uiBootMode;
|
||||
}
|
||||
vos_perf_mark(&t1);
|
||||
|
@ -176,6 +177,7 @@ UINT32 DrvGPIO_GetPhotoMovieModeFromMonitor(void)
|
|||
case PWR_ON_TIME_SYNC://B
|
||||
case PWR_ON_TIME_SEND:
|
||||
#endif
|
||||
Save_MenuInfo();
|
||||
g_uiBootMode = DX_HUNTING_MODE_OTHER;
|
||||
break;
|
||||
|
||||
|
|
|
@ -945,9 +945,9 @@
|
|||
////////////////////////sf st/////////////////////////////////////
|
||||
#define HUNTING_MCU_I2C DISABLE
|
||||
#define HUNTING_MCU_UART ENABLE
|
||||
#define HUNTING_IR_LED_940 DISABLE
|
||||
#define HUNTING_IR_LED_940 ENABLE
|
||||
#define SF_EXIF_MN_BUF_SIZE 256
|
||||
#define SF_BASE_VERSION "7MD4RCwD6TB"
|
||||
#define SF_BASE_VERSION "7MD4RCwD9T1"
|
||||
#define HW_S530 1
|
||||
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
|
||||
#define DCF_FILE_NAME "SYFW" /* SYFW0001.JPG */
|
||||
|
|
|
@ -432,7 +432,7 @@ void PhotoFastCapDateImprint_InitBuff(void)
|
|||
// else{
|
||||
// size = stamp_img.buff_size.output_buffer_size;
|
||||
// }
|
||||
stamp_text.buff_size.output_buffer_size = stamp_text.buff_size.output_buffer_size/4*5;
|
||||
stamp_text.buff_size.output_buffer_size = stamp_text.buff_size.output_buffer_size/4*5; //add alloc buff.
|
||||
size = stamp_text.buff_size.output_buffer_size;
|
||||
|
||||
ret = hd_common_mem_alloc("stamp_pri", &pa, (void **)&va, size, ddr_id);
|
||||
|
@ -781,17 +781,21 @@ INT32 PhotoFastCapDateImprint_GenYuvData(HD_VIDEO_FRAME *pDstImg)
|
|||
|
||||
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||
|
||||
if(puiPara->StampSwitch == 0)
|
||||
{
|
||||
return E_OK;
|
||||
}
|
||||
/* select font by image width */
|
||||
|
||||
#if PHOTO_STAMP_ISP_STATUS == DISABLE
|
||||
UINT32 ScaleFactor; /* not used , for backward capability*/
|
||||
PhotoFast_SelStampFont(pDstImg->dim.w, (char**)&(stamp_text.draw_cfg.string.font), &ScaleFactor);
|
||||
|
||||
stamp_text.draw_cfg.string.text = PhotoFast_InitStrBuf();
|
||||
#else
|
||||
stamp_text.draw_cfg.string.font = (lv_font_t *) lv_plugin_get_font(FONT)->font;
|
||||
#endif
|
||||
|
||||
stamp_text.draw_cfg.string.text = PhotoFast_InitStrBuf();
|
||||
|
||||
lv_user_font_conv_calc_buffer_size(&stamp_text.draw_cfg, &stamp_text.buff_size);
|
||||
lv_user_font_conv(&stamp_text.draw_cfg, &stamp_text.mem_cfg);
|
||||
|
||||
|
@ -857,7 +861,7 @@ INT32 PhotoFastCapDateImprint_GenYuvData(HD_VIDEO_FRAME *pDstImg)
|
|||
//sprintf((char *)puiPara->Latitude, "3458.3100N");
|
||||
//sprintf((char *)puiPara->Longitude, "12294.4200E");
|
||||
sf_get_gps_info_str(customString, 1);
|
||||
if(0/*puiPara->GpsSwitch == SF_ON*/)
|
||||
if(0/*(puiPara->GpsSwitch == SF_ON) && (customString[0] != '\0')*/)
|
||||
{
|
||||
if(customString[0] != '\0')
|
||||
{
|
||||
|
@ -908,12 +912,12 @@ INT32 PhotoFastCapDateImprint_GenYuvData2(HD_VIDEO_FRAME *pDstImg)
|
|||
#if PHOTO_STAMP_ISP_STATUS == DISABLE
|
||||
UINT32 ScaleFactor; /* not used , for backward capability*/
|
||||
PhotoFast_SelStampFont(pDstImg->dim.w, (char**)&(stamp_text.draw_cfg.string.font), &ScaleFactor);
|
||||
|
||||
stamp_text.draw_cfg.string.text = PhotoFast_InitStrBuf();
|
||||
#else
|
||||
stamp_text.draw_cfg.string.font = (lv_font_t *) lv_plugin_get_font(FONT)->font;
|
||||
#endif
|
||||
|
||||
stamp_text.draw_cfg.string.text = PhotoFast_InitStrBuf();
|
||||
|
||||
lv_user_font_conv_calc_buffer_size(&stamp_text.draw_cfg, &stamp_text.buff_size);
|
||||
lv_user_font_conv(&stamp_text.draw_cfg, &stamp_text.mem_cfg);
|
||||
|
||||
|
|
|
@ -1767,5 +1767,10 @@ void sf_power_on_para_check_init(void)
|
|||
#if SF_HW_TEST != ENABLE
|
||||
sf_set_pir_sensitivity(puiPara->PirSensitivity);
|
||||
#endif
|
||||
|
||||
/*if((PowerOnMode != PWR_ON_TIME_SEND) && (PowerOnMode != PWR_ON_TIMELAPSE) && (PowerOnMode != PWR_ON_PIR))
|
||||
{
|
||||
Save_MenuInfo();
|
||||
}*/
|
||||
#endif
|
||||
}
|
|
@ -108,7 +108,10 @@ UINT32 sf_battery_voltage_convert(UINT32 resistanceGnd, UINT32 resistanceVin, UI
|
|||
|
||||
//volt = 27 * adcVal * (resistanceGnd + resistanceVin) / resistanceGnd / 511;
|
||||
//volt = 27 * adcVal * (resistanceGnd + resistanceVin) / resistanceGnd / 2696;
|
||||
volt = (27 * adcVal + 3097) / 531;
|
||||
if(adcVal)
|
||||
{
|
||||
volt = (27 * adcVal + 554) / 539;
|
||||
}
|
||||
return volt;
|
||||
}
|
||||
|
||||
|
@ -130,7 +133,10 @@ UINT32 sf_aa_battery_voltage_convert(UINT32 resistanceGnd, UINT32 resistanceVin,
|
|||
*/
|
||||
|
||||
//volt = 27 * adcVal * (resistanceGnd + resistanceVin) / resistanceGnd / 511;
|
||||
volt = (27 * adcVal + 554) / 539;
|
||||
if(adcVal)
|
||||
{
|
||||
volt = (27 * adcVal + 3097) / 531;
|
||||
}
|
||||
return volt;
|
||||
}
|
||||
|
||||
|
@ -140,16 +146,23 @@ UINT32 sf_battery_convert_to_adc(UINT32 resistanceGnd, UINT32 resistanceVin, UIN
|
|||
|
||||
//adcVal = volt * resistanceGnd * 511 / 27 / (resistanceGnd + resistanceVin);
|
||||
//adcVal = volt * resistanceGnd * 2696 / 27 / (resistanceGnd + resistanceVin);
|
||||
adcVal = (volt * 531 - 3097) / 27;
|
||||
if(volt)
|
||||
{
|
||||
adcVal = (volt * 539 - 554) / 27;
|
||||
}
|
||||
return adcVal;
|
||||
}
|
||||
|
||||
UINT32 sf_aa_battery_convert_to_adc(UINT32 resistanceGnd, UINT32 resistanceVin, UINT32 volt)
|
||||
{
|
||||
UINT32 adcVal = 0;
|
||||
|
||||
//adcVal = volt * resistanceGnd * 511 / 27 / (resistanceGnd + resistanceVin);
|
||||
//adcVal = volt * resistanceGnd * 2696 / 27 / (resistanceGnd + resistanceVin);
|
||||
adcVal = (volt * 539 - 554) / 27;
|
||||
if(volt)
|
||||
{
|
||||
adcVal = (volt * 531 - 3097) / 27;
|
||||
}
|
||||
return adcVal;
|
||||
}
|
||||
UINT32 sf_get_max_value(UINT32 *_ValueList)
|
||||
|
@ -350,7 +363,7 @@ UINT32 sf_battery_adc_value_get_once(void)
|
|||
if(puiPara->BatteryLogSwitch)
|
||||
printf("DC ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,dcVoltageVal,dcVoltageVal/10,dcVoltageVal%10);
|
||||
}
|
||||
if(batAdc <= 0)
|
||||
if(batAdc <= 100)
|
||||
{
|
||||
getDcFlg--;
|
||||
}
|
||||
|
@ -368,7 +381,7 @@ UINT32 sf_battery_adc_value_get_once(void)
|
|||
if(puiPara->BatteryLogSwitch)
|
||||
printf("Li ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,liPolymerVoltageVal,liPolymerVoltageVal/10,liPolymerVoltageVal%10);
|
||||
}
|
||||
if(batAdc <= 0)
|
||||
if(batAdc <= 100)
|
||||
{
|
||||
getLiBatFlg--;
|
||||
}
|
||||
|
@ -387,7 +400,7 @@ UINT32 sf_battery_adc_value_get_once(void)
|
|||
printf("Bat ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,batVoltageVal,batVoltageVal/10,batVoltageVal%10);
|
||||
|
||||
}
|
||||
if(batAdc <= 0)
|
||||
if(batAdc <= 100)
|
||||
{
|
||||
getBatFlg--;
|
||||
}
|
||||
|
@ -949,7 +962,7 @@ void sf_battery_thread_init(void)
|
|||
|
||||
vos_flag_create(&FLG_ID_SF_BSTTERY, NULL, "FLG_ID_SF_BSTTERY");
|
||||
/*thread creat*/
|
||||
s_handle_batt = vos_task_create(sf_battery_check_thread, NULL, "sf_battery_check_thread", 25, 2048);
|
||||
s_handle_batt = vos_task_create(sf_battery_check_thread, NULL, "sf_battery_check_thread", 18, 2048);
|
||||
vos_task_resume(s_handle_batt);
|
||||
printf("[%s:%d] e\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
|
@ -1658,9 +1671,14 @@ void sf_BatteryInfoSave(char *name, FST_FILE fd)
|
|||
}*/
|
||||
//printf("fileName:%s\n",SF_BATTERY_TEST_FILE);
|
||||
//fd = FileSys_OpenFile(SF_BATTERY_TEST_FILE, FST_OPEN_ALWAYS | FST_OPEN_WRITE);
|
||||
|
||||
LibatAdc = sf_battery_convert_to_adc(24, 100, LiPolymerVoltageValTest);
|
||||
batAdc = sf_battery_convert_to_adc(24, 100, BatVoltageValTest);
|
||||
if(LiPolymerVoltageValTest)
|
||||
{
|
||||
LibatAdc = sf_battery_convert_to_adc(24, 100, LiPolymerVoltageValTest);
|
||||
}
|
||||
if(BatVoltageValTest)
|
||||
{
|
||||
batAdc = sf_aa_battery_convert_to_adc(24, 100, BatVoltageValTest);
|
||||
}
|
||||
|
||||
|
||||
sprintf(tmpBuf, "%s BatAdc=%lu BatVal=%lu LiBatAdc=%lu LiBatVal=%lu TemperAdc=%lu\r\n", name, batAdc, BatVoltageValTest, LibatAdc, LiPolymerVoltageValTest, TemperAdc);
|
||||
|
@ -1674,10 +1692,7 @@ void sf_BatteryInfoSave(char *name, FST_FILE fd)
|
|||
close(fd);
|
||||
printf("Add Success st_size:%ld\n", st.st_size);
|
||||
*/
|
||||
ret_fs = FileSys_SeekFile(fd, 0, FST_SEEK_END);
|
||||
if (ret_fs != FST_STA_OK) {
|
||||
printf("%s:%d seek file failed\r\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
|
||||
size = strlen(tmpBuf);
|
||||
printf("%s:%d size:%lu\r\n", __FUNCTION__, __LINE__, size);
|
||||
ret_fs = FileSys_WriteFile(fd, (UINT8*)tmpBuf, &size, 0, NULL);
|
||||
|
|
|
@ -289,7 +289,7 @@ THREAD_RETTYPE sf_led_thread(void *arg)
|
|||
}
|
||||
#endif
|
||||
}
|
||||
vos_util_delay_ms(10);
|
||||
vos_util_delay_ms(2);
|
||||
}
|
||||
|
||||
printf("[%s:%d] e \n", __FUNCTION__, __LINE__);
|
||||
|
|
|
@ -2157,6 +2157,9 @@ void sf_file_thumb_cfg_sava(void)
|
|||
|
||||
//return ;
|
||||
UINT8 fileIndex = 0;
|
||||
INT32 ret_fs = 0;
|
||||
FST_FILE_STATUS FileStat;
|
||||
|
||||
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||
|
||||
if (pThumbFileCfg != NULL) {
|
||||
|
@ -2183,6 +2186,7 @@ void sf_file_thumb_cfg_sava(void)
|
|||
snprintf(sendListName, sizeof(sendListName), "%s", SF_THUMB_SEND_AUTO);
|
||||
if((access(sendListName, F_OK) == 0) && (0 == flag))
|
||||
{
|
||||
printf("%s:%d DeleteFile:%s\r\n", __FUNCTION__, __LINE__, sendListName);
|
||||
if (FileSys_DeleteFile(sendListName) != FST_STA_OK) {
|
||||
DBG_IND("Ignore deleting file.\r\n");
|
||||
}
|
||||
|
@ -2201,17 +2205,26 @@ void sf_file_thumb_cfg_sava(void)
|
|||
else {
|
||||
fd = open(sendListName, O_APPEND | O_WRONLY | O_CREAT);
|
||||
}*/
|
||||
fs = FileSys_OpenFile(sendListName, FST_CREATE_ALWAYS | FST_OPEN_WRITE);
|
||||
fs = FileSys_OpenFile(sendListName, FST_OPEN_ALWAYS | FST_OPEN_WRITE);
|
||||
if(/*fd*/fs)
|
||||
{
|
||||
FileSys_StatFile(fs, &FileStat);
|
||||
printf("%s:%d qFileStat:%llu\n", __FUNCTION__, __LINE__, FileStat.uiFileSize);
|
||||
|
||||
|
||||
ret_fs = FileSys_SeekFile(fs, 0, FST_SEEK_END);
|
||||
if (ret_fs != FST_STA_OK) {
|
||||
printf("%s:%d seek file failed\r\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
for(fileIndex = 0; fileIndex < pThumbFileCfg->filecnt; fileIndex++)
|
||||
{
|
||||
if((0 == fileIndex) || ((1 == puiPara->SendMulti))){
|
||||
sf_add_file_name_to_send_list(pThumbFileCfg->stfileattr[fileIndex].thumbfileName, fs);
|
||||
printf("%s:%d thumbfileSize:%ld thumbfileName:%s thumbfilePath:%s\n", __FUNCTION__, __LINE__,pThumbFileCfg->stfileattr[fileIndex].thumbfileSize,pThumbFileCfg->stfileattr[fileIndex].thumbfileName,pThumbFileCfg->stfileattr[fileIndex].thumbfilePath);
|
||||
FileSys_FlushFile(fs);
|
||||
}
|
||||
}
|
||||
FileSys_FlushFile(fs);
|
||||
|
||||
FileSys_CloseFile(fs);
|
||||
//close(fd);
|
||||
}
|
||||
|
@ -2222,9 +2235,13 @@ void sf_file_thumb_cfg_sava(void)
|
|||
char str1[6] = { 0 };
|
||||
char str2[6] = { 0 };
|
||||
printf("fileName:%s\n",SF_BATTERY_TEST_FILE);
|
||||
fs = FileSys_OpenFile(SF_BATTERY_TEST_FILE, FST_CREATE_ALWAYS | FST_OPEN_WRITE);
|
||||
fs = FileSys_OpenFile(SF_BATTERY_TEST_FILE, FST_OPEN_ALWAYS | FST_OPEN_WRITE);
|
||||
if(fs)
|
||||
{
|
||||
ret_fs = FileSys_SeekFile(fs, 0, FST_SEEK_END);
|
||||
if (ret_fs != FST_STA_OK) {
|
||||
printf("%s:%d seek file failed\r\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
for(fileIndex = 0; fileIndex < pThumbFileCfg->filecnt; fileIndex++)
|
||||
{
|
||||
if((0 == fileIndex) || ((1 == puiPara->SendMulti))){
|
||||
|
@ -2234,9 +2251,10 @@ void sf_file_thumb_cfg_sava(void)
|
|||
snprintf((char *)str2, sizeof(str2), "%s", str1);
|
||||
printf("%s:%d thumbfileName:%s str2:%s\n", __FUNCTION__, __LINE__, pThumbFileCfg->stfileattr[fileIndex].thumbfileName, str2);
|
||||
sf_BatteryInfoSave(str2,fs);
|
||||
FileSys_FlushFile(fs);
|
||||
|
||||
}
|
||||
}
|
||||
FileSys_FlushFile(fs);
|
||||
FileSys_CloseFile(fs);
|
||||
//close(fd);
|
||||
}
|
||||
|
@ -2248,9 +2266,13 @@ void sf_file_thumb_cfg_sava(void)
|
|||
char str4[6] = { 0 };
|
||||
|
||||
printf("fileName:%s\n",SF_HW_TEST_FILE);
|
||||
fs = FileSys_OpenFile(SF_HW_TEST_FILE, FST_CREATE_ALWAYS | FST_OPEN_WRITE);
|
||||
fs = FileSys_OpenFile(SF_HW_TEST_FILE, FST_OPEN_ALWAYS | FST_OPEN_WRITE);
|
||||
if(fs)
|
||||
{
|
||||
ret_fs = FileSys_SeekFile(fs, 0, FST_SEEK_END);
|
||||
if (ret_fs != FST_STA_OK) {
|
||||
printf("%s:%d seek file failed\r\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
for(fileIndex = 0; fileIndex < pThumbFileCfg->filecnt; fileIndex++)
|
||||
{
|
||||
if((0 == fileIndex) || ((1 == puiPara->SendMulti))){
|
||||
|
@ -2260,9 +2282,10 @@ void sf_file_thumb_cfg_sava(void)
|
|||
snprintf((char *)str4, sizeof(str4), "%s", str3);
|
||||
printf("%s:%d thumbfileName:%s str2:%s\n", __FUNCTION__, __LINE__, pThumbFileCfg->stfileattr[fileIndex].thumbfileName, str4);
|
||||
sf_hw_info_save(str4,fs);
|
||||
FileSys_FlushFile(fs);
|
||||
|
||||
}
|
||||
}
|
||||
FileSys_FlushFile(fs);
|
||||
FileSys_CloseFile(fs);
|
||||
//close(fd);
|
||||
}
|
||||
|
@ -2288,6 +2311,7 @@ void sf_add_file_name_to_send_list(char *sendfname, FST_FILE fd)
|
|||
UINT32 size = 0;
|
||||
INT32 ret_fs = 0;
|
||||
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||
FST_FILE_STATUS FileStat;
|
||||
|
||||
if (sendfname == NULL) {
|
||||
printf("%s:%d sendfname err\n", __FUNCTION__, __LINE__);
|
||||
|
@ -2304,18 +2328,21 @@ void sf_add_file_name_to_send_list(char *sendfname, FST_FILE fd)
|
|||
{
|
||||
//fstat(fd, &st);
|
||||
//lseek(fd, 0, SEEK_END);
|
||||
ret_fs = FileSys_SeekFile((FST_FILE)fd, 0, FST_SEEK_END);
|
||||
/*ret_fs = FileSys_SeekFile(fd, 0, FST_SEEK_END);
|
||||
if (ret_fs != FST_STA_OK) {
|
||||
printf("%s:%d seek file failed\r\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
}*/
|
||||
|
||||
snprintf(buff, sizeof(buff), "%d%s\r\n", puiPara->CamMode, sendfname);
|
||||
size = SF_SEND_LIST_ITEM_LENGTH;
|
||||
ret_fs = FileSys_WriteFile((FST_FILE)fd, (UINT8*)buff, &size, 0, NULL);
|
||||
ret_fs = FileSys_WriteFile(fd, (UINT8*)buff, &size, 0, NULL);
|
||||
if (ret_fs != FST_STA_OK) {
|
||||
printf("%s:%d FileSys_WriteFile failed\r\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
|
||||
FileSys_StatFile(fd, &FileStat);
|
||||
printf("%s:%d FileStat:%llu\n", __FUNCTION__, __LINE__, FileStat.uiFileSize);
|
||||
|
||||
//write(fd, buff, SF_SEND_LIST_ITEM_LENGTH);
|
||||
|
||||
//printf("Add Success st_size:%ld\n", st.st_size);
|
||||
|
@ -2473,10 +2500,7 @@ void sf_hw_info_save(char *name,FST_FILE fd)
|
|||
write(fd, tmpBuf, strlen(tmpBuf));
|
||||
close(fd);*/
|
||||
//printf("Add Success st_size:%ld\n", st.st_size);
|
||||
ret_fs = FileSys_SeekFile(fd, 0, FST_SEEK_END);
|
||||
if (ret_fs != FST_STA_OK) {
|
||||
printf("%s:%d seek file failed\r\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
|
||||
size = strlen(tmpBuf);
|
||||
ret_fs = FileSys_WriteFile(fd, (UINT8*)tmpBuf, &size, 0, NULL);
|
||||
if (ret_fs != FST_STA_OK) {
|
||||
|
|
4
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_ae_0.dtsi
vendored
Normal file → Executable file
4
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_ae_0.dtsi
vendored
Normal file → Executable file
|
@ -7,7 +7,7 @@
|
|||
version-info = [00 01 00 01];
|
||||
ae_expect_lum {
|
||||
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 4b 00 00 00 55 00 00 00 55 00 00 00 55 00 00 00 55 00 00 00 57 00 00 00 57 00 00 00 57 00 00 00 57 00 00 00 57 00 00 00 5a 00 00 00 5a 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 44 00 00 00 4b 00 00 00 55 00 00 00 55 00 00 00 55 00 00 00 55 00 00 00 57 00 00 00 57 00 00 00 57 00 00 00 57 00 00 00 57 00 00 00 5a 00 00 00 5a 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 {
|
||||
size = [50 01 00 00];
|
||||
|
@ -23,7 +23,7 @@
|
|||
};
|
||||
ae_curve_gen_movie {
|
||||
size = [10 01 00 00];
|
||||
data = [f4 01 00 00 01 00 00 00 2c 00 00 00 64 00 00 00 00 00 00 00 00 00 00 00 1a 41 00 00 90 01 00 00 00 00 00 00 00 00 00 00 35 82 00 00 90 01 00 00 00 00 00 00 00 00 00 00 35 82 00 00 40 06 00 00 00 00 00 00 00 00 00 00 35 82 00 00 00 32 00 00 00 00 00 00 00 00 00 00 80 38 01 00 00 19 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 00 19 00 00 01 00 00 00 10 00 00 00 01 00 00 00 b8 0b 00 00 b8 0b 00 00 60 09 00 00 e2 04 00 00 d0 07 00 00 d0 07 00 00 dc 05 00 00 dc 05 00 00 b0 04 00 00 b0 04 00 00 00 00 00 00 f6 ec 00 00 00 00 00 00];
|
||||
data = [f4 01 00 00 01 00 00 00 2c 00 00 00 64 00 00 00 00 00 00 00 00 00 00 00 1a 41 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 35 82 00 00 90 01 00 00 00 00 00 00 00 00 00 00 35 82 00 00 40 06 00 00 00 00 00 00 00 00 00 00 35 82 00 00 00 32 00 00 00 00 00 00 00 00 00 00 80 38 01 00 00 19 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 20 4e 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 00 19 00 00 01 00 00 00 10 00 00 00 01 00 00 00 b8 0b 00 00 b8 0b 00 00 60 09 00 00 e2 04 00 00 d0 07 00 00 d0 07 00 00 dc 05 00 00 dc 05 00 00 b0 04 00 00 b0 04 00 00 00 00 00 00 f6 ec 00 00 00 00 00 00];
|
||||
};
|
||||
ae_meter_window {
|
||||
size = [00 01 00 00];
|
||||
|
|
16
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_iq_0.dtsi
vendored
Normal file → Executable file
16
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_iq_0.dtsi
vendored
Normal file → Executable file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user