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/handwired/brain | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/handwired/brain')
| -rw-r--r-- | keyboards/handwired/brain/config.h | 18 | ||||
| -rw-r--r-- | keyboards/handwired/brain/info.json | 11 | ||||
| -rw-r--r-- | keyboards/handwired/brain/rules.mk | 6 |
3 files changed, 12 insertions, 23 deletions
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 317d25f5f5..9b7c48da75 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -20,15 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" #define SPLIT_USB_DETECT -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - // wiring of each half #define MATRIX_COL_PINS \ @@ -48,11 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* Set 0 if debouncing isn't needed */ - - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D0 #define EE_HANDS //#define SPLIT_HAND_PIN B7 @@ -93,9 +82,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define TAPPING_TERM 150 //#define IGNORE_MOD_TAP_INTERRUPT -//#define TAPPING_FORCE_HOLD - -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 6 -#define BOOTMAGIC_LITE_ROW_RIGHT 5 -#define BOOTMAGIC_LITE_COLUMN_RIGHT 0 +//#define QUICK_TAP_TERM 0 diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json index 89af811654..a085da297f 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/info.json @@ -8,6 +8,17 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "bootmagic": { + "matrix": [0, 6] + }, + "split": { + "soft_serial_pin": "D0", + "bootmagic": { + "matrix": [5, 0] + } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/brain/rules.mk b/keyboards/handwired/brain/rules.mk index d42aa82706..df7d719da1 100644 --- a/keyboards/handwired/brain/rules.mk +++ b/keyboards/handwired/brain/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |