Remove `FLIP_HALF` layouts and move to data driven (#20588)

2 files changed, 53 insertions, 51 deletions

diff --git a/keyboards/40percentclub/foobar/foobar.h b/keyboards/40percentclub/foobar/foobar.h
index 8cf2e384ff..4d83aa8aad 100644
--- a/keyboards/40percentclub/foobar/foobar.h
+++ b/keyboards/40percentclub/foobar/foobar.h
@@ -16,51 +16,6 @@
 #pragma once
 
 #include "quantum.h"
-#define ___ KC_NO
-
-#ifndef FLIP_HALF
-#define LAYOUT_ortho_3x10( \
-	L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
-	L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
-	L20, L21, L22, L23, L24, R20, R21, R22, R23, R24  \
-) { \
-	{ L00, L01, L02, L03, L04 }, \
-	{ L10, L11, L12, L13, L14 }, \
-	{ L20, L21, L22, L23, L24 }, \
-	{ R04, R03, R02, R01, R00 }, \
-	{ R14, R13, R12, R11, R10 }, \
-	{ R24, R23, R22, R21, R20 }  \
-}
-#else
-#define LAYOUT_ortho_3x10( \
-	L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
-	L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
-	L20, L21, L22, L23, L24, R20, R21, R22, R23, R24  \
-) { \
-	{ L00, L01, L02, L03, L04 }, \
-	{ L10, L11, L12, L13, L14 }, \
-	{ L20, L21, L22, L23, L24 }, \
-	{ R00, R01, R02, R03, R04 }, \
-	{ R10, R11, R12, R13, R14 }, \
-	{ R20, R21, R22, R23, R24 }  \
-}
-#endif
-
-#define LAYOUT_ortho_3x5( \
-	L00, L01, L02, L03, L04, \
-  L10, L11, L12, L13, L14, \
-  L20, L21, L22, L23, L24  \
-) { \
-	{ L00, L01, L02, L03, L04 }, \
-	{ L10, L11, L12, L13, L14 }, \
-	{ L20, L21, L22, L23, L24 }, \
-	{ ___, ___, ___, ___, ___ }, \
-  { ___, ___, ___, ___, ___ }, \
-  { ___, ___, ___, ___, ___ }  \
-}
-
-#define LAYOUT_macro LAYOUT_ortho_3x5
-#define LAYOUT_split LAYOUT_ortho_3x10
 
 #ifdef USE_I2C
   #error "I2C not Supported"
diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json
index 53cda10128..89fc4d11a0 100644
--- a/keyboards/40percentclub/foobar/info.json
+++ b/keyboards/40percentclub/foobar/info.json
@@ -19,19 +19,66 @@
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_3x10"],
+    "layout_aliases": {
+        "LAYOUT_macro": "LAYOUT_ortho_3x5",
+        "LAYOUT_split": "LAYOUT_ortho_3x10"
+    },
     "layouts": {
         "LAYOUT_ortho_3x5": {
             "layout": [
-              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-              {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}
+                {"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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2}
             ]
         },
         "LAYOUT_ortho_3x10": {
             "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1},
-              {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}
+                {"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": [3, 4], "x": 5, "y": 0},
+                {"matrix": [3, 3], "x": 6, "y": 0},
+                {"matrix": [3, 2], "x": 7, "y": 0},
+                {"matrix": [3, 1], "x": 8, "y": 0},
+                {"matrix": [3, 0], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [4, 4], "x": 5, "y": 1},
+                {"matrix": [4, 3], "x": 6, "y": 1},
+                {"matrix": [4, 2], "x": 7, "y": 1},
+                {"matrix": [4, 1], "x": 8, "y": 1},
+                {"matrix": [4, 0], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [5, 4], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [5, 1], "x": 8, "y": 2},
+                {"matrix": [5, 0], "x": 9, "y": 2}
             ]
         }
     }