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

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

Browse Source
This commit is contained in:
xiaojiazhu 2023-11-27 14:14:58 +08:00
commit e9cc1a4461
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c
View File

@ -1455,7 +1455,7 @@ static void MovieExe_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT32
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
DBG_IND(" ===== MOVIE_USER_CB_EVENT_CLOSE_FILE_COMPLETED ===== id:%d \r\n", id); DBG_IND(" ===== MOVIE_USER_CB_EVENT_CLOSE_FILE_COMPLETED ===== id:%d \r\n", id);
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1) && (sf_cardv_get_cq_signal())) if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1) && (FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()))
{ {
if(SUCCESS == sf_share_mem_file_down(0, 0)){ if(SUCCESS == sf_share_mem_file_down(0, 0)){
sf_set_send_statu(TRUE); sf_set_send_statu(TRUE);

2
code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c
View File

@ -6825,7 +6825,7 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data)
snprintf(tmp2, sizeof(tmp2), "W%s%s.JPG", folder, number); /* DCF 8.3 naming rule */ snprintf(tmp2, sizeof(tmp2), "W%s%s.JPG", folder, number); /* DCF 8.3 naming rule */
DBG_DUMP("PHOTO THUMB %s \n %s\n", tmp, tmp2); DBG_DUMP("PHOTO THUMB %s \n %s\n", tmp, tmp2);
sf_file_thumb_cfg_fill(tmp, tmp2, queue_ele_in->jpg_thumb_size, enFileType); sf_file_thumb_cfg_fill(tmp, tmp2, queue_ele_in->jpg_thumb_size, enFileType);
if(sf_cardv_get_cq_signal() && ((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2)))) if((FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()) && ((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2))))
{ {
if(SUCCESS == sf_share_mem_file_down(0, 0)){ if(SUCCESS == sf_share_mem_file_down(0, 0)){
sf_set_send_statu(TRUE); sf_set_send_statu(TRUE);

11
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -1540,7 +1540,16 @@ void SysSetFixedFlagSysInit(void)
void SysResetFlag(void) void SysResetFlag(void)
{ {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
CHAR dateAuto;/*Auto/Manual*/
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if((SF_DATE_MANUAL == puiPara->DateAuto) && (!puiPara->OtaFlag))
{
dateAuto = SF_DATE_MANUAL;
}
else
{
dateAuto = DEFAULT_DATE_AUTO;
}
memset(puiPara, 0, sizeof(UIMenuStoreInfo)); memset(puiPara, 0, sizeof(UIMenuStoreInfo));
#endif #endif
// Set system flag default value here // Set system flag default value here
@ -1747,7 +1756,7 @@ void SysResetFlag(void)
puiPara->TimeSend2.Hour = 0; puiPara->TimeSend2.Hour = 0;
puiPara->TimeSend2.Min = 0; puiPara->TimeSend2.Min = 0;
puiPara->DateAuto = DEFAULT_DATE_AUTO; puiPara->DateAuto = dateAuto;
//NTPZoneS, //NTPZoneS,
//NTPZoneH, //NTPZoneH,
//NTPZoneM, //NTPZoneM,

2
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -1965,7 +1965,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
case WIFI_CONTROL_CAMERA_SHOOT: case WIFI_CONTROL_CAMERA_SHOOT:
MLOGI("[WIFI_SET_CAMERA_SHOOT] shoot:%d\n",pMsgStruct->msgBuf.ctrlShoot.shoot); MLOGI("[WIFI_SET_CAMERA_SHOOT] shoot:%d\n",pMsgStruct->msgBuf.ctrlShoot.shoot);
if((System_GetState(SYS_STATE_CARD) == CARD_INSERTED) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3)) if((FALSE == sf_get_send_statu()) && (System_GetState(SYS_STATE_CARD) == CARD_INSERTED) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3))
{ {
if((puiPara->CamMode != 1) && (pMsgStruct->msgBuf.ctrlShoot.shoot < 3)) if((puiPara->CamMode != 1) && (pMsgStruct->msgBuf.ctrlShoot.shoot < 3))
{ {

11
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -952,7 +952,16 @@ void SysSetFixedFlagSysInit(void)
void SysResetFlag(void) void SysResetFlag(void)
{ {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
CHAR dateAuto;/*Auto/Manual*/
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if((SF_DATE_MANUAL == puiPara->DateAuto) && (!puiPara->OtaFlag))
{
dateAuto = SF_DATE_MANUAL;
}
else
{
dateAuto = DEFAULT_DATE_AUTO;
}
memset(puiPara, 0, sizeof(UIMenuStoreInfo)); memset(puiPara, 0, sizeof(UIMenuStoreInfo));
#endif #endif
// Set system flag default value here // Set system flag default value here
@ -1159,7 +1168,7 @@ void SysResetFlag(void)
puiPara->TimeSend2.Hour = 0; puiPara->TimeSend2.Hour = 0;
puiPara->TimeSend2.Min = 0; puiPara->TimeSend2.Min = 0;
puiPara->DateAuto = DEFAULT_DATE_AUTO; puiPara->DateAuto = dateAuto;
//NTPZoneS, //NTPZoneS,
//NTPZoneH, //NTPZoneH,
//NTPZoneM, //NTPZoneM,