diff --git a/bsp/simulator/.config b/bsp/simulator/.config index c6273d99a9e4f8a4c35a0ba5e9c149437d996e82..8b55653c20f6f460b1467d7ec95d8c10755cd8ab 100644 --- a/bsp/simulator/.config +++ b/bsp/simulator/.config @@ -140,6 +140,7 @@ CONFIG_RT_DFS_ELM_DRIVES=2 CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 # CONFIG_RT_DFS_ELM_USE_ERASE is not set CONFIG_RT_DFS_ELM_REENTRANT=y +CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000 CONFIG_RT_USING_DFS_DEVFS=y # CONFIG_RT_USING_DFS_ROMFS is not set # CONFIG_RT_USING_DFS_RAMFS is not set @@ -228,6 +229,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_RYM is not set # CONFIG_RT_USING_ULOG is not set # CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set # CONFIG_RT_USING_RT_LINK is not set # @@ -324,6 +326,9 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_AGILE_FTP is not set # CONFIG_PKG_USING_EMBEDDEDPROTO is not set # CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set # CONFIG_PKG_USING_HM is not set # @@ -358,6 +363,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_NUEMWIN is not set # CONFIG_PKG_USING_MP3PLAYER is not set # CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# U8G2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set # # tools packages @@ -466,7 +478,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_AS7341 is not set # CONFIG_PKG_USING_STM32_SDIO is not set # CONFIG_PKG_USING_ICM20608 is not set -# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_BUTTON is not set # CONFIG_PKG_USING_PCF8574 is not set # CONFIG_PKG_USING_SX12XX is not set @@ -528,6 +539,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_MCP23008 is not set # CONFIG_PKG_USING_BLUETRUM_SDK is not set # CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set # # AI packages diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h index 2ef2dd62830d934cd1ceb299c342a594fb123b48..a5022f56c1117b900d5b6bc1f0f32fe321b51c01 100755 --- a/bsp/simulator/rtconfig.h +++ b/bsp/simulator/rtconfig.h @@ -91,6 +91,7 @@ #define RT_DFS_ELM_DRIVES 2 #define RT_DFS_ELM_MAX_SECTOR_SIZE 512 #define RT_DFS_ELM_REENTRANT +#define RT_DFS_ELM_MUTEX_TIMEOUT 3000 #define RT_USING_DFS_DEVFS /* Device Drivers */ @@ -158,6 +159,9 @@ /* multimedia packages */ +/* U8G2: a monochrome graphic library */ + + /* tools packages */ diff --git a/bsp/simulator/rtconfig.py b/bsp/simulator/rtconfig.py index 8fcbcebd002fe0f1008cbe111b8e2d06a35bb609..d08447939d1aa3f0d645d5983ea6b82544dd0e68 100755 --- a/bsp/simulator/rtconfig.py +++ b/bsp/simulator/rtconfig.py @@ -1,11 +1,12 @@ import os +import SCons.Tool.MSCommon.vc # toolchains options ARCH='sim' #CROSS_TOOL='msvc' or 'gcc' or 'mingw' #'msvc' and 'mingw' are both for windows # 'gcc' is for linux -CROSS_TOOL='mingw' +CROSS_TOOL='msvc' if os.getenv('RTT_CC'): CROSS_TOOL = os.getenv('RTT_CC') @@ -26,6 +27,20 @@ elif CROSS_TOOL == 'msvc': CPU = 'win32' PLATFORM = 'cl' EXEC_PATH = '' + vc_version = '' + vc_versions = SCons.Tool.MSCommon.vc.get_installed_vcs() + if not vc_versions: + print("No vc version!") + exit(1) + else: + vc_version = vc_versions[0] + EXEC_PATH = SCons.Tool.MSCommon.vc.find_vc_pdir(vc_version) + if not EXEC_PATH: + print('Installed VC %s failure!' % vc_version) + exit(1) + else: + print('Successfully installed VC %s, path:%s' % (vc_version, EXEC_PATH)) + else: print("bad CROSS TOOL!") exit(1)