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/basketweave | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/basketweave')
| -rw-r--r-- | keyboards/basketweave/config.h | 21 | ||||
| -rw-r--r-- | keyboards/basketweave/info.json | 7 | ||||
| -rw-r--r-- | keyboards/basketweave/rules.mk | 6 |
3 files changed, 7 insertions, 27 deletions
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h index 88828d7ddd..2c3f6f97f2 100644 --- a/keyboards/basketweave/config.h +++ b/keyboards/basketweave/config.h @@ -16,11 +16,6 @@ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 #define MATRIX_ROW_PINS { A6, C6, C7, A7, A5 } #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, B0, B1, B2, D5, D6, C5, C4, C3, C2, C1 } @@ -30,25 +25,9 @@ #define USB_MAX_POWER_CONSUMPTION 100 -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - -#define ENCODERS_PAD_A { D7 } -#define ENCODERS_PAD_B { C0 } -#define ENCODER_RESOLUTION 4 #define TAP_CODE_DELAY 10 - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json index c26fecaf1b..3ef505854e 100644 --- a/keyboards/basketweave/info.json +++ b/keyboards/basketweave/info.json @@ -8,6 +8,13 @@ "pid": "0x8989", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "D7", "pin_b": "C0"} + ] + }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/basketweave/rules.mk b/keyboards/basketweave/rules.mk index 138ccfe3e2..b43c5121f4 100644 --- a/keyboards/basketweave/rules.mk +++ b/keyboards/basketweave/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # |