gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-04-05 05:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2022-09-17 01:24:42 +00:00
commit a833644246
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platforms/chibios/drivers/uart.c
View File

@ -18,7 +18,9 @@
#include "quantum.h"
#if defined(WB32F3G71xx) || defined(WB32FQ95xx)
#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};
@ -30,11 +32,15 @@ void uart_init(uint32_t baud) {
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, PAL_MODE_ALTERNATE_OPENDRAIN);
palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE_OPENDRAIN);
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_OPENDRAIN);
palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE(SD1_RX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN);

42
platforms/chibios/drivers/uart.h
View File

@ -28,33 +28,51 @@
# define SD1_TX_PIN A9
#endif
#ifndef SD1_TX_PAL_MODE
# define SD1_TX_PAL_MODE 7
#endif
#ifndef SD1_RX_PIN
# define SD1_RX_PIN A10
#endif
#ifndef SD1_RX_PAL_MODE
# define SD1_RX_PAL_MODE 7
#endif
#ifndef SD1_CTS_PIN
# define SD1_CTS_PIN A11
#endif
#ifndef SD1_CTS_PAL_MODE
# define SD1_CTS_PAL_MODE 7
#endif
#ifndef SD1_RTS_PIN
# define SD1_RTS_PIN A12
#endif
#ifdef USE_GPIOV1
# ifndef SD1_TX_PAL_MODE
# define SD1_TX_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
# endif
# ifndef SD1_RX_PAL_MODE
# define SD1_RX_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
# endif
# ifndef SD1_CTS_PAL_MODE
# define SD1_CTS_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
# endif
# ifndef SD1_RTS_PAL_MODE
# define SD1_RTS_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
# endif
#else
# ifndef SD1_TX_PAL_MODE
# define SD1_TX_PAL_MODE 7
# endif
# ifndef SD1_RX_PAL_MODE
# define SD1_RX_PAL_MODE 7
# endif
# ifndef SD1_CTS_PAL_MODE
# define SD1_CTS_PAL_MODE 7
# endif
# ifndef SD1_RTS_PAL_MODE
# define SD1_RTS_PAL_MODE 7
# endif
#endif
#ifndef SD1_CR1
# define SD1_CR1 0