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

3 files changed, 95 insertions, 136 deletions

diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json
index 8f207c975b..06ace305e6 100644
--- a/keyboards/synapse/info.json
+++ b/keyboards/synapse/info.json
@@ -22,94 +22,100 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
+    "LAYOUT_7u_space": {
+      "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": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"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": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.5},
+        {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 7},
+        {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5},
+        {"matrix": [3, 10], "x": 11, "y": 3}
+      ]
+    },
     "LAYOUT_default": {
-	  "layout": [
-			{"x":0, "y":0},
-			{"x":1, "y":0},
-			{"x":2, "y":0},
-			{"x":3, "y":0},
-			{"x":4, "y":0},
-			{"x":5, "y":0},
-			{"x":6, "y":0}, 
-			{"x":7, "y":0},
-			{"x":8, "y":0},
-			{"x":9, "y":0},
-			{"x":10, "y":0},
-			{"x":11, "y":0},
-			{"x":0, "y":1, "w":1.25},
-			{"x":1.25, "y":1},
-			{"x":2.25, "y":1},
-			{"x":3.25, "y":1},
-			{"x":4.25, "y":1},
-			{"x":5.25, "y":1},
-			{"x":6.25, "y":1},
-			{"x":7.25, "y":1},
-			{"x":8.25, "y":1},
-			{"x":9.25, "y":1},
-			{"x":10.25, "y":1, "w":1.75},
-			{"x":0, "y":2, "w":1.75},
-			{"x":1.75, "y":2},
-			{"x":2.75, "y":2},
-			{"x":3.75, "y":2},
-			{"x":4.75, "y":2},
-			{"x":5.75, "y":2},
-			{"x":6.75, "y":2},
-			{"x":7.75, "y":2},
-			{"x":8.75, "y":2},
-			{"x":9.75, "y":2},
-			{"x":10.75, "y":2, "w":1.25},
-			{"x":0, "y":3},
-			{"x":1, "y":3},
-			{"x":2, "y":3},
-			{"x":3, "y":3, "w":3},
-			{"x":6, "y":3, "w":3},
-			{"x":9, "y":3},
-			{"x":10, "y":3},
-			{"x":11, "y":3}
-			]
-        },
-			"LAYOUT_7u_space": {
       "layout": [
-			{"x":0, "y":0},
-			{"x":1, "y":0},
-			{"x":2, "y":0},
-			{"x":3, "y":0},
-			{"x":4, "y":0},
-			{"x":5, "y":0},
-			{"x":6, "y":0},
-			{"x":7, "y":0},
-			{"x":8, "y":0},
-			{"x":9, "y":0}, 
-			{"x":10, "y":0},
-			{"x":11, "y":0},
-			{"x":0, "y":1, "w":1.25},
-			{"x":1.25, "y":1},
-			{"x":2.25, "y":1},
-			{"x":3.25, "y":1},
-			{"x":4.25, "y":1},
-			{"x":5.25, "y":1},
-			{"x":6.25, "y":1},
-			{"x":7.25, "y":1},
-			{"x":8.25, "y":1},
-			{"x":9.25, "y":1},
-			{"x":10.25, "y":1, "w":1.75},
-			{"x":0, "y":2, "w":1.75},
-			{"x":1.75, "y":2},
-			{"x":2.75, "y":2},
-			{"x":3.75, "y":2},
-			{"x":4.75, "y":2},
-			{"x":5.75, "y":2},
-			{"x":6.75, "y":2},
-			{"x":7.75, "y":2},
-			{"x":8.75, "y":2},
-			{"x":9.75, "y":2},
-			{"x":10.75, "y":2, "w":1.25},
-			{"x":0, "y":3},
-			{"x":1, "y":3, "w":1.5},
-			{"x":2.5, "y":3, "w":7},
-			{"x":9.5, "y":3, "w":1.5},
-			{"x":11, "y":3}
-			]
-        }
+        {"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": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"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": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3, "w": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3, "w": 3},
+        {"matrix": [3, 8], "x": 9, "y": 3},
+        {"matrix": [3, 9], "x": 10, "y": 3},
+        {"matrix": [3, 10], "x": 11, "y": 3}
+      ]
     }
+  }
 }
diff --git a/keyboards/synapse/synapse.c b/keyboards/synapse/synapse.c
index ac9c50ceb1..0b532eaab6 100644
--- a/keyboards/synapse/synapse.c
+++ b/keyboards/synapse/synapse.c
@@ -13,7 +13,8 @@
  * 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 "synapse.h"
+
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/synapse/synapse.h b/keyboards/synapse/synapse.h
deleted file mode 100644
index a126e450ec..0000000000
--- a/keyboards/synapse/synapse.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-    K30, K31, K32, K33,           K36,      K38, K39, K53 \
-) \
-{ \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, XXX}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, XXX}, \
-    {K30, K31, K32, K33, XXX, XXX, K36, XXX, K38, K39, K53, XXX} \
-} \
-
-#define LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-    K30, K31,	   K33,                     	 K39, K53 \
-) \
-{ \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, XXX}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, XXX}, \
-    {K30, K31, XXX, K33, XXX, XXX, XXX, XXX, XXX, K39, K53, XXX} \
-} 
-