update Tiger80 iso layout support (#1771)

the-via · Mar 21, 2023 · fd14021 · fd14021
1 parent 18fe9c0
commit fd14021
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 97 deletions.
diff --git a/src/kbdfans/tiger80/tiger80.json b/src/kbdfans/tiger80/tiger80.json
@@ -5,50 +5,42 @@
   "lighting": "qmk_rgblight",
   "matrix": {"rows": 6, "cols": 16},
   "layouts": {
+    "labels": [
+      [
+        "Layout",
+        "ANSI",
+        "ISO"
+      ]
+
+    ],
+
     "keymap": [
       [
-        {
-          "c": "#777777"
-        },
+        {"c": "#777777"},
         "0,0",
-        {
-          "x": 0.25,
-          "c": "#aaaaaa"
-        },
+        {"x": 0.25, "c": "#aaaaaa"},
         "0,1",
         "0,2",
         "0,3",
         "0,4",
-        {
-          "x": 0.25
-        },
+        {"x": 0.25},
         "0,5",
         "0,6",
         "0,7",
         "0,8",
-        {
-          "x": 0.25
-        },
+        {"x": 0.25},
         "0,9",
         "0,10",
         "0,11",
         "0,12",
-        {
-          "x": 0.25
-        },
+        {"x": 0.25},
         "0,13",
-        {
-          "x": 0.25
-        },
         "0,14",
         "0,15",
         "3,15"
       ],
       [
-        {
-          "y": 0.5,
-          "c": "#cccccc"
-        },
+        {"y": 0.5, "c": "#cccccc"},
         "1,0",
         "1,1",
         "1,2",
@@ -62,26 +54,17 @@
         "1,10",
         "1,11",
         "1,12",
-        {
-          "c": "#aaaaaa",
-          "w": 2
-        },
+        {"c": "#aaaaaa", "w": 2},
         "1,13",
-        {
-          "x": 0.25
-        },
+        {"x": 0.25},
         "1,14",
         "1,15",
         "3,14"
       ],
       [
-        {
-          "w": 1.5
-        },
+        {"w": 1.5},
         "2,0",
-        {
-          "c": "#cccccc"
-        },
+        {"c": "#cccccc"},
         "2,1",
         "2,2",
         "2,3",
@@ -94,26 +77,27 @@
         "2,10",
         "2,11",
         "2,12",
-        {
-          "c": "#aaaaaa",
-          "w": 1.5
-        },
-        "2,13",
-        {
-          "x": 0.25
-        },
+        {"c": "#aaaaaa", "w": 1.5},
+        "2,13\n\n\n0,0",  
+        {"x": 0.25},
         "2,14",
         "2,15",
-        "4,14"
-      ],
-      [
+        "4,14",
         {
-          "w": 1.75
+          "x": 2,
+          "c": "#777777",
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
         },
+        "2,13\n\n\n0,1"
+      ],
+      [
+        {"w": 1.75},
         "3,0",
-        {
-          "c": "#cccccc"
-        },
+        {"c": "#cccccc"},
         "3,1",
         "3,2",
         "3,3",
@@ -125,21 +109,14 @@
         "3,9",
         "3,10",
         "3,11",
-        {
-          "c": "#777777",
-          "w": 2.25
-        },
-        "3,13"
+        {"c": "#777777", "w": 2.25},
+        "3,13\n\n\n0,0",
+        {"c": "#cccccc","x":4.25},       
+        "3,13\n\n\n0,1"
       ],
       [
-        {
-          "c": "#aaaaaa",
-          "w": 2.25
-        },
-        "4,0",
-        {
-          "c": "#cccccc"
-        },
+        {"c": "#aaaaaa", "w": 2.25},
+        "4,0\n\n\n0,0",
         "4,2",
         "4,3",
         "4,4",
@@ -150,45 +127,29 @@
         "4,9",
         "4,10",
         "4,11",
-        {
-          "c": "#aaaaaa",
-          "w": 2.75
-        },
         "4,13",
-        {
-          "x": 1.25,
-          "c": "#777777"
-        },
+        {"x": 1.25, "c": "#777777"},
         "4,15"
       ],
       [
-        {
-          "c": "#aaaaaa",
-          "w": 1.5
-        },
+        {"c": "#aaaaaa", "w": 1.25, "y":-1, "x":6.5},
+        "4,0\n\n\n0,1",
+        {"c": "#cccccc"},
+        "4,1\n\n\n0,1"
+      ],
+      [
+        {"c": "#aaaaaa", "w": 1.5},
         "5,0",
         "5,1",
-        {
-          "w": 1.5
-        },
+        {"w": 1.5},
         "5,2",
-        {
-          "w": 7
-        },
+        {"w": 7},
         "5,6",
-        {
-          "w": 1.5
-        },
+        {"w": 1.5},
         "5,10",
         "5,11",
-        {
-          "w": 1.5
-        },
+        {"w": 1.5},
         "5,12",
-        {
-          "x": 0.25,
-          "c": "#777777"
-        },
         "5,13",
         "5,14",
         "5,15"

diff --git a/v3/kbdfans/tiger80/tiger80.json b/v3/kbdfans/tiger80/tiger80.json
@@ -6,6 +6,15 @@
   "menus": ["qmk_rgblight"],
   "matrix": {"rows": 6, "cols": 16},
   "layouts": {
+    "labels": [
+      [
+        "Layout",
+        "ANSI",
+        "ISO"
+      ]
+
+    ],
+
     "keymap": [
       [
         {"c": "#777777"},
@@ -71,11 +80,21 @@
         "2,11",
         "2,12",
         {"c": "#aaaaaa", "w": 1.5},
-        "2,13",
+        "2,13\n\n\n0,0",
         {"x": 0.25},
         "2,14",
         "2,15",
-        "4,14"
+        "4,14",
+        {
+          "x": 2,
+          "c": "#777777",
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "2,13\n\n\n0,1"
       ],
       [
         {"w": 1.75},
@@ -93,12 +112,13 @@
         "3,10",
         "3,11",
         {"c": "#777777", "w": 2.25},
-        "3,13"
+        "3,13\n\n\n0,0",
+        {"c": "#cccccc","x":4.25},
+        "3,13\n\n\n0,1"
       ],
       [
         {"c": "#aaaaaa", "w": 2.25},
-        "4,0",
-        {"c": "#cccccc"},
+        "4,0\n\n\n0,0",
         "4,2",
         "4,3",
         "4,4",
@@ -114,6 +134,12 @@
         {"x": 1.25, "c": "#777777"},
         "4,15"
       ],
+      [
+        {"c": "#aaaaaa", "w": 1.25, "y":-1, "x":6.5},
+        "4,0\n\n\n0,1",
+        {"c": "#cccccc"},
+        "4,1\n\n\n0,1"
+      ],
       [
         {"c": "#aaaaaa", "w": 1.5},
         "5,0",