Move `default` layouts to data driven (#20349)

2 files changed, 87 insertions, 39 deletions

diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index ba45d388fd..0980cb4275 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -31,7 +31,93 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":0, "y":1}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2, "w":1.25}, {"x":19.25, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":1.25}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3, "w":1.25}, {"x":17.25, "y":3}, {"x":18.25, "y":3}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4, "w":2.25}, {"x":11, "y":4, "w":1.75}, {"x":12.75, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":18.25, "y":4}]
+            "layout": [
+                {"label": "k11", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "k12", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "k13", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "k14", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "k15", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "k16", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "k17", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "k18", "matrix": [0, 7], "x": 7.5, "y": 0},
+
+                {"label": "k69", "matrix": [5, 8], "x": 10.75, "y": 0},
+                {"label": "k610", "matrix": [5, 9], "x": 11.75, "y": 0},
+                {"label": "k611", "matrix": [5, 10], "x": 12.75, "y": 0},
+                {"label": "k612", "matrix": [5, 11], "x": 13.75, "y": 0},
+                {"label": "k613", "matrix": [5, 12], "x": 14.75, "y": 0},
+                {"label": "k614", "matrix": [5, 13], "x": 15.75, "y": 0},
+                {"label": "k615", "matrix": [5, 14], "x": 16.75, "y": 0},
+                {"label": "k616", "matrix": [5, 15], "x": 17.75, "y": 0},
+
+                {"label": "k21", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "k22", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"label": "k23", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "k24", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "k25", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "k26", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "k27", "matrix": [1, 6], "x": 7, "y": 1},
+
+                {"label": "k78", "matrix": [6, 7], "x": 10.75, "y": 1},
+                {"label": "k79", "matrix": [6, 8], "x": 11.75, "y": 1},
+                {"label": "k710", "matrix": [6, 9], "x": 12.75, "y": 1},
+                {"label": "k711", "matrix": [6, 10], "x": 13.75, "y": 1},
+                {"label": "k712", "matrix": [6, 11], "x": 14.75, "y": 1},
+                {"label": "k713", "matrix": [6, 12], "x": 15.75, "y": 1},
+                {"label": "k714", "matrix": [6, 13], "x": 16.75, "y": 1},
+                {"label": "k715", "matrix": [6, 14], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"label": "k31", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "k32", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"label": "k33", "matrix": [2, 2], "x": 3.25, "y": 2},
+                {"label": "k34", "matrix": [2, 3], "x": 4.25, "y": 2},
+                {"label": "k35", "matrix": [2, 4], "x": 5.25, "y": 2},
+                {"label": "k36", "matrix": [2, 5], "x": 6.25, "y": 2},
+                {"label": "k37", "matrix": [2, 6], "x": 7.25, "y": 2},
+
+                {"label": "k88", "matrix": [7, 7], "x": 11, "y": 2},
+                {"label": "k89", "matrix": [7, 8], "x": 12, "y": 2},
+                {"label": "k810", "matrix": [7, 9], "x": 13, "y": 2},
+                {"label": "k811", "matrix": [7, 10], "x": 14, "y": 2},
+                {"label": "k812", "matrix": [7, 11], "x": 15, "y": 2},
+                {"label": "k813", "matrix": [7, 12], "x": 16, "y": 2},
+                {"label": "k814", "matrix": [7, 13], "x": 17, "y": 2},
+                {"label": "k815", "matrix": [7, 14], "x": 18, "y": 2, "w": 1.25},
+                {"label": "k816", "matrix": [7, 15], "x": 19.25, "y": 2},
+
+                {"label": "k41", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "k42", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"label": "k43", "matrix": [3, 2], "x": 2.75, "y": 3},
+                {"label": "k44", "matrix": [3, 3], "x": 3.75, "y": 3},
+                {"label": "k45", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "k46", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "k47", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "k48", "matrix": [3, 7], "x": 7.75, "y": 3},
+
+                {"label": "k99", "matrix": [8, 8], "x": 11, "y": 3},
+                {"label": "k910", "matrix": [8, 9], "x": 12, "y": 3},
+                {"label": "k911", "matrix": [8, 10], "x": 13, "y": 3},
+                {"label": "k912", "matrix": [8, 11], "x": 14, "y": 3},
+                {"label": "k913", "matrix": [8, 12], "x": 15, "y": 3},
+                {"label": "k914", "matrix": [8, 13], "x": 16, "y": 3, "w": 1.25},
+                {"label": "k915", "matrix": [8, 14], "x": 17.25, "y": 3},
+                {"label": "k916", "matrix": [8, 15], "x": 18.25, "y": 3},
+
+                {"label": "k51", "matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"label": "k52", "matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"label": "k57", "matrix": [4, 6], "x": 5.5, "y": 4},
+                {"label": "k58", "matrix": [4, 7], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"label": "k109", "matrix": [9, 8], "x": 11, "y": 4, "w": 1.75},
+                {"label": "k1010", "matrix": [9, 9], "x": 12.75, "y": 4},
+                {"label": "k1014", "matrix": [9, 13], "x": 16.25, "y": 4},
+                {"label": "k1015", "matrix": [9, 14], "x": 17.25, "y": 4},
+                {"label": "k1016", "matrix": [9, 15], "x": 18.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/sagittarius/sagittarius.h b/keyboards/cannonkeys/sagittarius/sagittarius.h
deleted file mode 100644
index ba2fb2bc18..0000000000
--- a/keyboards/cannonkeys/sagittarius/sagittarius.h
+++ /dev/null
@@ -1,38 +0,0 @@
- /* Copyright 2020 Andrew Kannan
-  *
-  * 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 LAYOUT_default( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k69, k610, k611, k612, k613, k614, k615, k616, \
-    k21, k22, k23, k24, k25, k26, k27, k78, k79, k710, k711, k712, k713, k714, k715, \
-    k31, k32, k33, k34, k35, k36, k37, k88, k89, k810, k811, k812, k813, k814, k815, k816, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k99, k910, k911, k912, k913, k914, k915, k916, \
-    k51, k52, k57, k58, k109, k1010, k1014, k1015, k1016 \
-) { \
-	{ k11, k12, k13, k14, k15, k16, k17, k18, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ k21, k22, k23, k24, k25, k26, k27, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ k31, k32, k33, k34, k35, k36, k37, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ k41, k42, k43, k44, k45, k46, k47, k48, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ k51, k52, KC_NO, KC_NO, KC_NO, KC_NO, k57, k58, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO },  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k69, k610, k611, k612, k613, k614, k615, k616 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k78, k79, k710, k711, k712, k713, k714, k715, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k88, k89, k810, k811, k812, k813, k814, k815, k816 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k99, k910, k911, k912, k913, k914, k915, k916 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k109, k1010, KC_NO, KC_NO, KC_NO, k1014, k1015, k1016 }\
-}