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/gon/nerd60 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/gon/nerd60')
| -rw-r--r-- | keyboards/gon/nerd60/config.h | 17 | ||||
| -rw-r--r-- | keyboards/gon/nerd60/info.json | 9 | ||||
| -rw-r--r-- | keyboards/gon/nerd60/rules.mk | 8 |
3 files changed, 9 insertions, 25 deletions
diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h index 90b4b18494..c3762c6388 100644 --- a/keyboards/gon/nerd60/config.h +++ b/keyboards/gon/nerd60/config.h @@ -1,15 +1,5 @@ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 8 - -/* backlight */ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 3 - /* matrix pins */ #define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5 } @@ -17,14 +7,7 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* ROW and COL for ESC key */ -#define BOOTMAGIC_LITE_ROW 8 -#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index baf67fe528..097d4d45c0 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -8,6 +8,15 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, + "bootmagic": { + "matrix": [8, 0] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/gon/nerd60/rules.mk b/keyboards/gon/nerd60/rules.mk index 903e60ee8e..e0782ddcb5 100644 --- a/keyboards/gon/nerd60/rules.mk +++ b/keyboards/gon/nerd60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -19,5 +13,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_iso 60_iso_split_bs_rshift |