Move single `LAYOUT`s to data driven (#20365)

3 files changed, 62 insertions, 88 deletions

diff --git a/keyboards/misonoworks/chocolatebar/chocolatebar.c b/keyboards/misonoworks/chocolatebar/chocolatebar.c
index dc9a251df4..ea30292b86 100644
--- a/keyboards/misonoworks/chocolatebar/chocolatebar.c
+++ b/keyboards/misonoworks/chocolatebar/chocolatebar.c
@@ -15,7 +15,7 @@ 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 "chocolatebar.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/misonoworks/chocolatebar/chocolatebar.h b/keyboards/misonoworks/chocolatebar/chocolatebar.h
deleted file mode 100644
index badebdb73b..0000000000
--- a/keyboards/misonoworks/chocolatebar/chocolatebar.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 MisonoWorks
-
-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( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011,       K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       K111,       K113, K114, K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208,             K211, K212, K213, K214, K215, \
-	K300, K301, K302, K303,       K305, K306,       K308,             K311, K312, K313, K314, K315  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  KC_NO, K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO, K111,  KC_NO, K113,  K114,  K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  KC_NO, KC_NO, K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  KC_NO, K305,  K306,  KC_NO, K308,  KC_NO, KC_NO, K311,  K312,  K313,  K314,  K315 }  \
-} 
diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json
index ce4f796b88..abb58f29f5 100644
--- a/keyboards/misonoworks/chocolatebar/info.json
+++ b/keyboards/misonoworks/chocolatebar/info.json
@@ -21,64 +21,70 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Back Space", "x":11, "y":0},
-                {"label":"7", "x":13, "y":0},
-                {"label":"8", "x":14, "y":0},
-                {"label":"9", "x":15, "y":0},
+                {"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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"A", "x":1.5, "y":1},
-                {"label":"S", "x":2.5, "y":1},
-                {"label":"D", "x":3.5, "y":1},
-                {"label":"F", "x":4.5, "y":1},
-                {"label":"G", "x":5.5, "y":1},
-                {"label":"H", "x":6.5, "y":1},
-                {"label":"J", "x":7.5, "y":1},
-                {"label":"K", "x":8.5, "y":1},
-                {"label":"L", "x":9.5, "y":1},
-                {"label":"Enter", "x":10.5, "y":1, "w":1.5},
-                {"label":"4", "x":13, "y":1},
-                {"label":"5", "x":14, "y":1},
-                {"label":"6", "x":15, "y":1},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Shift", "x":0, "y":2, "w":2},
-                {"label":"Z", "x":2, "y":2},
-                {"label":"X", "x":3, "y":2},
-                {"label":"C", "x":4, "y":2},
-                {"label":"V", "x":5, "y":2},
-                {"label":"B", "x":6, "y":2},
-                {"label":"N", "x":7, "y":2},
-                {"label":"M", "x":8, "y":2},
-                {"label":",  <", "x":9, "y":2},
-                {"label":"Shift", "x":10, "y":2, "w":1.5},
-                {"label":"Up", "x":11.75, "y":2.25},
-                {"label":"1", "x":13, "y":2},
-                {"label":"2", "x":14, "y":2},
-                {"label":"3", "x":15, "y":2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1, "w": 1.5},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":3, "w":1.5},
-                {"label":"Meta", "x":3, "y":3},
-                {"x":4, "y":3, "w":2},
-                {"x":6, "y":3, "w":2},
-                {"label":"Super", "x":8, "y":3},
-                {"label":"Ctrl", "x":9, "y":3, "w":1.5},
-                {"label":"Left", "x":10.75, "y":3.25},
-                {"label":"Down", "x":11.75, "y":3.25},
-                {"label":"Right", "x":12.75, "y":3.25},
-                {"label":"0", "x":14, "y":3},
-                {"label":"Calc", "x":15, "y":3}
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 11], "x": 10, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 12], "x": 11.75, "y": 2.25},
+
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3, "w": 1.5},
+
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3}
             ]
         }
     }