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/cosmo65 | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/cosmo65')
-rw-r--r-- | keyboards/cosmo65/config.h | 5 | ||||
-rw-r--r-- | keyboards/cosmo65/info.json | 2 | ||||
-rw-r--r-- | keyboards/cosmo65/rules.mk | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/keyboards/cosmo65/config.h b/keyboards/cosmo65/config.h index 810b278c74..b8131f5d7d 100644 --- a/keyboards/cosmo65/config.h +++ b/keyboards/cosmo65/config.h @@ -14,7 +14,6 @@ along with this program. If not, see http://www.gnu.org/licenses/. #pragma once -#include "config_common.h" /* RGB Lighting */ #define RGB_DI_PIN F7 @@ -29,10 +28,6 @@ along with this program. If not, see http://www.gnu.org/licenses/. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - /* keyboard matrix assignments */ #define MATRIX_ROW_PINS { D5, D0, F0, F5, F4 } #define MATRIX_COL_PINS { E6, D4, D6, D7, B4, B5, B6, C6, C7, D1, D2, D3, F1, F6 } diff --git a/keyboards/cosmo65/info.json b/keyboards/cosmo65/info.json index da4317de80..a0bd7ed6e4 100644 --- a/keyboards/cosmo65/info.json +++ b/keyboards/cosmo65/info.json @@ -8,6 +8,8 @@ "pid": "0x6331", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cosmo65/rules.mk b/keyboards/cosmo65/rules.mk index 909885ec6f..940a788add 100644 --- a/keyboards/cosmo65/rules.mk +++ b/keyboards/cosmo65/rules.mk @@ -1,9 +1,3 @@ -# MCU Name -MCU = atmega32u4 - -# Bootloader -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |