solve conflict#1

Merged

mysterywolf merged 19 commits intomysterywolf:libc4from

RT-Thread:master

Jun 10, 2022

Commits on Jun 7, 2022

Fix compiler warnings (#6023)
enkiller
authored

Commits on Jun 8, 2022

[bsp][stm32] 增加uart7和uart8的DMA配置

BreederBai
authored and
Guozhanxin
committed
[bsp][stm32h750-artpi] add bootloader.bin, add the description of the bootloader in README.md.(#5923)

Yanlineng
authored and
Guozhanxin
committed
[bsp][stm32h750-artpi] Modify the content of flash algorithms in README.md

Yanlineng
authored and
Guozhanxin
committed
[libc][time] solve the problem which the os tick can be calculated wrongly because the local variable was not initialized.

fortunerains
authored and
Guozhanxin
committed
attach: remove strnlen #6026

mysterywolf
authored and
Guozhanxin
committed
[bsp][stm32] fix stm32f767-st-nucleo console device name

luhuadong
authored and
Guozhanxin
committed
[bsp][100ask]: create two new bsp for 100ask stm32f103 boards and commit them (#6045)

100ask-alen
and
slhking
authored
添加USART1/2/3的管脚配置操作 (#6039)
xiaoxiaolisunny
authored
[Scons] 将GCC判断条件改为列表方式，方便后续增加新的编译工具链

mysterywolf
authored and
Guozhanxin
committed
[Scons][iar][iccarm] IAR统一使用iccarm作为判断条件而不是是用IDE的名字来进行判断

mysterywolf
authored and
Guozhanxin
committed
[scons][iar] 将IAR的PLATFORM字段由iar调整为iccarm

mysterywolf
authored and
Guozhanxin
committed
添加HC32F460系列CAN设备驱动支持

xiaoxiaolisunny
authored and
Guozhanxin
committed
修改USART2_RX_PIN

xiaoxiaolisunny
authored and
Guozhanxin
committed

Commits on Jun 9, 2022

Commits on Jun 10, 2022

[.gitignore] add source insight projects in .gitignore

chenyingchun0312
authored and
Guozhanxin
committed