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/ortho5by12 | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/ortho5by12')
-rw-r--r-- | keyboards/ortho5by12/config.h | 11 | ||||
-rw-r--r-- | keyboards/ortho5by12/info.json | 5 | ||||
-rw-r--r-- | keyboards/ortho5by12/rules.mk | 6 |
3 files changed, 5 insertions, 17 deletions
diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h index f8b8de4259..b11ecb7733 100644 --- a/keyboards/ortho5by12/config.h +++ b/keyboards/ortho5by12/config.h @@ -14,11 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size, duplex 10x6 */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 6 /* * Keyboard Matrix Assignments @@ -36,13 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -/* 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 - -#define BOOTMAGIC_LITE_ROW 7 -#define BOOTMAGIC_LITE_COLUMN 2 diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json index 5bda0d68fb..cf87e52e48 100644 --- a/keyboards/ortho5by12/info.json +++ b/keyboards/ortho5by12/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.2" }, + "bootmagic": { + "matrix": [7, 2] + }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_ortho_5x12_1x2uC": { "layout": [ diff --git a/keyboards/ortho5by12/rules.mk b/keyboards/ortho5by12/rules.mk index 6b944b130f..bf02b03119 100644 --- a/keyboards/ortho5by12/rules.mk +++ b/keyboards/ortho5by12/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # |