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

1.增加ftp cmd

Browse Source 
2.修复wifi开启后参数同步被退出
This commit is contained in:
payton 2023-07-27 13:59:22 +08:00
parent f6a3c14eb3
commit 148df46ead
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/application/source/cardv/SrcCode/System/SysMain_cmd.c
View File

@ -252,6 +252,9 @@ SXCMD_ITEM("setusbmuxs", sf_cmd_usb_mux_s, "set usbmuxs")
SXCMD_ITEM("4gusbboot", sf_cmd_cardv_4g_usb_boot, "set 4gusbboot") SXCMD_ITEM("4gusbboot", sf_cmd_cardv_4g_usb_boot, "set 4gusbboot")
SXCMD_ITEM("sfcheck", sf_cmd_fs_ro_check, "sf check") SXCMD_ITEM("sfcheck", sf_cmd_fs_ro_check, "sf check")
SXCMD_ITEM("dispparaset %", sf_cmd_disp_para_set, "dispparaset v1 v2 v3 v4 v5 v6") SXCMD_ITEM("dispparaset %", sf_cmd_disp_para_set, "dispparaset v1 v2 v3 v4 v5 v6")
SXCMD_ITEM("ftpsw %", sf_cmd_ftp_switch, "ftpsw v1")
SXCMD_ITEM("ftpset %", sf_cmd_ftp, "ftpset v1 v2 v3 v4")
SXCMD_ITEM("ftpsset %", sf_cmd_ftps, "ftpsset v1 v2 v3 v4")
#endif #endif

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

@ -115,4 +115,7 @@ BOOL sf_check_net_work_flag(void);
void sf_save_camera_info(void); void sf_save_camera_info(void);
UINT32 sf_cardv_wifi_start(void); UINT32 sf_cardv_wifi_start(void);
BOOL sf_cmd_disp_para_set(unsigned char argc, char **argv); BOOL sf_cmd_disp_para_set(unsigned char argc, char **argv);
BOOL sf_cmd_ftp_switch(unsigned char argc, char **argv);
BOOL sf_cmd_ftp(unsigned char argc, char **argv);
BOOL sf_cmd_ftps(unsigned char argc, char **argv);
#endif #endif

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

@ -2057,6 +2057,8 @@ void sf_do_upgrade_thread(void)
void* sf_cardv_para_check_thread(void *arg) void* sf_cardv_para_check_thread(void *arg)
{ {
SLOGI("thread run\n");
ParaTskCfg.IsRun = 1;
while(ParaTskCfg.IsRun) while(ParaTskCfg.IsRun)
{ {
if(TRUE == sf_get_cardv_para_check_flag()){ if(TRUE == sf_get_cardv_para_check_flag()){
@ -2067,6 +2069,8 @@ void* sf_cardv_para_check_thread(void *arg)
vos_util_delay_ms(10); vos_util_delay_ms(10);
} }
SLOGI("thread end\n");
ParaTskCfg.IsRun = 0; ParaTskCfg.IsRun = 0;
return NULL; return NULL;
@ -2085,7 +2089,6 @@ UINT32 sf_cardv_para_check_start(void)
MLOGD("thread creat fail!\n"); MLOGD("thread creat fail!\n");
return ret; return ret;
} }
ParaTskCfg.IsRun = 1;
return SF_SUCCESS; return SF_SUCCESS;
} }
@ -2354,8 +2357,7 @@ void* sf_cardv_wifi_thread(void *arg)
/*wifi init*/ /*wifi init*/
UINet_AppIpc_Init(); UINet_AppIpc_Init();
sf_net_wifi_init(NET_AP_MODE, NET_AUTH_WPA2); sf_net_wifi_init(NET_AP_MODE, NET_AUTH_WPA2);
ParaTskCfg.IsRun = 0; WifiTskCfg.IsRun = 0;
return NULL; return NULL;
} }
@ -2411,3 +2413,20 @@ BOOL sf_cmd_disp_para_set(unsigned char argc, char **argv)
printf("[%s:%d]disp para set:%d %d %d %d %d %d\n", __FUNCTION__, __LINE__, puiPara->x1, puiPara->x2, puiPara->x3, puiPara->x4, puiPara->x5, puiPara->x6); printf("[%s:%d]disp para set:%d %d %d %d %d %d\n", __FUNCTION__, __LINE__, puiPara->x1, puiPara->x2, puiPara->x3, puiPara->x4, puiPara->x5, puiPara->x6);
return TRUE; return TRUE;
} }
BOOL sf_cmd_ftp_switch(unsigned char argc, char **argv)
{
UINT32 value;
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(argc == 1)
{
sscanf_s(argv[0],"%d", &value);
if(value < SF_FTP_MAX)
{
puiPara->FtpSwitch = value;
Save_MenuInfo();
}
}
printf("[%s:%d] FtpSwitch:%d\n", __FUNCTION__, __LINE__,puiPara->FtpSwitch);
return TRUE;
}