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/trashman | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/trashman')
| -rw-r--r-- | keyboards/trashman/ketch/config.h | 4 | ||||
| -rw-r--r-- | keyboards/trashman/ketch/info.json | 2 | ||||
| -rw-r--r-- | keyboards/trashman/ketch/rules.mk | 6 |
3 files changed, 2 insertions, 10 deletions
diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h index 7bee062c77..4889ef5c18 100644 --- a/keyboards/trashman/ketch/config.h +++ b/keyboards/trashman/ketch/config.h @@ -21,14 +21,10 @@ SOFTWARE. */ #pragma once -#include "config_common.h" -#define MATRIX_ROWS 6 -#define MATRIX_COLS 8 #define MATRIX_ROW_PINS { F5, F1, F0, F7, B6, F6 } #define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7 } #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 #define USB_MAX_POWER_CONSUMPTION 100 #define RGB_DI_PIN F4 diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index fbeffd539c..57c6289d0d 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -8,6 +8,8 @@ "pid": "0x8947", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/trashman/ketch/rules.mk b/keyboards/trashman/ketch/rules.mk index 08651407c5..5525d13f88 100644 --- a/keyboards/trashman/ketch/rules.mk +++ b/keyboards/trashman/ketch/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |