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/xelus/dharma | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/xelus/dharma')
-rw-r--r-- | keyboards/xelus/dharma/config.h | 11 | ||||
-rw-r--r-- | keyboards/xelus/dharma/info.json | 6 | ||||
-rw-r--r-- | keyboards/xelus/dharma/rules.mk | 6 |
3 files changed, 6 insertions, 17 deletions
diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h index 08fd8fb8f8..a3301f94f7 100644 --- a/keyboards/xelus/dharma/config.h +++ b/keyboards/xelus/dharma/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 18 - /* key matrix pins */ #define MATRIX_ROW_PINS { D0, D1, D2, D3, B0 } #define MATRIX_COL_PINS { B3, B2, B1, D5, D4, E6, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 } @@ -27,9 +23,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -37,7 +30,3 @@ #define LOCKING_RESYNC_ENABLE #define FORCE_NKRO - -#define LED_CAPS_LOCK_PIN B7 -#define LED_NUM_LOCK_PIN F0 -#define LED_PIN_ON_STATE 1 diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/info.json index 174cf2a1f0..ffd8e500b9 100644 --- a/keyboards/xelus/dharma/info.json +++ b/keyboards/xelus/dharma/info.json @@ -8,6 +8,12 @@ "pid": "0xDAAA", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B7", + "num_lock": "F0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/dharma/rules.mk b/keyboards/xelus/dharma/rules.mk index 476cf49f27..3b6a1809db 100644 --- a/keyboards/xelus/dharma/rules.mk +++ b/keyboards/xelus/dharma/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |