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/0xcb/static | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/0xcb/static')
| -rw-r--r-- | keyboards/0xcb/static/config.h | 15 | ||||
| -rw-r--r-- | keyboards/0xcb/static/info.json | 7 | ||||
| -rw-r--r-- | keyboards/0xcb/static/rules.mk | 6 |
3 files changed, 7 insertions, 21 deletions
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h index 784baadc2c..f77002e8ab 100644 --- a/keyboards/0xcb/static/config.h +++ b/keyboards/0xcb/static/config.h @@ -16,14 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" // clang-format off -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 - - /* * Keyboard Matrix Assignments * @@ -41,12 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW #define TAP_CODE_DELAY 10 -#define ENCODER_RESOLUTION 4 -#define ENCODERS_PAD_A { D0 } -#define ENCODERS_PAD_B { D1 } // clang-format on -/* 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 @@ -56,7 +45,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* oled custom font */ #define OLED_FONT_END 255 #define OLED_FONT_H "gfxfont.c" - -/* bootmagic */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json index 4a6232abad..a18bd7b313 100644 --- a/keyboards/0xcb/static/info.json +++ b/keyboards/0xcb/static/info.json @@ -8,6 +8,13 @@ "pid": "0xA455", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "D0", "pin_b": "D1"} + ] + }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk index a06dda50ba..24ff2f2cfd 100644 --- a/keyboards/0xcb/static/rules.mk +++ b/keyboards/0xcb/static/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # |