Merge remote-tracking branch 'origin/master' into develop

3 files changed, 78 insertions, 98 deletions

diff --git a/keyboards/supersplit/config.h b/keyboards/supersplit/config.h
index e3f300355b..8f17bdb757 100644
--- a/keyboards/supersplit/config.h
+++ b/keyboards/supersplit/config.h
@@ -35,4 +35,3 @@
 
 #define SOFT_SERIAL_PIN D2
 #define MASTER_LEFT
-
diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/info.json
index d72d083649..b03e1630a6 100644
--- a/keyboards/supersplit/info.json
+++ b/keyboards/supersplit/info.json
@@ -13,8 +13,7 @@
         "nkro": true
     },
     "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7", "F6",
-                 "B6", "B2", "B3", "B1", "F7", "F6"],
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
         "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
     },
     "processor": "atmega32u4",
@@ -27,85 +26,85 @@
     "layouts": {
         "LAYOUT_split_6x4_9": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 1.5 },
-                { "matrix": [1, 0], "x": 1, "y": 1.5 },
-                { "matrix": [2, 0], "x": 2, "y": 0.5 },
-                { "matrix": [3, 0], "x": 3, "y": 0 },
-                { "matrix": [4, 0], "x": 4, "y": 0.7 },
-                { "matrix": [5, 0], "x": 5, "y": 1 },
+                { "x": 0, "y": 1.5, "matrix": [0, 0] },
+                { "x": 1, "y": 1.5, "matrix": [0, 1] },
+                { "x": 2, "y": 0.5, "matrix": [0, 2] },
+                { "x": 3, "y": 0, "matrix": [0, 3] },
+                { "x": 4, "y": 0.7, "matrix": [0, 4] },
+                { "x": 5, "y": 1, "matrix": [0, 5] },
 
-                { "matrix": [0, 1], "x": 0, "y": 2.5 },
-                { "matrix": [1, 1], "x": 1, "y": 2.5 },
-                { "matrix": [2, 1], "x": 2, "y": 1.5 },
-                { "matrix": [3, 1], "x": 3, "y": 1 },
-                { "matrix": [4, 1], "x": 4, "y": 1.7 },
-                { "matrix": [5, 1], "x": 5, "y": 2 },
+                { "x": 0, "y": 2.5, "matrix": [1, 0] },
+                { "x": 1, "y": 2.5, "matrix": [1, 1] },
+                { "x": 2, "y": 1.5, "matrix": [1, 2] },
+                { "x": 3, "y": 1, "matrix": [1, 3] },
+                { "x": 4, "y": 1.7, "matrix": [1, 4] },
+                { "x": 5, "y": 2, "matrix": [1, 5] },
 
-                { "matrix": [0, 2], "x": 0, "y": 3.5 },
-                { "matrix": [1, 2], "x": 1, "y": 3.5 },
-                { "matrix": [2, 2], "x": 2, "y": 2.5 },
-                { "matrix": [3, 2], "x": 3, "y": 2 },
-                { "matrix": [4, 2], "x": 4, "y": 2.7 },
-                { "matrix": [5, 2], "x": 5, "y": 3 },
+                { "x": 0, "y": 3.5, "matrix": [2, 0] },
+                { "x": 1, "y": 3.5, "matrix": [2, 1] },
+                { "x": 2, "y": 2.5, "matrix": [2, 2] },
+                { "x": 3, "y": 2, "matrix": [2, 3] },
+                { "x": 4, "y": 2.7, "matrix": [2, 4] },
+                { "x": 5, "y": 3, "matrix": [2, 5] },
 
-                { "matrix": [0, 3], "x": 0, "y": 4.5 },
-                { "matrix": [1, 3], "x": 1, "y": 4.5 },
-                { "matrix": [2, 3], "x": 2, "y": 3.5 },
-                { "matrix": [3, 3], "x": 3, "y": 3 },
-                { "matrix": [4, 3], "x": 4, "y": 3.7 },
-                { "matrix": [5, 3], "x": 5, "y": 4 },
+                { "x": 0, "y": 4.5, "matrix": [3, 0] },
+                { "x": 1, "y": 4.5, "matrix": [3, 1] },
+                { "x": 2, "y": 3.5, "matrix": [3, 2] },
+                { "x": 3, "y": 3, "matrix": [3, 3] },
+                { "x": 4, "y": 3.7, "matrix": [3, 4] },
+                { "x": 5, "y": 4, "matrix": [3, 5] },
 
-                { "matrix": [3, 4], "x": 6, "y": 5 },
-                { "matrix": [4, 4], "x": 7, "y": 5 },
-                { "matrix": [5, 4], "x": 8, "y": 5 },
+                { "x": 6, "y": 5, "matrix": [4, 3] },
+                { "x": 7, "y": 5, "matrix": [4, 4] },
+                { "x": 8, "y": 5, "matrix": [4, 5] },
 
-                { "matrix": [0, 5], "x": 3, "y": 6 },
-                { "matrix": [1, 5], "x": 4, "y": 6 },
-                { "matrix": [2, 5], "x": 5, "y": 6 },
-                { "matrix": [3, 5], "x": 6, "y": 6 },
-                { "matrix": [4, 5], "x": 7, "y": 6 },
-                { "matrix": [5, 5], "x": 8, "y": 6 },
+                { "x": 3, "y": 6, "matrix": [5, 0] },
+                { "x": 4, "y": 6, "matrix": [5, 1] },
+                { "x": 5, "y": 6, "matrix": [5, 2] },
+                { "x": 6, "y": 6, "matrix": [5, 3] },
+                { "x": 7, "y": 6, "matrix": [5, 4] },
+                { "x": 8, "y": 6, "matrix": [5, 5] },
 
 
 
-                { "matrix": [5, 6], "x": 13, "y": 1 },
-                { "matrix": [4, 6], "x": 14, "y": 0.7 },
-                { "matrix": [3, 6], "x": 15, "y": 0 },
-                { "matrix": [2, 6], "x": 16, "y": 0.5 },
-                { "matrix": [1, 6], "x": 17, "y": 1.5 },
-                { "matrix": [0, 6], "x": 18, "y": 1.5 },
+                { "x": 13, "y": 1, "matrix": [6, 5] },
+                { "x": 14, "y": 0.7, "matrix": [6, 4] },
+                { "x": 15, "y": 0, "matrix": [6, 3] },
+                { "x": 16, "y": 0.5, "matrix": [6, 2] },
+                { "x": 17, "y": 1.5, "matrix": [6, 1] },
+                { "x": 18, "y": 1.5, "matrix": [6, 0] },
 
-                { "matrix": [5, 7], "x": 13, "y": 2 },
-                { "matrix": [4, 7], "x": 14, "y": 1.7 },
-                { "matrix": [3, 7], "x": 15, "y": 1 },
-                { "matrix": [2, 7], "x": 16, "y": 1.5 },
-                { "matrix": [1, 7], "x": 17, "y": 2.5 },
-                { "matrix": [0, 7], "x": 18, "y": 2.5 },
+                { "x": 13, "y": 2, "matrix": [7, 5] },
+                { "x": 14, "y": 1.7, "matrix": [7, 4] },
+                { "x": 15, "y": 1, "matrix": [7, 3] },
+                { "x": 16, "y": 1.5, "matrix": [7, 2] },
+                { "x": 17, "y": 2.5, "matrix": [7, 1] },
+                { "x": 18, "y": 2.5, "matrix": [7, 0] },
 
-                { "matrix": [5, 8], "x": 13, "y": 3 },
-                { "matrix": [4, 8], "x": 14, "y": 2.7 },
-                { "matrix": [3, 8], "x": 15, "y": 2 },
-                { "matrix": [2, 8], "x": 16, "y": 2.5 },
-                { "matrix": [1, 8], "x": 17, "y": 3.5 },
-                { "matrix": [0, 8], "x": 18, "y": 3.5 },
+                { "x": 13, "y": 3, "matrix": [8, 5] },
+                { "x": 14, "y": 2.7, "matrix": [8, 4] },
+                { "x": 15, "y": 2, "matrix": [8, 3] },
+                { "x": 16, "y": 2.5, "matrix": [8, 2] },
+                { "x": 17, "y": 3.5, "matrix": [8, 1] },
+                { "x": 18, "y": 3.5, "matrix": [8, 0] },
 
-                { "matrix": [5, 9], "x": 13, "y": 4 },
-                { "matrix": [4, 9], "x": 14, "y": 3.7 },
-                { "matrix": [3, 9], "x": 15, "y": 3 },
-                { "matrix": [2, 9], "x": 16, "y": 3.5 },
-                { "matrix": [1, 9], "x": 17, "y": 4.5 },
-                { "matrix": [0, 9], "x": 18, "y": 4.5 },
+                { "x": 13, "y": 4, "matrix": [9, 5] },
+                { "x": 14, "y": 3.7, "matrix": [9, 4] },
+                { "x": 15, "y": 3, "matrix": [9, 3] },
+                { "x": 16, "y": 3.5, "matrix": [9, 2] },
+                { "x": 17, "y": 4.5, "matrix": [9, 1] },
+                { "x": 18, "y": 4.5, "matrix": [9, 0] },
 
-                { "matrix": [0, 10], "x": 10, "y": 5 },
-                { "matrix": [1, 10], "x": 11, "y": 5 },
-                { "matrix": [2, 10], "x": 12, "y": 5 },
+                { "x": 10, "y": 5, "matrix": [10, 5] },
+                { "x": 11, "y": 5, "matrix": [10, 4] },
+                { "x": 12, "y": 5, "matrix": [10, 3] },
 
-                { "matrix": [0, 11], "x": 10, "y": 6 },
-                { "matrix": [1, 11], "x": 11, "y": 6 },
-                { "matrix": [2, 11], "x": 12, "y": 6 },
-                { "matrix": [3, 11], "x": 13, "y": 6 },
-                { "matrix": [4, 11], "x": 14, "y": 6 },
-                { "matrix": [5, 11], "x": 15, "y": 6 }
+                { "x": 10, "y": 6, "matrix": [11, 5] },
+                { "x": 11, "y": 6, "matrix": [11, 4] },
+                { "x": 12, "y": 6, "matrix": [11, 3] },
+                { "x": 13, "y": 6, "matrix": [11, 2] },
+                { "x": 14, "y": 6, "matrix": [11, 1] },
+                { "x": 15, "y": 6, "matrix": [11, 0] }
             ]
         }
     }
diff --git a/keyboards/supersplit/keymaps/default/keymap.c b/keyboards/supersplit/keymaps/default/keymap.c
index 8a23ca5ca3..5d5e53ef49 100644
--- a/keyboards/supersplit/keymaps/default/keymap.c
+++ b/keyboards/supersplit/keymaps/default/keymap.c
@@ -1,34 +1,16 @@
-/* Copyright 2022 tarneo (tarneo@tarneo.fr)
- *
- * 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.
+#include QMK_KEYBOARD_H
+
+
+/* THIS FILE WAS GENERATED!
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This file was generated by qmk json2c. You may or may not want to
+ * edit it directly.
  */
-#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_split_6x4_9(
-            // 6*4 + 9-key thumb cluster = 33 keys
-            // Left side
-            KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,
-            KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
-            KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
-            KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC,
-            // Right side
-            KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-            KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
-            KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
-            KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-            KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
-            )
+	[0] = LAYOUT_split_6x4_9(KC_PSCR, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_LCTL, KC_Z, KC_X, KC_C, KC_G, KC_V, KC_NO, KC_NO, KC_NO, KC_LGUI, KC_LSFT, LT(1,KC_SPC), KC_DEL, KC_NO, KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PAUS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_NO, KC_H, KC_N, KC_E, KC_I, KC_O, KC_ENT, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSPC, MO(2), KC_LGUI),
+	[1] = LAYOUT_split_6x4_9(KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_AT, KC_AMPR, KC_DLR, KC_PERC, KC_TRNS, KC_HASH, KC_LPRN, KC_LCBR, KC_LBRC, KC_MINS, KC_TRNS, KC_NO, KC_ASTR, KC_QUOT, KC_DQUO, KC_UNDS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_CIRC, KC_EQL, KC_PLUS, KC_NO, KC_NO, KC_TRNS, KC_BSLS, KC_RBRC, KC_RCBR, KC_RPRN, KC_PIPE, KC_TRNS, KC_GRV, KC_TILD, KC_EXLM, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[2] = LAYOUT_split_6x4_9(KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS, KC_NO, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
+
+