autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/xidatong-arm32' into jerryscript

This commit is contained in:
wgzAIIT 2023-09-21 13:45:21 +08:00
parent f7d0b0925c aa3e6c9370
commit d14272c55f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/sdio/connect_sdio.c
View File

@ -285,7 +285,7 @@ static bool is_mount_ok = false;
*/ */
static int MountSDCardFs(enum FilesystemType fs_type) static int MountSDCardFs(enum FilesystemType fs_type)
{ {
if (MountFilesystem(SDIO_BUS_NAME, SDIO_DEVICE_NAME, SDIO_DRIVER_NAME, fs_type, "/") == 0){ if (MountFilesystem(SDIO_BUS_NAME, SDIO_DEVICE_NAME, SDIO_DRIVER_NAME, fs_type, "/") == 0) {
KPrintf("Sd card mount to '/'"); KPrintf("Sd card mount to '/'");
is_mount_ok = true; is_mount_ok = true;
} else { } else {
@ -395,7 +395,7 @@ int MountSDCard()
bool GetSdMountStatus(void) bool GetSdMountStatus(void)
{ {
if(!is_mount_ok) if(!is_mount_ok)
KPrintf("The SD card was not mounted successfully or not inserted, please check!\r\n"); KPrintf("SD card is not inserted or failed to mount, please check!\r\n");
return is_mount_ok; return is_mount_ok;
} }

2
Ubiquitous/XiZi_IIoT/tool/bootloader/ota/ota.c
View File

@ -1014,7 +1014,7 @@ reconnect:
} }
} }
#ifdef USING_DOWNLOAD_JSON #ifdef USING_DOWNLOAD_JSON
// 3.下载json文件,SD卡要确保已经插入 // 3.下载json文件,SD卡要确保已经插入并mount成功
extern bool GetSdMountStatus(void); extern bool GetSdMountStatus(void);
if(strstr((char *)Platform_mqtt.cmdbuff,jsontopicdatabuff) && GetSdMountStatus()) if(strstr((char *)Platform_mqtt.cmdbuff,jsontopicdatabuff) && GetSdMountStatus())
{ {