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/nix_studio/n60_a | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/nix_studio/n60_a')
-rw-r--r-- | keyboards/nix_studio/n60_a/config.h | 5 | ||||
-rw-r--r-- | keyboards/nix_studio/n60_a/info.json | 2 | ||||
-rw-r--r-- | keyboards/nix_studio/n60_a/rules.mk | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/keyboards/nix_studio/n60_a/config.h b/keyboards/nix_studio/n60_a/config.h index 12d8d6b5ee..871856ed65 100644 --- a/keyboards/nix_studio/n60_a/config.h +++ b/keyboards/nix_studio/n60_a/config.h @@ -15,11 +15,6 @@ */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 /* * Keyboard Matrix Assignments diff --git a/keyboards/nix_studio/n60_a/info.json b/keyboards/nix_studio/n60_a/info.json index 8d83b42065..73fe121551 100644 --- a/keyboards/nix_studio/n60_a/info.json +++ b/keyboards/nix_studio/n60_a/info.json @@ -8,6 +8,8 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nix_studio/n60_a/rules.mk b/keyboards/nix_studio/n60_a/rules.mk index cbeed4653c..7fb99d788f 100644 --- a/keyboards/nix_studio/n60_a/rules.mk +++ b/keyboards/nix_studio/n60_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |