Skip to content

Commit fda37d5

Browse files
GuozhanxinGuozhanxin
authored
Merge pull request #5319 from RT-Thread/master
【PSE分支】同步master到PSE分支
2 parents 1d4594c + 1cf8370 commit fda37d5

File tree

94 files changed

+2894
-1815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+2894
-1815
lines changed

‎bsp/bluetrum/ab32vg1-ab-prougen/.config‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ CONFIG_RT_IDLE_HOOK_LIST_SIZE=4
2323
CONFIG_IDLE_THREAD_STACK_SIZE=512
2424
CONFIG_RT_USING_TIMER_SOFT=y
2525
CONFIG_RT_TIMER_THREAD_PRIO=4
26-
CONFIG_RT_TIMER_THREAD_STACK_SIZE=256
26+
CONFIG_RT_TIMER_THREAD_STACK_SIZE=1024
2727

2828
#
2929
# kservice optimization
3030
#
3131
# CONFIG_RT_KSERVICE_USING_STDLIB is not set
3232
# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
3333
# CONFIG_RT_USING_ASM_MEMCPY is not set
34+
# CONFIG_RT_USING_ASM_MEMSET is not set
35+
# CONFIG_RT_USING_TINY_FFS is not set
36+
# CONFIG_RT_PRINTF_LONGLONG is not set
3437
CONFIG_RT_DEBUG=y
3538
# CONFIG_RT_DEBUG_COLOR is not set
3639
# CONFIG_RT_DEBUG_INIT_CONFIG is not set
@@ -76,8 +79,7 @@ CONFIG_RT_USING_DEVICE_OPS=y
7679
CONFIG_RT_USING_CONSOLE=y
7780
CONFIG_RT_CONSOLEBUF_SIZE=128
7881
CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
79-
# CONFIG_RT_PRINTF_LONGLONG is not set
80-
CONFIG_RT_VER_NUM=0x40004
82+
CONFIG_RT_VER_NUM=0x40100
8183
# CONFIG_RT_USING_CPU_FFS is not set
8284
# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
8385

@@ -88,6 +90,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y
8890
CONFIG_RT_USING_USER_MAIN=y
8991
CONFIG_RT_MAIN_THREAD_STACK_SIZE=1024
9092
CONFIG_RT_MAIN_THREAD_PRIORITY=10
93+
# CONFIG_RT_USING_LEGACY is not set
9194

9295
#
9396
# C++ features
@@ -117,6 +120,14 @@ CONFIG_FINSH_ARG_MAX=10
117120
# Device virtual file system
118121
#
119122
# CONFIG_RT_USING_DFS is not set
123+
# CONFIG_RT_DFS_ELM_USE_LFN_0 is not set
124+
# CONFIG_RT_DFS_ELM_USE_LFN_1 is not set
125+
# CONFIG_RT_DFS_ELM_USE_LFN_2 is not set
126+
# CONFIG_RT_DFS_ELM_USE_LFN_3 is not set
127+
# CONFIG_RT_DFS_ELM_LFN_UNICODE_0 is not set
128+
# CONFIG_RT_DFS_ELM_LFN_UNICODE_1 is not set
129+
# CONFIG_RT_DFS_ELM_LFN_UNICODE_2 is not set
130+
# CONFIG_RT_DFS_ELM_LFN_UNICODE_3 is not set
120131

121132
#
122133
# Device Drivers
@@ -163,10 +174,13 @@ CONFIG_RT_USING_PIN=y
163174
#
164175
# POSIX layer and C standard library
165176
#
166-
# CONFIG_RT_USING_LIBC is not set
167-
# CONFIG_RT_USING_PTHREADS is not set
177+
CONFIG_RT_USING_LIBC=y
168178
CONFIG_RT_LIBC_USING_TIME=y
179+
# CONFIG_RT_LIBC_USING_FILEIO is not set
180+
# CONFIG_RT_USING_MODULE is not set
169181
CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
182+
# CONFIG_RT_USING_POSIX is not set
183+
# CONFIG_RT_USING_PTHREADS is not set
170184

171185
#
172186
# Network
@@ -304,6 +318,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
304318
# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set
305319
# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set
306320
# CONFIG_PKG_USING_HM is not set
321+
# CONFIG_PKG_USING_SMALL_MODBUS is not set
307322

308323
#
309324
# security packages
@@ -351,6 +366,12 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
351366
# CONFIG_PKG_USING_U8G2_OFFICIAL is not set
352367
# CONFIG_PKG_USING_U8G2 is not set
353368

369+
#
370+
# PainterEngine: A cross-platform graphics application framework written in C language
371+
#
372+
# CONFIG_PKG_USING_PAINTERENGINE is not set
373+
# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set
374+
354375
#
355376
# tools packages
356377
#
@@ -392,6 +413,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
392413
# CONFIG_PKG_USING_MEM_SANDBOX is not set
393414
# CONFIG_PKG_USING_SOLAR_TERMS is not set
394415
# CONFIG_PKG_USING_GAN_ZHI is not set
416+
# CONFIG_PKG_USING_FDT is not set
395417

396418
#
397419
# system packages
@@ -405,6 +427,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
405427
# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set
406428
# CONFIG_PKG_USING_QFPLIB_M3 is not set
407429

430+
#
431+
# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard
432+
#
433+
# CONFIG_PKG_USING_CMSIS_5 is not set
434+
# CONFIG_PKG_USING_CMSIS_5_AUX is not set
435+
# CONFIG_PKG_USING_CMSIS_RTOS2 is not set
436+
408437
#
409438
# Micrium: Micrium software products porting for RT-Thread
410439
#
@@ -422,7 +451,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
422451
# CONFIG_PKG_USING_FLASHDB is not set
423452
# CONFIG_PKG_USING_SQLITE is not set
424453
# CONFIG_PKG_USING_RTI is not set
425-
# CONFIG_PKG_USING_CMSIS is not set
426454
# CONFIG_PKG_USING_DFS_YAFFS is not set
427455
# CONFIG_PKG_USING_LITTLEFS is not set
428456
# CONFIG_PKG_USING_DFS_JFFS2 is not set
@@ -439,6 +467,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
439467
# CONFIG_PKG_USING_QBOOT is not set
440468
# CONFIG_PKG_USING_PPOOL is not set
441469
# CONFIG_PKG_USING_OPENAMP is not set
470+
# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
442471
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
443472
# CONFIG_PKG_USING_LPM is not set
444473
# CONFIG_PKG_USING_TLSF is not set
@@ -599,12 +628,14 @@ CONFIG_PKG_BLUETRUM_SDK_VER="latest"
599628
# Hardware Drivers Config
600629
#
601630
CONFIG_SOC_AB32VG1=y
631+
# CONFIG_PKG_USING_BLUETRUM_NIMBLE is not set
602632

603633
#
604634
# Onboard Peripheral Drivers
605635
#
606636
# CONFIG_BSP_USING_AUDIO is not set
607637
# CONFIG_BSP_USING_SDCARD is not set
638+
# CONFIG_BSP_USING_NIMBLE is not set
608639

609640
#
610641
# On-chip Peripheral Drivers
@@ -622,8 +653,5 @@ CONFIG_BSP_UART0_FIFO_SIZE=10
622653
# CONFIG_BSP_USING_ONCHIP_RTC is not set
623654
# CONFIG_BSP_USING_ADC is not set
624655
# CONFIG_BSP_USING_IRRX is not set
625-
626-
#
627-
# Board extended module Drivers
628-
#
656+
# CONFIG_BSP_USING_ON_CHIP_FLASH is not set
629657
CONFIG_BOARD_BLUETRUM_EVB=y

‎bsp/bluetrum/ab32vg1-ab-prougen/.settings/.rtmenus‎

284 KB
Binary file not shown.

‎bsp/bluetrum/ab32vg1-ab-prougen/.settings/language.settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-309903127852947962" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="530397848961880773" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎bsp/bluetrum/ab32vg1-ab-prougen/.settings/projcfg.ini‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#RT-Thread Studio Project Configuration
2-
#Wed Dec 16 14:30:21 CST 2020
2+
#Wed Nov 24 11:34:07 CST 2021
33
cfg_version=v3.0
44
board_name=AB32VG1-AB-PROUGEN
55
example_name=
6-
hardware_adapter=DAP-LINK
7-
project_type=rt-thread
6+
hardware_adapter=ST-LINK
87
board_base_nano_proj=False
8+
project_type=rt-thread
99
chip_name=AB32VG1
1010
selected_rtt_version=latest
11-
bsp_version=1.0.0
11+
bsp_version=1.1.0
1212
os_branch=full
13-
output_project_path=D\:/Softwares/RT-ThreadStudio/workspace
13+
output_project_path=D\:\\code\\rt_thread\\studio\\ab32vg1
1414
is_base_example_project=False
1515
is_use_scons_build=True
1616
project_base_bsp=true
1717
project_name=ab32vg1
1818
os_version=latest
19-
bsp_path=repo/Local/Board_Support_Packages/Bluetrum/AB32VG1-AB-PROUGEN/1.0.0
19+
bsp_path=repo/Extract/Board_Support_Packages/Bluetrum/AB32VG1-AB-PROUGEN/1.1.0

‎bsp/bluetrum/ab32vg1-ab-prougen/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ ab32vg1-prougen 是 中科蓝讯(Bluetrum) 推出的一款基于 RISC-V 内核
7070
| GPIO | 支持 | PA PB PE PF |
7171
| UART | 支持 | UART0/1/2 |
7272
| SDIO | 支持 | |
73-
| ADC | 支持 | 10bit ADC |
74-
| SPI | 即将支持 | 软件 SPI |
73+
| ADC | 支持 | 10bit SRADC 16bit SDADC |
74+
| SPI | 即将支持 | |
7575
| I2C | 支持 | 软件 I2C |
7676
| RTC | 支持 | |
7777
| WDT | 支持 | |
78-
| FLASH | 即将支持 | 对接 FAL |
78+
| FLASH | 支持 | 对接 FAL |
7979
| TIMER | 支持 | |
8080
| PWM | 支持 | LPWM 的 G1 G2 G3 之间是互斥的，只能三选一 |
8181
| FM receive | 支持 | |

‎bsp/bluetrum/ab32vg1-ab-prougen/applications/blehr_app.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, Bluetrum Development Team
2+
* Copyright (c) 2021-2021, Bluetrum Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -64,7 +64,8 @@ static int blehr_sample(void)
6464
15,
6565
1);
6666

67-
if (tid != RT_NULL) {
67+
if (tid != RT_NULL)
68+
{
6869
rt_thread_startup(tid);
6970
}
7071
}

‎bsp/bluetrum/ab32vg1-ab-prougen/applications/mnt.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void sd_mount(void *parameter)
2626
while (1)
2727
{
2828
rt_thread_mdelay(500);
29-
if(rt_device_find("sd0") != RT_NULL)
29+
if (rt_device_find("sd0") != RT_NULL)
3030
{
3131
if (dfs_mount("sd0", "/", "elm", 0, 0) == RT_EOK)
3232
{

‎bsp/bluetrum/ab32vg1-ab-prougen/board/Kconfig‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
menu "Hardware Drivers Config"
22

3-
config SOC_AB32VG1
4-
bool
3+
menuconfig SOC_AB32VG1
4+
bool "SOC_AB32VG1"
55
select PKG_USING_BLUETRUM_SDK
66
default y
77

8-
config PKG_USING_BLUETRUM_NIMBLE
9-
bool
8+
menuconfig PKG_USING_BLUETRUM_NIMBLE
9+
bool "PKG_USING_BLUETRUM_NIMBLE"
1010
default n
1111

1212
menu "Onboard Peripheral Drivers"
@@ -34,6 +34,11 @@ menu "Onboard Peripheral Drivers"
3434
default 24000000
3535
endif
3636

37+
config BSP_USING_NIMBLE
38+
bool "use nimble stack(iot)"
39+
select PKG_USING_BLUETRUM_NIMBLE
40+
default n
41+
3742
endmenu
3843

3944
menu "On-chip Peripheral Drivers"
@@ -233,20 +238,10 @@ menu "On-chip Peripheral Drivers"
233238
default n
234239
endif
235240

241+
config BSP_USING_ON_CHIP_FLASH
242+
bool "Enable on-chip FLASH"
243+
default n
236244
endmenu
237245

238-
choice
239-
prompt "BLE STACK"
240-
default BLE_STACK_USING_NULL
241-
help
242-
Select the ble stack
243-
244-
config BLE_STACK_USING_NULL
245-
bool "not use the ble stack"
246-
247-
config BSP_USING_NIMBLE
248-
bool "use nimble stack(iot)"
249-
select PKG_USING_BLUETRUM_NIMBLE
250-
endchoice
251246

252247
endmenu

‎bsp/bluetrum/ab32vg1-ab-prougen/board/SConscript‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ board.c
88
ab32vg1_hal_msp.c
99
''')
1010
CPPPATH = [cwd]
11+
CPPPATH += [cwd + '/ports']
1112

1213
if GetDepend(['RT_USING_AUDIO']):
1314
src += Glob('ports/audio/drv_sound.c')
1415

16+
if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
17+
src += Glob('ports/on_chip_flash_init.c')
18+
1519
group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH)
1620

1721
objs = [group]

0 commit comments

Comments
 (0)