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/blaster75 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/blaster75')
| -rw-r--r-- | keyboards/blaster75/config.h | 10 | ||||
| -rw-r--r-- | keyboards/blaster75/info.json | 2 | ||||
| -rw-r--r-- | keyboards/blaster75/rules.mk | 6 |
3 files changed, 2 insertions, 16 deletions
diff --git a/keyboards/blaster75/config.h b/keyboards/blaster75/config.h index 7f17869ce5..f6d8d07de8 100644 --- a/keyboards/blaster75/config.h +++ b/keyboards/blaster75/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* Matrix Size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 15 /* Matrix Pinouts */ // 0 1 2 3 4 5 6 7 8 9 A B C D E @@ -30,8 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Diode Direction */ #define DIODE_DIRECTION COL2ROW - -/* Debounce Setting */ -#define DEBOUNCE 5 - - diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json index 332c5a5f12..47561bc286 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/info.json @@ -8,6 +8,8 @@ "pid": "0xB075", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/blaster75/rules.mk b/keyboards/blaster75/rules.mk index d851baa2c4..997fedb0b1 100644 --- a/keyboards/blaster75/rules.mk +++ b/keyboards/blaster75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |