From a4d8cf1511990e07c130fb5262e64eb3fd29af78 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Tue, 25 Jul 2023 19:00:26 +0800 Subject: [PATCH] =?UTF-8?q?console=20=E5=8F=A3=E6=94=B9=E4=B8=BA=20uart8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: a1012112796 <1012112796@qq.com> --- .config | 11 ++++---- project.uvoptx | 70 ++++++++++++++++++++++++------------------------- project.uvprojx | 40 ++++++++++++++-------------- rtconfig.h | 4 +-- 4 files changed, 63 insertions(+), 62 deletions(-) diff --git a/.config b/.config index cd43031..1c8fc3d 100644 --- a/.config +++ b/.config @@ -78,7 +78,7 @@ CONFIG_RT_USING_DEVICE=y # CONFIG_RT_USING_INTERRUPT_INFO is not set CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=256 -CONFIG_RT_CONSOLE_DEVICE_NAME="uart4" +CONFIG_RT_CONSOLE_DEVICE_NAME="uart8" CONFIG_RT_VER_NUM=0x50000 CONFIG_ARCH_ARM=y CONFIG_RT_USING_CPU_FFS=y @@ -600,6 +600,7 @@ CONFIG_PKG_RT_VSNPRINTF_FULL_VER="latest" # CONFIG_PKG_USING_BALANCE is not set # CONFIG_PKG_USING_SHT2X is not set # CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_SHT4X is not set # CONFIG_PKG_USING_AD7746 is not set # CONFIG_PKG_USING_ADT74XX is not set # CONFIG_PKG_USING_MAX17048 is not set @@ -700,6 +701,7 @@ CONFIG_PKG_RT_VSNPRINTF_FULL_VER="latest" # CONFIG_PKG_USING_FINGERPRINT is not set # CONFIG_PKG_USING_BT_ECB02C is not set # CONFIG_PKG_USING_UAT is not set +# CONFIG_PKG_USING_ST7789 is not set # CONFIG_PKG_USING_SPI_TOOLS is not set # @@ -794,7 +796,7 @@ CONFIG_PKG_RT_VSNPRINTF_FULL_VER="latest" # CONFIG_PKG_USING_RTDUINO is not set # -# Projects +# Projects and Demos # # CONFIG_PKG_USING_ARDUINO_MSGQ_C_CPP_DEMO is not set # CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set @@ -943,17 +945,17 @@ CONFIG_PKG_RT_VSNPRINTF_FULL_VER="latest" # # Display # -# CONFIG_PKG_USING_ARDUINO_TFT_ESPI is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_GFX_LIBRARY is not set # CONFIG_PKG_USING_ARDUINO_U8G2 is not set -# CONFIG_PKG_USING_ARDUINO_U8GLIB_ARDUINO is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_ST7735 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SSD1306 is not set +# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_ILI9341 is not set # CONFIG_PKG_USING_SEEED_TM1637 is not set # # Timing # +# CONFIG_PKG_USING_ARDUINO_RTCLIB is not set # CONFIG_PKG_USING_ARDUINO_MSTIMER2 is not set # CONFIG_PKG_USING_ARDUINO_TICKER is not set # CONFIG_PKG_USING_ARDUINO_TASKSCHEDULER is not set @@ -990,7 +992,6 @@ CONFIG_PKG_RT_VSNPRINTF_FULL_VER="latest" # # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MFRC630 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SI5351 is not set -# CONFIG_PKG_USING_ARDUINO_RTCLIB is not set # # Signal IO diff --git a/project.uvoptx b/project.uvoptx index c0ca65a..8e72482 100644 --- a/project.uvoptx +++ b/project.uvoptx @@ -315,8 +315,8 @@ 0 0 0 - rt-thread\components\libc\cplusplus\cxx_crt.cpp - cxx_crt.cpp + rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp + cxx_Semaphore.cpp 0 0 @@ -327,26 +327,14 @@ 0 0 0 - rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp - cxx_Semaphore.cpp + rt-thread\components\libc\cplusplus\cxx_crt.cpp + cxx_crt.cpp 0 0 2 12 - 1 - 0 - 0 - 0 - rt-thread\components\libc\cplusplus\cxx_crt_init.c - cxx_crt_init.c - 0 - 0 - - - 2 - 13 8 0 0 @@ -356,6 +344,18 @@ 0 0 + + 2 + 13 + 1 + 0 + 0 + 0 + rt-thread\components\libc\cplusplus\cxx_crt_init.c + cxx_crt_init.c + 0 + 0 + @@ -604,7 +604,7 @@ Drivers - 1 + 0 0 0 0 @@ -755,8 +755,8 @@ 0 0 0 - rt-thread\components\fal\src\fal.c - fal.c + rt-thread\components\fal\src\fal_rtt.c + fal_rtt.c 0 0 @@ -767,23 +767,23 @@ 0 0 0 - rt-thread\components\fal\src\fal_flash.c - fal_flash.c - 0 - 0 - - - 6 - 46 - 1 - 0 - 0 - 0 rt-thread\components\fal\src\fal_partition.c fal_partition.c 0 0 + + 6 + 46 + 1 + 0 + 0 + 0 + rt-thread\components\fal\src\fal.c + fal.c + 0 + 0 + 6 47 @@ -791,8 +791,8 @@ 0 0 0 - rt-thread\components\fal\src\fal_rtt.c - fal_rtt.c + rt-thread\components\fal\src\fal_flash.c + fal_flash.c 0 0 @@ -856,7 +856,7 @@ IAP - 1 + 0 0 0 0 @@ -876,7 +876,7 @@ Kernel - 1 + 0 0 0 0 diff --git a/project.uvprojx b/project.uvprojx index 34fce1a..660c2aa 100644 --- a/project.uvprojx +++ b/project.uvprojx @@ -10,7 +10,7 @@ rt-thread 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::.\ARMCC + 5060750::V5.06 update 6 (build 750)::ARMCC 0 @@ -54,7 +54,7 @@ 1 0 1 - 1 + 0 .\build\keil\List\ 1 0 @@ -433,26 +433,26 @@ 8 rt-thread\components\libc\cplusplus\cxx_Thread.cpp - - cxx_crt.cpp - 8 - rt-thread\components\libc\cplusplus\cxx_crt.cpp - cxx_Semaphore.cpp 8 rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp - cxx_crt_init.c - 1 - rt-thread\components\libc\cplusplus\cxx_crt_init.c + cxx_crt.cpp + 8 + rt-thread\components\libc\cplusplus\cxx_crt.cpp cxx_Mutex.cpp 8 rt-thread\components\libc\cplusplus\cxx_Mutex.cpp + + cxx_crt_init.c + 1 + rt-thread\components\libc\cplusplus\cxx_crt_init.c + @@ -623,6 +623,16 @@ Fal + + fal_rtt.c + 1 + rt-thread\components\fal\src\fal_rtt.c + + + fal_partition.c + 1 + rt-thread\components\fal\src\fal_partition.c + fal.c 1 @@ -633,16 +643,6 @@ 1 rt-thread\components\fal\src\fal_flash.c - - fal_partition.c - 1 - rt-thread\components\fal\src\fal_partition.c - - - fal_rtt.c - 1 - rt-thread\components\fal\src\fal_rtt.c - diff --git a/rtconfig.h b/rtconfig.h index 1079076..a6622b7 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -45,7 +45,7 @@ #define RT_USING_DEVICE #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 256 -#define RT_CONSOLE_DEVICE_NAME "uart4" +#define RT_CONSOLE_DEVICE_NAME "uart8" #define RT_VER_NUM 0x50000 #define ARCH_ARM #define RT_USING_CPU_FFS @@ -219,7 +219,7 @@ /* Arduino libraries */ -/* Projects */ +/* Projects and Demos */ /* Sensors */