Merge branch 'develop'

4 files changed, 102 insertions, 123 deletions

diff --git a/keyboards/centromere/centromere.h b/keyboards/centromere/centromere.h
index bf13aa7b00..078cdca07f 100644
--- a/keyboards/centromere/centromere.h
+++ b/keyboards/centromere/centromere.h
@@ -27,39 +27,3 @@
 #define set_led_magenta red_led_on;  grn_led_off; blu_led_on
 #define set_led_cyan    red_led_off; grn_led_on;  blu_led_on
 #define set_led_white   red_led_on;  grn_led_on;  blu_led_on
-
-// For readability
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_split_3x6_3( \
-  k0a, k00, k01, k02, k03, k04,      k05, k06, k07, k08, k09, k0b, \
-  k1a, k10, k11, k12, k13, k14,      k15, k16, k17, k18, k19, k1b,\
-  k2a, k20, k21, k22, k23, k24,      k25, k26, k27, k28, k29, k2b,\
-                 k32, k33, k34,      k35, k36, k37  \
-) \
-  {                                                       \
-    { 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 }, \
-    { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \
-    { ___, ___, k2a, k1a, k0a, k0b, k1b, k2b, ___, ___ }  \
-  }
-
-#define LAYOUT_split_3x5_3( \
-  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,\
-            k32, k33, k34,      k35, k36, k37  \
-) \
-  {                                                       \
-    { 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 }, \
-    { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \
-    { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }  \
-  }
-
-#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json
index cd1c07c67c..5f9b57d97a 100644
--- a/keyboards/centromere/info.json
+++ b/keyboards/centromere/info.json
@@ -11,91 +11,108 @@
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["split_3x5_3" "split_3x6_3"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x6_3"
+    },
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0.25},
-                {"label":"Q", "x":1, "y":0.25},
-                {"label":"W", "x":2, "y":0.125},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0.125},
-                {"label":"T", "x":5, "y":0.25},
-                {"label":"Y", "x":8, "y":0.25},
-                {"label":"U", "x":9, "y":0.125},
-                {"label":"I", "x":10, "y":0},
-                {"label":"O", "x":11, "y":0.125},
-                {"label":"P", "x":12, "y":0.25},
-                {"label":"Backspace", "x":13, "y":0.25},
-                {"label":"LCtrl", "x":0, "y":1.25},
-                {"label":"A", "x":1, "y":1.25},
-                {"label":"S", "x":2, "y":1.125},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1.125},
-                {"label":"G", "x":5, "y":1.25},
-                {"label":"H", "x":8, "y":1.25},
-                {"label":"J", "x":9, "y":1.125},
-                {"label":"K", "x":10, "y":1},
-                {"label":"L", "x":11, "y":1.125},
-                {"label":";", "x":12, "y":1.25},
-                {"label":"'", "x":13, "y":1.25},
-                {"label":"Shift", "x":0, "y":2.25},
-                {"label":"Z", "x":1, "y":2.25},
-                {"label":"X", "x":2, "y":2.125},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2.125},
-                {"label":"B", "x":5, "y":2.25},
-                {"label":"N", "x":8, "y":2.25},
-                {"label":"M", "x":9, "y":2.125},
-                {"label":",", "x":10, "y":2},
-                {"label":".", "x":11, "y":2.125},
-                {"label":"/", "x":12, "y":2.25},
-                {"label":"Enter", "x":13, "y":2.25},
-                {"label":"LGUI", "x":3.5, "y":3.125},
-                {"label":"MO(_FN)", "x":4.5, "y":3.25},
-                {"label":"Space", "x":5.5, "y":3.375},
-                {"label":"Space", "x":7.5, "y":3.375},
-                {"label":"MO(_NUM)", "x":8.5, "y":3.25},
-                {"label":"RAlt", "x":9.5, "y":3.125}
+                {"matrix": [4, 4], "x": 0, "y": 0.25},
+                {"matrix": [0, 0], "x": 1, "y": 0.25},
+                {"matrix": [0, 1], "x": 2, "y": 0.125},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0.125},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+
+                {"matrix": [0, 5], "x": 8, "y": 0.25},
+                {"matrix": [0, 6], "x": 9, "y": 0.125},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0.125},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "y": 0.25},
+
+                {"matrix": [4, 3], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [1, 1], "x": 2, "y": 1.125},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1.125},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+
+                {"matrix": [1, 5], "x": 8, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.125},
+                {"matrix": [1, 7], "x": 10, "y": 1},
+                {"matrix": [1, 8], "x": 11, "y": 1.125},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [4, 6], "x": 13, "y": 1.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 2.25},
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2, "y": 2.125},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2.125},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+
+                {"matrix": [2, 5], "x": 8, "y": 2.25},
+                {"matrix": [2, 6], "x": 9, "y": 2.125},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2.125},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [4, 7], "x": 13, "y": 2.25},
+
+                {"matrix": [3, 2], "x": 3.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.375},
+
+                {"matrix": [3, 5], "x": 7.5, "y": 3.375},
+                {"matrix": [3, 6], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.5, "y": 3.125}
             ]
         },
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"label":"Q", "x":0, "y":0.25},
-                {"label":"W", "x":1, "y":0.125},
-                {"label":"E", "x":2, "y":0},
-                {"label":"R", "x":3, "y":0.125},
-                {"label":"T", "x":4, "y":0.25},
-                {"label":"Y", "x":7, "y":0.25},
-                {"label":"U", "x":8, "y":0.125},
-                {"label":"I", "x":9, "y":0},
-                {"label":"O", "x":10, "y":0.125},
-                {"label":"P", "x":11, "y":0.25},
-                {"label":"A", "x":0, "y":1.25},
-                {"label":"S", "x":1, "y":1.125},
-                {"label":"D", "x":2, "y":1},
-                {"label":"F", "x":3, "y":1.125},
-                {"label":"G", "x":4, "y":1.25},
-                {"label":"H", "x":7, "y":1.25},
-                {"label":"J", "x":8, "y":1.125},
-                {"label":"K", "x":9, "y":1},
-                {"label":"L", "x":10, "y":1.125},
-                {"label":";", "x":11, "y":1.25},
-                {"label":"Z", "x":0, "y":2.25},
-                {"label":"X", "x":1, "y":2.125},
-                {"label":"C", "x":2, "y":2},
-                {"label":"V", "x":3, "y":2.125},
-                {"label":"B", "x":4, "y":2.25},
-                {"label":"N", "x":7, "y":2.25},
-                {"label":"M", "x":8, "y":2.125},
-                {"label":",", "x":9, "y":2},
-                {"label":".", "x":10, "y":2.125},
-                {"label":"/", "x":11, "y":2.25},
-                {"label":"LGUI", "x":2.5, "y":3.125},
-                {"label":"MO(_FN)", "x":3.5, "y":3.25},
-                {"label":"Space", "x":4.5, "y":3.375},
-                {"label":"Space", "x":6.5, "y":3.375},
-                {"label":"MO(_NUM)", "x":7.5, "y":3.25},
-                {"label":"RAlt", "x":8.5, "y":3.125}
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+                {"matrix": [0, 5], "x": 7, "y": 0.25},
+                {"matrix": [0, 6], "x": 8, "y": 0.125},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0.125},
+                {"matrix": [0, 9], "x": 11, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [1, 5], "x": 7, "y": 1.25},
+                {"matrix": [1, 6], "x": 8, "y": 1.125},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1.125},
+                {"matrix": [1, 9], "x": 11, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+                {"matrix": [2, 6], "x": 8, "y": 2.125},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2.125},
+                {"matrix": [2, 9], "x": 11, "y": 2.25},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.375},
+
+                {"matrix": [3, 5], "x": 6.5, "y": 3.375},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.125}
             ]
         }
     }
diff --git a/keyboards/centromere/keymaps/mini_bom/config.h b/keyboards/centromere/keymaps/mini_bom/config.h
index 61b0a76297..7a79437fab 100644
--- a/keyboards/centromere/keymaps/mini_bom/config.h
+++ b/keyboards/centromere/keymaps/mini_bom/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #ifdef COMBO_ENABLE
-#    define COMBO_COUNT 10
 #    define COMBO_TERM 50
 #endif
 
@@ -25,4 +24,3 @@
 #    undef TAPPING_TERM
 #endif
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/centromere/keymaps/mini_bom/keymap.c b/keyboards/centromere/keymaps/mini_bom/keymap.c
index 82e68aafa5..1dd8f60c5a 100644
--- a/keyboards/centromere/keymaps/mini_bom/keymap.c
+++ b/keyboards/centromere/keymaps/mini_bom/keymap.c
@@ -20,7 +20,7 @@
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.  
+// entirely and just use numbers.
 
 
 enum centromere_layers
@@ -57,7 +57,7 @@ enum centromere_layers
  *  |        |       |        |           |        |    |   |
  *  '-------------------------'           '-----------------'
  */
- 
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Keymap 0: Basic layer
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_NO, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE,        KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS, KC_NO,
  KC_NO, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2,       KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT, KC_NO,
  KC_NO, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1,      KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS, KC_NO,
- CM_TOGG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL 
+ CM_TOGG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL
   ),
 
     /* Keymap 2: Pad/Function layer
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_NUMB] = LAYOUT(
      KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5,           KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO,
      KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, KC_NO,
-     KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,     KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD, KC_NO, 
+     KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,     KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD, KC_NO,
      KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT
      ),
 
@@ -137,8 +137,8 @@ const uint16_t PROGMEM combo_less[] = {KC_H, KC_J, COMBO_END};
 const uint16_t PROGMEM combo_more[] = {KC_K, KC_L, COMBO_END};
 const uint16_t PROGMEM combo_quot[] = {KC_N, KC_M, COMBO_END};
 const uint16_t PROGMEM combo_dash[] = {KC_X, KC_C, COMBO_END};
-  
-combo_t key_combos[COMBO_COUNT] = {
+
+combo_t key_combos[] = {
     [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
     [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
     [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
@@ -148,6 +148,6 @@ combo_t key_combos[COMBO_COUNT] = {
     [COMBO_LESS] = COMBO(combo_less,KC_LT),
     [COMBO_MORE] = COMBO(combo_more,KC_GT),
     [COMBO_QUOT] = COMBO(combo_quot, KC_QUOT),
-    [COMBO_DASH] = COMBO(combo_dash, KC_MINS),  
+    [COMBO_DASH] = COMBO(combo_dash, KC_MINS),
 };
 #endif