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/ymdk/np24 | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/ymdk/np24')
-rw-r--r-- | keyboards/ymdk/np24/u4rgb6/config.h | 18 | ||||
-rw-r--r-- | keyboards/ymdk/np24/u4rgb6/info.json | 11 | ||||
-rw-r--r-- | keyboards/ymdk/np24/u4rgb6/rules.mk | 8 |
3 files changed, 11 insertions, 26 deletions
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index 08df0fa144..0524cfd563 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -15,11 +15,6 @@ */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 4 /* key matrix pins */ #define MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 } @@ -28,19 +23,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* LED indicator pins */ -#define LED_NUM_LOCK_PIN C6 -#define LED_PIN_ON_STATE 0 - -/* number of backlight levels */ -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -# define BACKLIGHT_LEVELS 31 -#endif - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index c6965cd568..dd4b532538 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -7,6 +7,17 @@ "pid": "0x5024", "device_version": "4.0.6" }, + "backlight": { + "pin": "B7", + "levels": 31 + }, + "indicators": { + "num_lock": "C6", + "on_state": 0 + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["ortho_6x4", "numpad_6x4"], "layouts": { "LAYOUT_ortho_6x4": { "layout": [ diff --git a/keyboards/ymdk/np24/u4rgb6/rules.mk b/keyboards/ymdk/np24/u4rgb6/rules.mk index 95064b139d..8a6e2c7b71 100644 --- a/keyboards/ymdk/np24/u4rgb6/rules.mk +++ b/keyboards/ymdk/np24/u4rgb6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -16,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = ortho_6x4 numpad_6x4 |