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/keebio/iris/rev6a | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/keebio/iris/rev6a')
-rw-r--r-- | keyboards/keebio/iris/rev6a/config.h | 22 | ||||
-rw-r--r-- | keyboards/keebio/iris/rev6a/info.json | 12 | ||||
-rw-r--r-- | keyboards/keebio/iris/rev6a/rules.mk | 6 |
3 files changed, 11 insertions, 29 deletions
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h index 69ea7556fe..dd05a6ec3b 100644 --- a/keyboards/keebio/iris/rev6a/config.h +++ b/keyboards/keebio/iris/rev6a/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 6 - // wiring of each half #define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 } #define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 } @@ -29,26 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 } #define SPLIT_HAND_PIN D5 -#define ENCODERS_PAD_A { B3 } -#define ENCODERS_PAD_B { B2 } -#define ENCODERS_PAD_A_RIGHT { B3 } -#define ENCODERS_PAD_B_RIGHT { B2 } - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D0 - /* ws2812 RGB LED */ #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json index c580018ea7..027a79f512 100644 --- a/keyboards/keebio/iris/rev6a/info.json +++ b/keyboards/keebio/iris/rev6a/info.json @@ -3,5 +3,15 @@ "usb": { "pid": "0x6356", "device_version": "6.1.0" - } + }, + "encoder": { + "rotary": [ + {"pin_a": "B3", "pin_b": "B2"} + ] + }, + "split": { + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/keebio/iris/rev6a/rules.mk b/keyboards/keebio/iris/rev6a/rules.mk index 87f19b5fc1..5dcf2c2b7c 100644 --- a/keyboards/keebio/iris/rev6a/rules.mk +++ b/keyboards/keebio/iris/rev6a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |