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:
payton 2023-12-07 16:17:37 +08:00
commit df8cb7848d
25 changed files with 147 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -922,7 +922,7 @@
#define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwDB08"
#define SF_BASE_VERSION "7MR5RCwDC01"
#define HW_S530 DISABLE
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */

2
code/application/source/cardv/SrcCode/System/SysStrg_CB.c
View File

@ -126,8 +126,6 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
switch (status) {
case FST_STA_OK:
DBG_MSG("card-%d mount OK\r\n", param1 + 1);
printf("===============ddddddddddddddddddd FST_STA_OK\n");
Ux_PostEvent(NVTEVT_STRG_MOUNT_OK, 2, param1, status);
break;
case FST_STA_DISK_UNFORMAT:
DBG_MSG("^Rcard-%d mount FAIL: Unformat\r\n", param1 + 1);

1
code/application/source/cardv/SrcCode/System/SysStrg_Exe.c
View File

@ -1006,6 +1006,7 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
stMessageBuf.arg3 = FST_STA_OK;
stMessageBuf.cmdId = CMD_SD;
sf_com_message_send_to_app(&stMessageBuf);
Ux_PostEvent(NVTEVT_STRG_MOUNT_OK, 0);
}
#endif
#endif

10
code/application/source/cardv/SrcCode/UIApp/AppDisp_PBView.c
View File

@ -1342,7 +1342,7 @@ void PBView_DrawNoFile(void)
VF_GFX_DRAW_RECT *pDrawRectDst = &DrawRectDst;
UINT32 disp_rotate = GxVideo_GetDeviceCtrl(DOUT1, DISPLAY_DEVCTRL_SWAPXY);
USIZE dst_aspect_ratio = GxVideo_GetDeviceAspect(DOUT1);
ISIZE disp_size = GxVideo_GetDeviceSize(DOUT1);
// ISIZE disp_size = GxVideo_GetDeviceSize(DOUT1);
SIZECONVERT_INFO CovtInfo = {0};
HD_URECT DstDispRect = {0};
@ -1379,8 +1379,10 @@ void PBView_DrawNoFile(void)
DstDispRect.h = p_video_out_syscaps->output_dim.h;
}
///hard code
DstDispRect.w = disp_size.w;
DstDispRect.h = disp_size.h;
// DstDispRect.w = disp_size.w;
// DstDispRect.h = disp_size.h;
DstDispRect.w = ALIGN_CEIL_8(DstDispRect.w);
DstDispRect.h = ALIGN_CEIL_16(DstDispRect.h);
hd_view_buf.blk_size = DstDispRect.w*DstDispRect.h*3/2; //YUV420
PBView_get_hd_common_buf(&hd_view_buf);
@ -1798,7 +1800,7 @@ void PBView_OnDrawCB(PB_VIEW_STATE view_state, HD_VIDEO_FRAME *pHdDecVdoFrame)
PB_GetParam(PBPRMID_PLAYBACK_STATUS, &u32CurrPbStatus);
if ((uiFileNum == 0) || (u32CurrPbStatus != PB_STA_DONE)){
PBView_DrawErrorView();
// PBView_DrawErrorView();
PB_SetPBFlag(PB_SET_FLG_DRAW_END);
return;
}

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c
View File

@ -156,7 +156,7 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = {
{ "USB", 3 }, /* LV_PLUGIN_STRING_ID_STRID_USB */
{ "PC Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_PC_MODE */
{ "MSDC", 4 }, /* LV_PLUGIN_STRING_ID_STRID_MSDC */
{ "PC-ACM", 6 }, /* LV_PLUGIN_STRING_ID_STRID_PCC */
{ "PC-CAM", 6 }, /* LV_PLUGIN_STRING_ID_STRID_PCC */
{ "Pictbridge", 10 }, /* LV_PLUGIN_STRING_ID_STRID_PICTBRIDGE */
{ "Power Charging", 14 }, /* LV_PLUGIN_STRING_ID_STRID_USBCHARGE */
{ "TV Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_TV_MODE */

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang
View File

@ -423,7 +423,7 @@
"USB",
"PC Mode",
"MSDC",
"PC-ACM",
"PC-CAM",
"Pictbridge",
"Power Charging",
"TV Mode",

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c
View File

@ -294,6 +294,7 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID)
case IDM_DELETE_THIS:
strID = LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE;
lv_label_set_text(Confirm_label, "Comfirm Delete");
gBKGEvt = NVTEVT_BKW_DELALL;
break;
case IDM_FORMAT_SD:
strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD;
@ -613,7 +614,8 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
}
/* parent is UIFlowMenuCommonConfirm */
lv_plugin_scr_close(lv_obj_get_parent(obj), NULL);
// lv_plugin_scr_close(lv_obj_get_parent(obj), NULL);
lv_plugin_scr_close(lv_obj_get_parent(obj), gen_nvtmsg_data(NVTRET_CONFIRM, 1, gItemID));
break;
}

15
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
View File

@ -407,15 +407,20 @@ static void network_scan_task_cb(lv_task_t* task)
return;
}
if(sf_cardv_get_sim_insert() == 0)
if (sf_cardv_get_usb_init() == 0)
{
lv_label_set_text(plabel, "\n\nCheck SIM");
Countdown = 3;
return;
lv_label_set_text(plabel, "\nSIM read failed, please restart the camera.");
Countdown = 3;
}
else if(sf_cardv_get_is_esim() == 0)
{
lv_label_set_text(plabel, "\n\nNetwork selection is only available with SIM cards that have multiple networks.");
lv_label_set_text(plabel, "\nNetwork selection is only available with SIM cards that have multiple networks.");
Countdown = 3;
return;
}
else if(sf_cardv_get_sim_insert() == 0)
{
lv_label_set_text(plabel, "\n\nCheck SIM");
Countdown = 3;
return;
}

13
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -584,6 +584,7 @@ void LV_MenuItem_OnOpen(lv_obj_t* obj)
static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu)
{
UIMenuStoreInfo *puiPara = sf_ui_para_get();
TM_PAGE *pPage;
TM_ITEM *pItem;
TM_OPTION *pOption;
@ -738,6 +739,18 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu)
lv_plugin_label_set_text(label_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_STRING_ID_STRID_0);
}
}
else if(pItem->ItemId == IDM_MAX_NUM_DAY)
{
#define SEND_MAX_NUM_UNLIMITED 0
if (SEND_MAX_NUM_UNLIMITED == puiPara->SendMaxNum)
{
lv_plugin_label_set_text(label_option_1_scr_uiflowmenucommonitem, pOption->TextId);
}
else
{
lv_label_set_text_fmt(label_option_1_scr_uiflowmenucommonitem, "%d", puiPara->SendMaxNum);
}
}
else
lv_plugin_label_set_text(label_option_1_scr_uiflowmenucommonitem, pOption->TextId);
lv_plugin_label_update_font(label_option_1_scr_uiflowmenucommonitem, LV_OBJ_PART_MAIN);

5
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -1539,6 +1539,11 @@ void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event)
case LV_USER_EVENT_KEY_RELEASE:
{
uint32_t* key = (uint32_t*)lv_event_get_data();
if (LV_KEY_ENTER != *key)
{
lv_indev_wait_release(lv_indev_get_act());
break;
}
/* handle key event */
UIFlowMovie_Key(obj, *key);

22
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -743,7 +743,7 @@ static void update_wifi(void)
lv_obj_set_hidden(image_wifi_connected_scr_uiflowphoto, false);
lv_plugin_img_set_src(image_wifi_connected_scr_uiflowphoto, res[index]);
SF_BLE_STATUS_E status2 = sf_get_ble_status();
if (SF_WIFI_CON == status || SF_BLE_CON == status2)
if (0 < appSvrResponseSocketGet() || SF_BLE_CON == status2)
{
lv_obj_set_hidden(label_tips2_scr_uiflowphoto, false);
} else {
@ -1149,11 +1149,11 @@ static void UIFlowPhoto_OnExeZoomInStop(lv_obj_t* obj)
static void UIFlowPhoto_OnExeOpenPlayScreen(lv_obj_t* obj)
{
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) {
gPhotoData.State = PHOTO_ST_WARNING_MENU;
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 1000);
return;
}
// if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) {
// gPhotoData.State = PHOTO_ST_WARNING_MENU;
// UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 1000);
// return;
// }
Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_FORCETO_PLAYBACK_MODE, 0);
}
// static void UIFlowPhoto_OnExeZoomOutStart(lv_obj_t* obj)
@ -2015,6 +2015,11 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
case LV_EVENT_KEY:
{
if (PHOTO_ST_CAPTURE == gPhotoData.State)
{
printf("PHOTO_ST_CAPTURE not handl key event.\n");
break;
}
uint32_t* key = (uint32_t*)lv_event_get_data();
UIFlowPhoto_Key_down(obj, *key);
if(*key != LV_KEY_ENTER)
@ -2023,6 +2028,11 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
}
case LV_USER_EVENT_KEY_RELEASE:
{
if (PHOTO_ST_CAPTURE == gPhotoData.State)
{
printf("PHOTO_ST_CAPTURE not handl key event.\n");
break;
}
uint32_t* key = (uint32_t*)lv_event_get_data();
/* handle key event */
UIFlowPhoto_Key(obj, *key);

48
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -115,6 +115,7 @@ static void UIFlowPlay_IconImageSize(BOOL bShow)
if (bShow == FALSE) {
// UxCtrl_SetShow(&UIFlowWndPlay_StaticTXT_SizeCtrl, FALSE);
lv_obj_set_hidden(label_file_size_scr_uiflowplay, true);
lv_obj_set_hidden(container_play_scr_uiflowplay, true);
return;
}
//show icon
@ -926,7 +927,7 @@ static void UIFlowPlay_OpenFile(lv_obj_t* obj)
g_PlbData.State = PLB_ST_IDLE;
update_playicons(g_PlbData.State);
PBView_DrawNoFile();
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_NO_IMAGE, warn_msgbox_auto_close_ms);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, warn_msgbox_auto_close_ms);
g_bUIFlowWndPlayNoImgWndOpened = TRUE;
}
else
@ -977,11 +978,13 @@ static void UIFlowPlay_ScrOpen(lv_obj_t* obj)
set_indev_keypad_group(obj);
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) {
PBView_DrawNoFile();
g_bUIFlowWndPlayNoImgWndOpened = TRUE;
/* never closed */
g_PlbData.State = PLB_ST_IDLE;
update_playicons(g_PlbData.State);
Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PHOTO);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 0);
// Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PHOTO);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, 3000);
return;
}
@ -1029,7 +1032,6 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data)
case NVTRET_DELETE:
case NVTRET_DELETEALL:
uiStatus = PB_WaitCommandFinish(PB_WAIT_INFINITE);
if (uiStatus & PB_STA_NOIMAGE)
{
g_PlbData.State = PLB_ST_IDLE;
@ -1038,7 +1040,7 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data)
//#NT#Support IVOT_N12144_CO-148_A
PBView_DrawNoFile();
//#NT#2023/11/14#Eric - end
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_NO_IMAGE, warn_msgbox_auto_close_ms);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, warn_msgbox_auto_close_ms);
g_bUIFlowWndPlayNoImgWndOpened = TRUE;
}
} else {
@ -1061,7 +1063,7 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data)
//#NT#Support IVOT_N12144_CO-148_A
PBView_DrawNoFile();
//#NT#2023/11/14#Eric - end
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_NO_IMAGE, warn_msgbox_auto_close_ms);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, warn_msgbox_auto_close_ms);
g_bUIFlowWndPlayNoImgWndOpened = TRUE;
}
}else{
@ -1075,6 +1077,32 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data)
DBG_DUMP("NVTRET_WARNING");
// Ux_PostEvent(paramArray[1], 0);
break;
case NVTRET_CONFIRM:
{
UIPlay_PlaySingle(PB_SINGLE_CURR);
uiStatus = PB_WaitCommandFinish(PB_WAIT_INFINITE);
if (uiStatus & PB_STA_NOIMAGE)
{
if (!g_bUIFlowWndPlayNoImgWndOpened) {
g_PlbData.State = PLB_ST_IDLE;
//#NT#2023/11/14#Eric - begin
//#NT#Support IVOT_N12144_CO-148_A
PBView_DrawNoFile();
//#NT#2023/11/14#Eric - end
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, warn_msgbox_auto_close_ms);
g_bUIFlowWndPlayNoImgWndOpened = TRUE;
} else {
g_PlbData.State = PLB_ST_MENU;
SysSetFlag(FL_PROTECT, PROTECT_ONE);
lv_plugin_scr_open(UIFlowMenuCommonItem, NULL);
}
} else {
g_PlbData.State = PLB_ST_FULL;
}
break;
}
default:
break;
}
} else {
UIPlay_PlaySingle(PB_SINGLE_CURR);
@ -1087,7 +1115,7 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data)
//#NT#Support IVOT_N12144_CO-148_A
PBView_DrawNoFile();
//#NT#2023/11/14#Eric - end
// UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_NO_IMAGE, warn_msgbox_auto_close_ms);
// UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, warn_msgbox_auto_close_ms);
g_bUIFlowWndPlayNoImgWndOpened = TRUE;
} else {
g_PlbData.State = PLB_ST_MENU;
@ -2087,17 +2115,19 @@ static void UIFlowPlay_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* ms
// case NVTEVT_STORAGE_CHANGE:
case NVTEVT_STRG_REMOVE:
{
printf("=============================== NVTEVT_STRG_REMOVE\n");
if (!g_bUIFlowWndPlayNoImgWndOpened)
{
PBView_DrawNoFile();
g_bUIFlowWndPlayNoImgWndOpened = TRUE;
}
UIFlowPlay_Exit(obj);
break;
}
case NVTEVT_STRG_MOUNT_OK:
{
printf("=============================== NVTEVT_STRG_MOUNT_OK\n");
UIPlay_PlaySingle(PB_SINGLE_CURR);
g_PlbData.State = PLB_ST_FULL;
update_playicons(g_PlbData.State);
g_bUIFlowWndPlayNoImgWndOpened = FALSE;
UIFlowPlay_OpenFile(obj);
break;

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSBEventCallback.c
View File

@ -27,7 +27,7 @@ static void UIFlowUsb_Key(lv_obj_t* obj, uint32_t key)
Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_USBMSDC);
}
else{
Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_USBPCC);
// Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_USBPCC);
}
break;

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

@ -74,7 +74,7 @@ UINT8 sf_get_wifi_cmd(void);
void sf_network_select(UINT8 profileId, UINT8 ctlType); //SF_CONTROL_TYPE_e ctlType
void sf_4g_operator_scan(UINT8 mode, UINT8 ctlType); //SF_CONTROL_TYPE_e ctlType
SINT32 sf_lpa_get_esim_iccid(SF_CHAR iccid[][22]);
void sf_set_esim_card(INT8 flag);

3
code/application/source/sf_app/code/include/sf_commu_mcu_reg.h
View File

@ -356,7 +356,8 @@ unsigned char sf_mcu_wdg_off(void);
void sf_set_module_sleep_flag(UINT8 flag);
UINT8 sf_get_module_sleep_flag(void);
int sf_app_while_flag(void);
void sf_set_sim_insert(UINT32 sim);
void sf_set_sim_insert(INT32 sim);
void sf_set_usb_init(int flag);
UINT32 sf_get_sim_insert(void);
int sf_get_signal_ready(void);
int sf_set_signal_ready(int value);

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

@ -485,6 +485,7 @@ typedef enum sf_PARA_MESSAGE_TYPE_E
SF_PARA_CMD_BLE = 0x1F05,
SF_PARA_CMD_SIMISINSERT = 0x1F06,
SF_PARA_CMD_ISESIM = 0x1F07,
SF_PARA_CMD_USB_INIT = 0x1F08,
}SF_PARA_MESSAGE_TYPE_E;
typedef enum sf_WIFI_MESSAGE_TYPE_E

4
code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c
View File

