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/doio/kb30 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/doio/kb30')
| -rw-r--r-- | keyboards/doio/kb30/config.h | 24 | ||||
| -rw-r--r-- | keyboards/doio/kb30/info.json | 9 | ||||
| -rw-r--r-- | keyboards/doio/kb30/rules.mk | 6 |
3 files changed, 9 insertions, 30 deletions
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h index 21f2109401..866bd3e1d9 100644 --- a/keyboards/doio/kb30/config.h +++ b/keyboards/doio/kb30/config.h @@ -17,41 +17,17 @@ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 7 #define MATRIX_ROW_PINS { B3, B4, B9, B8, A5, A6 } #define MATRIX_COL_PINS { B14, B13, B12, B0, A7, A9, A8 } #define DIODE_DIRECTION COL2ROW // COL2ROW or ROW2COL -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -// #define LED_NUM_LOCK_PIN A8 -// #define LED_CAPS_LOCK_PIN B14 -// #define LED_SCROLL_LOCK_PIN A9 -// #define LED_PIN_ON_STATE 0 - -/* key encoders pins*/ -#define ENCODERS_PAD_A { B5 , A1 , A3 } -#define ENCODERS_PAD_B { B6 , A2 , A4 } -#define ENCODER_RESOLUTIONS \ - { 4, 4, 2 } - // #define QMK_KEYS_PER_SCAN 12 -// #define FORCE_NKRO - /* OLED */ #ifdef OLED_ENABLE diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json index c8307ce80b..9fe8e83185 100644 --- a/keyboards/doio/kb30/info.json +++ b/keyboards/doio/kb30/info.json @@ -8,6 +8,15 @@ "pid": "0x3001", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B6"}, + {"pin_a": "A1", "pin_b": "A2"}, + {"pin_a": "A3", "pin_b": "A4", "resolution": 2} + ] + }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk index 7d16bb3a10..a50872f0d5 100644 --- a/keyboards/doio/kb30/rules.mk +++ b/keyboards/doio/kb30/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # |