Merge branch 'the-via:master' into JK01

the-via · Nov 14, 2023 · 2d94619 · 2d94619
2 parents e1d862a + e69ad9a
commit 2d94619
Show file tree

Hide file tree

Showing 23 changed files with 4,561 additions and 10 deletions.
diff --git a/src/mechstudio/dawn.json b/src/mechstudio/dawn.json
@@ -0,0 +1,26 @@
+{
+    "name": "Mech Studio Dawn",
+    "vendorId": "0x4d53",
+    "productId": "0x0004",
+    "matrix": { "rows": 6, "cols": 15 },
+    "lighting": "none",
+    "layouts": {
+        "keymap": [
+            [{"x":2.5,"c":"#777777"},"0,0",{"x":0.5,"c":"#cccccc"},"0,1","0,2","0,3","0,4",{"x":0.5,"c":"#aaaaaa"},"0,5","0,6","0,7","0,8",{"x":0.5,"c":"#cccccc"},"0,10","0,11","0,12","0,13",{"x":0.5,"c":"#aaaaaa"},"0,14"],
+            [{"y":0.25,"x":2.5},"1,0",{"c":"#cccccc"},"1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"c":"#aaaaaa","w":2},"1,13\n\n\n0,0","1,14",{"x":0.25},"2,13\n\n\n0,1","1,13\n\n\n0,1"],
+            [{"x":2.5,"w":1.5},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12",{"w":1.5},"3,12\n\n\n1,0",{"c":"#aaaaaa"},"2,14",{"x":1.25,"c":"#777777","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"3,13\n\n\n1,1"],
+            [{"x":2.5,"c":"#aaaaaa","w":1.75},"3,0",{"c":"#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#777777","w":2.25},"3,13\n\n\n1,0",{"c":"#aaaaaa"},"3,14",{"x":0.25},"3,12\n\n\n1,1"],
+            [{"w":1.25},"4,0\n\n\n2,1",{"c":"#cccccc"},"4,1\n\n\n2,1",{"x":0.25,"c":"#aaaaaa","w":2.25},"4,0\n\n\n2,0",{"c":"#cccccc"},"4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"c":"#aaaaaa","w":1.75},"4,12\n\n\n3,0","4,13\n\n\n3,0","4,14",{"x":0.25,"w":2.75},"4,12\n\n\n3,1"],
+            [{"x":2.5,"w":1.5},"5,0\n\n\n4,0","5,1\n\n\n4,0",{"w":1.25},"5,2\n\n\n4,0",{"c":"#cccccc","w":6.25},"5,6\n\n\n4,0",{"c":"#aaaaaa","w":1.25},"5,10\n\n\n4,0",{"w":1.25},"5,11\n\n\n4,0",{"x":0.5},"5,12","5,13","5,14"],
+            [{"y":0.5,"x":2.5,"w":1.25},"5,0\n\n\n4,1",{"w":1.25},"5,1\n\n\n4,1",{"w":1.5},"5,2\n\n\n4,1",{"c":"#cccccc","w":7},"5,6\n\n\n4,1",{"c":"#aaaaaa","w":1.5},"5,11\n\n\n4,1"],
+            [{"x":2.5,"w":1.5},"5,0\n\n\n4,2",{"x":0.75,"w":1.5},"5,2\n\n\n4,2",{"c":"#cccccc","w":7},"5,6\n\n\n4,2",{"c":"#aaaaaa","w":1.5},"5,11\n\n\n4,2"]
+        ],
+        "labels": [
+            "Split Backspace",
+            "ISO Enter",
+            "Split Left Shift",
+            "Split Right Shift",
+            ["Bottom Row", "ANSI", "7U ANSI", "WKL"]
+        ]
+    }
+}
diff --git a/src/mechwild/clunker/clunker.json b/src/mechwild/clunker/clunker.json
@@ -105,7 +105,7 @@
         "4,1\n\n\n2,1",
         "4,2\n\n\n2,1",
         {"c": "#cccccc", "w": 6.25},
-        "4,4\n\n\n2,1",
+        "4,3\n\n\n2,1",
         {"c": "#aaaaaa"},
         "4,5\n\n\n2,1",
         "4,6\n\n\n2,1",

diff --git a/v3/4pplet/waffling60_rev_e_ansi.json b/v3/4pplet/waffling60_rev_e_ansi.json
@@ -0,0 +1,237 @@
+{
+  "name": "waffling60 Rev E ANSI",
+  "vendorId": "0x4444",
+  "productId": "0x0015",
+  "keycodes": ["qmk_lighting"],
+  "menus": ["qmk_rgblight"],
+  "matrix": {"rows": 5, "cols": 14},
+  "layouts": {
+    "labels": [
+      [
+        "Backspace",
+        "Unified",
+        "Split",
+        "Encoder"
+      ],
+      ["Modifiers", "WK", "WKL", "HHKB"],
+      ["Spacebar", "7U", "Split Space", "10U"]
+    ],
+    "keymap": 
+    [
+      [
+        {
+          "c": "#aaaaaa"
+        },
+        "0,0",
+        {
+          "c": "#cccccc"
+        },
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "1,13\n\n\n0,0",
+        {
+          "x": 0.5,
+          "c": "#cccccc"
+        },
+        "0,13\n\n\n0,1",
+        {
+          "c": "#aaaaaa"
+        },
+        "1,13\n\n\n0,1",
+        {
+          "c": "#cccccc"
+        },
+        "0,13\n\n\n0,2",
+        {
+          "c": "#aaaaaa"
+        },
+        "1,13\n\n\n0,2\n\n\n\n\n\ne0"
+      ],
+      [
+        {
+          "w": 1.5
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "2,12"
+      ],
+      [
+        {
+          "w": 1.75
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        {
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "2,13"
+      ],
+      [
+        {
+          "w": 2.25
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        "3,11",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,12",
+        "3,13"
+      ],
+      [
+        {
+          "w": 1.5
+        },
+        "4,0\n\n\n1,0",
+        "4,1\n\n\n1,0",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n2,0",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,6\n\n\n2,0",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,11\n\n\n2,0",
+        "4,12\n\n\n1,0",
+        {
+          "w": 1.5
+        },
+        "4,13\n\n\n1,0"
+      ],
+      [
+        {
+          "y": 0.5,
+          "x": 2.5,
+          "w": 1.5
+        },
+        "4,2\n\n\n2,1",
+        {
+          "c": "#cccccc",
+          "w": 3
+        },
+        "4,4\n\n\n2,1",
+        "4,6\n\n\n2,1",
+        {
+          "w": 3
+        },
+        "4,8\n\n\n2,1",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,11\n\n\n2,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "c": "#cccccc",
+          "w": 10
+        },
+        "4,6\n\n\n2,2"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,0\n\n\n1,1",
+        {
+          "d": true
+        },
+        "4,1\n\n\n1,1",
+        {
+          "x": 10,
+          "d": true
+        },
+        "4,12\n\n\n1,1",
+        {
+          "w": 1.5
+        },
+        "4,13\n\n\n1,1"
+      ],
+      [
+        {
+          "w": 1.5,
+          "d": true
+        },
+        "4,0\n\n\n1,2",
+        "4,1\n\n\n1,2",
+        {
+          "x": 10
+        },
+        "4,12\n\n\n1,2",
+        {
+          "w": 1.5,
+          "d": true
+        },
+        "4,13\n\n\n1,2"
+      ]
+    ]
+
+  }
+}