diff options
Diffstat (limited to 'keyboards/merge/uc1')
| -rw-r--r-- | keyboards/merge/uc1/config.h | 10 | ||||
| -rw-r--r-- | keyboards/merge/uc1/info.json | 7 | ||||
| -rw-r--r-- | keyboards/merge/uc1/rules.mk | 6 |
3 files changed, 8 insertions, 15 deletions
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index 0359ca2747..9dcfb6e074 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -14,11 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 +#pragma once #define MATRIX_ROW_PINS { B1, B2 } #define MATRIX_COL_PINS { B3, B4 } @@ -43,7 +39,3 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { F5 } -#define ENCODERS_PAD_B { F6 } -#define ENCODER_RESOLUTION 4 diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index ed4beff454..55b68a4510 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -8,6 +8,13 @@ "pid": "0x5543", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F6"} + ] + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/merge/uc1/rules.mk b/keyboards/merge/uc1/rules.mk index a3f7ea0f8d..e78e1f6cec 100644 --- a/keyboards/merge/uc1/rules.mk +++ b/keyboards/merge/uc1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |