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

2 files changed, 46 insertions, 97 deletions

diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h
deleted file mode 100644
index e410c22466..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/4x5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#ifndef FLIP_HALF
-#define LAYOUT( \
-    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, \
-         L31, L32,                                         R32, R33, \
-                       L33, L34,                     R30, R31, \
-                                 L44, L43, R41, R40, \
-                                 L42, L41, R43, R42 \
-) { \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { XXX, L31, L32, L33, L34 }, \
-    { XXX, L41, L42, L43, L44 }, \
-\
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { XXX, R33, R32, R31, R30 }, \
-    { XXX, R43, R42, R41, R40 } \
-}
-#else
-#define LAYOUT( \
-    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, \
-         L31, L32,                                         R32, R33, \
-                       L33, L34,                     R30, R31, \
-                                 L43, L44, R40, R41, \
-                                 L41, L42, R42, R43 \
-) { \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { XXX, R33, R32, R31, R30 }, \
-    { XXX, R43, R42, R41, R40 }, \
-\
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { XXX, L31, L32, L33, L34 }, \
-    { XXX, L41, L42, L43, L44 } \
-}
-#endif
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
index ddb96923f4..bb3b3e6c2c 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -24,65 +24,65 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "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},
 
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y":0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 0], "x": 14, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
+                {"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},
 
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 1], "x": 13, "y": 1},
+                {"matrix": [6, 0], "x": 14, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
+                {"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},
 
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 1], "x": 13, "y": 2},
+                {"matrix": [7, 0], "x": 14, "y": 2},
 
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
 
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 4},
 
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 3], "x": 11, "y": 4},
 
-                {"x": 5, "y": 5},
-                {"x": 6, "y": 5},
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 3], "x": 6, "y": 5},
 
-                {"x": 8, "y": 5},
-                {"x": 9, "y": 5},
+                {"matrix": [9, 3], "x": 8, "y": 5},
+                {"matrix": [9, 4], "x": 9, "y": 5},
 
-                {"x": 5, "y": 6},
-                {"x": 6, "y": 6},
+                {"matrix": [4, 2], "x": 5, "y": 6},
+                {"matrix": [4, 1], "x": 6, "y": 6},
 
-                {"x": 8, "y": 6},
-                {"x": 9, "y": 6}
+                {"matrix": [9, 1], "x": 8, "y": 6},
+                {"matrix": [9, 2], "x": 9, "y": 6}
             ]
         }
     }