diff options
Diffstat (limited to 'keyboards/merge/iso_macro')
-rw-r--r-- | keyboards/merge/iso_macro/config.h | 11 | ||||
-rw-r--r-- | keyboards/merge/iso_macro/info.json | 11 | ||||
-rw-r--r-- | keyboards/merge/iso_macro/rules.mk | 6 |
3 files changed, 11 insertions, 17 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h index f5a82d2df8..7bf2b1b33b 100644 --- a/keyboards/merge/iso_macro/config.h +++ b/keyboards/merge/iso_macro/config.h @@ -16,20 +16,9 @@ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 #define MATRIX_ROW_PINS { F4, F5, F6} #define MATRIX_COL_PINS { B4, B5, B6} -#define BACKLIGHT_PIN B7 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - - -#define ENCODERS_PAD_A { F0, D0 } -#define ENCODERS_PAD_B { F1, D1 } -#define ENCODER_RESOLUTION 4 diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json index bdade6a712..bc4269755f 100644 --- a/keyboards/merge/iso_macro/info.json +++ b/keyboards/merge/iso_macro/info.json @@ -8,6 +8,17 @@ "pid": "0x1200", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "F0", "pin_b": "F1"}, + {"pin_a": "D0", "pin_b": "D1"} + ] + }, + "backlight": { + "pin": "B7" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/merge/iso_macro/rules.mk b/keyboards/merge/iso_macro/rules.mk index a220ff6f85..f6b1d47e1a 100644 --- a/keyboards/merge/iso_macro/rules.mk +++ b/keyboards/merge/iso_macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |