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/avalanche/v2 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/avalanche/v2')
| -rw-r--r-- | keyboards/avalanche/v2/config.h | 9 | ||||
| -rw-r--r-- | keyboards/avalanche/v2/info.json | 10 | ||||
| -rw-r--r-- | keyboards/avalanche/v2/rules.mk | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h index 16b26d8ffc..3978f581e1 100644 --- a/keyboards/avalanche/v2/config.h +++ b/keyboards/avalanche/v2/config.h @@ -3,22 +3,13 @@ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D2 - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_SPLIT - -#define ENCODERS_PAD_A { B5 } -#define ENCODERS_PAD_B { F4 } -#define ENCODER_RESOLUTION 2 diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index 52c03b57a3..7105fc1787 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -8,6 +8,16 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "F4", "resolution": 2} + ] + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v2/rules.mk b/keyboards/avalanche/v2/rules.mk index 3b645daf9b..8e241b2dfd 100644 --- a/keyboards/avalanche/v2/rules.mk +++ b/keyboards/avalanche/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |