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/neito | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/neito')
| -rw-r--r-- | keyboards/neito/config.h | 12 | ||||
| -rw-r--r-- | keyboards/neito/info.json | 15 | ||||
| -rw-r--r-- | keyboards/neito/rules.mk | 6 |
3 files changed, 15 insertions, 18 deletions
diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 7e61de81c8..0e5ca7a6b6 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -14,23 +14,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" -#define MATRIX_ROWS 10 -#define MATRIX_COLS 8 #define MATRIX_ROW_PINS { E6, F0, F5, F6, C7, C6, B4, D7, D6, D4 } #define MATRIX_COL_PINS { F4, F1, F7, B2, D1, D2, B3, B1 } #define DIODE_DIRECTION COL2ROW -#define ENCODERS_PAD_A { B7 } -#define ENCODERS_PAD_B { B0 } -#define ENCODER_RESOLUTION 4 - -#define LED_CAPS_LOCK_PIN B6 -#define BACKLIGHT_ON_STATE 0 - -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 5 #define GRAVE_ESC_CTRL_OVERRIDE diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index 884a97b136..7455762b51 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -8,6 +8,21 @@ "pid": "0xB44C", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B7", "pin_b": "B0"} + ] + }, + "backlight": { + "pin": "B5", + "levels": 5, + "on_state": 0 + }, + "indicators": { + "caps_lock": "B6" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index 6e98d9d811..a36b9d8dca 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |