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

This commit is contained in:
payton 2023-10-16 21:14:52 +08:00
commit c332c5873f
8 changed files with 15 additions and 3 deletions

12
.gitignore vendored
View File

@ -45,3 +45,15 @@ rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/ModelConfig.mk
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-evb.dtb
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-evb.tmp.dts
build/nvt-tools/__pycache__/
rtos/build/nvt-tools/__pycache__/
BSP/root-fs/rootfs/var/lib/dbus/
BSP/root-fs/rootfs/lib/firmware/
BSP/root-fs/rootfs/usr/lib/libdbus-1.so.3
BSP/root-fs/rootfs/usr/lib/libexpat.so.1
BSP/root-fs/rootfs/usr/lib/libgettextlib-0.22.so
BSP/root-fs/rootfs/usr/lib/libgettextpo.so.0
BSP/root-fs/rootfs/usr/lib/libglib-2.0.so.0
BSP/root-fs/rootfs/usr/lib/libintl.so.8
BSP/root-fs/rootfs/usr/lib/libncurses.so.6
BSP/root-fs/rootfs/usr/lib/libreadline.so.8

View File

@ -355,7 +355,7 @@ static void update_4g_module_icon(void)
signal_icon_hidden(searching_index);
searching_index++;
searching_index = searching_index % 5;
printf(" searching ... [%d]\n", searching_index);
//printf(" searching ... [%d]\n", searching_index);
signal_icon_show(searching_index);
}
else if(signal != signal_new)

View File

@ -163,7 +163,7 @@ extern "C" {
#define SIM_AUTO_MATCH_FILE_PATH SF_SD_ROOT"SIM Auto Match.TXT"
#define SF_DCF_DIR_NAME_SUFFIX DCF_FILE_NAME /**< DCF Directory Name (it must be 5-characters) */
#define SF_DCF_ROOT_DIR_NAME DCF_DIR_NAME /**< DCF Root Directory Name */
#define SF_DCF_ROOT_DIR_NAME "DCIM" /**< DCF Root Directory Name */
#define SF_DCF_THM_DIR_NAME "THUMB" /**< DCF Directory Name (it must be 5-characters) */
#define SF_DCF_EXT_PHOTO "JPG" /**< File extenstion name for Date DB */

View File

@ -743,7 +743,7 @@ int sf_app_sd_loop(void)
while(nloop)
{
sprintf(cPathTmp,"%s%s/%03d%s/", SF_SD_ROOT, SF_DCF_ROOT_DIR_NAME, nDirKey, DCF_DIR_NAME); // ""/mnt/sd/DCIM/100MEDIA"
sprintf(cPathTmp,"%s%s/%03d%s", SF_SD_ROOT, SF_DCF_ROOT_DIR_NAME, nDirKey, DCF_DIR_NAME); // ""/mnt/sd/DCIM/100MEDIA"
//Not Empty,Record File Name
sprintf(cFileTmp, "%s/%s%04d.%s",cPathTmp, DCF_FILE_NAME, nFileKey, SF_DCF_EXT_PHOTO);