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/jian/rev1 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/jian/rev1')
| -rw-r--r-- | keyboards/jian/rev1/config.h | 15 | ||||
| -rw-r--r-- | keyboards/jian/rev1/info.json | 8 | ||||
| -rw-r--r-- | keyboards/jian/rev1/rules.mk | 6 |
3 files changed, 7 insertions, 22 deletions
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index 3e8f0eed02..083b235a2e 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -17,12 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 8 -#define MATRIX_COLS 7 #define DIODE_DIRECTION COL2ROW // wiring of each half @@ -83,16 +78,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock) #endif // SCROLL_NMOSFET -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -#ifdef BACKLIGHT_ENABLE -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 -//#define BACKLIGHT_BREATHING //not working with splits right now -#define BREATHING_PERIOD 6 -#endif - /* ws2812 RGB LED */ #define RGB_DI_PIN D4 #define RGBLIGHT_TIMER diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json index 32540b3f78..fc65cb13b8 100644 --- a/keyboards/jian/rev1/info.json +++ b/keyboards/jian/rev1/info.json @@ -2,5 +2,11 @@ "keyboard_name": "Jian", "usb": { "device_version": "1.0.0" - } + }, + "backlight": { + "pin": "B6", + "levels": 5 + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk index cce01f50c3..8e6da2d84f 100644 --- a/keyboards/jian/rev1/rules.mk +++ b/keyboards/jian/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |