From 7763183074f2e4fe1720ab92450fde64a9205f18 Mon Sep 17 00:00:00 2001 From: Yifang Date: Sat, 25 Feb 2023 14:28:03 +0800 Subject: [PATCH] =?UTF-8?q?[rtduino][lpc55s69]=20=E7=BA=A0=E6=AD=A3uart?= =?UTF-8?q?=E5=BC=95=E8=84=9A=E9=94=99=E8=AF=AF=E5=B9=B6=E4=BD=BF=E8=83=BD?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BE=9D=E8=B5=96=E9=A1=B9=20(#6976)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [rtduino][lpc55s69] 纠正uart引脚错误并使能相关依赖项 Co-authored-by: Man, Jianting (Meco) <920369182@qq.com> --- .../lpc55s69_nxp_evk/applications/arduino_pinout/README.md | 4 ++-- .../applications/arduino_pinout/pins_arduino.c | 4 ++-- .../applications/arduino_pinout/pins_arduino.h | 2 +- bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/README.md b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/README.md index 94b21fbfe0..4f1a4bc2e2 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/README.md +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/README.md @@ -24,8 +24,8 @@ Hardware Drivers Config ---> | Arduino引脚编号 | LPC55引脚编号 | 5V容忍 | 备注 | | ------------------- | --------- | ---- | ------------------------------------------------------------------------- | -| 0 (D0) | P(1,24) | 是/否 | Serial2-RX，默认被RT-Thread的UART设备框架uart1接管 | -| 1 (D1) | P(0,27) | 是/否 | Serial2-TX，默认被RT-Thread的UART设备框架uart1接管 | +| 0 (D0) | P(1,24) | 是/否 | Serial2-RX，默认被RT-Thread的UART设备框架uart2接管 | +| 1 (D1) | P(0,27) | 是/否 | Serial2-TX，默认被RT-Thread的UART设备框架uart2接管 | | 2 (D2) | P(0,15) | 是/否 | | | 3 (D3) | P(1,6) | 是/否 | | | 4 (D4) | P(1,7) | 是/否 | PWM2-CH2，默认被RT-Thread的PWM设备框架pwm2接管 | diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/pins_arduino.c b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/pins_arduino.c index 5aa441b4d4..0c02e3ac29 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/pins_arduino.c +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/pins_arduino.c @@ -23,8 +23,8 @@ */ const pin_map_t pin_map_table[]= { - {D0, GET_PINS(1,24), "uart1"}, /* Serial2-RX */ - {D1, GET_PINS(0,27), "uart1"}, /* Serial2-TX */ + {D0, GET_PINS(1,24), "uart2"}, /* Serial2-RX */ + {D1, GET_PINS(0,27), "uart2"}, /* Serial2-TX */ {D2, GET_PINS(0,15)}, {D3, GET_PINS(1,6)}, {D4, GET_PINS(1,7), "pwm2", 2}, /* PWM */ diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/pins_arduino.h b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/pins_arduino.h index b5487c5426..22dbc3b4e3 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/pins_arduino.h +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/arduino_pinout/pins_arduino.h @@ -44,6 +44,6 @@ #define RTDUINO_DEFAULT_IIC_BUS_NAME "i2c1" /* Serial2 : P(,27-TX P(,24-RX */ -#define RTDUINO_SERIAL2_DEVICE_NAME "uart1" +#define RTDUINO_SERIAL2_DEVICE_NAME "uart2" #endif /* Pins_Arduino_h */ diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig index ff786f2c5c..99d7da5bae 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig @@ -266,7 +266,7 @@ menu "Onboard Peripheral Drivers" config BSP_USING_ARDUINO bool "Compatible with Arduino Ecosystem (RTduino)" select PKG_USING_RTDUINO - select BSP_USING_STLINK_TO_USART + select BSP_USING_UART2 select BSP_USING_GPIO select BSP_USING_ADC select BSP_USING_ADC0