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/30wer | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/30wer')
| -rw-r--r-- | keyboards/30wer/config.h | 5 | ||||
| -rw-r--r-- | keyboards/30wer/info.json | 2 | ||||
| -rw-r--r-- | keyboards/30wer/rules.mk | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h index 3dcd4d0302..23ccf24b81 100644 --- a/keyboards/30wer/config.h +++ b/keyboards/30wer/config.h @@ -1,10 +1,5 @@ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 13 /* pcb default pin-out */ #define MATRIX_ROW_PINS { E6, B4, B5 } diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json index 62fee361a0..bbaa61f6ba 100644 --- a/keyboards/30wer/info.json +++ b/keyboards/30wer/info.json @@ -8,6 +8,8 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/30wer/rules.mk b/keyboards/30wer/rules.mk index aad55a7dfa..0048c64351 100644 --- a/keyboards/30wer/rules.mk +++ b/keyboards/30wer/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |