Merge branch 'develop'

8 files changed, 53 insertions, 118 deletions

diff --git a/keyboards/q4z/config.h b/keyboards/q4z/config.h
index eea6fcc076..67553a4432 100644
--- a/keyboards/q4z/config.h
+++ b/keyboards/q4z/config.h
@@ -15,23 +15,6 @@
  */ 
 #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 { F4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { D1, D0, D4, B6, B2, B3, B1, F7, F6, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/q4z/info.json b/keyboards/q4z/info.json
index aed372df94..dc02296131 100644
--- a/keyboards/q4z/info.json
+++ b/keyboards/q4z/info.json
@@ -8,53 +8,62 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
+        "rows": ["F4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (F4,D1)", "x":0.5, "y":0},
-                {"label":"K01 (F4,D0)", "x":1.5, "y":0},
-                {"label":"K02 (F4,D4)", "x":2.5, "y":0},
-                {"label":"K03 (F4,B6)", "x":3.5, "y":0},
-                {"label":"K04 (F4,B2)", "x":4.5, "y":0},
-                {"label":"K10 (C6,D1)", "x":0, "y":1},
-                {"label":"K11 (C6,D0)", "x":1, "y":1},
-                {"label":"K12 (C6,D4)", "x":2, "y":1},
-                {"label":"K13 (C6,B6)", "x":3, "y":1},
-                {"label":"K14 (C6,B2)", "x":4, "y":1},
-                {"label":"K15 (C6,B3)", "x":5, "y":1},
-                {"label":"K16 (C6,B1)", "x":6, "y":1},
-                {"label":"K17 (C6,F7)", "x":7, "y":1},
-                {"label":"K18 (C6,F6)", "x":8, "y":1},
-                {"label":"K19 (C6,F5)", "x":9, "y":1, "w":1.25},
-                {"label":"K20 (D7,D1)", "x":0, "y":2, "w":1.25},
-                {"label":"K21 (D7,D0)", "x":1.25, "y":2},
-                {"label":"K22 (D7,D4)", "x":2.25, "y":2},
-                {"label":"K23 (D7,B6)", "x":3.25, "y":2},
-                {"label":"K24 (D7,B2)", "x":4.25, "y":2},
-                {"label":"K25 (D7,B3)", "x":5.25, "y":2},
-                {"label":"K26 (D7,B1)", "x":6.25, "y":2},
-                {"label":"K27 (D7,F7)", "x":7.25, "y":2},
-                {"label":"K28 (D7,F6)", "x":8.25, "y":2},
-                {"label":"K29 (D7,F5)", "x":9.25, "y":2},
-                {"label":"K30 (E6,D1)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (E6,D0)", "x":1.75, "y":3},
-                {"label":"K32 (E6,D4)", "x":2.75, "y":3},
-                {"label":"K33 (E6,B6)", "x":3.75, "y":3},
-                {"label":"K34 (E6,B2)", "x":4.75, "y":3},
-                {"label":"K35 (E6,B3)", "x":5.75, "y":3},
-                {"label":"K36 (E6,B1)", "x":6.75, "y":3},
-                {"label":"K37 (E6,F7)", "x":7.75, "y":3},
-                {"label":"K38 (E6,F6)", "x":8.75, "y":3, "w":1.5},
-                {"label":"K40 (B4,D1)", "x":0, "y":4},
-                {"label":"K41 (B4,D0)", "x":1, "y":4},
-                {"label":"K42 (B4,D4)", "x":2, "y":4},
-                {"label":"K43 (B4,B6)", "x":3, "y":4, "w":2.25},
-                {"label":"K44 (B4,B2)", "x":5.25, "y":4, "w":2},
-                {"label":"K45 (B4,B3)", "x":7.25, "y":4},
-                {"label":"K46 (B4,B1)", "x":8.25, "y":4},
-                {"label":"K47 (B4,F7)", "x":9.25, "y":4}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "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, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.5},
+
+                {"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, "w": 2.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7.25, "y": 4},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [4, 7], "x": 9.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/q4z/keymaps/default/config.h b/keyboards/q4z/keymaps/default/config.h
index ac3a08778d..88392557de 100644
--- a/keyboards/q4z/keymaps/default/config.h
+++ b/keyboards/q4z/keymaps/default/config.h
@@ -15,9 +15,6 @@
  */
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
-
 #ifdef COMBO_ENABLE
-#define COMBO_COUNT 5
 #define COMBO_TERM 200
 #endif
diff --git a/keyboards/q4z/keymaps/default/keymap.c b/keyboards/q4z/keymaps/default/keymap.c
index 45fe8c2dd5..4a7c28acb1 100644
--- a/keyboards/q4z/keymaps/default/keymap.c
+++ b/keyboards/q4z/keymaps/default/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_A, KC_S, COMBO_END};
 const uint16_t PROGMEM combo_esc[] = {KC_Q, KC_W, COMBO_END};
 const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
   [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
   [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/q4z/keymaps/rjboone/config.h b/keyboards/q4z/keymaps/rjboone/config.h
index 9921a19178..9264f33bae 100644
--- a/keyboards/q4z/keymaps/rjboone/config.h
+++ b/keyboards/q4z/keymaps/rjboone/config.h
@@ -15,11 +15,7 @@
  */
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
-
 #undef TAPPING_TERM
 #define TAPPING_TERM 300
 
-#undef COMBO_COUNT
-#define COMBO_COUNT 5
 #define COMBO_TERM 50
diff --git a/keyboards/q4z/keymaps/rjboone/keymap.c b/keyboards/q4z/keymaps/rjboone/keymap.c
index 8e764e4735..c54ec014ec 100644
--- a/keyboards/q4z/keymaps/rjboone/keymap.c
+++ b/keyboards/q4z/keymaps/rjboone/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_A, KC_S, COMBO_END};
 const uint16_t PROGMEM combo_esc[] = {KC_Q, KC_W, COMBO_END};
 const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
   [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
   [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/q4z/q4z.c b/keyboards/q4z/q4z.c
deleted file mode 100644
index 537f1f5780..0000000000
--- a/keyboards/q4z/q4z.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 rjboone
- *
- * 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 "q4z.h"
diff --git a/keyboards/q4z/q4z.h b/keyboards/q4z/q4z.h
deleted file mode 100644
index 465178fdb1..0000000000
--- a/keyboards/q4z/q4z.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 rjboone
- *
- * 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"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K01, K06, K11, K16, K21, \
-    K02, K07, K12, K17, K22, K26, K30, K34, K38,  K41, \
-    K03,  K08, K13, K18, K23, K27, K31, K35, K39, K42, \
-    K04,    K09, K14, K19, K24, K28, K32, K36,    K40, \
-    K05, K10, K15,     K20,    K25,    K29, K33, K37 \
-) { \
-    { K01, K06, K11, K16, K21, XXX, XXX, XXX, XXX, XXX }, \
-    { K02, K07, K12, K17, K22, K26, K30, K34, K38, K41 }, \
-    { K03, K08, K13, K18, K23, K27, K31, K35, K39, K42 }, \
-    { K04, K09, K14, K19, K24, K28, K32, K36, K40, XXX }, \
-    { K05, K10, K15, K20, K25, K29, K33, K37, XXX, XXX } \
-}