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/handwired/elrgo_s | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/handwired/elrgo_s')
-rw-r--r-- | keyboards/handwired/elrgo_s/config.h | 12 | ||||
-rw-r--r-- | keyboards/handwired/elrgo_s/info.json | 5 | ||||
-rw-r--r-- | keyboards/handwired/elrgo_s/rules.mk | 6 |
3 files changed, 5 insertions, 18 deletions
diff --git a/keyboards/handwired/elrgo_s/config.h b/keyboards/handwired/elrgo_s/config.h index dc20ab1d3e..40b3f759d8 100644 --- a/keyboards/handwired/elrgo_s/config.h +++ b/keyboards/handwired/elrgo_s/config.h @@ -17,11 +17,6 @@ Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru> #pragma once -#include "config_common.h" - -// Rows are doubled-up for splits -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 // Wiring of each half #define MATRIX_ROW_PINS { B1, B3, B2, B6 } @@ -30,13 +25,6 @@ Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru> #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D0 - - /* disable debug print */ // #define NO_DEBUG diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json index a176872fbf..33e3c7566c 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/info.json @@ -8,6 +8,11 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_split_3x6_5": { "layout": [ diff --git a/keyboards/handwired/elrgo_s/rules.mk b/keyboards/handwired/elrgo_s/rules.mk index c5b46aa48e..04b1fc01b7 100644 --- a/keyboards/handwired/elrgo_s/rules.mk +++ b/keyboards/handwired/elrgo_s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |