summaryrefslogtreecommitdiff
path: root/keyboards/keebio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keebio')
-rw-r--r--keyboards/keebio/bamfk1/config.h2
-rw-r--r--keyboards/keebio/bamfk4/config.h12
-rw-r--r--keyboards/keebio/bamfk4/info.json5
-rw-r--r--keyboards/keebio/bdn9/rev1/config.h2
-rw-r--r--keyboards/keebio/bdn9/rev2/config.h2
-rw-r--r--keyboards/keebio/bfo9000/bfo9000.c1
-rw-r--r--keyboards/keebio/bfo9000/config.h7
-rw-r--r--keyboards/keebio/bfo9000/info.json5
-rw-r--r--keyboards/keebio/bigswitchseat/bigswitchseat.c4
-rw-r--r--keyboards/keebio/bigswitchseat/config.h9
-rw-r--r--keyboards/keebio/bigswitchseat/info.json5
-rw-r--r--keyboards/keebio/chocopad/chocopad.c2
-rw-r--r--keyboards/keebio/chocopad/chocopad.h15
-rw-r--r--keyboards/keebio/chocopad/config.h10
-rw-r--r--keyboards/keebio/chocopad/info.json27
-rw-r--r--keyboards/keebio/convolution/convolution.c2
-rw-r--r--keyboards/keebio/convolution/convolution.h22
-rw-r--r--keyboards/keebio/convolution/rev1/info.json3
-rw-r--r--keyboards/keebio/convolution/rev1/rev1.h1
-rw-r--r--keyboards/keebio/convolution/rev1/rules.mk1
-rw-r--r--keyboards/keebio/dilly/config.h10
-rw-r--r--keyboards/keebio/dilly/dilly.c2
-rw-r--r--keyboards/keebio/dilly/dilly.h16
-rw-r--r--keyboards/keebio/dilly/info.json40
-rw-r--r--keyboards/keebio/dsp40/dsp40.c17
-rw-r--r--keyboards/keebio/dsp40/dsp40.h21
-rw-r--r--keyboards/keebio/dsp40/rev1/config.h8
-rw-r--r--keyboards/keebio/dsp40/rev1/info.json194
-rw-r--r--keyboards/keebio/dsp40/rev1/rev1.c2
-rw-r--r--keyboards/keebio/dsp40/rev1/rev1.h47
-rw-r--r--keyboards/keebio/ergodicity/config.h19
-rw-r--r--keyboards/keebio/ergodicity/info.json5
-rw-r--r--keyboards/keebio/foldkb/foldkb.c17
-rw-r--r--keyboards/keebio/foldkb/foldkb.h23
-rw-r--r--keyboards/keebio/foldkb/rev1/config.h4
-rw-r--r--keyboards/keebio/foldkb/rev1/info.json5
-rw-r--r--keyboards/keebio/foldkb/rev1/rev1.c2
-rw-r--r--keyboards/keebio/foldkb/rev1/rev1.h1
-rw-r--r--keyboards/keebio/fourier/config.h7
-rw-r--r--keyboards/keebio/fourier/fourier.c1
-rw-r--r--keyboards/keebio/fourier/fourier.h4
-rw-r--r--keyboards/keebio/fourier/info.json5
-rw-r--r--keyboards/keebio/iris/iris.c1
-rw-r--r--keyboards/keebio/iris/iris.h26
-rw-r--r--keyboards/keebio/iris/keymaps/mattly/rules.mk0
-rw-r--r--keyboards/keebio/iris/rev1/config.h7
-rw-r--r--keyboards/keebio/iris/rev1/info.json5
-rw-r--r--keyboards/keebio/iris/rev1/rev1.h10
-rw-r--r--keyboards/keebio/iris/rev1_led/config.h7
-rw-r--r--keyboards/keebio/iris/rev1_led/info.json5
-rw-r--r--keyboards/keebio/iris/rev1_led/rev1_led.h10
-rw-r--r--keyboards/keebio/iris/rev2/config.h7
-rw-r--r--keyboards/keebio/iris/rev2/info.json5
-rw-r--r--keyboards/keebio/iris/rev2/rev2.h10
-rw-r--r--keyboards/keebio/iris/rev3/config.h6
-rw-r--r--keyboards/keebio/iris/rev3/info.json5
-rw-r--r--keyboards/keebio/iris/rev3/rev3.h10
-rw-r--r--keyboards/keebio/iris/rev4/config.h8
-rw-r--r--keyboards/keebio/iris/rev4/info.json11
-rw-r--r--keyboards/keebio/iris/rev4/rev4.h9
-rw-r--r--keyboards/keebio/iris/rev5/config.h8
-rw-r--r--keyboards/keebio/iris/rev5/info.json11
-rw-r--r--keyboards/keebio/iris/rev5/rev5.h1
-rw-r--r--keyboards/keebio/iris/rev6/config.h10
-rw-r--r--keyboards/keebio/iris/rev6/info.json13
-rw-r--r--keyboards/keebio/iris/rev6/rev6.h1
-rw-r--r--keyboards/keebio/iris/rev6a/config.h10
-rw-r--r--keyboards/keebio/iris/rev6a/info.json13
-rw-r--r--keyboards/keebio/iris/rev6a/rev6a.h1
-rw-r--r--keyboards/keebio/iris/rev6b/config.h10
-rw-r--r--keyboards/keebio/iris/rev6b/info.json13
-rw-r--r--keyboards/keebio/iris/rev6b/rev6b.h1
-rw-r--r--keyboards/keebio/iris/rev7/config.h11
-rw-r--r--keyboards/keebio/iris/rev7/info.json13
-rw-r--r--keyboards/keebio/iris/rev7/rev7.h1
-rw-r--r--keyboards/keebio/kbo5000/kbo5000.c1
-rw-r--r--keyboards/keebio/kbo5000/kbo5000.h7
-rw-r--r--keyboards/keebio/kbo5000/rev1/config.h6
-rw-r--r--keyboards/keebio/kbo5000/rev1/info.json11
-rw-r--r--keyboards/keebio/kbo5000/rev1/rev1.c2
-rw-r--r--keyboards/keebio/kbo5000/rev1/rev1.h1
-rw-r--r--keyboards/keebio/laplace/config.h8
-rw-r--r--keyboards/keebio/laplace/info.json5
-rw-r--r--keyboards/keebio/laplace/laplace.c1
-rw-r--r--keyboards/keebio/levinson/info.json7
-rw-r--r--keyboards/keebio/levinson/levinson.c2
-rw-r--r--keyboards/keebio/levinson/levinson.h11
-rw-r--r--keyboards/keebio/levinson/rev1/config.h6
-rw-r--r--keyboards/keebio/levinson/rev1/info.json10
-rw-r--r--keyboards/keebio/levinson/rev1/rev1.c1
-rw-r--r--keyboards/keebio/levinson/rev1/rev1.h10
-rw-r--r--keyboards/keebio/levinson/rev2/config.h6
-rw-r--r--keyboards/keebio/levinson/rev2/info.json10
-rw-r--r--keyboards/keebio/levinson/rev2/rev2.c2
-rw-r--r--keyboards/keebio/levinson/rev2/rev2.h10
-rw-r--r--keyboards/keebio/levinson/rev3/config.h7
-rw-r--r--keyboards/keebio/levinson/rev3/info.json77
-rw-r--r--keyboards/keebio/levinson/rev3/rev3.c2
-rw-r--r--keyboards/keebio/levinson/rev3/rev3.h32
-rw-r--r--keyboards/keebio/nyquist/info.json10
-rw-r--r--keyboards/keebio/nyquist/nyquist.c1
-rw-r--r--keyboards/keebio/nyquist/nyquist.h13
-rw-r--r--keyboards/keebio/nyquist/rev1/config.h7
-rw-r--r--keyboards/keebio/nyquist/rev1/info.json15
-rw-r--r--keyboards/keebio/nyquist/rev1/rev1.c1
-rw-r--r--keyboards/keebio/nyquist/rev1/rev1.h10
-rw-r--r--keyboards/keebio/nyquist/rev2/config.h7
-rw-r--r--keyboards/keebio/nyquist/rev2/info.json15
-rw-r--r--keyboards/keebio/nyquist/rev2/rev2.h10
-rw-r--r--keyboards/keebio/nyquist/rev3/config.h6
-rw-r--r--keyboards/keebio/nyquist/rev3/info.json144
-rw-r--r--keyboards/keebio/nyquist/rev3/rev3.c2
-rw-r--r--keyboards/keebio/nyquist/rev3/rev3.h53
-rw-r--r--keyboards/keebio/quefrency/quefrency.c1
-rw-r--r--keyboards/keebio/quefrency/quefrency.h16
-rw-r--r--keyboards/keebio/quefrency/rev1/config.h7
-rw-r--r--keyboards/keebio/quefrency/rev1/info.json13
-rw-r--r--keyboards/keebio/quefrency/rev2/config.h6
-rw-r--r--keyboards/keebio/quefrency/rev2/info.json11
-rw-r--r--keyboards/keebio/quefrency/rev2/rev2.c2
-rw-r--r--keyboards/keebio/quefrency/rev2/rev2.h9
-rw-r--r--keyboards/keebio/quefrency/rev3/config.h6
-rw-r--r--keyboards/keebio/quefrency/rev3/info.json11
-rw-r--r--keyboards/keebio/quefrency/rev3/rev3.c2
-rw-r--r--keyboards/keebio/quefrency/rev3/rev3.h1
-rw-r--r--keyboards/keebio/quefrency/rev4/config.h6
-rw-r--r--keyboards/keebio/quefrency/rev4/info.json11
-rw-r--r--keyboards/keebio/quefrency/rev4/rev4.c2
-rw-r--r--keyboards/keebio/quefrency/rev4/rev4.h1
-rw-r--r--keyboards/keebio/quefrency/rev5/config.h6
-rw-r--r--keyboards/keebio/quefrency/rev5/info.json11
-rw-r--r--keyboards/keebio/quefrency/rev5/rev5.c2
-rw-r--r--keyboards/keebio/quefrency/rev5/rev5.h1
-rw-r--r--keyboards/keebio/rorschach/rev1/config.h7
-rw-r--r--keyboards/keebio/rorschach/rev1/info.json109
-rw-r--r--keyboards/keebio/rorschach/rev1/rev1.c1
-rw-r--r--keyboards/keebio/rorschach/rev1/rev1.h10
-rw-r--r--keyboards/keebio/rorschach/rorschach.c1
-rw-r--r--keyboards/keebio/rorschach/rorschach.h7
-rw-r--r--keyboards/keebio/sinc/rev1/rev1.h187
-rw-r--r--keyboards/keebio/sinc/rev2/rev2.h9
-rw-r--r--keyboards/keebio/sinc/rev3/info.json3
-rw-r--r--keyboards/keebio/sinc/rev3/rev3.h1
-rw-r--r--keyboards/keebio/sinc/rev3/rules.mk1
-rw-r--r--keyboards/keebio/sinc/sinc.c2
-rw-r--r--keyboards/keebio/sinc/sinc.h28
-rw-r--r--keyboards/keebio/stick/config.h2
-rw-r--r--keyboards/keebio/tragicforce68/config.h17
-rw-r--r--keyboards/keebio/tragicforce68/info.json462
-rw-r--r--keyboards/keebio/tragicforce68/tragicforce68.c1
-rw-r--r--keyboards/keebio/tragicforce68/tragicforce68.h59
-rw-r--r--keyboards/keebio/tukey/config.h4
-rw-r--r--keyboards/keebio/viterbi/info.json82
-rw-r--r--keyboards/keebio/viterbi/rev1/config.h8
-rw-r--r--keyboards/keebio/viterbi/rev1/info.json85
-rw-r--r--keyboards/keebio/viterbi/rev1/rev1.c1
-rw-r--r--keyboards/keebio/viterbi/rev1/rev1.h9
-rw-r--r--keyboards/keebio/viterbi/rev2/config.h6
-rw-r--r--keyboards/keebio/viterbi/rev2/info.json93
-rw-r--r--keyboards/keebio/viterbi/rev2/rev2.c2
-rw-r--r--keyboards/keebio/viterbi/rev2/rev2.h35
-rw-r--r--keyboards/keebio/viterbi/viterbi.c1
-rw-r--r--keyboards/keebio/viterbi/viterbi.h12
-rw-r--r--keyboards/keebio/wavelet/config.h7
-rw-r--r--keyboards/keebio/wavelet/info.json67
-rw-r--r--keyboards/keebio/wavelet/wavelet.c2
-rw-r--r--keyboards/keebio/wavelet/wavelet.h22
-rw-r--r--keyboards/keebio/wtf60/config.h18
-rw-r--r--keyboards/keebio/wtf60/info.json5
-rw-r--r--keyboards/keebio/wtf60/wtf60.c1
170 files changed, 1288 insertions, 1579 deletions
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index 590cce19c5..901a26fe8d 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -12,7 +12,6 @@
#define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } }
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -28,7 +27,6 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index 8d60a33d48..426bde52b1 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -3,18 +3,7 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { F0 }
-#define MATRIX_COL_PINS { E6, D5, B6, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 32
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -79,7 +68,6 @@
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 5559d586e9..cb4728ae34 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -8,6 +8,11 @@
"pid": "0x1114",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "D5", "B6", "B7"],
+ "rows": ["F0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h
index fbd33490d6..22d7643005 100644
--- a/keyboards/keebio/bdn9/rev1/config.h
+++ b/keyboards/keebio/bdn9/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index ee2065f176..30c53e2f86 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAP_CODE_DELAY 10
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 11
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -91,7 +90,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# endif
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bfo9000/bfo9000.c b/keyboards/keebio/bfo9000/bfo9000.c
deleted file mode 100644
index 2ae778e32b..0000000000
--- a/keyboards/keebio/bfo9000/bfo9000.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "bfo9000.h"
diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h
index 684674d7af..894f7fbe62 100644
--- a/keyboards/keebio/bfo9000/config.h
+++ b/keyboards/keebio/bfo9000/config.h
@@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-#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/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
index 432857124c..f578783905 100644
--- a/keyboards/keebio/bfo9000/info.json
+++ b/keyboards/keebio/bfo9000/info.json
@@ -8,6 +8,11 @@
"pid": "0x1169",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D3", "D2", "D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
diff --git a/keyboards/keebio/bigswitchseat/bigswitchseat.c b/keyboards/keebio/bigswitchseat/bigswitchseat.c
deleted file mode 100644
index a322fdad62..0000000000
--- a/keyboards/keebio/bigswitchseat/bigswitchseat.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "bigswitchseat.h"
diff --git a/keyboards/keebio/bigswitchseat/config.h b/keyboards/keebio/bigswitchseat/config.h
index c14aa4bd8d..6d03529f68 100644
--- a/keyboards/keebio/bigswitchseat/config.h
+++ b/keyboards/keebio/bigswitchseat/config.h
@@ -3,15 +3,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- */
-
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { F0 }
-#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/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/info.json
index df0cb6d9e8..03301a75f1 100644
--- a/keyboards/keebio/bigswitchseat/info.json
+++ b/keyboards/keebio/bigswitchseat/info.json
@@ -8,6 +8,11 @@
"pid": "0x1011",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0"],
+ "rows": ["E6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/keebio/chocopad/chocopad.c b/keyboards/keebio/chocopad/chocopad.c
index 523e0626a9..b52c8608ca 100644
--- a/keyboards/keebio/chocopad/chocopad.c
+++ b/keyboards/keebio/chocopad/chocopad.c
@@ -1,4 +1,4 @@
-#include "chocopad.h"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/chocopad/chocopad.h b/keyboards/keebio/chocopad/chocopad.h
deleted file mode 100644
index 43e94a093d..0000000000
--- a/keyboards/keebio/chocopad/chocopad.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
- A1, A2, A3, A4, \
- B1, B2, B3, B4, \
- C1, C2, C3, C4, \
- D1, D2, D3, D4 \
-) { \
- { A1, A2, A3, A4 }, \
- { B1, B2, B3, B4 }, \
- { C1, C2, C3, C4 }, \
- { D1, D2, D3, D4 } \
-}
diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h
index 6d28712e8c..3dc169cf79 100644
--- a/keyboards/keebio/chocopad/config.h
+++ b/keyboards/keebio/chocopad/config.h
@@ -1,20 +1,11 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, E6, B3, B2 }
-#define MATRIX_COL_PINS { D2, D4, F6, F5 }
-
-/* COL2ROW or 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 */
#define LOCKING_RESYNC_ENABLE
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -28,6 +19,5 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
#define RGB_DI_PIN D3
#define RGBLED_NUM 4
diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json
index 9b047cc4fc..7befd0a0d7 100644
--- a/keyboards/keebio/chocopad/info.json
+++ b/keyboards/keebio/chocopad/info.json
@@ -8,6 +8,11 @@
"pid": "0x1144",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["D2", "D4", "F6", "F5"],
+ "rows": ["D7", "E6", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 6
@@ -17,7 +22,27 @@
"community_layouts": ["ortho_4x4"],
"layouts": {
"LAYOUT_ortho_4x4": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/keebio/convolution/convolution.c b/keyboards/keebio/convolution/convolution.c
index 884f3e7e5b..fc726e277a 100644
--- a/keyboards/keebio/convolution/convolution.c
+++ b/keyboards/keebio/convolution/convolution.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "convolution.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/convolution/convolution.h b/keyboards/keebio/convolution/convolution.h
deleted file mode 100644
index fcf299b815..0000000000
--- a/keyboards/keebio/convolution/convolution.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_convolution_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json
index f68dc39158..64ffee936e 100644
--- a/keyboards/keebio/convolution/rev1/info.json
+++ b/keyboards/keebio/convolution/rev1/info.json
@@ -24,6 +24,9 @@
{"pin_a": "GP14", "pin_b": "GP15" }
]
},
+ "ws2812": {
+ "driver": "vendor"
+ },
"rgb_matrix": {
"driver": "WS2812",
"layout": [
diff --git a/keyboards/keebio/convolution/rev1/rev1.h b/keyboards/keebio/convolution/rev1/rev1.h
index c50074c3f3..3bbc40146a 100644
--- a/keyboards/keebio/convolution/rev1/rev1.h
+++ b/keyboards/keebio/convolution/rev1/rev1.h
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "convolution.h"
#include "quantum.h"
#define LAYOUT_65xt( \
diff --git a/keyboards/keebio/convolution/rev1/rules.mk b/keyboards/keebio/convolution/rev1/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/keebio/convolution/rev1/rules.mk
+++ b/keyboards/keebio/convolution/rev1/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h
index c10fe13a30..1b80f5bfd1 100644
--- a/keyboards/keebio/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
@@ -1,20 +1,11 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, E6, B4, B1, B3, B2 }
-#define MATRIX_COL_PINS { D2, D4, C6, F6, F5 }
-
-/* COL2ROW or 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 */
#define LOCKING_RESYNC_ENABLE
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -28,7 +19,6 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
#define RGB_DI_PIN D3
#define RGBLED_NUM 10
diff --git a/keyboards/keebio/dilly/dilly.c b/keyboards/keebio/dilly/dilly.c
index 558968542f..231a828f07 100644
--- a/keyboards/keebio/dilly/dilly.c
+++ b/keyboards/keebio/dilly/dilly.c
@@ -1,4 +1,4 @@
-#include "dilly.h"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/dilly/dilly.h b/keyboards/keebio/dilly/dilly.h
deleted file mode 100644
index e0f13bae5e..0000000000
--- a/keyboards/keebio/dilly/dilly.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x10( \
- k00, k01, k02, k03, k04, k34, k33, k32, k31, k30, \
- k10, k11, k12, k13, k14, k44, k43, k42, k41, k40, \
- k20, k21, k22, k23, k24, k54, k53, k52, k51, k50 \
-) { \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { k20, k21, k22, k23, k24 }, \
- { k30, k31, k32, k33, k34 }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, k54 } \
-}
diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json
index f69290454a..8f68587770 100644
--- a/keyboards/keebio/dilly/info.json
+++ b/keyboards/keebio/dilly/info.json
@@ -8,6 +8,11 @@
"pid": "0x113A",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["D2", "D4", "C6", "F6", "F5"],
+ "rows": ["D7", "E6", "B4", "B1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5"
},
@@ -16,7 +21,40 @@
"community_layouts": ["ortho_3x10"],
"layouts": {
"LAYOUT_ortho_3x10": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "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":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [3, 4], "x": 5, "y": 0},
+ {"matrix": [3, 3], "x": 6, "y": 0},
+ {"matrix": [3, 2], "x": 7, "y": 0},
+ {"matrix": [3, 1], "x": 8, "y": 0},
+ {"matrix": [3, 0], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [4, 4], "x": 5, "y": 1},
+ {"matrix": [4, 3], "x": 6, "y": 1},
+ {"matrix": [4, 2], "x": 7, "y": 1},
+ {"matrix": [4, 1], "x": 8, "y": 1},
+ {"matrix": [4, 0], "x": 9, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [5, 4], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [5, 2], "x": 7, "y": 2},
+ {"matrix": [5, 1], "x": 8, "y": 2},
+ {"matrix": [5, 0], "x": 9, "y": 2}
+ ]
}
}
}
diff --git a/keyboards/keebio/dsp40/dsp40.c b/keyboards/keebio/dsp40/dsp40.c
deleted file mode 100644
index 745cd386d4..0000000000
--- a/keyboards/keebio/dsp40/dsp40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "dsp40.h"
diff --git a/keyboards/keebio/dsp40/dsp40.h b/keyboards/keebio/dsp40/dsp40.h
deleted file mode 100644
index ec5e5fbbcb..0000000000
--- a/keyboards/keebio/dsp40/dsp40.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifdef KEYBOARD_keebio_dsp40_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h
index 0f69303ca8..3f722a5801 100644
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/config.h
@@ -16,20 +16,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B9, A9, A8, B15 }
-#define MATRIX_COL_PINS { B10, B2, A3, A4, B7, B6, A10, C13, C14, C15, F0, F1 }
-
#define TAP_CODE_DELAY 10
-#define DIODE_DIRECTION COL2ROW
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -46,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json
index c5ce2f5a17..524bb51372 100644
--- a/keyboards/keebio/dsp40/rev1/info.json
+++ b/keyboards/keebio/dsp40/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x144C",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B10", "B2", "A3", "A4", "B7", "B6", "A10", "C13", "C14", "C15", "F0", "F1"],
+ "rows": ["B9", "A9", "A8", "B15"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A1", "pin_b": "A2"}
@@ -19,103 +24,112 @@
},
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "layout_aliases": {
+ "LAYOUT_40_staggered": "LAYOUT"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Esc", "x": 0, "y": 0 },
- { "label": "Q", "x": 1, "y": 0 },
- { "label": "W", "x": 2, "y": 0 },
- { "label": "E", "x": 3, "y": 0 },
- { "label": "R", "x": 4, "y": 0 },
- { "label": "T", "x": 5, "y": 0 },
- { "label": "Y", "x": 6, "y": 0 },
- { "label": "U", "x": 7, "y": 0 },
- { "label": "I", "x": 8, "y": 0 },
- { "label": "O", "x": 9, "y": 0 },
- { "label": "P", "x": 10, "y": 0 },
- { "label": "Back<br>Space", "x": 11, "y": 0 },
- { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
- { "label": "A", "x": 1.25, "y": 1 },
- { "label": "S", "x": 2.25, "y": 1 },
- { "label": "D", "x": 3.25, "y": 1 },
- { "label": "F", "x": 4.25, "y": 1 },
- { "label": "G", "x": 5.25, "y": 1 },
- { "label": "H", "x": 6.25, "y": 1 },
- { "label": "J", "x": 7.25, "y": 1 },
- { "label": "K", "x": 8.25, "y": 1 },
- { "label": "L", "x": 9.25, "y": 1 },
- { "label": "Enter", "x": 10.25, "y": 1, "w": 1.75 },
- { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
- { "label": "Z", "x": 1.75, "y": 2 },
- { "label": "X", "x": 2.75, "y": 2 },
- { "label": "C", "x": 3.75, "y": 2 },
- { "label": "V", "x": 4.75, "y": 2 },
- { "label": "B", "x": 5.75, "y": 2 },
- { "label": "N", "x": 6.75, "y": 2 },
- { "label": "M", "x": 7.75, "y": 2 },
- { "label": "<", "x": 8.75, "y": 2 },
- { "label": "Shift", "x": 9.75, "y": 2, "w": 1.25 },
- { "label": "Fn", "x": 11, "y": 2 },
- { "label": "Hyper", "x": 0, "y": 3, "w": 1.25 },
- { "label": "Super", "x": 1.25, "y": 3 },
- { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
- { "x": 3.5, "y": 3, "w": 2.25 },
- { "x": 5.75, "y": 3, "w": 2.75 },
- { "label": "Super", "x": 8.5, "y": 3, "w": 1.25 },
- { "label": "Meta", "x": 9.75, "y": 3 },
- { "label": "Super", "x": 10.75, "y": 3, "w": 1.25 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
]
},
"LAYOUT_ortho_4x12": {
"layout": [
- { "label": "Tab", "x": 0, "y": 0 },
- { "label": "Q", "x": 1, "y": 0 },
- { "label": "W", "x": 2, "y": 0 },
- { "label": "E", "x": 3, "y": 0 },
- { "label": "R", "x": 4, "y": 0 },
- { "label": "T", "x": 5, "y": 0 },
- { "label": "Y", "x": 6, "y": 0 },
- { "label": "U", "x": 7, "y": 0 },
- { "label": "I", "x": 8, "y": 0 },
- { "label": "O", "x": 9, "y": 0 },
- { "label": "P", "x": 10, "y": 0 },
- { "label": "Back Space", "x": 11, "y": 0 },
- { "label": "Esc", "x": 0, "y": 1 },
- { "label": "A", "x": 1, "y": 1 },
- { "label": "S", "x": 2, "y": 1 },
- { "label": "D", "x": 3, "y": 1 },
- { "label": "F", "x": 4, "y": 1 },
- { "label": "G", "x": 5, "y": 1 },
- { "label": "H", "x": 6, "y": 1 },
- { "label": "J", "x": 7, "y": 1 },
- { "label": "K", "x": 8, "y": 1 },
- { "label": "L", "x": 9, "y": 1 },
- { "label": ";", "x": 10, "y": 1 },
- { "label": "'", "x": 11, "y": 1 },
- { "label": "Shift", "x": 0, "y": 2 },
- { "label": "Z", "x": 1, "y": 2 },
- { "label": "X", "x": 2, "y": 2 },
- { "label": "C", "x": 3, "y": 2 },
- { "label": "V", "x": 4, "y": 2 },
- { "label": "B", "x": 5, "y": 2 },
- { "label": "N", "x": 6, "y": 2 },
- { "label": "M", "x": 7, "y": 2 },
- { "label": ",", "x": 8, "y": 2 },
- { "label": ".", "x": 9, "y": 2 },
- { "label": "/", "x": 10, "y": 2 },
- { "label": "Enter", "x": 11, "y": 2 },
- { "x": 0, "y": 3 },
- { "label": "Ctrl", "x": 1, "y": 3 },
- { "label": "Alt", "x": 2, "y": 3 },
- { "label": "Super", "x": 3, "y": 3 },
- { "label": "Lower", "x": 4, "y": 3 },
- { "label": "Space", "x": 5, "y": 3 },
- { "label": "Space", "x": 6, "y": 3 },
- { "label": "Raise", "x": 7, "y": 3 },
- { "label": "Left", "x": 8, "y": 3 },
- { "label": "Down", "x": 9, "y": 3 },
- { "label": "Up", "x": 10, "y": 3 },
- { "label": "Right", "x": 11, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/keebio/dsp40/rev1/rev1.c b/keyboards/keebio/dsp40/rev1/rev1.c
index 41187b90b6..dbaea8d4cc 100644
--- a/keyboards/keebio/dsp40/rev1/rev1.c
+++ b/keyboards/keebio/dsp40/rev1/rev1.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev1.h"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/dsp40/rev1/rev1.h b/keyboards/keebio/dsp40/rev1/rev1.h
deleted file mode 100644
index f03792175e..0000000000
--- a/keyboards/keebio/dsp40/rev1/rev1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "dsp40.h"
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
- KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12, \
- KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB11, KB12, \
- KC1, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12, \
- KD1, KD2, KD3, KD4, KD5, KD6, KD7, KD8, KD9, KD10, KD11, KD12 \
-) \
-{ \
- { KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12 }, \
- { KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB11, KB12 }, \
- { KC1, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12 }, \
- { KD1, KD2, KD3, KD4, KD5, KD6, KD7, KD8, KD9, KD10, KD11, KD12 } \
-}
-
-#define LAYOUT( \
- KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12, \
- KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB12, \
- KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12, \
- KD1, KD2, KD3, KD5, KD8, KD10, KD11, KD12 \
-) \
-{ \
- { KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12 }, \
- { KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KC_NO, KB12 }, \
- { KC_NO, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12 }, \
- { KD1, KD2, KD3, KC_NO, KD5, KC_NO, KC_NO, KD8, KC_NO, KD10, KD11, KD12 } \
-}
-
-#define LAYOUT_40_staggered LAYOUT
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index c9f49ad1fb..dd4726a35d 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/config.h
@@ -17,25 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, C7, B6, B4 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D7, D6, D4, D3, D2, D1, D0, B7, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -52,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json
index 94203340ce..1bb55ed4ee 100644
--- a/keyboards/keebio/ergodicity/info.json
+++ b/keyboards/keebio/ergodicity/info.json
@@ -8,6 +8,11 @@
"pid": "0x125F",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B3"],
+ "rows": ["B0", "B1", "C7", "B6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 7,
diff --git a/keyboards/keebio/foldkb/foldkb.c b/keyboards/keebio/foldkb/foldkb.c
deleted file mode 100644
index 97641bf992..0000000000
--- a/keyboards/keebio/foldkb/foldkb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "foldkb.h"
diff --git a/keyboards/keebio/foldkb/foldkb.h b/keyboards/keebio/foldkb/foldkb.h
deleted file mode 100644
index bd02a4ef9d..0000000000
--- a/keyboards/keebio/foldkb/foldkb.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_foldkb_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h
index 3b10809fb6..3dd11100d6 100644
--- a/keyboards/keebio/foldkb/rev1/config.h
+++ b/keyboards/keebio/foldkb/rev1/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5 }
#define SPLIT_HAND_PIN F7
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index 00dffdc401..a3b12965ec 100644
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x1258",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5"],
+ "rows": ["B1", "B2", "C7", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}
diff --git a/keyboards/keebio/foldkb/rev1/rev1.c b/keyboards/keebio/foldkb/rev1/rev1.c
index a0dfb31b52..efb9fd53fc 100644
--- a/keyboards/keebio/foldkb/rev1/rev1.c
+++ b/keyboards/keebio/foldkb/rev1/rev1.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "foldkb.h"
+#include "rev1.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/foldkb/rev1/rev1.h b/keyboards/keebio/foldkb/rev1/rev1.h
index d07152538a..7349258f66 100644
--- a/keyboards/keebio/foldkb/rev1/rev1.h
+++ b/keyboards/keebio/foldkb/rev1/rev1.h
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "foldkb.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h
index a9af99d29d..0f2d67caaa 100644
--- a/keyboards/keebio/fourier/config.h
+++ b/keyboards/keebio/fourier/config.h
@@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
/* Split Defines */
#define SPLIT_HAND_PIN D2
diff --git a/keyboards/keebio/fourier/fourier.c b/keyboards/keebio/fourier/fourier.c
deleted file mode 100644
index 1bd47f98bc..0000000000
--- a/keyboards/keebio/fourier/fourier.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "fourier.h"
diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h
index b99dd57c2e..1bc5e1653c 100644
--- a/keyboards/keebio/fourier/fourier.h
+++ b/keyboards/keebio/fourier/fourier.h
@@ -1,9 +1,5 @@
#pragma once
-#ifdef KEYBOARD_fourier_rev1
- #include "rev1.h"
-#endif
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
index 9633cb3e93..dbe60ec677 100644
--- a/keyboards/keebio/fourier/info.json
+++ b/keyboards/keebio/fourier/info.json
@@ -8,6 +8,11 @@
"pid": "0x1247",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["F4", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"qmk_lufa_bootloader": {
"esc_input": "F4",
"esc_output": "F5",
diff --git a/keyboards/keebio/iris/iris.c b/keyboards/keebio/iris/iris.c
deleted file mode 100644
index fb28b3a6d6..0000000000
--- a/keyboards/keebio/iris/iris.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "iris.h"
diff --git a/keyboards/keebio/iris/iris.h b/keyboards/keebio/iris/iris.h
deleted file mode 100644
index b7be3fc59e..0000000000
--- a/keyboards/keebio/iris/iris.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_keebio_iris_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_keebio_iris_rev1_led)
- #include "rev1_led.h"
-#elif defined(KEYBOARD_keebio_iris_rev2)
- #include "rev2.h"
-#elif defined(KEYBOARD_keebio_iris_rev3)
- #include "rev3.h"
-#elif defined(KEYBOARD_keebio_iris_rev4)
- #include "rev4.h"
-#elif defined(KEYBOARD_keebio_iris_rev5)
- #include "rev5.h"
-#elif defined(KEYBOARD_keebio_iris_rev6)
- #include "rev6.h"
-#elif defined(KEYBOARD_keebio_iris_rev6a)
- #include "rev6a.h"
-#elif defined(KEYBOARD_keebio_iris_rev6b)
- #include "rev6b.h"
-#elif defined(KEYBOARD_keebio_iris_rev7)
- #include "rev7.h"
-#endif
-
-#include "quantum.h"
-#include "via.h"
diff --git a/keyboards/keebio/iris/keymaps/mattly/rules.mk b/keyboards/keebio/iris/keymaps/mattly/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/keebio/iris/keymaps/mattly/rules.mk
+++ /dev/null
diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 436c47ccac..c6fa1b9512 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or 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/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
index 736b6006b9..ba412159e2 100644
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@@ -4,6 +4,11 @@
"pid": "0x1256",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "B5", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D2",
"levels": 5
diff --git a/keyboards/keebio/iris/rev1/rev1.h b/keyboards/keebio/iris/rev1/rev1.h
index 19df105c2e..d94716242c 100644
--- a/keyboards/keebio/iris/rev1/rev1.h
+++ b/keyboards/keebio/iris/rev1/rev1.h
@@ -1,17 +1,7 @@
#pragma once
-#include "iris.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index 3bd96004be..c6fa1b9512 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 }
-
-/* COL2ROW or 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/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
index e5d71a70b0..816b2fe390 100644
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@@ -4,6 +4,11 @@
"pid": "0x1256",
"device_version": "1.1.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "F4"],
+ "rows": ["D7", "E6", "B4", "B5", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5
diff --git a/keyboards/keebio/iris/rev1_led/rev1_led.h b/keyboards/keebio/iris/rev1_led/rev1_led.h
index 19df105c2e..d94716242c 100644
--- a/keyboards/keebio/iris/rev1_led/rev1_led.h
+++ b/keyboards/keebio/iris/rev1_led/rev1_led.h
@@ -1,17 +1,7 @@
#pragma once
-#include "iris.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 71a5e3ad01..698827a767 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or 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/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index 7ac3883bb5..f85f82a627 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -4,6 +4,11 @@
"pid": "0x2256",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "D2", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 5
diff --git a/keyboards/keebio/iris/rev2/rev2.h b/keyboards/keebio/iris/rev2/rev2.h
index 19df105c2e..d94716242c 100644
--- a/keyboards/keebio/iris/rev2/rev2.h
+++ b/keyboards/keebio/iris/rev2/rev2.h
@@ -1,17 +1,7 @@
#pragma once
-#include "iris.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index 932daf4396..a84d0c02e4 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -17,14 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D2, D3, D5, D7, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, D4, B4 }
#define SPLIT_HAND_PIN F0
-/* COL2ROW or 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/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index 0fc9aa4832..15dd75e680 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -4,6 +4,11 @@
"pid": "0x3256",
"device_version": "3.0.0"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "F5", "F6", "D4", "B4"],
+ "rows": ["D2", "D3", "D5", "D7", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B7"}
diff --git a/keyboards/keebio/iris/rev3/rev3.h b/keyboards/keebio/iris/rev3/rev3.h
index a968c47ed6..c808c4bef3 100644
--- a/keyboards/keebio/iris/rev3/rev3.h
+++ b/keyboards/keebio/iris/rev3/rev3.h
@@ -1,17 +1,7 @@
#pragma once
-#include "iris.h"
#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index d1e542d774..7af2b5fd94 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -17,16 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 }
-#define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 }
-#define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
#define SPLIT_HAND_PIN D5
-/* COL2ROW or 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/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index a0689c0ed4..464a7b2d43 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -4,6 +4,11 @@
"pid": "0x4256",
"device_version": "4.0.0"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "D3", "D2", "B7", "D4"],
+ "rows": ["B1", "F0", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B2", "pin_b": "B3"}
@@ -27,6 +32,12 @@
{"pin_a": "F7", "pin_b": "F6"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
+ "rows": ["B1", "B2", "D2", "F1", "F4"]
+ }
}
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/iris/rev4/rev4.h b/keyboards/keebio/iris/rev4/rev4.h
index 06e515ebc6..0e99bd501a 100644
--- a/keyboards/keebio/iris/rev4/rev4.h
+++ b/keyboards/keebio/iris/rev4/rev4.h
@@ -1,16 +1,7 @@
#pragma once
-#include "iris.h"
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define LAYOUT( \
LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \
LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 2444970342..77825d3c1c 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -17,16 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 }
-#define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 }
-#define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
#define SPLIT_HAND_PIN D5
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_DEFAULT_LEVEL 3
/* ws2812 RGB LED */
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index 8279cdcc2b..2df637509b 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -4,6 +4,11 @@
"pid": "0x5256",
"device_version": "5.0.0"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "D3", "D2", "B7", "D4"],
+ "rows": ["B1", "F0", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B2", "pin_b": "B3"}
@@ -27,6 +32,12 @@
{"pin_a": "F7", "pin_b": "F6"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
+ "rows": ["B1", "B2", "D2", "F1", "F4"]
+ }
}
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/iris/rev5/rev5.h b/keyboards/keebio/iris/rev5/rev5.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev5/rev5.h
+++ b/keyboards/keebio/iris/rev5/rev5.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 0c6b1e38f8..0ed1cb78eb 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -17,19 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
-#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
#define SPLIT_HAND_PIN D5
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
@@ -96,4 +87,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
# endif
-#endif
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 8470624a31..f4bb81a81a 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -4,13 +4,24 @@
"pid": "0x6256",
"device_version": "6.0.0"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+ "rows": ["B1", "F0", "F5", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B2"}
]
},
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+ "rows": ["B1", "F0", "F5", "B4", "B5"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/keebio/iris/rev6/rev6.h b/keyboards/keebio/iris/rev6/rev6.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6/rev6.h
+++ b/keyboards/keebio/iris/rev6/rev6.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index dd05a6ec3b..fe802cef2e 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -17,19 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
-#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
#define SPLIT_HAND_PIN D5
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
@@ -96,4 +87,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
-#endif
diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json
index 027a79f512..2f5d8cb655 100644
--- a/keyboards/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@@ -4,13 +4,24 @@
"pid": "0x6356",
"device_version": "6.1.0"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+ "rows": ["B1", "F0", "F5", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B2"}
]
},
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+ "rows": ["B1", "F0", "F5", "B4", "B5"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/keebio/iris/rev6a/rev6a.h b/keyboards/keebio/iris/rev6a/rev6a.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6a/rev6a.h
+++ b/keyboards/keebio/iris/rev6a/rev6a.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index dd05a6ec3b..fe802cef2e 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -17,19 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
-#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
#define SPLIT_HAND_PIN D5
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
@@ -96,4 +87,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
-#endif
diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json
index b8d1f076a4..9327bf0678 100644
--- a/keyboards/keebio/iris/rev6b/info.json
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -4,13 +4,24 @@
"pid": "0x6456",
"device_version": "6.2.0"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+ "rows": ["B1", "F0", "F5", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B2"}
]
},
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+ "rows": ["B1", "F0", "F5", "B4", "B5"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/keebio/iris/rev6b/rev6b.h b/keyboards/keebio/iris/rev6b/rev6b.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6b/rev6b.h
+++ b/keyboards/keebio/iris/rev6b/rev6b.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 906b65b0b2..f7599e3e4d 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -17,19 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
-#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
#define SPLIT_HAND_PIN D5
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
@@ -96,5 +87,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
-#endif
-
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index 086f8907a9..e68af28df1 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -4,6 +4,11 @@
"pid": "0x7256",
"device_version": "7.0.0"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+ "rows": ["B1", "F0", "F5", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B2"},
@@ -11,7 +16,13 @@
]
},
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+ "rows": ["B1", "F0", "F5", "B4", "B5"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/keebio/iris/rev7/rev7.h b/keyboards/keebio/iris/rev7/rev7.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev7/rev7.h
+++ b/keyboards/keebio/iris/rev7/rev7.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/kbo5000/kbo5000.c b/keyboards/keebio/kbo5000/kbo5000.c
deleted file mode 100644
index c46093537e..0000000000
--- a/keyboards/keebio/kbo5000/kbo5000.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kbo5000.h"
diff --git a/keyboards/keebio/kbo5000/kbo5000.h b/keyboards/keebio/kbo5000/kbo5000.h
deleted file mode 100644
index 33f1998eb0..0000000000
--- a/keyboards/keebio/kbo5000/kbo5000.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_kbo5000_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h
index 4e6f11cd38..5f765e89a5 100644
--- a/keyboards/keebio/kbo5000/rev1/config.h
+++ b/keyboards/keebio/kbo5000/rev1/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7, B0 }
-#define MATRIX_COL_PINS { F4, NO_PIN, F0, B7, B3, D2, D3, D5, D4, NO_PIN }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7, B0 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, D2, D3, B7, B1 }
#define SPLIT_HAND_PIN F7
#define CAPS_LOCK_LED_PIN B6
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index 5df36178e7..c45bfad4d4 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x126A",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", null, "F0", "B7", "B3", "D2", "D3", "D5", "D4", null],
+ "rows": ["B1", "B2", "C7", "B4", "D7", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}
@@ -25,6 +30,12 @@
{"pin_a": "C7", "pin_b": "C6"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "D2", "D3", "B7", "B1"],
+ "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
+ }
}
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c
index 904c85242b..f0f4ae730d 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.c
+++ b/keyboards/keebio/kbo5000/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "kbo5000.h"
+#include "rev1.h"
#include "split_util.h"
void matrix_init_kb(void) {
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.h b/keyboards/keebio/kbo5000/rev1/rev1.h
index 63239d3463..56d827871c 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.h
+++ b/keyboards/keebio/kbo5000/rev1/rev1.h
@@ -1,6 +1,5 @@
#pragma once
-#include "kbo5000.h"
#include "quantum.h"
#define LAYOUT_ansi( \
diff --git a/keyboards/keebio/laplace/config.h b/keyboards/keebio/laplace/config.h
index 455aacc2e7..cce01b488e 100644
--- a/keyboards/keebio/laplace/config.h
+++ b/keyboards/keebio/laplace/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS {D3, F4, D2, F5, D7, B4, C6, E6}
-#define MATRIX_COL_PINS {D1, F6, F7, B1, B3, B2, B6}
-
/* WS2812 RGB LED */
#define RGB_DI_PIN D4
#define RGBLIGHT_EFFECT_BREATHING
@@ -36,7 +31,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 14
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define TAPPING_TERM 200
diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json
index 21312f64f3..c0ee05d92a 100644
--- a/keyboards/keebio/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
@@ -8,6 +8,11 @@
"pid": "0x1147",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["D1", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D3", "F4", "D2", "F5", "D7", "B4", "C6", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
diff --git a/keyboards/keebio/laplace/laplace.c b/keyboards/keebio/laplace/laplace.c
deleted file mode 100644
index dcf32aee69..0000000000
--- a/keyboards/keebio/laplace/laplace.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "laplace.h"
diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json
index 2bf92724bb..d7cbab9f45 100644
--- a/keyboards/keebio/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
@@ -8,10 +8,5 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
- "community_layouts": ["ortho_4x12"],
- "layouts": {
- "LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
- }
- }
+ "community_layouts": ["ortho_4x12"]
}
diff --git a/keyboards/keebio/levinson/levinson.c b/keyboards/keebio/levinson/levinson.c
index b361640bcf..6f1a050e80 100644
--- a/keyboards/keebio/levinson/levinson.c
+++ b/keyboards/keebio/levinson/levinson.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/keebio/levinson/levinson.h b/keyboards/keebio/levinson/levinson.h
deleted file mode 100644
index fd022ab518..0000000000
--- a/keyboards/keebio/levinson/levinson.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_levinson_rev1
- #include "rev1.h"
-#elif KEYBOARD_keebio_levinson_rev2
- #include "rev2.h"
-#elif KEYBOARD_keebio_levinson_rev3
- #include "rev3.h"
-#endif
diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h
index c64d1a9e9e..9efacf6599 100644
--- a/keyboards/keebio/levinson/rev1/config.h
+++ b/keyboards/keebio/levinson/rev1/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-#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/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json
index 05416bd138..faad88b20e 100644
--- a/keyboards/keebio/levinson/rev1/info.json
+++ b/keyboards/keebio/levinson/rev1/info.json
@@ -7,8 +7,18 @@
"pid": "0x1146",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "C6",
"levels": 7
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
}
+ }
}
diff --git a/keyboards/keebio/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c
deleted file mode 100644
index 72df88710a..0000000000
--- a/keyboards/keebio/levinson/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "levinson.h"
diff --git a/keyboards/keebio/levinson/rev1/rev1.h b/keyboards/keebio/levinson/rev1/rev1.h
index 1c555b6775..14db8b445b 100644
--- a/keyboards/keebio/levinson/rev1/rev1.h
+++ b/keyboards/keebio/levinson/rev1/rev1.h
@@ -1,17 +1,7 @@
#pragma once
-#include "levinson.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#ifndef FLIP_HALF
// Standard Keymap
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h
index 88c38bc9ab..9efacf6599 100644
--- a/keyboards/keebio/levinson/rev2/config.h
+++ b/keyboards/keebio/levinson/rev2/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-#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/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json
index dbd0901737..984b06c946 100644
--- a/keyboards/keebio/levinson/rev2/info.json
+++ b/keyboards/keebio/levinson/rev2/info.json
@@ -7,8 +7,18 @@
"pid": "0x2146",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 7
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
}
+ }
}
diff --git a/keyboards/keebio/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c
index b569fbd9fb..8fb49f97b3 100644
--- a/keyboards/keebio/levinson/rev2/rev2.c
+++ b/keyboards/keebio/levinson/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "rev2.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/levinson/rev2/rev2.h b/keyboards/keebio/levinson/rev2/rev2.h
index 1c555b6775..14db8b445b 100644
--- a/keyboards/keebio/levinson/rev2/rev2.h
+++ b/keyboards/keebio/levinson/rev2/rev2.h
@@ -1,17 +1,7 @@
#pragma once
-#include "levinson.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#ifndef FLIP_HALF
// Standard Keymap
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h
index be2be855d0..d8a0366f14 100644
--- a/keyboards/keebio/levinson/rev3/config.h
+++ b/keyboards/keebio/levinson/rev3/config.h
@@ -19,15 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, E6, B4, B5 }
-#define MATRIX_COL_PINS { D3, F4, F7, B1, B3, B2 }
-#define MATRIX_ROW_PINS_RIGHT { D4, B2, B3, B1 }
-#define MATRIX_COL_PINS_RIGHT { F4, F7, D3, B5, B4, E6 }
#define SPLIT_HAND_PIN D2
-#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/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json
index 8cc3fa9fb9..b31f71533d 100644
--- a/keyboards/keebio/levinson/rev3/info.json
+++ b/keyboards/keebio/levinson/rev3/info.json
@@ -1,14 +1,89 @@
{
"keyboard_name": "Levinson Rev. 3",
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F4", "F7", "D3", "B5", "B4", "E6"],
+ "rows": ["D4", "B2", "B3", "B1"]
+ }
+ }
},
"usb": {
"pid": "0x3146",
"device_version": "3.0.0"
},
+ "matrix_pins": {
+ "cols": ["D3", "F4", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 7
+ },
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_4x12"
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [4, 5], "x": 7, "y": 0},
+ {"matrix": [4, 4], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [4, 0], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [5, 5], "x": 7, "y": 1},
+ {"matrix": [5, 4], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1},
+ {"matrix": [5, 0], "x": 12, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [6, 5], "x": 7, "y": 2},
+ {"matrix": [6, 4], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2},
+ {"matrix": [6, 0], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 5], "x": 7, "y": 3},
+ {"matrix": [7, 4], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 12, "y": 3}
+ ]
+ }
}
}
diff --git a/keyboards/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c
index b569fbd9fb..76fb136c03 100644
--- a/keyboards/keebio/levinson/rev3/rev3.c
+++ b/keyboards/keebio/levinson/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/levinson/rev3/rev3.h b/keyboards/keebio/levinson/rev3/rev3.h
deleted file mode 100644
index da7349d2e7..0000000000
--- a/keyboards/keebio/levinson/rev3/rev3.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "levinson.h"
-
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R35, R34, R33, R32, R31, R30 } \
- }
-
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/keebio/nyquist/info.json b/keyboards/keebio/nyquist/info.json
index 8d872e8e0c..9a544f3382 100644
--- a/keyboards/keebio/nyquist/info.json
+++ b/keyboards/keebio/nyquist/info.json
@@ -4,13 +4,5 @@
"usb": {
"vid": "0xCB10"
},
- "community_layouts": ["ortho_5x12", "ortho_4x12"],
- "layouts": {
- "LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
- },
- "LAYOUT_ortho_4x12": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
- }
- }
+ "community_layouts": ["ortho_5x12", "ortho_4x12"]
}
diff --git a/keyboards/keebio/nyquist/nyquist.c b/keyboards/keebio/nyquist/nyquist.c
deleted file mode 100644
index 2face09d42..0000000000
--- a/keyboards/keebio/nyquist/nyquist.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nyquist.h"
diff --git a/keyboards/keebio/nyquist/nyquist.h b/keyboards/keebio/nyquist/nyquist.h
deleted file mode 100644
index 63d7680f06..0000000000
--- a/keyboards/keebio/nyquist/nyquist.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_keebio_nyquist_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_keebio_nyquist_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_nyquist_rev3
- #include "rev3.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/keebio/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h
index 7a1aeedb88..e0e8582286 100644
--- a/keyboards/keebio/nyquist/rev1/config.h
+++ b/keyboards/keebio/nyquist/rev1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or 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/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json
index 768687f5c9..869d3d9780 100644
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ b/keyboards/keebio/nyquist/rev1/info.json
@@ -4,9 +4,22 @@
"pid": "0x1156",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
+ },
+ "LAYOUT_ortho_4x12": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+ }
+ }
}
diff --git a/keyboards/keebio/nyquist/rev1/rev1.c b/keyboards/keebio/nyquist/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/keebio/nyquist/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/keebio/nyquist/rev1/rev1.h b/keyboards/keebio/nyquist/rev1/rev1.h
index 5896a826cc..7bbfb34e4f 100644
--- a/keyboards/keebio/nyquist/rev1/rev1.h
+++ b/keyboards/keebio/nyquist/rev1/rev1.h
@@ -1,17 +1,7 @@
#pragma once
-#include "nyquist.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#ifndef FLIP_HALF
// Standard Keymap
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h
index 267faf45d9..e0e8582286 100644
--- a/keyboards/keebio/nyquist/rev2/config.h
+++ b/keyboards/keebio/nyquist/rev2/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { D2, F5, F6, F7, B1, B3 }
-
-/* COL2ROW or 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/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json
index b47bb7511b..0810473ac7 100644
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ b/keyboards/keebio/nyquist/rev2/info.json
@@ -4,6 +4,11 @@
"pid": "0x2156",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["D2", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 7
@@ -12,5 +17,13 @@
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
+ },
+ "LAYOUT_ortho_4x12": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+ }
+ }
}
diff --git a/keyboards/keebio/nyquist/rev2/rev2.h b/keyboards/keebio/nyquist/rev2/rev2.h
index 5896a826cc..7bbfb34e4f 100644
--- a/keyboards/keebio/nyquist/rev2/rev2.h
+++ b/keyboards/keebio/nyquist/rev2/rev2.h
@@ -1,17 +1,7 @@
#pragma once
-#include "nyquist.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#ifndef FLIP_HALF
// Standard Keymap
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h
index 697205027d..dfb8f79aaa 100644
--- a/keyboards/keebio/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/config.h
@@ -17,14 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { F0, F5, D7, F6, F7 }
-#define MATRIX_COL_PINS { F1, F4, B7, D2, D3, D4 }
#define SPLIT_HAND_PIN D5
-/* COL2ROW or 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/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json
index e7bd8635ae..fceda141b1 100644
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ b/keyboards/keebio/nyquist/rev3/info.json
@@ -4,6 +4,11 @@
"pid": "0x3156",
"device_version": "3.0.0"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "B7", "D2", "D3", "D4"],
+ "rows": ["F0", "F5", "D7", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 7
@@ -12,5 +17,142 @@
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
- "bootloader": "qmk-dfu"
+ "bootloader": "qmk-dfu",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_5x12"
+ },
+ "layouts": {
+ "LAYOUT_ortho_5x12": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 7, "y": 2},
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [8, 0], "x": 7, "y": 3},
+ {"matrix": [8, 1], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 5], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [9, 0], "x": 7, "y": 4},
+ {"matrix": [9, 1], "x": 8, "y": 4},
+ {"matrix": [9, 2], "x": 9, "y": 4},
+ {"matrix": [9, 3], "x": 10, "y": 4},
+ {"matrix": [9, 4], "x": 11, "y": 4},
+ {"matrix": [9, 5], "x": 12, "y": 4}
+ ]
+ },
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 7, "y": 2},
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [8, 0], "x": 7, "y": 3},
+ {"matrix": [8, 1], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 5], "x": 12, "y": 3}
+ ]
+ }
+ }
}
diff --git a/keyboards/keebio/nyquist/rev3/rev3.c b/keyboards/keebio/nyquist/rev3/rev3.c
index c464270517..76fb136c03 100644
--- a/keyboards/keebio/nyquist/rev3/rev3.c
+++ b/keyboards/keebio/nyquist/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "rev3.h"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/nyquist/rev3/rev3.h b/keyboards/keebio/nyquist/rev3/rev3.h
deleted file mode 100644
index e365c0e417..0000000000
--- a/keyboards/keebio/nyquist/rev3/rev3.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "nyquist.h"
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, R44, R45 } \
- }
-
-#define LAYOUT_ortho_4x12( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_ortho_5x12 LAYOUT
diff --git a/keyboards/keebio/quefrency/quefrency.c b/keyboards/keebio/quefrency/quefrency.c
deleted file mode 100644
index d713a0ff3a..0000000000
--- a/keyboards/keebio/quefrency/quefrency.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "quefrency.h"
diff --git a/keyboards/keebio/quefrency/quefrency.h b/keyboards/keebio/quefrency/quefrency.h
deleted file mode 100644
index 434f674bce..0000000000
--- a/keyboards/keebio/quefrency/quefrency.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_quefrency_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev3
- #include "rev3.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev4
- #include "rev4.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev5
- #include "rev5.h"
-#endif
diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h
index 882997de51..5842393aa2 100644
--- a/keyboards/keebio/quefrency/rev1/config.h
+++ b/keyboards/keebio/quefrency/rev1/config.h
@@ -18,15 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, D4, D7, E6, B4, C6 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6, B5 }
-#define MATRIX_ROW_PINS_RIGHT { F4, D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { F5, F6, F7, B1, B3, B2, B6, C6 }
#define SPLIT_HAND_PIN D2
-#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/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json
index 6c40e387ac..ee616bb0fe 100644
--- a/keyboards/keebio/quefrency/rev1/info.json
+++ b/keyboards/keebio/quefrency/rev1/info.json
@@ -8,8 +8,19 @@
"pid": "0x1257",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+ "rows": ["F4", "D4", "D7", "E6", "B4", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "C6"],
+ "rows": ["F4", "D4", "D7", "E6", "B4", "B5"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h
index 63f1408cda..0d7e9f8a30 100644
--- a/keyboards/keebio/quefrency/rev2/config.h
+++ b/keyboards/keebio/quefrency/rev2/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
#define SPLIT_HAND_PIN F7
#define CAPS_LOCK_LED_PIN B6
diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json
index 508e2431b9..e9e037ea90 100644
--- a/keyboards/keebio/quefrency/rev2/info.json
+++ b/keyboards/keebio/quefrency/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x2257",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+ "rows": ["B1", "B2", "C7", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}
@@ -24,6 +29,12 @@
{"pin_a": "D6", "pin_b": "D4"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+ "rows": ["B3", "B2", "B6", "B4", "D7"]
+ }
}
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c
index 4e3e75a21f..3992687b7a 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.c
+++ b/keyboards/keebio/quefrency/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "quefrency.h"
+#include "rev2.h"
#include "split_util.h"
void matrix_init_kb(void) {
diff --git a/keyboards/keebio/quefrency/rev2/rev2.h b/keyboards/keebio/quefrency/rev2/rev2.h
index 2f57ac489f..e9814575b2 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.h
+++ b/keyboards/keebio/quefrency/rev2/rev2.h
@@ -1,16 +1,7 @@
#pragma once
-#include "quefrency.h"
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define LAYOUT_60( \
LA3, LA4, LA5, LA6, LA7, LA8, LA9, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h
index 63f1408cda..0d7e9f8a30 100644
--- a/keyboards/keebio/quefrency/rev3/config.h
+++ b/keyboards/keebio/quefrency/rev3/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
#define SPLIT_HAND_PIN F7
#define CAPS_LOCK_LED_PIN B6
diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json
index cd335a1d27..85e78eb203 100644
--- a/keyboards/keebio/quefrency/rev3/info.json
+++ b/keyboards/keebio/quefrency/rev3/info.json
@@ -8,6 +8,11 @@
"pid": "0x3357",
"device_version": "3.1.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+ "rows": ["B1", "B2", "C7", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}
@@ -24,6 +29,12 @@
{"pin_a": "D6", "pin_b": "D4"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+ "rows": ["B3", "B2", "B6", "B4", "D7"]
+ }
}
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c
index 52ce977ac7..24791f75d0 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.c
+++ b/keyboards/keebio/quefrency/rev3/rev3.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quefrency.h"
+#include "rev3.h"
#include "split_util.h"
void matrix_init_kb(void) {
diff --git a/keyboards/keebio/quefrency/rev3/rev3.h b/keyboards/keebio/quefrency/rev3/rev3.h
index 12f76d5c85..120186f9c0 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.h
+++ b/keyboards/keebio/quefrency/rev3/rev3.h
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "quefrency.h"
#include "quantum.h"
#define LAYOUT_60( \
diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h
index 3292fbf302..e3adf83576 100644
--- a/keyboards/keebio/quefrency/rev4/config.h
+++ b/keyboards/keebio/quefrency/rev4/config.h
@@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
#define SPLIT_HAND_PIN F7
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
index de9a383d4f..c3f2fc4041 100644
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -8,6 +8,11 @@
"pid": "0x4357",
"device_version": "4.1.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+ "rows": ["B1", "B2", "C7", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}
@@ -21,6 +26,12 @@
{"pin_a": "D6", "pin_b": "D4"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+ "rows": ["B3", "B2", "B6", "B4", "D7"]
+ }
}
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/quefrency/rev4/rev4.c b/keyboards/keebio/quefrency/rev4/rev4.c
index 66d73a934a..78e48dcf70 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.c
+++ b/keyboards/keebio/quefrency/rev4/rev4.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quefrency.h"
+#include "rev4.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/quefrency/rev4/rev4.h b/keyboards/keebio/quefrency/rev4/rev4.h
index 2284a6da43..4f51cc8f32 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.h
+++ b/keyboards/keebio/quefrency/rev4/rev4.h
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "quefrency.h"
#include "quantum.h"
#define LAYOUT_60( \
diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h
index 3292fbf302..e3adf83576 100644
--- a/keyboards/keebio/quefrency/rev5/config.h
+++ b/keyboards/keebio/quefrency/rev5/config.h
@@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
#define SPLIT_HAND_PIN F7
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json
index 422d987258..7c62abecac 100644
--- a/keyboards/keebio/quefrency/rev5/info.json
+++ b/keyboards/keebio/quefrency/rev5/info.json
@@ -8,6 +8,11 @@
"pid": "0x5357",
"device_version": "5.1.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+ "rows": ["B1", "B2", "C7", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}
@@ -21,6 +26,12 @@
{"pin_a": "D6", "pin_b": "D4"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+ "rows": ["B3", "B2", "B6", "B4", "D7"]
+ }
}
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/quefrency/rev5/rev5.c b/keyboards/keebio/quefrency/rev5/rev5.c
index 66d73a934a..a94fecd967 100644
--- a/keyboards/keebio/quefrency/rev5/rev5.c
+++ b/keyboards/keebio/quefrency/rev5/rev5.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quefrency.h"
+#include "rev5.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/quefrency/rev5/rev5.h b/keyboards/keebio/quefrency/rev5/rev5.h
index 2284a6da43..4f51cc8f32 100644
--- a/keyboards/keebio/quefrency/rev5/rev5.h
+++ b/keyboards/keebio/quefrency/rev5/rev5.h
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "quefrency.h"
#include "quantum.h"
#define LAYOUT_60( \
diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h
index 435ebb2845..73161d7a99 100644
--- a/keyboards/keebio/rorschach/rev1/config.h
+++ b/keyboards/keebio/rorschach/rev1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or 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/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
index 88cec27844..0a117cc944 100644
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x1246",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "D2", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 5
@@ -20,67 +25,67 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 3, "y": 0 },
- { "w": 1, "x": 4, "y": 0 },
- { "w": 1, "x": 5, "y": 0 },
+ { "x": 0, "y": 0 },
+ { "x": 1, "y": 0 },
+ { "x": 2, "y": 0 },
+ { "x": 3, "y": 0 },
+ { "x": 4, "y": 0 },
+ { "x": 5, "y": 0 },
- { "w": 1, "x": 9, "y": 0 },
- { "w": 1, "x": 10, "y": 0 },
- { "w": 1, "x": 11, "y": 0 },
- { "w": 1, "x": 12, "y": 0 },
- { "w": 1, "x": 13, "y": 0 },
- { "w": 1, "x": 14, "y": 0 },
+ { "x": 9, "y": 0 },
+ { "x": 10, "y": 0 },
+ { "x": 11, "y": 0 },
+ { "x": 12, "y": 0 },
+ { "x": 13, "y": 0 },
+ { "x": 14, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 },
- { "w": 1, "x": 3, "y": 1 },
- { "w": 1, "x": 4, "y": 1 },
- { "w": 1, "x": 5, "y": 1 },
+ { "x": 0, "y": 1 },
+ { "x": 1, "y": 1 },
+ { "x": 2, "y": 1 },
+ { "x": 3, "y": 1 },
+ { "x": 4, "y": 1 },
+ { "x": 5, "y": 1 },
- { "w": 1, "x": 9, "y": 1 },
- { "w": 1, "x": 10, "y": 1 },
- { "w": 1, "x": 11, "y": 1 },
- { "w": 1, "x": 12, "y": 1 },
- { "w": 1, "x": 13, "y": 1 },
- { "w": 1, "x": 14, "y": 1 },
+ { "x": 9, "y": 1 },
+ { "x": 10, "y": 1 },
+ { "x": 11, "y": 1 },
+ { "x": 12, "y": 1 },
+ { "x": 13, "y": 1 },
+ { "x": 14, "y": 1 },
- { "w": 1, "x": 0, "y": 2 },
- { "w": 1, "x": 1, "y": 2 },
- { "w": 1, "x": 2, "y": 2 },
- { "w": 1, "x": 3, "y": 2 },
- { "w": 1, "x": 4, "y": 2 },
- { "w": 1, "x": 5, "y": 2 },
+ { "x": 0, "y": 2 },
+ { "x": 1, "y": 2 },
+ { "x": 2, "y": 2 },
+ { "x": 3, "y": 2 },
+ { "x": 4, "y": 2 },
+ { "x": 5, "y": 2 },
- { "w": 1, "x": 9, "y": 2 },
- { "w": 1, "x": 10, "y": 2 },
- { "w": 1, "x": 11, "y": 2 },
- { "w": 1, "x": 12, "y": 2 },
- { "w": 1, "x": 13, "y": 2 },
- { "w": 1, "x": 14, "y": 2 },
+ { "x": 9, "y": 2 },
+ { "x": 10, "y": 2 },
+ { "x": 11, "y": 2 },
+ { "x": 12, "y": 2 },
+ { "x": 13, "y": 2 },
+ { "x": 14, "y": 2 },
- { "w": 1, "x": 0, "y": 3 },
- { "w": 1, "x": 1, "y": 3 },
- { "w": 1, "x": 2, "y": 3 },
- { "w": 1, "x": 3, "y": 3 },
- { "w": 1, "x": 4, "y": 3 },
- { "w": 1, "x": 5, "y": 3 },
+ { "x": 0, "y": 3 },
+ { "x": 1, "y": 3 },
+ { "x": 2, "y": 3 },
+ { "x": 3, "y": 3 },
+ { "x": 4, "y": 3 },
+ { "x": 5, "y": 3 },
- { "w": 1, "x": 9, "y": 3 },
- { "w": 1, "x": 10, "y": 3 },
- { "w": 1, "x": 11, "y": 3 },
- { "w": 1, "x": 12, "y": 3 },
- { "w": 1, "x": 13, "y": 3 },
- { "w": 1, "x": 14, "y": 3 },
+ { "x": 9, "y": 3 },
+ { "x": 10, "y": 3 },
+ { "x": 11, "y": 3 },
+ { "x": 12, "y": 3 },
+ { "x": 13, "y": 3 },
+ { "x": 14, "y": 3 },
- { "w": 1, "x": 5.5, "y": 4 },
- { "w": 1, "x": 6, "y": 5 },
+ { "x": 5.5, "y": 4 },
+ { "x": 6, "y": 5 },
- { "w": 1, "x": 8, "y": 5 },
- { "w": 1, "x": 8.5, "y": 4 }
+ { "x": 8, "y": 5 },
+ { "x": 8.5, "y": 4 }
]
}
diff --git a/keyboards/keebio/rorschach/rev1/rev1.c b/keyboards/keebio/rorschach/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/keebio/rorschach/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/keebio/rorschach/rev1/rev1.h b/keyboards/keebio/rorschach/rev1/rev1.h
index 278bf8186e..32c421c7d0 100644
--- a/keyboards/keebio/rorschach/rev1/rev1.h
+++ b/keyboards/keebio/rorschach/rev1/rev1.h
@@ -1,17 +1,7 @@
#pragma once
-#include "rorschach.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/rorschach/rorschach.c b/keyboards/keebio/rorschach/rorschach.c
deleted file mode 100644
index 49e2917890..0000000000
--- a/keyboards/keebio/rorschach/rorschach.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rorschach.h"
diff --git a/keyboards/keebio/rorschach/rorschach.h b/keyboards/keebio/rorschach/rorschach.h
deleted file mode 100644
index f11093f074..0000000000
--- a/keyboards/keebio/rorschach/rorschach.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_keebio_rorschach_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/keebio/sinc/rev1/rev1.h b/keyboards/keebio/sinc/rev1/rev1.h
index 1fbbc2d6af..45d7ab05d1 100644
--- a/keyboards/keebio/sinc/rev1/rev1.h
+++ b/keyboards/keebio/sinc/rev1/rev1.h
@@ -1,15 +1,8 @@
#pragma once
-#include "sinc.h"
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
+#define XXX KC_NO
#define LAYOUT_75( \
LF3, LF4, LF5, LF6, LF7, LF8, LF9, RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
@@ -20,18 +13,18 @@
LE3, LE4, LE5, LE6, LE7, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8 \
) \
{ \
- { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
- { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
- { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
- { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
- { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
- { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
- { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+ { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+ { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+ { XXX, XXX, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+ { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+ { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, XXX }, \
+ { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, XXX }, \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
}
#define LAYOUT_80( \
@@ -43,18 +36,18 @@
LE3, LE4, LE5, LE6, LE7, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8, RE9 \
) \
{ \
- { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
- { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
- { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
- { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+ { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+ { XXX, XXX, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+ { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
{ RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
{ RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
- { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+ { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, RC9 }, \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
}
#define LAYOUT_75_with_macro( \
@@ -67,17 +60,17 @@
) \
{ \
{ LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
- { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
- { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
- { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
- { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
- { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
- { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+ { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+ { LD1, LD2, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+ { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+ { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, XXX }, \
+ { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, XXX }, \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
}
#define LAYOUT_80_with_macro( \
@@ -90,17 +83,17 @@
) \
{ \
{ LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
- { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
- { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
- { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+ { LD1, LD2, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+ { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
{ RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
{ RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
- { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+ { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, RC9 }, \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
}
#define LAYOUT_75_iso( \
@@ -112,18 +105,18 @@
LE3, LE4, LE5, LE6, LE7, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8 \
) \
{ \
- { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
- { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
- { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
- { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
- { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
- { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
- { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+ { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+ { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+ { XXX, XXX, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+ { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+ { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, XXX }, \
+ { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, XXX }, \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
}
#define LAYOUT_80_iso( \
@@ -135,18 +128,18 @@
LE3, LE4, LE5, LE6, LE7, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8, RE9 \
) \
{ \
- { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
- { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
- { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
- { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+ { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+ { XXX, XXX, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+ { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
{ RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
- { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
+ { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, RB9 }, \
{ RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
}
#define LAYOUT_75_iso_with_macro( \
@@ -159,17 +152,17 @@
) \
{ \
{ LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+ { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
{ LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
- { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
- { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
- { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
- { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
- { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+ { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+ { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, XXX }, \
+ { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, XXX }, \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
}
#define LAYOUT_80_iso_with_macro( \
@@ -182,17 +175,17 @@
) \
{ \
{ LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+ { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
{ LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
- { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
- { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
{ RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
- { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
+ { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, RB9 }, \
{ RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
}
#define LAYOUT_all( \
@@ -205,15 +198,15 @@
) \
{ \
{ LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+ { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+ { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
{ LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
- { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
- { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+ { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+ { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
{ RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
{ RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
{ RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
- { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
- { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
- { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+ { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+ { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+ { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
}
diff --git a/keyboards/keebio/sinc/rev2/rev2.h b/keyboards/keebio/sinc/rev2/rev2.h
index 15d4b402b0..8960cf7579 100644
--- a/keyboards/keebio/sinc/rev2/rev2.h
+++ b/keyboards/keebio/sinc/rev2/rev2.h
@@ -16,17 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "sinc.h"
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define LAYOUT_75( \
LF3, LF4, LF5, LF6, LF7, LF8, LF9, RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
LA3, LA4, LA5, LA6, LA7, LA8, LA9, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
index baf5af5f1a..a17921b38b 100644
--- a/keyboards/keebio/sinc/rev3/info.json
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -39,6 +39,9 @@
{"pin_a": "GP21", "pin_b": "GP20" }
]
},
+ "ws2812": {
+ "driver": "vendor"
+ },
"rgb_matrix": {
"driver": "WS2812",
"split_count": [56, 57],
diff --git a/keyboards/keebio/sinc/rev3/rev3.h b/keyboards/keebio/sinc/rev3/rev3.h
index 57d072398a..b863ddfe20 100644
--- a/keyboards/keebio/sinc/rev3/rev3.h
+++ b/keyboards/keebio/sinc/rev3/rev3.h
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "sinc.h"
#include "quantum.h"
#define LAYOUT_75( \
diff --git a/keyboards/keebio/sinc/rev3/rules.mk b/keyboards/keebio/sinc/rev3/rules.mk
index 8fb51ec82d..161ec22b16 100644
--- a/keyboards/keebio/sinc/rev3/rules.mk
+++ b/keyboards/keebio/sinc/rev3/rules.mk
@@ -1,2 +1 @@
SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c
index 9b2f6da512..d50eb82019 100644
--- a/keyboards/keebio/sinc/sinc.c
+++ b/keyboards/keebio/sinc/sinc.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "sinc.h"
+#include "quantum.h"
#include "split_util.h"
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/sinc/sinc.h b/keyboards/keebio/sinc/sinc.h
deleted file mode 100644
index 4607d8125c..0000000000
--- a/keyboards/keebio/sinc/sinc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_sinc_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_keebio_sinc_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_sinc_rev3
- #include "rev3.h"
-#endif
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index c4b27e4324..f8582148f9 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* WS2812 RGB LED */
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -88,6 +87,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# endif
-#endif
#define TAPPING_TERM 200
diff --git a/keyboards/keebio/tragicforce68/config.h b/keyboards/keebio/tragicforce68/config.h
index 656be72025..5070f05156 100644
--- a/keyboards/keebio/tragicforce68/config.h
+++ b/keyboards/keebio/tragicforce68/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, B4, E6, C6, D7, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or 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/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/info.json
index 2be5e4f0c1..07d292728b 100644
--- a/keyboards/keebio/tragicforce68/info.json
+++ b/keyboards/keebio/tragicforce68/info.json
@@ -8,6 +8,11 @@
"pid": "0x0510",
"device_version": "1.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D3", "D2", "D1", "D0", "B4", "E6", "C6", "D7", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 7,
@@ -16,238 +21,253 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["68_ansi"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_68_ansi"
+ },
"layouts": {
"LAYOUT_68_ansi": {
"layout": [
- {"label":"~", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
-
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":" {", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"x":15.25, "y":1},
- {"x":16.25, "y":1},
-
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"x":15.25, "y":3},
-
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"Win", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"x":14.25, "y":4},
- {"x":15.25, "y":4},
- {"x":16.25, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [4, 0], "x": 8, "y": 0},
+ {"matrix": [4, 1], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 4], "x": 12, "y": 0},
+ {"matrix": [4, 5], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [4, 6], "x": 15.25, "y": 0},
+ {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [5, 0], "x": 8.5, "y": 1},
+ {"matrix": [5, 1], "x": 9.5, "y": 1},
+ {"matrix": [5, 2], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [5, 6], "x": 15.25, "y": 1},
+ {"matrix": [5, 7], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [6, 0], "x": 8.75, "y": 2},
+ {"matrix": [6, 1], "x": 9.75, "y": 2},
+ {"matrix": [6, 2], "x": 10.75, "y": 2},
+ {"matrix": [6, 3], "x": 11.75, "y": 2},
+ {"matrix": [6, 4], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [7, 0], "x": 9.25, "y": 3},
+ {"matrix": [7, 1], "x": 10.25, "y": 3},
+ {"matrix": [7, 2], "x": 11.25, "y": 3},
+ {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [7, 4], "x": 15.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [6, 5], "x": 14.25, "y": 4},
+ {"matrix": [6, 6], "x": 15.25, "y": 4},
+ {"matrix": [6, 7], "x": 16.25, "y": 4}
]
},
"LAYOUT_split_space": {
"layout": [
- {"label":"~", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
-
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":" {", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"x":15.25, "y":1},
- {"x":16.25, "y":1},
-
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"x":15.25, "y":3},
-
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":2.25},
- {"x":6, "y":4, "w":1.75},
- {"x":7.75, "y":4, "w":2.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"Win", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"x":14.25, "y":4},
- {"x":15.25, "y":4},
- {"x":16.25, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [4, 0], "x": 8, "y": 0},
+ {"matrix": [4, 1], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 4], "x": 12, "y": 0},
+ {"matrix": [4, 5], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [4, 6], "x": 15.25, "y": 0},
+ {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [5, 0], "x": 8.5, "y": 1},
+ {"matrix": [5, 1], "x": 9.5, "y": 1},
+ {"matrix": [5, 2], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [5, 6], "x": 15.25, "y": 1},
+ {"matrix": [5, 7], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [6, 0], "x": 8.75, "y": 2},
+ {"matrix": [6, 1], "x": 9.75, "y": 2},
+ {"matrix": [6, 2], "x": 10.75, "y": 2},
+ {"matrix": [6, 3], "x": 11.75, "y": 2},
+ {"matrix": [6, 4], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [7, 0], "x": 9.25, "y": 3},
+ {"matrix": [7, 1], "x": 10.25, "y": 3},
+ {"matrix": [7, 2], "x": 11.25, "y": 3},
+ {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [7, 4], "x": 15.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [8, 4], "x": 6, "y": 4, "w": 1.75},
+ {"matrix": [8, 5], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [6, 5], "x": 14.25, "y": 4},
+ {"matrix": [6, 6], "x": 15.25, "y": 4},
+ {"matrix": [6, 7], "x": 16.25, "y": 4}
]
},
"LAYOUT_split_space_and_backspace": {
"layout": [
- {"label":"~", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"Del", "x":13, "y":0},
- {"label":"Backspace", "x":14, "y":0},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
-
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":" {", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"x":15.25, "y":1},
- {"x":16.25, "y":1},
-
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"x":15.25, "y":3},
-
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":2.25},
- {"x":6, "y":4, "w":1.75},
- {"x":7.75, "y":4, "w":2.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"Win", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"x":14.25, "y":4},
- {"x":15.25, "y":4},
- {"x":16.25, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [4, 0], "x": 8, "y": 0},
+ {"matrix": [4, 1], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 4], "x": 12, "y": 0},
+ {"matrix": [4, 5], "x": 13, "y": 0},
+ {"matrix": [7, 6], "x": 14, "y": 0},
+
+ {"matrix": [4, 6], "x": 15.25, "y": 0},
+ {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [5, 0], "x": 8.5, "y": 1},
+ {"matrix": [5, 1], "x": 9.5, "y": 1},
+ {"matrix": [5, 2], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [5, 6], "x": 15.25, "y": 1},
+ {"matrix": [5, 7], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [6, 0], "x": 8.75, "y": 2},
+ {"matrix": [6, 1], "x": 9.75, "y": 2},
+ {"matrix": [6, 2], "x": 10.75, "y": 2},
+ {"matrix": [6, 3], "x": 11.75, "y": 2},
+ {"matrix": [6, 4], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [7, 0], "x": 9.25, "y": 3},
+ {"matrix": [7, 1], "x": 10.25, "y": 3},
+ {"matrix": [7, 2], "x": 11.25, "y": 3},
+ {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [7, 4], "x": 15.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [8, 4], "x": 6, "y": 4, "w": 1.75},
+ {"matrix": [8, 5], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [6, 5], "x": 14.25, "y": 4},
+ {"matrix": [6, 6], "x": 15.25, "y": 4},
+ {"matrix": [6, 7], "x": 16.25, "y": 4}
]
}
}
diff --git a/keyboards/keebio/tragicforce68/tragicforce68.c b/keyboards/keebio/tragicforce68/tragicforce68.c
deleted file mode 100644
index 42df8ec295..0000000000
--- a/keyboards/keebio/tragicforce68/tragicforce68.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tragicforce68.h"
diff --git a/keyboards/keebio/tragicforce68/tragicforce68.h b/keyboards/keebio/tragicforce68/tragicforce68.h
deleted file mode 100644
index a177f52816..0000000000
--- a/keyboards/keebio/tragicforce68/tragicforce68.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
- A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6, E7, E8, \
- B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6, F7, F8, \
- C1, C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4, G5, \
- D1, D2, D3, D4, D5, D6, D7, D8, H1, H2, H3, H4, H5, \
- J1, J2, J3, J5, J7, J8, H6, G6, G7, G8 \
-) { \
- { A1, A2, A3, A4, A5, A6, A7, A8 }, \
- { B1, B2, B3, B4, B5, B6, B7, B8 }, \
- { C1, C2, C3, C4, C5, C6, C7, C8 }, \
- { D1, D2, D3, D4, D5, D6, D7, D8 }, \
- { E1, E2, E3, E4, E5, E6, E7, E8 }, \
- { F1, F2, F3, F4, F5, F6, F7, F8 }, \
- { G1, G2, G3, G4, G5, G6, G7, G8 }, \
- { H1, H2, H3, H4, H5, H6, KC_NO, KC_NO }, \
- { J1, J2, J3, KC_NO, J5, KC_NO, J7, J8 } \
-}
-
-#define LAYOUT_split_space( \
- A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6, E7, E8, \
- B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6, F7, F8, \
- C1, C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4, G5, \
- D1, D2, D3, D4, D5, D6, D7, D8, H1, H2, H3, H4, H5, \
- J1, J2, J3, J4, J5, J6, J7, J8, H6, G6, G7, G8 \
-) { \
- { A1, A2, A3, A4, A5, A6, A7, A8 }, \
- { B1, B2, B3, B4, B5, B6, B7, B8 }, \
- { C1, C2, C3, C4, C5, C6, C7, C8 }, \
- { D1, D2, D3, D4, D5, D6, D7, D8 }, \
- { E1, E2, E3, E4, E5, E6, E7, E8 }, \
- { F1, F2, F3, F4, F5, F6, F7, F8 }, \
- { G1, G2, G3, G4, G5, G6, G7, G8 }, \
- { H1, H2, H3, H4, H5, H6, KC_NO, KC_NO }, \
- { J1, J2, J3, J4, J5, J6, J7, J8 } \
-}
-
-#define LAYOUT_split_space_and_backspace( \
- A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6, H7, E7, E8, \
- B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6, F7, F8, \
- C1, C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4, G5, \
- D1, D2, D3, D4, D5, D6, D7, D8, H1, H2, H3, H4, H5, \
- J1, J2, J3, J4, J5, J6, J7, J8, H6, G6, G7, G8 \
-) { \
- { A1, A2, A3, A4, A5, A6, A7, A8 }, \
- { B1, B2, B3, B4, B5, B6, B7, B8 }, \
- { C1, C2, C3, C4, C5, C6, C7, C8 }, \
- { D1, D2, D3, D4, D5, D6, D7, D8 }, \
- { E1, E2, E3, E4, E5, E6, E7, E8 }, \
- { F1, F2, F3, F4, F5, F6, F7, F8 }, \
- { G1, G2, G3, G4, G5, G6, G7, G8 }, \
- { H1, H2, H3, H4, H5, H6, H7, KC_NO }, \
- { J1, J2, J3, J4, J5, J6, J7, J8 } \
-}
-
-#define LAYOUT LAYOUT_68_ansi
diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h
index b62aef8a09..e93b57b8e7 100644
--- a/keyboards/keebio/tukey/config.h
+++ b/keyboards/keebio/tukey/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,9 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#endif
-
/* 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/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json
index 0b6d002758..1fadcce126 100644
--- a/keyboards/keebio/viterbi/info.json
+++ b/keyboards/keebio/viterbi/info.json
@@ -7,85 +7,5 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
- "community_layouts": ["ortho_5x14"],
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "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":6, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1},
- {"x":14, "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":6, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2},
- {"x":14, "y":2},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
- {"x":13, "y":3},
- {"x":14, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4},
- {"x":11, "y":4},
- {"x":12, "y":4},
- {"x":13, "y":4},
- {"x":14, "y":4}
- ]
- }
- }
+ "community_layouts": ["ortho_5x14"]
}
diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h
index d911b45208..a31e17e1ab 100644
--- a/keyboards/keebio/viterbi/rev1/config.h
+++ b/keyboards/keebio/viterbi/rev1/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or 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/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json
index d91c35fc85..b1a35d2886 100644
--- a/keyboards/keebio/viterbi/rev1/info.json
+++ b/keyboards/keebio/viterbi/rev1/info.json
@@ -6,5 +6,90 @@
"usb": {
"pid": "0x1157",
"device_version": "1.0.0"
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "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":6, "y":1},
+ {"x":8, "y":1},
+ {"x":9, "y":1},
+ {"x":10, "y":1},
+ {"x":11, "y":1},
+ {"x":12, "y":1},
+ {"x":13, "y":1},
+ {"x":14, "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":6, "y":2},
+ {"x":8, "y":2},
+ {"x":9, "y":2},
+ {"x":10, "y":2},
+ {"x":11, "y":2},
+ {"x":12, "y":2},
+ {"x":13, "y":2},
+ {"x":14, "y":2},
+
+ {"x":0, "y":3},
+ {"x":1, "y":3},
+ {"x":2, "y":3},
+ {"x":3, "y":3},
+ {"x":4, "y":3},
+ {"x":5, "y":3},
+ {"x":6, "y":3},
+ {"x":8, "y":3},
+ {"x":9, "y":3},
+ {"x":10, "y":3},
+ {"x":11, "y":3},
+ {"x":12, "y":3},
+ {"x":13, "y":3},
+ {"x":14, "y":3},
+
+ {"x":0, "y":4},
+ {"x":1, "y":4},
+ {"x":2, "y":4},
+ {"x":3, "y":4},
+ {"x":4, "y":4},
+ {"x":5, "y":4},
+ {"x":6, "y":4},
+ {"x":8, "y":4},
+ {"x":9, "y":4},
+ {"x":10, "y":4},
+ {"x":11, "y":4},
+ {"x":12, "y":4},
+ {"x":13, "y":4},
+ {"x":14, "y":4}
+ ]
+ }
}
}
diff --git a/keyboards/keebio/viterbi/rev1/rev1.c b/keyboards/keebio/viterbi/rev1/rev1.c
deleted file mode 100644
index 509e42dc51..0000000000
--- a/keyboards/keebio/viterbi/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "viterbi.h"
diff --git a/keyboards/keebio/viterbi/rev1/rev1.h b/keyboards/keebio/viterbi/rev1/rev1.h
index 88a3200f6b..95776a7aeb 100644
--- a/keyboards/keebio/viterbi/rev1/rev1.h
+++ b/keyboards/keebio/viterbi/rev1/rev1.h
@@ -1,16 +1,7 @@
#pragma once
-#include "viterbi.h"
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#ifndef FLIP_HALF
// Standard Keymap
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h
index 898ba3d786..d455adcba8 100644
--- a/keyboards/keebio/viterbi/rev2/config.h
+++ b/keyboards/keebio/viterbi/rev2/config.h
@@ -17,14 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
#define SPLIT_HAND_PIN D2
-/* COL2ROW or 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/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json
index dd375f3053..92206ebc41 100644
--- a/keyboards/keebio/viterbi/rev2/info.json
+++ b/keyboards/keebio/viterbi/rev2/info.json
@@ -7,8 +7,101 @@
"pid": "0x2157",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 7
+ },
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_5x14"
+ },
+ "layouts": {
+ "LAYOUT_ortho_5x14": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 6], "x": 8, "y": 0},
+ {"matrix": [5, 5], "x": 9, "y": 0},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [6, 6], "x": 8, "y": 1},
+ {"matrix": [6, 5], "x": 9, "y": 1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 1], "x": 13, "y": 1},
+ {"matrix": [6, 0], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [7, 6], "x": 8, "y": 2},
+ {"matrix": [7, 5], "x": 9, "y": 2},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 1], "x": 13, "y": 2},
+ {"matrix": [7, 0], "x": 14, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+
+ {"matrix": [8, 6], "x": 8, "y": 3},
+ {"matrix": [8, 5], "x": 9, "y": 3},
+ {"matrix": [8, 4], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 1], "x": 13, "y": 3},
+ {"matrix": [8, 0], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+
+ {"matrix": [9, 6], "x": 8, "y": 4},
+ {"matrix": [9, 5], "x": 9, "y": 4},
+ {"matrix": [9, 4], "x": 10, "y": 4},
+ {"matrix": [9, 3], "x": 11, "y": 4},
+ {"matrix": [9, 2], "x": 12, "y": 4},
+ {"matrix": [9, 1], "x": 13, "y": 4},
+ {"matrix": [9, 0], "x": 14, "y": 4}
+ ]
+ }
}
}
diff --git a/keyboards/keebio/viterbi/rev2/rev2.c b/keyboards/keebio/viterbi/rev2/rev2.c
index a72cc44436..f00bb726e9 100644
--- a/keyboards/keebio/viterbi/rev2/rev2.c
+++ b/keyboards/keebio/viterbi/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "viterbi.h"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/viterbi/rev2/rev2.h b/keyboards/keebio/viterbi/rev2/rev2.h
deleted file mode 100644
index 599e6415a3..0000000000
--- a/keyboards/keebio/viterbi/rev2/rev2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "viterbi.h"
-#include "quantum.h"
-
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R46, R45, R44, R43, R42, R41, R40 } \
- }
-
-#define LAYOUT_ortho_5x14 LAYOUT
diff --git a/keyboards/keebio/viterbi/viterbi.c b/keyboards/keebio/viterbi/viterbi.c
deleted file mode 100644
index 509e42dc51..0000000000
--- a/keyboards/keebio/viterbi/viterbi.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "viterbi.h"
diff --git a/keyboards/keebio/viterbi/viterbi.h b/keyboards/keebio/viterbi/viterbi.h
deleted file mode 100644
index b17b322410..0000000000
--- a/keyboards/keebio/viterbi/viterbi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_viterbi_rev1
- #include "rev1.h"
-#elif KEYBOARD_keebio_viterbi_rev2
- #include "rev2.h"
-#endif
-
-#define LAYOUT_ortho_5x14 LAYOUT
-
diff --git a/keyboards/keebio/wavelet/config.h b/keyboards/keebio/wavelet/config.h
index 6866a313d4..846d9b2da2 100644
--- a/keyboards/keebio/wavelet/config.h
+++ b/keyboards/keebio/wavelet/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, F7, B3, D2, D1, D4, D7 }
-#define MATRIX_COL_PINS { F6, B1, B2, B6, B4, E6 }
-
-#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/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json
index 1a1663c4d7..57532fb7ad 100644
--- a/keyboards/keebio/wavelet/info.json
+++ b/keyboards/keebio/wavelet/info.json
@@ -8,6 +8,11 @@
"pid": "0x1046",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "B1", "B2", "B6", "B4", "E6"],
+ "rows": ["F4", "F5", "F7", "B3", "D2", "D1", "D4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 7
@@ -15,13 +20,67 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x12"],
+ "layout_aliases": {
+ "LAYOUT_ortho_4x12": "LAYOUT"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "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":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2},
- {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [4, 5], "x": 6, "y": 0},
+ {"matrix": [4, 4], "x": 7, "y": 0},
+ {"matrix": [4, 3], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0},
+ {"matrix": [4, 0], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [5, 5], "x": 6, "y": 1},
+ {"matrix": [5, 4], "x": 7, "y": 1},
+ {"matrix": [5, 3], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 0], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [6, 5], "x": 6, "y": 2},
+ {"matrix": [6, 4], "x": 7, "y": 2},
+ {"matrix": [6, 3], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2},
+ {"matrix": [6, 0], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 5], "x": 6, "y": 3},
+ {"matrix": [7, 4], "x": 7, "y": 3},
+ {"matrix": [7, 3], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 1], "x": 10, "y": 3},
+ {"matrix": [7, 0], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/keebio/wavelet/wavelet.c b/keyboards/keebio/wavelet/wavelet.c
index 466b4fe72e..6f1a050e80 100644
--- a/keyboards/keebio/wavelet/wavelet.c
+++ b/keyboards/keebio/wavelet/wavelet.c
@@ -1,4 +1,4 @@
-#include "wavelet.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/keebio/wavelet/wavelet.h b/keyboards/keebio/wavelet/wavelet.h
deleted file mode 100644
index d6a0ef4227..0000000000
--- a/keyboards/keebio/wavelet/wavelet.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R35, R34, R33, R32, R31, R30 } \
- }
-
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h
index afd480e018..34869d5107 100644
--- a/keyboards/keebio/wtf60/config.h
+++ b/keyboards/keebio/wtf60/config.h
@@ -16,26 +16,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B4, B5, B6, C7, F7, B1, B2, B3, D2, D3, D5, D4, D6, D7 }
#define AUDIO_PIN C6
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -52,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/info.json
index d6932595cf..33fd15d6c6 100644
--- a/keyboards/keebio/wtf60/info.json
+++ b/keyboards/keebio/wtf60/info.json
@@ -8,6 +8,11 @@
"pid": "0x1337",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B4", "B5", "B6", "C7", "F7", "B1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7"],
+ "rows": ["F0", "F1", "F4", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi"],
diff --git a/keyboards/keebio/wtf60/wtf60.c b/keyboards/keebio/wtf60/wtf60.c
deleted file mode 100644
index 631af10615..0000000000
--- a/keyboards/keebio/wtf60/wtf60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "wtf60.h"