Browse Source
[Core] Allow ChibiOS `SIO` driver for `UART` driver (#22839)
* onekey: stm32f3_disco: add usart pins and activate peripheral Signed-off-by: Stefan Kerkmann <karlk90@pm.me> * chibios: uart: change SD1 prefix to UART Signed-off-by: Stefan Kerkmann <karlk90@pm.me> * chibios: uart: add SIO driver and RP2040 compatibility Signed-off-by: Stefan Kerkmann <karlk90@pm.me> Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update platforms/chibios/drivers/uart.h Co-authored-by: Joel Challis <git@zvecr.com> --------- Signed-off-by: Stefan Kerkmann <karlk90@pm.me> Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>pull/23119/head
Stefan Kerkmann
2 months ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 428 additions and 149 deletions
Split View
Diff Options
-
+11 -2builddefs/common_features.mk
-
+13 -2docs/platformdev_rp2040.md
-
+12 -18docs/uart_driver.md
-
+6 -0keyboards/handwired/onekey/stm32f3_disco/config.h
-
+6 -0keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
-
+26 -2platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
-
+24 -0platforms/chibios/boards/QMK_BLOK/configs/config.h
-
+24 -0platforms/chibios/boards/QMK_PM2040/configs/config.h
-
+14 -0platforms/chibios/chibios_config.h
-
+0 -70platforms/chibios/drivers/uart.c
-
+139 -55platforms/chibios/drivers/uart.h
-
+65 -0platforms/chibios/drivers/uart_serial.c
-
+77 -0platforms/chibios/drivers/uart_sio.c
-
+11 -0platforms/chibios/platform.mk
+ 11
- 2
builddefs/common_features.mk
View File
+ 13
- 2
docs/platformdev_rp2040.md
View File
+ 12
- 18
docs/uart_driver.md
View File
+ 6
- 0
keyboards/handwired/onekey/stm32f3_disco/config.h
View File
+ 6
- 0
keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
View File
+ 26
- 2
platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
View File
+ 24
- 0
platforms/chibios/boards/QMK_BLOK/configs/config.h
View File
+ 24
- 0
platforms/chibios/boards/QMK_PM2040/configs/config.h
View File
+ 14
- 0
platforms/chibios/chibios_config.h
View File
+ 0
- 70
platforms/chibios/drivers/uart.c
View File
| @ -1,70 +0,0 @@ | |||
| /* Copyright 2021 | |||
| * | |||
| * This program is free software: you can redistribute it and/or modify | |||
| * it under the terms of the GNU General Public License as published by | |||
| * the Free Software Foundation, either version 3 of the License, or | |||
| * (at your option) any later version. | |||
| * | |||
| * This program is distributed in the hope that it will be useful, | |||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| * GNU General Public License for more details. | |||
| * | |||
| * You should have received a copy of the GNU General Public License | |||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "uart.h" | |||
| #if defined(MCU_KINETIS) | |||
| static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE}; | |||
| #elif defined(WB32F3G71xx) || defined(WB32FQ95xx) | |||
| static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_WRDLEN, SD1_STPBIT, SD1_PARITY, SD1_ATFLCT}; | |||
| #else | |||
| static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_CR1, SD1_CR2, SD1_CR3}; | |||
| #endif | |||
| void uart_init(uint32_t baud) { | |||
| static bool is_initialised = false; | |||
| if (!is_initialised) { | |||
| is_initialised = true; | |||
| #if defined(MCU_KINETIS) | |||
| serialConfig.sc_speed = baud; | |||
| #else | |||
| serialConfig.speed = baud; | |||
| #endif | |||
| #if defined(USE_GPIOV1) | |||
| palSetLineMode(SD1_TX_PIN, SD1_TX_PAL_MODE); | |||
| palSetLineMode(SD1_RX_PIN, SD1_RX_PAL_MODE); | |||
| #else | |||
| palSetLineMode(SD1_TX_PIN, PAL_MODE_ALTERNATE(SD1_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST); | |||
| palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE(SD1_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST); | |||
| #endif | |||
| sdStart(&SERIAL_DRIVER, &serialConfig); | |||
| } | |||
| } | |||
| void uart_write(uint8_t data) { | |||
| sdPut(&SERIAL_DRIVER, data); | |||
| } | |||
| uint8_t uart_read(void) { | |||
| msg_t res = sdGet(&SERIAL_DRIVER); | |||
| return (uint8_t)res; | |||
| } | |||
| void uart_transmit(const uint8_t *data, uint16_t length) { | |||
| sdWrite(&SERIAL_DRIVER, data, length); | |||
| } | |||
| void uart_receive(uint8_t *data, uint16_t length) { | |||
| sdRead(&SERIAL_DRIVER, data, length); | |||
| } | |||
| bool uart_available(void) { | |||
| return !sdGetWouldBlock(&SERIAL_DRIVER); | |||
| } | |||
+ 139
- 55
platforms/chibios/drivers/uart.h
View File
+ 65
- 0
platforms/chibios/drivers/uart_serial.c
View File
| @ -0,0 +1,65 @@ | |||
| // Copyright 2024 Stefan Kerkmann (@KarlK90) | |||
| // Copyright 2021 QMK | |||
| // SPDX-License-Identifier: GPL-2.0-or-later | |||
| #include "uart.h" | |||
| #if defined(MCU_KINETIS) | |||
| static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE}; | |||
| #elif defined(WB32F3G71xx) || defined(WB32FQ95xx) | |||
| static SerialConfig serialConfig = { | |||
| SERIAL_DEFAULT_BITRATE, UART_WRDLEN, UART_STPBIT, UART_PARITY, UART_ATFLCT, | |||
| }; | |||
| #else | |||
| static SerialConfig serialConfig = { | |||
| SERIAL_DEFAULT_BITRATE, | |||
| UART_CR1, | |||
| UART_CR2, | |||
| UART_CR3, | |||
| }; | |||
| #endif | |||
| void uart_init(uint32_t baud) { | |||
| static bool is_initialised = false; | |||
| if (is_initialised) { | |||
| return; | |||
| } | |||
| is_initialised = true; | |||
| #if defined(MCU_KINETIS) | |||
| serialConfig.sc_speed = baud; | |||
| #else | |||
| serialConfig.speed = baud; | |||
| #endif | |||
| #if defined(USE_GPIOV1) | |||
| palSetLineMode(UART_TX_PIN, UART_TX_PAL_MODE); | |||
| palSetLineMode(UART_RX_PIN, UART_RX_PAL_MODE); | |||
| #else | |||
| palSetLineMode(UART_TX_PIN, PAL_MODE_ALTERNATE(UART_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST); | |||
| palSetLineMode(UART_RX_PIN, PAL_MODE_ALTERNATE(UART_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST); | |||
| #endif | |||
| sdStart(&UART_DRIVER, &serialConfig); | |||
| } | |||
| void uart_write(uint8_t data) { | |||
| sdPut(&UART_DRIVER, data); | |||
| } | |||
| uint8_t uart_read(void) { | |||
| return (uint8_t)sdGet(&UART_DRIVER); | |||
| } | |||
| void uart_transmit(const uint8_t *data, uint16_t length) { | |||
| sdWrite(&UART_DRIVER, data, length); | |||
| } | |||
| void uart_receive(uint8_t *data, uint16_t length) { | |||
| sdRead(&UART_DRIVER, data, length); | |||
| } | |||
| bool uart_available(void) { | |||
| return !sdGetWouldBlock(&UART_DRIVER); | |||
| } | |||
+ 77
- 0
platforms/chibios/drivers/uart_sio.c
View File
| @ -0,0 +1,77 @@ | |||
| // Copyright 2024 Stefan Kerkmann (@KarlK90) | |||
| // Copyright 2021 QMK | |||
| // SPDX-License-Identifier: GPL-2.0-or-later | |||
| #include "uart.h" | |||
| #if defined(MCU_RP) | |||
| // 38400 baud, 8 data bits, 1 stop bit, no parity, no flow control | |||
| static SIOConfig sioConfig = { | |||
| .baud = SIO_DEFAULT_BITRATE, | |||
| .UARTLCR_H = (UART_UARTLCR_H_WLEN_8BITS | UART_UARTLCR_H_FEN), | |||
| .UARTCR = 0U, | |||
| .UARTIFLS = (UART_UARTIFLS_RXIFLSEL_1_8F | UART_UARTIFLS_TXIFLSEL_1_8E), | |||
| .UARTDMACR = 0U, | |||
| }; | |||
| #else | |||
| static SIOConfig sioConfig = { | |||
| .baud = SIO_DEFAULT_BITRATE, | |||
| # if defined(MCU_STM32) && defined(CHIBIOS_HAL_USARTv3) | |||
| .presc = USART_PRESC1, | |||
| # endif | |||
| .cr1 = UART_CR1, | |||
| .cr2 = UART_CR2, | |||
| .cr3 = UART_CR3, | |||
| }; | |||
| #endif | |||
| void uart_init(uint32_t baud) { | |||
| static bool is_initialised = false; | |||
| if (is_initialised) { | |||
| return; | |||
| } | |||
| is_initialised = true; | |||
| sioConfig.baud = baud; | |||
| #if defined(USE_GPIOV1) | |||
| palSetLineMode(UART_TX_PIN, UART_TX_PAL_MODE); | |||
| palSetLineMode(UART_RX_PIN, UART_RX_PAL_MODE); | |||
| #else | |||
| palSetLineMode(UART_TX_PIN, PAL_MODE_ALTERNATE(UART_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST); | |||
| palSetLineMode(UART_RX_PIN, PAL_MODE_ALTERNATE(UART_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST); | |||
| #endif | |||
| sioStart(&UART_DRIVER, &sioConfig); | |||
| } | |||
| void uart_write(uint8_t data) { | |||
| chnPutTimeout(&UART_DRIVER, data, TIME_INFINITE); | |||
| } | |||
| uint8_t uart_read(void) { | |||
| msg_t result = chnGetTimeout(&UART_DRIVER, TIME_INFINITE); | |||
| if (sioHasRXErrorsX(&UART_DRIVER)) { | |||
| sioGetAndClearErrors(&UART_DRIVER); | |||
| } | |||
| return (uint8_t)result; | |||
| } | |||
| void uart_transmit(const uint8_t *data, uint16_t length) { | |||
| chnWrite(&UART_DRIVER, data, length); | |||
| } | |||
| void uart_receive(uint8_t *data, uint16_t length) { | |||
| chnRead(&UART_DRIVER, data, length); | |||
| if (sioHasRXErrorsX(&UART_DRIVER)) { | |||
| sioGetAndClearErrors(&UART_DRIVER); | |||
| } | |||
| } | |||
| bool uart_available() { | |||
| return !sioIsRXEmptyX(&UART_DRIVER); | |||
| } | |||