Move miscellaneous layouts to data driven (#20516)

1 files changed, 158 insertions, 160 deletions

diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/info.json
index 002c82f6b7..ee4f46aad7 100644
--- a/keyboards/nyhxis/nfr_70/info.json
+++ b/keyboards/nyhxis/nfr_70/info.json
@@ -16,168 +16,166 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-        "LAYOUT_ansi":{
-            "layout":
-            [
-                { "label": "ESC", "x": 0, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 },
-                { "label": "`", "x": 0, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "TAB", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": "'", "x": 10.75, "y": 3.25 },
-                { "x": 12.75, "y": 3.25 },
-                { "label": "CAPS", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": ";", "x": 11.75, "y": 3.25 },
-                { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "LSHIFT", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "NUBS", "x": 1.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "RALT", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "LCTRL", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "LWIN", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "LALT", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "SPACE", "x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "RWIN", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "MENU", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "RCTRL", "x": 13.75, "y": 5.25, "w": 1.25 }
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 4.25, "y": 0},
+                {"matrix": [1, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [1, 2], "x": 10.75, "y": 0},
+                {"matrix": [0, 3], "x": 12.75, "y": 0},
+                {"matrix": [1, 3], "x": 1.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [1, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [1, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 0], "x": 3, "y": 1.25},
+                {"matrix": [3, 1], "x": 5, "y": 1.25},
+                {"matrix": [2, 1], "x": 7, "y": 1.25},
+                {"matrix": [3, 2], "x": 9, "y": 1.25},
+                {"matrix": [2, 2], "x": 11, "y": 1.25},
+                {"matrix": [3, 3], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 3], "x": 0, "y": 1.25},
+                {"matrix": [3, 4], "x": 2, "y": 1.25},
+                {"matrix": [2, 4], "x": 4, "y": 1.25},
+                {"matrix": [3, 5], "x": 6, "y": 1.25},
+                {"matrix": [2, 5], "x": 8, "y": 1.25},
+                {"matrix": [3, 6], "x": 10, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [6, 6], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [4, 0], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 0], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 0], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [9, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [9, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 4], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 13.75, "y": 5.25, "w": 1.25}
             ]
         },
-        "LAYOUT_tsangan":{
-            "layout":
-            [
-                { "label": "ESC", "x": 0, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 },
-                { "label": "`", "x": 0, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "TAB", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": "'", "x": 10.75, "y": 3.25 },
-                { "x": 12.75, "y": 3.25 },
-                { "label": "CAPS", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": ";", "x": 11.75, "y": 3.25 },
-                { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "LSHIFT", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "NUBS", "x": 1.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "x": 10, "y": 5.25 },
-                { "label": "LCTRL", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "LWIN", "x": 1.5, "y": 5.25 },
-                { "label": "LALT", "x": 2.5, "y": 5.25, "w": 1.5 },
-                { "label": "SPACE", "x": 4, "y": 5.25, "w": 7 },
-                { "label": "RALT", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "RWIN", "x": 12.5, "y": 5.25 },
-                { "label": "RCTRL", "x": 13.5, "y": 5.25, "w": 1.5 }
+        "LAYOUT_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 4.25, "y": 0},
+                {"matrix": [1, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [1, 2], "x": 10.75, "y": 0},
+                {"matrix": [0, 3], "x": 12.75, "y": 0},
+                {"matrix": [1, 3], "x": 1.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [1, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [1, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 0], "x": 3, "y": 1.25},
+                {"matrix": [3, 1], "x": 5, "y": 1.25},
+                {"matrix": [2, 1], "x": 7, "y": 1.25},
+                {"matrix": [3, 2], "x": 9, "y": 1.25},
+                {"matrix": [2, 2], "x": 11, "y": 1.25},
+                {"matrix": [3, 3], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 3], "x": 0, "y": 1.25},
+                {"matrix": [3, 4], "x": 2, "y": 1.25},
+                {"matrix": [2, 4], "x": 4, "y": 1.25},
+                {"matrix": [3, 5], "x": 6, "y": 1.25},
+                {"matrix": [2, 5], "x": 8, "y": 1.25},
+                {"matrix": [3, 6], "x": 10, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [6, 6], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [4, 0], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 0], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 0], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [9, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 10, "y": 5.25},
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [10, 4], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 5], "x": 12.5, "y": 5.25},
+                {"matrix": [10, 6], "x": 13.5, "y": 5.25, "w": 1.5}
             ]
         }
     }