summaryrefslogtreecommitdiffstats
path: root/keyboards/buzzard
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/buzzard')
-rw-r--r--keyboards/buzzard/buzzard.c3
-rw-r--r--keyboards/buzzard/buzzard.h9
-rw-r--r--keyboards/buzzard/keymaps/crehmann/config.h5
-rw-r--r--keyboards/buzzard/keymaps/default/config.h5
-rw-r--r--keyboards/buzzard/rev1/config.h9
-rw-r--r--keyboards/buzzard/rev1/info.json101
-rw-r--r--keyboards/buzzard/rev1/rev1.c2
-rw-r--r--keyboards/buzzard/rev1/rev1.h52
8 files changed, 102 insertions, 84 deletions
diff --git a/keyboards/buzzard/buzzard.c b/keyboards/buzzard/buzzard.c
deleted file mode 100644
index 00ad12a23e..0000000000
--- a/keyboards/buzzard/buzzard.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "buzzard.h"
diff --git a/keyboards/buzzard/buzzard.h b/keyboards/buzzard/buzzard.h
deleted file mode 100644
index f094e4af39..0000000000
--- a/keyboards/buzzard/buzzard.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_buzzard_rev1)
-# include "rev1.h"
-#endif \ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h
index c5638c767d..181396ad26 100644
--- a/keyboards/buzzard/keymaps/crehmann/config.h
+++ b/keyboards/buzzard/keymaps/crehmann/config.h
@@ -6,9 +6,6 @@
// Configure the global tapping term (default: 200ms)
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
@@ -35,4 +32,4 @@
#ifdef PS2_MOUSE_ENABLE
#define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)
#define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/buzzard/keymaps/default/config.h b/keyboards/buzzard/keymaps/default/config.h
index 0f1db48977..2a42e17d0c 100644
--- a/keyboards/buzzard/keymaps/default/config.h
+++ b/keyboards/buzzard/keymaps/default/config.h
@@ -6,9 +6,6 @@
// Configure the global tapping term (default: 200ms)
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
@@ -36,4 +33,4 @@
#ifdef PS2_MOUSE_ENABLE
#define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT) // using the right mouse button for scrolling (other buttons can be configured)
#define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index fb028e0f64..f29441fac8 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -3,15 +3,6 @@
#pragma once
-// wiring
-#define MATRIX_ROW_PINS \
- { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS \
- { B1, B3, B2, B6, B5, B4}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* 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/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
index 173eb49e72..c39421c597 100644
--- a/keyboards/buzzard/rev1/info.json
+++ b/keyboards/buzzard/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0xB077",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B1", "B3", "B2", "B6", "B5", "B4"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
@@ -15,7 +20,99 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+ "layout": [
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [4, 0], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 3], "x": 14, "y": 0},
+ {"matrix": [4, 4], "x": 15, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [5, 0], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 3], "x": 14, "y": 1},
+ {"matrix": [5, 4], "x": 15, "y": 1},
+ {"matrix": [5, 5], "x": 16, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [6, 0], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 3], "x": 14, "y": 2},
+ {"matrix": [6, 4], "x": 15, "y": 2},
+ {"matrix": [6, 5], "x": 16, "y": 2},
+
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+
+ {"matrix": [7, 0], "x": 9, "y": 3},
+ {"matrix": [7, 1], "x": 10, "y": 3},
+ {"matrix": [7, 2], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_stack": {
+ "layout": [
+ {"matrix": [0, 4], "x": 0, "y": 0},
+ {"matrix": [0, 3], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 4, "y": 0},
+ {"matrix": [1, 5], "x": 5, "y": 0},
+ {"matrix": [1, 4], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [1, 2], "x": 8, "y": 0},
+ {"matrix": [1, 1], "x": 9, "y": 0},
+ {"matrix": [1, 0], "x": 10, "y": 0},
+ {"matrix": [2, 5], "x": 11, "y": 0},
+ {"matrix": [2, 4], "x": 12, "y": 0},
+ {"matrix": [2, 3], "x": 13, "y": 0},
+ {"matrix": [2, 2], "x": 14, "y": 0},
+ {"matrix": [2, 1], "x": 15, "y": 0},
+ {"matrix": [2, 0], "x": 16, "y": 0},
+ {"matrix": [3, 2], "x": 17, "y": 0},
+ {"matrix": [3, 1], "x": 18, "y": 0},
+ {"matrix": [3, 0], "x": 19, "y": 0},
+ {"matrix": [4, 0], "x": 20, "y": 0},
+ {"matrix": [4, 1], "x": 21, "y": 0},
+ {"matrix": [4, 2], "x": 22, "y": 0},
+ {"matrix": [4, 3], "x": 23, "y": 0},
+ {"matrix": [4, 4], "x": 24, "y": 0},
+ {"matrix": [5, 0], "x": 25, "y": 0},
+ {"matrix": [5, 1], "x": 26, "y": 0},
+ {"matrix": [5, 2], "x": 27, "y": 0},
+ {"matrix": [5, 3], "x": 28, "y": 0},
+ {"matrix": [5, 4], "x": 29, "y": 0},
+ {"matrix": [5, 5], "x": 30, "y": 0},
+ {"matrix": [6, 0], "x": 31, "y": 0},
+ {"matrix": [6, 1], "x": 32, "y": 0},
+ {"matrix": [6, 2], "x": 33, "y": 0},
+ {"matrix": [6, 3], "x": 34, "y": 0},
+ {"matrix": [6, 4], "x": 35, "y": 0},
+ {"matrix": [6, 5], "x": 36, "y": 0},
+ {"matrix": [7, 0], "x": 37, "y": 0},
+ {"matrix": [7, 1], "x": 38, "y": 0},
+ {"matrix": [7, 2], "x": 39, "y": 0}
+ ]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/buzzard/rev1/rev1.c b/keyboards/buzzard/rev1/rev1.c
index 0124a92c32..c6cdc66187 100644
--- a/keyboards/buzzard/rev1/rev1.c
+++ b/keyboards/buzzard/rev1/rev1.c
@@ -1,6 +1,6 @@
// Copyright 2021 Christoph Rehmann (crehmann)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "rev1.h"
+#include "quantum.h"
#ifdef HAPTIC_ENABLE
#include "drivers/haptic/DRV2605L.h"
diff --git a/keyboards/buzzard/rev1/rev1.h b/keyboards/buzzard/rev1/rev1.h
deleted file mode 100644
index c73e9164f0..0000000000
--- a/keyboards/buzzard/rev1/rev1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "buzzard.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \
- L10, L11, L12, L13, L14, L15, R16, R17, R18, R19, R20, R21, \
- L22, L23, L24, L25, L26, L27, R28, R29, R30, R31, R32, R33, \
- L34, L35, L36, R37, R38, R39 \
-) \
-{ \
- { L04, L03, L02, L01, L00, KC_NO }, \
- { L15, L14, L13, L12, L11, L10 }, \
- { L27, L26, L25, L24, L23, L22 }, \
- { L36, L35, L34, KC_NO, KC_NO, KC_NO }, \
- { R05, R06, R07, R08, R09, KC_NO }, \
- { R16, R17, R18, R19, R20, R21 }, \
- { R28, R29, R30, R31, R32, R33 }, \
- { R37, R38, R39, KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_stack( \
- L00, L01, L02, L03, L04, \
- L10, L11, L12, L13, L14, L15, \
- L22, L23, L24, L25, L26, L27, \
- L34, L35, L36, \
- \
- R05, R06, R07, R08, R09, \
- R16, R17, R18, R19, R20, R21, \
- R28, R29, R30, R31, R32, R33, \
- R37, R38, R39 \
-) \
-{ \
- { L04, L03, L02, L01, L00, KC_NO }, \
- { L15, L14, L13, L12, L11, L10 }, \
- { L27, L26, L25, L24, L23, L22 }, \
- { L36, L35, L34, KC_NO, KC_NO, KC_NO }, \
- { R05, R06, R07, R08, R09, KC_NO }, \
- { R16, R17, R18, R19, R20, R21 }, \
- { R28, R29, R30, R31, R32, R33 }, \
- { R37, R38, R39, KC_NO, KC_NO, KC_NO }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 04:35:16 +0000