Merge branch 'develop'

6 files changed, 75 insertions, 153 deletions

diff --git a/keyboards/splitty/config.h b/keyboards/splitty/config.h
index 3056705bb2..e190122bc8 100644
--- a/keyboards/splitty/config.h
+++ b/keyboards/splitty/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { F0, F1, D4, D5, D6 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B2, B3, B4, B5, B6 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Split Keyboard specific options. */
 #define USE_I2C
 #define EE_HANDS
diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json
index bdcb13d044..06e9c6a099 100644
--- a/keyboards/splitty/info.json
+++ b/keyboards/splitty/info.json
@@ -8,79 +8,89 @@
     "pid": "0x6052",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
+    "rows": ["F0", "F1", "D4", "D5", "D6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label": "L00", "x": 0, "y": 0.6667},
-        {"label": "L01", "x": 1, "y": 0.6667},
-        {"label": "L02", "x": 2, "y": 0.2667},
-        {"label": "L03", "x": 3, "y": 0},
-        {"label": "L04", "x": 4, "y": 0.2667},
-        {"label": "L05", "x": 5, "y": 0},
-        {"label": "L06", "x": 6, "y": 0},
-        {"label": "R06", "x": 10, "y": 0},
-        {"label": "R05", "x": 11, "y": 0},
-        {"label": "R04", "x": 12, "y": 0.2667},
-        {"label": "R03", "x": 13, "y": 0},
-        {"label": "R02", "x": 14, "y": 0.2667},
-        {"label": "R01", "x": 15, "y": 0.6667},
-        {"label": "R00", "x": 16, "y": 0.6667},
+        {"matrix": [0, 0], "x": 0, "y": 0.6667},
+        {"matrix": [0, 1], "x": 1, "y": 0.6667},
+        {"matrix": [0, 2], "x": 2, "y": 0.2667},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.2667},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 6], "x": 10, "y": 0},
+        {"matrix": [5, 5], "x": 11, "y": 0},
+        {"matrix": [5, 4], "x": 12, "y": 0.2667},
+        {"matrix": [5, 3], "x": 13, "y": 0},
+        {"matrix": [5, 2], "x": 14, "y": 0.2667},
+        {"matrix": [5, 1], "x": 15, "y": 0.6667},
+        {"matrix": [5, 0], "x": 16, "y": 0.6667},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.6667},
+        {"matrix": [1, 1], "x": 1, "y": 1.6667},
+        {"matrix": [1, 2], "x": 2, "y": 1.2667},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.2667},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1, "h": 1.5},
+
+        {"matrix": [6, 6], "x": 10, "y": 1, "h": 1.5},
+        {"matrix": [6, 5], "x": 11, "y": 1},
+        {"matrix": [6, 4], "x": 12, "y": 1.2667},
+        {"matrix": [6, 3], "x": 13, "y": 1},
+        {"matrix": [6, 2], "x": 14, "y": 1.2667},
+        {"matrix": [6, 1], "x": 15, "y": 1.6667},
+        {"matrix": [6, 0], "x": 16, "y": 1.6667},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.6667},
+        {"matrix": [2, 1], "x": 1, "y": 2.6667},
+        {"matrix": [2, 2], "x": 2, "y": 2.2667},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.2667},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [7, 5], "x": 11, "y": 2},
+        {"matrix": [7, 4], "x": 12, "y": 2.2667},
+        {"matrix": [7, 3], "x": 13, "y": 2},
+        {"matrix": [7, 2], "x": 14, "y": 2.2667},
+        {"matrix": [7, 1], "x": 15, "y": 2.6667},
+        {"matrix": [7, 0], "x": 16, "y": 2.6667},
 
-        {"label": "L08", "x": 0, "y": 1.6667},
-        {"label": "L09", "x": 1, "y": 1.6667},
-        {"label": "L10", "x": 2, "y": 1.2667},
-        {"label": "L11", "x": 3, "y": 1},
-        {"label": "L12", "x": 4, "y": 1.2667},
-        {"label": "L13", "x": 5, "y": 1},
-        {"label": "L14", "x": 6, "y": 1, "h": 1.5},
-        {"label": "R14", "x": 10, "y": 1, "h": 1.5},
-        {"label": "R13", "x": 11, "y": 1},
-        {"label": "R12", "x": 12, "y": 1.2667},
-        {"label": "R11", "x": 13, "y": 1},
-        {"label": "R10", "x": 14, "y": 1.2667},
-        {"label": "R09", "x": 15, "y": 1.6667},
-        {"label": "R08", "x": 16, "y": 1.6667},
+        {"matrix": [3, 0], "x": 0, "y": 3.6667},
+        {"matrix": [3, 1], "x": 1, "y": 3.6667},
+        {"matrix": [3, 2], "x": 2, "y": 3.2667},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3.2667},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 2.5, "h": 1.5},
 
-        {"label": "L16", "x": 0, "y": 2.6667},
-        {"label": "L17", "x": 1, "y": 2.6667},
-        {"label": "L18", "x": 2, "y": 2.2667},
-        {"label": "L19", "x": 3, "y": 2},
-        {"label": "L20", "x": 4, "y": 2.2667},
-        {"label": "L21", "x": 5, "y": 2},
-        {"label": "R21", "x": 11, "y": 2},
-        {"label": "R20", "x": 12, "y": 2.2667},
-        {"label": "R19", "x": 13, "y": 2},
-        {"label": "R18", "x": 14, "y": 2.2667},
-        {"label": "R17", "x": 15, "y": 2.6667},
-        {"label": "R16", "x": 16, "y": 2.6667},
+        {"matrix": [8, 6], "x": 10, "y": 2.5, "h": 1.5},
+        {"matrix": [8, 5], "x": 11, "y": 3},
+        {"matrix": [8, 4], "x": 12, "y": 3.2667},
+        {"matrix": [8, 3], "x": 13, "y": 3},
+        {"matrix": [8, 2], "x": 14, "y": 3.2667},
+        {"matrix": [8, 1], "x": 15, "y": 3.6667},
+        {"matrix": [8, 0], "x": 16, "y": 3.6667},
 
-        {"label": "L24", "x": 0, "y": 3.6667},
-        {"label": "L25", "x": 1, "y": 3.6667},
-        {"label": "L26", "x": 2, "y": 3.2667},
-        {"label": "L27", "x": 3, "y": 3},
-        {"label": "L28", "x": 4, "y": 3.2667},
-        {"label": "L29", "x": 5, "y": 3},
-        {"label": "L30", "x": 6, "y": 2.5, "h": 1.5},
-        {"label": "R30", "x": 10, "y": 2.5, "h": 1.5},
-        {"label": "R29", "x": 11, "y": 3},
-        {"label": "R28", "x": 12, "y": 3.2667},
-        {"label": "R27", "x": 13, "y": 3},
-        {"label": "R26", "x": 14, "y": 3.2667},
-        {"label": "R25", "x": 15, "y": 3.6667},
-        {"label": "R24", "x": 16, "y": 3.6667},
+        {"matrix": [4, 2], "x": 2, "y": 4.2667},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4.2667},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
 
-        {"label": "L34", "x": 2, "y": 4.2667},
-        {"label": "L35", "x": 3, "y": 4},
-        {"label": "L36", "x": 4, "y": 4.2667},
-        {"label": "L37", "x": 5, "y": 4},
-        {"label": "L38", "x": 6, "y": 4},
-        {"label": "R38", "x": 10, "y": 4},
-        {"label": "R37", "x": 11, "y": 4},
-        {"label": "R36", "x": 12, "y": 4.2667},
-        {"label": "R35", "x": 13, "y": 4},
-        {"label": "R34", "x": 14, "y": 4.2667}
+        {"matrix": [9, 6], "x": 10, "y": 4},
+        {"matrix": [9, 5], "x": 11, "y": 4},
+        {"matrix": [9, 4], "x": 12, "y": 4.2667},
+        {"matrix": [9, 3], "x": 13, "y": 4},
+        {"matrix": [9, 2], "x": 14, "y": 4.2667}
       ]
     }
   }
diff --git a/keyboards/splitty/rev1/rev1.c b/keyboards/splitty/rev1/rev1.c
deleted file mode 100644
index 0cf9a1d9c3..0000000000
--- a/keyboards/splitty/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Nicolas Schodet
- *
- * 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 "splitty.h"
diff --git a/keyboards/splitty/rev1/rev1.h b/keyboards/splitty/rev1/rev1.h
deleted file mode 100644
index 9205165730..0000000000
--- a/keyboards/splitty/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2018 Nicolas Schodet
- *
- * 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 QMK_KEYBOARD_H
-
-// clang-format off
-#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,           R21, R22, R23, R24, R25, R26, \
-        L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-                  L42, L43, L44, L45, L46, R40, R41, R42, R43, R44 \
-) { \
-        { L00, L01, L02, L03, L04, L05, L06 }, \
-        { L10, L11, L12, L13, L14, L15, L16 }, \
-        { L20, L21, L22, L23, L24, L25, KC_NO }, \
-        { L30, L31, L32, L33, L34, L35, L36 }, \
-        { KC_NO, KC_NO, 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, KC_NO }, \
-        { R36, R35, R34, R33, R32, R31, R30 }, \
-        { KC_NO, KC_NO, R44, R43, R42, R41, R40 }, \
-}
-// clang-format on
diff --git a/keyboards/splitty/splitty.c b/keyboards/splitty/splitty.c
index 707f289832..bd493a80ed 100644
--- a/keyboards/splitty/splitty.c
+++ b/keyboards/splitty/splitty.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "splitty.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/splitty/splitty.h b/keyboards/splitty/splitty.h
deleted file mode 100644
index 420e1ea27b..0000000000
--- a/keyboards/splitty/splitty.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018 Nicolas Schodet
- *
- * 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_splitty_rev1
-#    include "rev1.h"
-#endif