Merge branch 'develop'

9 files changed, 121 insertions, 71 deletions

diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/info.json
index 437f850963..b5f3a96cb5 100644
--- a/keyboards/makenova/omega/omega4/info.json
+++ b/keyboards/makenova/omega/omega4/info.json
@@ -23,13 +23,124 @@
     },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"", "x":0.75, "y":3}, {"label":"", "x":1.75, "y":3}, {"label":"Space", "x":2.75, "y":3, "w":6}, {"label":"", "x":8.75, "y":3}, {"label":"", "x":9.75, "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": [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": [1, 0], "x": 0.25, "y": 1},
+                {"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": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 5], "x": 2.75, "y": 3, "w": 6},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3}
+            ]
         },
         "LAYOUT_6u_bar": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"", "x":0.75, "y":3}, {"label":"Space", "x":1.75, "y":3, "w":8}, {"label":"", "x":9.75, "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": [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": [1, 0], "x": 0.25, "y": 1},
+                {"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": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 5], "x": 1.75, "y": 3, "w": 8},
+                {"matrix": [3, 9], "x": 9.75, "y": 3}
+            ]
         },
         "LAYOUT_10u_bar": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"Space", "x":0.75, "y":3, "w":10}]
+            "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": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"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": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+
+                {"matrix": [3, 5], "x": 0.75, "y": 3, "w": 10}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/config.h b/keyboards/makenova/omega/omega4/keymaps/default/config.h
index 1d2dd05351..067267521d 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default/config.h
@@ -4,9 +4,7 @@
 #pragma once
 
 #ifdef COMBO_ENABLE
-#    define COMBO_COUNT 4
 #    define COMBO_TERM 50
 #endif
 
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
index 583d5a8a3d..cfe3233145 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
+++ b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
 const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
 const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   COMBO(combo_bspc,KC_BSPC), // 1
   COMBO(combo_ent,KC_ENT), // 2
   COMBO(combo_tab,KC_TAB), // 3
@@ -61,4 +61,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
     QK_BOOT,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
index 1d2dd05351..067267521d 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
@@ -4,9 +4,7 @@
 #pragma once
 
 #ifdef COMBO_ENABLE
-#    define COMBO_COUNT 4
 #    define COMBO_TERM 50
 #endif
 
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
index 2cbc706ee4..b443a57a65 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
 const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
 const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   COMBO(combo_bspc,KC_BSPC), // 1
   COMBO(combo_ent,KC_ENT), // 2
   COMBO(combo_tab,KC_TAB), // 3
@@ -62,4 +62,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
     QK_BOOT
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
index 1d2dd05351..067267521d 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
@@ -4,9 +4,7 @@
 #pragma once
 
 #ifdef COMBO_ENABLE
-#    define COMBO_COUNT 4
 #    define COMBO_TERM 50
 #endif
 
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
index e5e9cc05a6..00c135b3f3 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
 const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
 const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   COMBO(combo_bspc,KC_BSPC), // 1
   COMBO(combo_ent,KC_ENT), // 2
   COMBO(combo_tab,KC_TAB), // 3
@@ -61,4 +61,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
     QK_BOOT,   KC_TRNS, KC_TRNS
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/makenova/omega/omega4/omega4.c b/keyboards/makenova/omega/omega4/omega4.c
deleted file mode 100644
index b64ae638bd..0000000000
--- a/keyboards/makenova/omega/omega4/omega4.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 makenova (@makenova)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "omega4.h"
diff --git a/keyboards/makenova/omega/omega4/omega4.h b/keyboards/makenova/omega/omega4/omega4.h
deleted file mode 100644
index 754b58ee35..0000000000
--- a/keyboards/makenova/omega/omega4/omega4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 makenova (@makenova)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-    K30, K31,                K35,           K38, K39 \
-){ \
-    { K00, K01, K02,   K03,   K04,   K05, K06,   K07,   K08, K09 }, \
-    { K10, K11, K12,   K13,   K14,   K15, K16,   K17,   K18, K19 }, \
-    { K20, K21, K22,   K23,   K24,   K25, K26,   K27,   K28, K29 }, \
-    { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39 } \
-}
-
-#define LAYOUT_6u_bar( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-    K30,                     K35,                K39 \
-){ \
-    { K00,   K01,   K02,   K03,   K04,   K05, K06,   K07,   K08,   K09 }, \
-    { K10,   K11,   K12,   K13,   K14,   K15, K16,   K17,   K18,   K19 }, \
-    { K20,   K21,   K22,   K23,   K24,   K25, K26,   K27,   K28,   K29 }, \
-    { K30,   KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, K39 } \
-}
-
-#define LAYOUT_10u_bar( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-                             K35                      \
-){ \
-    { K00,   K01,   K02,   K03,   K04,   K05, K06,   K07,   K08,   K09 }, \
-    { K10,   K11,   K12,   K13,   K14,   K15, K16,   K17,   K18,   K19 }, \
-    { K20,   K21,   K22,   K23,   K24,   K25, K26,   K27,   K28,   K29 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, KC_NO } \
-}