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/elephant42 | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/elephant42')
-rw-r--r-- | keyboards/elephant42/config.h | 13 | ||||
-rw-r--r-- | keyboards/elephant42/info.json | 5 | ||||
-rw-r--r-- | keyboards/elephant42/rules.mk | 6 |
3 files changed, 5 insertions, 19 deletions
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h index a1c4d21c11..49ff44755a 100644 --- a/keyboards/elephant42/config.h +++ b/keyboards/elephant42/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 /* * Keyboard Matrix Assignments @@ -41,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D2 - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_SPLIT { 27, 27 } @@ -74,12 +67,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGB_MATRIX_SPD_STEP 8 #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - #ifndef OLED_FONT_H # define OLED_FONT_H "keyboards/elephant42/lib/glcdfont.c" #endif diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json index cbc7b78378..161ec776cd 100644 --- a/keyboards/elephant42/info.json +++ b/keyboards/elephant42/info.json @@ -8,6 +8,11 @@ "pid": "0x0721", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk index 642314b9c2..66270aae47 100644 --- a/keyboards/elephant42/rules.mk +++ b/keyboards/elephant42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |