Skip to content

Commit 77bcf46

Browse files
authored
Merge pull request #5340 from mysterywolf/40ximprove
[4.0.x] 同步master关键bug修复
2 parents a8fad55 + 2a2bb84 commit 77bcf46

File tree

631 files changed

+25414
-20702
lines changed

Some content is hidden

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

631 files changed

+25414
-20702
lines changed

bsp/CME_M7/project.uvproj

Lines changed: 203 additions & 287 deletions
Large diffs are not rendered by default.

bsp/Vango_V85xx/.config

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
339339
# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set
340340
# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set
341341
# CONFIG_PKG_USING_HM is not set
342+
# CONFIG_PKG_USING_SMALL_MODBUS is not set
342343
# end of IoT - internet of things
343344

344345
#
@@ -363,17 +364,24 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
363364
#
364365
# multimedia packages
365366
#
366-
# CONFIG_PKG_USING_OPENMV is not set
367-
# CONFIG_PKG_USING_MUPDF is not set
368-
# CONFIG_PKG_USING_STEMWIN is not set
369367

370368
#
371-
# lvgl: powerful and easy-to-use embedded GUI library
369+
# LVGL: powerful and easy-to-use embedded GUI library
372370
#
373-
# CONFIG_PKG_USING_LITTLEVGL2RTT is not set
374371
# CONFIG_PKG_USING_LVGL is not set
375-
# end of lvgl: powerful and easy-to-use embedded GUI library
372+
# CONFIG_PKG_USING_LITTLEVGL2RTT is not set
373+
# end of LVGL: powerful and easy-to-use embedded GUI library
374+
375+
#
376+
# u8g2: a monochrome graphic library
377+
#
378+
# CONFIG_PKG_USING_U8G2_OFFICIAL is not set
379+
# CONFIG_PKG_USING_U8G2 is not set
380+
# end of u8g2: a monochrome graphic library
376381

382+
# CONFIG_PKG_USING_OPENMV is not set
383+
# CONFIG_PKG_USING_MUPDF is not set
384+
# CONFIG_PKG_USING_STEMWIN is not set
377385
# CONFIG_PKG_USING_WAVPLAYER is not set
378386
# CONFIG_PKG_USING_TJPGD is not set
379387
# CONFIG_PKG_USING_PDFGEN is not set
@@ -386,11 +394,11 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
386394
# CONFIG_PKG_USING_UGUI is not set
387395

388396
#
389-
# u8g2: a monochrome graphic library
397+
# PainterEngine: A cross-platform graphics application framework written in C language
390398
#
391-
# CONFIG_PKG_USING_U8G2_OFFICIAL is not set
392-
# CONFIG_PKG_USING_U8G2 is not set
393-
# end of u8g2: a monochrome graphic library
399+
# CONFIG_PKG_USING_PAINTERENGINE is not set
400+
# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set
401+
# end of PainterEngine: A cross-platform graphics application framework written in C language
394402
# end of multimedia packages
395403

396404
#
@@ -434,12 +442,20 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
434442
# CONFIG_PKG_USING_MEM_SANDBOX is not set
435443
# CONFIG_PKG_USING_SOLAR_TERMS is not set
436444
# CONFIG_PKG_USING_GAN_ZHI is not set
445+
# CONFIG_PKG_USING_FDT is not set
437446
# end of tools packages
438447

439448
#
440449
# system packages
441450
#
442451

452+
#
453+
# rt_kprintf: enhanced rt_kprintf packages
454+
#
455+
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
456+
# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
457+
# end of rt_kprintf: enhanced rt_kprintf packages
458+
443459
#
444460
# acceleration: Assembly language or algorithmic acceleration packages
445461
#
@@ -449,6 +465,14 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
449465
# CONFIG_PKG_USING_QFPLIB_M3 is not set
450466
# end of acceleration: Assembly language or algorithmic acceleration packages
451467

468+
#
469+
# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard
470+
#
471+
# CONFIG_PKG_USING_CMSIS_5 is not set
472+
# CONFIG_PKG_USING_CMSIS_5_AUX is not set
473+
# CONFIG_PKG_USING_CMSIS_RTOS2 is not set
474+
# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard
475+
452476
#
453477
# Micrium: Micrium software products porting for RT-Thread
454478
#
@@ -468,7 +492,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
468492
# CONFIG_PKG_USING_FLASHDB is not set
469493
# CONFIG_PKG_USING_SQLITE is not set
470494
# CONFIG_PKG_USING_RTI is not set
471-
# CONFIG_PKG_USING_CMSIS is not set
472495
# CONFIG_PKG_USING_DFS_YAFFS is not set
473496
# CONFIG_PKG_USING_LITTLEFS is not set
474497
# CONFIG_PKG_USING_DFS_JFFS2 is not set
@@ -485,14 +508,14 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
485508
# CONFIG_PKG_USING_QBOOT is not set
486509
# CONFIG_PKG_USING_PPOOL is not set
487510
# CONFIG_PKG_USING_OPENAMP is not set
488-
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
489511
# CONFIG_PKG_USING_LPM is not set
490512
# CONFIG_PKG_USING_TLSF is not set
491513
# CONFIG_PKG_USING_EVENT_RECORDER is not set
492514
# CONFIG_PKG_USING_ARM_2D is not set
493515
# CONFIG_PKG_USING_WCWIDTH is not set
494516
# CONFIG_PKG_USING_MCUBOOT is not set
495517
# CONFIG_PKG_USING_TINYUSB is not set
518+
# CONFIG_PKG_USING_USB_STACK is not set
496519
# end of system packages
497520

498521
#
@@ -569,6 +592,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
569592
# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set
570593
# CONFIG_PKG_USING_BL_MCU_SDK is not set
571594
# CONFIG_PKG_USING_SOFT_SERIAL is not set
595+
# CONFIG_PKG_USING_MB85RS16 is not set
572596
# end of peripheral libraries and drivers
573597

574598
#

0 commit comments

Comments
 (0)