From 61fa6949fbb537f54d48a4fc0218ff2b6873e940 Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Tue, 20 Feb 2024 11:34:24 +0100 Subject: [Core] Allow ChibiOS `SIO` driver for `UART` driver (#22839) * onekey: stm32f3_disco: add usart pins and activate peripheral Signed-off-by: Stefan Kerkmann * chibios: uart: change SD1 prefix to UART Signed-off-by: Stefan Kerkmann * chibios: uart: add SIO driver and RP2040 compatibility Signed-off-by: Stefan Kerkmann Co-authored-by: Sergey Vlasov * Update platforms/chibios/drivers/uart.h Co-authored-by: Joel Challis --------- Signed-off-by: Stefan Kerkmann Co-authored-by: Sergey Vlasov Co-authored-by: Joel Challis --- .../GENERIC_PROMICRO_RP2040/configs/config.h | 28 ++++++++++++++++++++-- platforms/chibios/boards/QMK_BLOK/configs/config.h | 24 +++++++++++++++++++ .../chibios/boards/QMK_PM2040/configs/config.h | 24 +++++++++++++++++++ 3 files changed, 74 insertions(+), 2 deletions(-) (limited to 'platforms/chibios/boards') diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h index 9209e99e76..73c2b40f46 100644 --- a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h +++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h @@ -1,4 +1,4 @@ -// Copyright 2022 Stefan Kerkmann +// Copyright 2024 Stefan Kerkmann // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -55,8 +55,32 @@ # define SERIAL_USART_RX_PIN GP1 #endif +/**====================== + ** UART Driver + *========================**/ + +#if !defined(UART_DRIVER) +# define UART_DRIVER SIOD0 +#endif + +#if !defined(UART_TX_PIN) +# define UART_TX_PIN GP0 +#endif + +#if !defined(UART_RX_PIN) +# define UART_RX_PIN GP1 +#endif + +#if !defined(UART_CTS_PIN) +# define UART_CTS_PIN GP2 +#endif + +#if !defined(UART_RTS_PIN) +# define UART_RTS_PIN GP3 +#endif + /**====================== ** Double-tap *========================**/ -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET diff --git a/platforms/chibios/boards/QMK_BLOK/configs/config.h b/platforms/chibios/boards/QMK_BLOK/configs/config.h index 168afb1fc4..834dc497d3 100644 --- a/platforms/chibios/boards/QMK_BLOK/configs/config.h +++ b/platforms/chibios/boards/QMK_BLOK/configs/config.h @@ -3,6 +3,10 @@ #pragma once +/**====================== + ** I2C Driver + *========================**/ + #ifndef I2C_DRIVER # define I2C_DRIVER I2CD0 #endif @@ -13,6 +17,26 @@ # define I2C1_SCL_PIN D0 #endif +/**====================== + ** UART Driver + *========================**/ + +#ifndef UART_DRIVER +# define UART_DRIVER SIOD0 +#endif + +#ifndef UART_TX_PIN +# define UART_TX_PIN D3 +#endif + +#ifndef UART_RX_PIN +# define UART_RX_PIN D2 +#endif + +/**====================== + ** Double-tap + *========================**/ + #ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET # define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #endif diff --git a/platforms/chibios/boards/QMK_PM2040/configs/config.h b/platforms/chibios/boards/QMK_PM2040/configs/config.h index ec85ae0cf4..f8b46b7fe4 100644 --- a/platforms/chibios/boards/QMK_PM2040/configs/config.h +++ b/platforms/chibios/boards/QMK_PM2040/configs/config.h @@ -3,6 +3,10 @@ #pragma once +/**====================== + ** I2C Driver + *========================**/ + #ifndef I2C_DRIVER # define I2C_DRIVER I2CD1 #endif @@ -13,6 +17,26 @@ # define I2C1_SCL_PIN D0 #endif +/**====================== + ** UART Driver + *========================**/ + +#ifndef UART_DRIVER +# define UART_DRIVER SIOD0 +#endif + +#ifndef UART_TX_PIN +# define UART_TX_PIN D3 +#endif + +#ifndef UART_RX_PIN +# define UART_RX_PIN D2 +#endif + +/**====================== + ** Double-tap + *========================**/ + #ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET # define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #endif -- cgit v1.2.3