diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/yanghu/unicorne | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/yanghu/unicorne')
| -rw-r--r-- | keyboards/yanghu/unicorne/config.h | 14 | ||||
| -rw-r--r-- | keyboards/yanghu/unicorne/f411/info.json | 5 | ||||
| -rw-r--r-- | keyboards/yanghu/unicorne/f411/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/yanghu/unicorne/info.json | 6 |
4 files changed, 11 insertions, 20 deletions
diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h index 4279f955a9..e53141a772 100644 --- a/keyboards/yanghu/unicorne/config.h +++ b/keyboards/yanghu/unicorne/config.h @@ -16,11 +16,6 @@ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 #define MATRIX_COL_PINS \ { A14, A15, B13, B14, B15, A13, A0, A1, A2, A3, A6, A7 } @@ -30,11 +25,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define ENCODERS_PAD_A \ - { B10, B2 } -#define ENCODERS_PAD_B \ - { B12, B0 } - /* I2C - required for custom i2c_init */ #define I2C1_SCL_PIN B6 #define I2C1_SDA_PIN B7 @@ -68,7 +58,3 @@ #define WS2812_DMA_STREAM STM32_DMA1_STREAM2 #define WS2812_DMA_CHANNEL 5 #define WS2812_EXTERNAL_PULLUP - - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 diff --git a/keyboards/yanghu/unicorne/f411/info.json b/keyboards/yanghu/unicorne/f411/info.json new file mode 100644 index 0000000000..2517a82403 --- /dev/null +++ b/keyboards/yanghu/unicorne/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/yanghu/unicorne/f411/rules.mk b/keyboards/yanghu/unicorne/f411/rules.mk index c25a64f4b3..e69de29bb2 100644 --- a/keyboards/yanghu/unicorne/f411/rules.mk +++ b/keyboards/yanghu/unicorne/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 67bb7f657d..85b39abe9b 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -8,6 +8,12 @@ "pid": "0x0204", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B10", "pin_b": "B12"}, + {"pin_a": "B2", "pin_b": "B0"} + ] + }, "layout_aliases": { "LAYOUT": "LAYOUT_split_3x6_4" }, |