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/waterfowl | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/waterfowl')
| -rw-r--r-- | keyboards/waterfowl/config.h | 17 | ||||
| -rw-r--r-- | keyboards/waterfowl/info.json | 11 | ||||
| -rw-r--r-- | keyboards/waterfowl/rules.mk | 6 |
3 files changed, 11 insertions, 23 deletions
diff --git a/keyboards/waterfowl/config.h b/keyboards/waterfowl/config.h index 299da6f9f0..62f5ba6633 100644 --- a/keyboards/waterfowl/config.h +++ b/keyboards/waterfowl/config.h @@ -15,12 +15,6 @@ */ #pragma once -#include "config_common.h" - -/* Key matrix size */ -/* Rows are doubled up */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 5 // Wiring #define MATRIX_ROW_PINS { D4, C6, D7, E6 } @@ -29,21 +23,10 @@ // COL2ROW, ROW2COL #define DIODE_DIRECTION COL2ROW -// Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed -#define DEBOUNCE 5 - -// Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - -#define SOFT_SERIAL_PIN D2 #define OLED_DISPLAY_128X64 #define SPLIT_MODS_ENABLE #define SPLIT_WPM_ENABLE #define SPLIT_USB_DETECT -// Encoders -#define ENCODERS_PAD_A { B4, B3 } -#define ENCODERS_PAD_B { B5, B2 } -#define ENCODER_RESOLUTIONS { 4, 2 } - // Tapping term #define TAPPING_TERM 200
\ No newline at end of file diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json index f8219ec80a..17f01e24e2 100644 --- a/keyboards/waterfowl/info.json +++ b/keyboards/waterfowl/info.json @@ -8,6 +8,17 @@ "pid": "0x9CE3", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "B5"}, + {"pin_a": "B3", "pin_b": "B2", "resolution": 2}, + ] + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk index 1515d5f866..4f359b9ee8 100644 --- a/keyboards/waterfowl/rules.mk +++ b/keyboards/waterfowl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |