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/pisces | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/pisces')
| -rw-r--r-- | keyboards/pisces/config.h | 13 | ||||
| -rw-r--r-- | keyboards/pisces/info.json | 5 | ||||
| -rw-r--r-- | keyboards/pisces/rules.mk | 6 |
3 files changed, 5 insertions, 19 deletions
diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h index 8690a4e5f1..01210f2a0f 100644 --- a/keyboards/pisces/config.h +++ b/keyboards/pisces/config.h @@ -16,21 +16,11 @@ #pragma once -#include "config_common.h" - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D2 - /* Select hand configuration */ #define SPLIT_HAND_MATRIX_GRID B0,B7 #define MATRIX_MASKED #define SPLIT_USB_DETECT -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS (3*2) -#define MATRIX_COLS 7 - /* * Keyboard Matrix Assignments * @@ -47,9 +37,6 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* 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 */ diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json index f70712c9f6..e7243bfc8d 100644 --- a/keyboards/pisces/info.json +++ b/keyboards/pisces/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_3x6_1": { "layout": [ diff --git a/keyboards/pisces/rules.mk b/keyboards/pisces/rules.mk index fe6c057668..b3c916d3ce 100644 --- a/keyboards/pisces/rules.mk +++ b/keyboards/pisces/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |