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/kbdfans/maja_soldered | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/kbdfans/maja_soldered')
| -rwxr-xr-x | keyboards/kbdfans/maja_soldered/config.h | 11 | ||||
| -rw-r--r-- | keyboards/kbdfans/maja_soldered/info.json | 6 | ||||
| -rwxr-xr-x | keyboards/kbdfans/maja_soldered/rules.mk | 6 |
3 files changed, 6 insertions, 17 deletions
diff --git a/keyboards/kbdfans/maja_soldered/config.h b/keyboards/kbdfans/maja_soldered/config.h index 62a0201c17..bf315f1ee3 100755 --- a/keyboards/kbdfans/maja_soldered/config.h +++ b/keyboards/kbdfans/maja_soldered/config.h @@ -15,22 +15,11 @@ */ #pragma once -#include "config_common.h" -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 #define MATRIX_ROW_PINS { F0, B6, D6, B4, D7 } #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, B0, B1, B2, B3, B7, D2, D3, D5 } #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 3 - -/* number of backlight levels */ -#define BACKLIGHT_PIN B5 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 3 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/info.json index 296ece294c..b59d3eae39 100644 --- a/keyboards/kbdfans/maja_soldered/info.json +++ b/keyboards/kbdfans/maja_soldered/info.json @@ -8,6 +8,12 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "debounce": 3, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kbdfans/maja_soldered/rules.mk b/keyboards/kbdfans/maja_soldered/rules.mk index 9385d5e176..ea875031b1 100755 --- a/keyboards/kbdfans/maja_soldered/rules.mk +++ b/keyboards/kbdfans/maja_soldered/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |