diff options
Diffstat (limited to 'keyboards/merge/um80')
| -rw-r--r-- | keyboards/merge/um80/config.h | 7 | ||||
| -rw-r--r-- | keyboards/merge/um80/info.json | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index 238e5f6d43..f267fa3670 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -16,17 +16,10 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_SPLIT #define RGBLED_NUM 100 #define RGBLED_SPLIT { 48, 52 } diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index e3e1359c92..9b7e73b2da 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -8,6 +8,11 @@ "pid": "0x3241", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B7", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} @@ -16,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { |