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/pjb | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/pjb')
| -rw-r--r-- | keyboards/pjb/eros/config.h | 9 | ||||
| -rw-r--r-- | keyboards/pjb/eros/info.json | 8 | ||||
| -rw-r--r-- | keyboards/pjb/eros/rules.mk | 8 |
3 files changed, 8 insertions, 17 deletions
diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h index c8d9692461..932c66ba01 100644 --- a/keyboards/pjb/eros/config.h +++ b/keyboards/pjb/eros/config.h @@ -16,17 +16,8 @@ #pragma once -#include "config_common.h" - -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 #define MATRIX_ROW_PINS { B2, B1, B0, D7, B7, D1 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D5, B4, D3, D2, E6, B3 } #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - -#define LED_CAPS_LOCK_PIN D6 -#define LED_SCROLL_LOCK_PIN D0 -#define LED_PIN_ON_STATE 0 diff --git a/keyboards/pjb/eros/info.json b/keyboards/pjb/eros/info.json index bda8ab15fb..cbba6dcecc 100644 --- a/keyboards/pjb/eros/info.json +++ b/keyboards/pjb/eros/info.json @@ -8,6 +8,13 @@ "pid": "0x4552", "device_version": "2.0.0" }, + "indicators": { + "caps_lock": "D6", + "scroll_lock": "D0", + "on_state": 0 + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all_f13": "LAYOUT_tkl_f13_ansi_split_bs_rshift", "LAYOUT_tkl_ansi_f13": "LAYOUT_tkl_f13_ansi", @@ -17,6 +24,7 @@ "LAYOUT_tkl_ansi_tsangan_f13_split_back": "LAYOUT_tkl_f13_ansi_tsangan_split_bs", "LAYOUT_tkl_ansi_tsangan_f13_split_shift": "LAYOUT_tkl_f13_ansi_tsangan_split_rshift" }, + "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_ansi_tsangan"], "layouts": { "LAYOUT_tkl_f13_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/pjb/eros/rules.mk b/keyboards/pjb/eros/rules.mk index 70f7fdde37..12dca933d7 100644 --- a/keyboards/pjb/eros/rules.mk +++ b/keyboards/pjb/eros/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -15,5 +9,3 @@ COMMAND_ENABLE = yes # Commands for debug and configuration BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Enable audio output - -LAYOUTS = tkl_f13_ansi tkl_f13_ansi_split_bs_rshift tkl_f13_ansi_tsangan |