Skip to content

Commit e304538

Browse files
authored
Merge pull request #5157 from mysterywolf/win32
[bsp][simulator] support for finding a msvc path automatically
2 parents c41bf91 + 09b4f00 commit e304538

File tree

3 files changed

+34
-2
lines changed

3 files changed

+34
-2
lines changed

bsp/simulator/.config

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ CONFIG_RT_DFS_ELM_DRIVES=2
140140
CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512
141141
# CONFIG_RT_DFS_ELM_USE_ERASE is not set
142142
CONFIG_RT_DFS_ELM_REENTRANT=y
143+
CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
143144
CONFIG_RT_USING_DFS_DEVFS=y
144145
# CONFIG_RT_USING_DFS_ROMFS is not set
145146
# CONFIG_RT_USING_DFS_RAMFS is not set
@@ -228,6 +229,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
228229
# CONFIG_RT_USING_RYM is not set
229230
# CONFIG_RT_USING_ULOG is not set
230231
# CONFIG_RT_USING_UTEST is not set
232+
# CONFIG_RT_USING_VAR_EXPORT is not set
231233
# CONFIG_RT_USING_RT_LINK is not set
232234

233235
#
@@ -324,6 +326,9 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
324326
# CONFIG_PKG_USING_AGILE_FTP is not set
325327
# CONFIG_PKG_USING_EMBEDDEDPROTO is not set
326328
# CONFIG_PKG_USING_RT_LINK_HW is not set
329+
# CONFIG_PKG_USING_LORA_PKT_FWD is not set
330+
# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set
331+
# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set
327332
# CONFIG_PKG_USING_HM is not set
328333

329334
#
@@ -358,6 +363,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
358363
# CONFIG_PKG_USING_NUEMWIN is not set
359364
# CONFIG_PKG_USING_MP3PLAYER is not set
360365
# CONFIG_PKG_USING_TINYJPEG is not set
366+
# CONFIG_PKG_USING_UGUI is not set
367+
368+
#
369+
# U8G2: a monochrome graphic library
370+
#
371+
# CONFIG_PKG_USING_U8G2_OFFICIAL is not set
372+
# CONFIG_PKG_USING_U8G2 is not set
361373

362374
#
363375
# tools packages
@@ -466,7 +478,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
466478
# CONFIG_PKG_USING_AS7341 is not set
467479
# CONFIG_PKG_USING_STM32_SDIO is not set
468480
# CONFIG_PKG_USING_ICM20608 is not set
469-
# CONFIG_PKG_USING_U8G2 is not set
470481
# CONFIG_PKG_USING_BUTTON is not set
471482
# CONFIG_PKG_USING_PCF8574 is not set
472483
# CONFIG_PKG_USING_SX12XX is not set
@@ -528,6 +539,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
528539
# CONFIG_PKG_USING_MCP23008 is not set
529540
# CONFIG_PKG_USING_BLUETRUM_SDK is not set
530541
# CONFIG_PKG_USING_MISAKA_AT24CXX is not set
542+
# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set
543+
# CONFIG_PKG_USING_BL_MCU_SDK is not set
531544

532545
#
533546
# AI packages

bsp/simulator/rtconfig.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
#define RT_DFS_ELM_DRIVES 2
9292
#define RT_DFS_ELM_MAX_SECTOR_SIZE 512
9393
#define RT_DFS_ELM_REENTRANT
94+
#define RT_DFS_ELM_MUTEX_TIMEOUT 3000
9495
#define RT_USING_DFS_DEVFS
9596

9697
/* Device Drivers */
@@ -158,6 +159,9 @@
158159
/* multimedia packages */
159160

160161

162+
/* U8G2: a monochrome graphic library */
163+
164+
161165
/* tools packages */
162166

163167

bsp/simulator/rtconfig.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import os
2+
import SCons.Tool.MSCommon.vc
23

34
# toolchains options
45
ARCH='sim'
56
#CROSS_TOOL='msvc' or 'gcc' or 'mingw'
67
#'msvc' and 'mingw' are both for windows
78
# 'gcc' is for linux
8-
CROSS_TOOL='mingw'
9+
CROSS_TOOL='msvc'
910

1011
if os.getenv('RTT_CC'):
1112
CROSS_TOOL = os.getenv('RTT_CC')
@@ -26,6 +27,20 @@
2627
CPU = 'win32'
2728
PLATFORM = 'cl'
2829
EXEC_PATH = ''
30+
vc_version = ''
31+
vc_versions = SCons.Tool.MSCommon.vc.get_installed_vcs()
32+
if not vc_versions:
33+
print("No vc version!")
34+
exit(1)
35+
else:
36+
vc_version = vc_versions[0]
37+
EXEC_PATH = SCons.Tool.MSCommon.vc.find_vc_pdir(vc_version)
38+
if not EXEC_PATH:
39+
print('Installed VC %s failure!' % vc_version)
40+
exit(1)
41+
else:
42+
print('Successfully installed VC %s, path:%s' % (vc_version, EXEC_PATH))
43+
2944
else:
3045
print("bad CROSS TOOL!")
3146
exit(1)

0 commit comments

Comments
 (0)