@ -1913,8 +1913,8 @@ SINT32 sf_lpa_get_download_profile_iccid(SINT8* iccid)
static UINT8 g_esim_flag=0; //adjust insert esim or not
void sf_set_esim_card(UINT8 flag)
static INT8 g_esim_flag=-1; //adjust insert esim or not
void sf_set_esim_card(INT8 flag)
{
if(g_esim_flag != flag)
{

1
code/application/source/sf_app/code/source/app/sf_device.c
View File

@ -404,6 +404,7 @@ SINT32 app_led_net_reg_stop(SINT32 s32ret)
}
else if(s32ret == SF_TTY_ERROR_OPEN)
{
sf_set_usb_init(0);
sf_sys_status_led_set(SF_LED_SYS_STATE_SIM_ERROR);
sf_sys_status_led_set(SF_LED_SYS_STATE_ERROR);
}

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

@ -1449,6 +1449,10 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
#endif
s32ret = sf_4G_sim_init(pfnParam);
// if (SF_SUCCESS != s32ret)
// {
// sf_set_esim_card(0);
// }
SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
SLOGD("\n");
#if 1

15
code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c
View File

@ -57,7 +57,10 @@ unsigned char POWEROFF = 0;
SF_TIME_S sfMcuTime = { 0 };
static BOOL ConfigureModeFlag = 0; /* 0: HTC Mode, 1: Nomal Mode */
//static UINT8 PowerOnMode = 0; //=>PWR_ON_SETUP
static UINT32 simCardInsert=0;
#define SIM_CARD_INSERT 1
#define SIM_CARD_NOT_INSERT 0
#define SIM_CARD_DEFAULT_STATUS -1
static INT32 simCardInsert = SIM_CARD_DEFAULT_STATUS;
static UINT8 gModuleSleep = 1;
static int isSignalReady = -1;
static SINT32 GPRS_ERRNO = 0;
@ -1225,7 +1228,7 @@ int sf_app_while_flag(void)
return 0;
}
}
void sf_set_sim_insert(UINT32 sim)
void sf_set_sim_insert(INT32 sim)
{
if(simCardInsert != sim)
{
@ -1238,6 +1241,14 @@ void sf_set_sim_insert(UINT32 sim)
simCardInsert = sim;
}
void sf_set_usb_init(int flag)
{
SF_MESSAGE_BUF_S stMessageBuf = {0};
stMessageBuf.arg2 = flag;
stMessageBuf.arg1 = SF_PARA_CMD_USB_INIT;
stMessageBuf.cmdId = CMD_PARA;
sf_com_message_send_to_cardv(&stMessageBuf);
}
UINT32 sf_get_sim_insert(void)
{

4
code/lib/source/sifar/code/include/sf_common.h
View File

@ -119,7 +119,9 @@ UINT8 sf_cardv_4G_status_get(void);
void sf_cardv_set_sim_insert(INT8 sim);
INT8 sf_cardv_get_sim_insert(void);
void sf_cardv_set_is_esim(int flag);
UINT8 sf_cardv_get_is_esim(void);
void sf_cardv_set_usb_init(int flag);
int sf_cardv_get_usb_init(void);
INT8 sf_cardv_get_is_esim(void);
void sf_cardv_set_operationSelectResp(UINT8 resp);
UINT8 sf_cardv_get_operationSelectResp(void);
void sf_set_send_statu(BOOL is);

2
code/lib/source/sifar/code/include/sf_mcu.h
View File

@ -396,7 +396,7 @@ void sf_set_power_off_flag(UINT8 flag);
UINT8 sf_get_power_off_flag(void);
int sf_while_flag(void);
UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId);
void sf_set_sim_insert(UINT8 sim);
void sf_set_sim_insert(INT32 sim);
UINT8 sf_get_mcu_rtc_set_sys(void);
unsigned short sf_get_mcu_ver(void);
UINT16 sf_mcu_get_irshtter(void);

18
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -72,7 +72,8 @@ static unsigned int KeepAliveTime_s = DEFAULT_GO_TO_WORK_MODE_TIME_S;
BOOL isGoing2Pir = FALSE;
static UINT8 NetWorkFlag = 0; //SF_4G_STATUS_E
static INT8 simCardInsert = -1;
static int g_esim_flag = 0;
static int g_esim_flag = -1;
static int gModuleInitFlag = -1;
static UINT8 operationSelectResp = 0; //WIFICameraErrCode_t
UINT8 RtspFlag = 0;
static BOOL IsMenu = FALSE;
@ -1761,6 +1762,9 @@ static SINT32 sf_cardv_proccess_cmd_para_update(SF_MESSAGE_BUF_S *pMessageBuf)
break;
case SF_PARA_CMD_ISESIM:
sf_cardv_set_is_esim(pMessageBuf->arg2);
break;
case SF_PARA_CMD_USB_INIT:
sf_cardv_set_usb_init(pMessageBuf->arg2);
break;
default:
break;
@ -2581,10 +2585,20 @@ void sf_cardv_set_is_esim(int flag)
printf("cardv g_esim_flag:%d\n",g_esim_flag);
}
UINT8 sf_cardv_get_is_esim(void)
INT8 sf_cardv_get_is_esim(void)
{
return g_esim_flag;
}
void sf_cardv_set_usb_init(int flag)
{
gModuleInitFlag = flag;
printf("cardv gModuleInitFlag:%d\n",gModuleInitFlag);
}
int sf_cardv_get_usb_init(void)
{
return gModuleInitFlag;
}
void sf_cardv_set_operationSelectResp(UINT8 resp)
{

7
code/lib/source/sifar/code/source/mcu/sf_mcu_client.c
View File

@ -59,7 +59,10 @@ static UINT8 ModuleUpdating = 0;
static BOOL ConfigureModeFlag = 0; /* 0: HTC Mode, 1: Nomal Mode */
static UINT8 AeNightMode = 0; /* 0:day 1:night */
//#define printf(fmt, args...) printk(fmt , ## args)
static UINT32 simCardInsert=0;
#define SIM_CARD_INSERT 1
#define SIM_CARD_NOT_INSERT 0
#define SIM_CARD_DEFAULT_STATUS -1
static INT32 simCardInsert = SIM_CARD_DEFAULT_STATUS;
static UINT8 gModuleSleep = 1;
UINT32 SmsCheck = 0;
static UINT8 McuProductInfo = 0;
@ -2027,7 +2030,7 @@ int sf_while_flag(void)
}
}
void sf_set_sim_insert(UINT8 sim)
void sf_set_sim_insert(INT32 sim)
{
simCardInsert = sim;
}

2
rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -945,7 +945,7 @@
#define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwDB08"
#define SF_BASE_VERSION "7MR5RCwDC01"
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */
#define PHOTO_THUMB_PATH "A:\\THUMB\\"