From 81425f4dbd5184193b5d0f408b5aac64a3a46d4c Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:31:57 +1100 Subject: [PATCH 1/4] Add Fuyu HS --- src/zykrah/fuyu_hs.json | 339 +++++++++++++++++++++++++++++++++++++++ v3/zykrah/fuyu_hs.json | 341 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 680 insertions(+) create mode 100644 src/zykrah/fuyu_hs.json create mode 100644 v3/zykrah/fuyu_hs.json diff --git a/src/zykrah/fuyu_hs.json b/src/zykrah/fuyu_hs.json new file mode 100644 index 0000000000..a8108d5aab --- /dev/null +++ b/src/zykrah/fuyu_hs.json @@ -0,0 +1,339 @@ +{ + "name": "Fuyu Hotswap", + "vendorId": "0x7A79", + "productId": "0x4648", + "matrix": { + "rows": 6, + "cols": 17 + }, + "lighting": "none", + "layouts": { + "labels": [ + "Split Backspace", + [ + "Bottom Row", + "6.25U", + "7U", + "WKL" + ], + "Split Right Shift", + "Stepped Caps", + "Numpad Blocker" + ], + "keymap": [ + [ + { + "x": 2.5 + }, + "0,0", + { + "x": 1 + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.5 + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5 + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.25, + "x": 2.5 + }, + "1,0", + "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": "#a7d9d6", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,14", + "1,15", + "1,16", + { + "x": 1, + "c": "#a7d9d6" + }, + "1,13\n\n\n0,1", + "3,13\n\n\n0,1" + ], + [ + { + "x": 2.5, + "c": "#cccccc", + "w": 1.5 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#bf9656", + "w": 1.5 + }, + "2,13", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,14", + "2,15", + "2,16" + ], + [ + { + "c": "#727cb3", + "w": 1.25, + "w2": 1.75, + "l": true + }, + "3,0\n\n\n3,1", + { + "x": 1.25, + "w": 1.75 + }, + "3,0\n\n\n3,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": "#bf9656", + "w": 2.25 + }, + "3,12", + { + "x": 0.25, + "c": "#ff7575" + }, + "3,14\n\n\n4,0", + "3,15\n\n\n4,0", + "3,16\n\n\n4,0", + { + "x": 3.25, + "d": true + }, + "3,14\n\n\n4,1", + { + "d": true + }, + "3,15\n\n\n4,1", + { + "d": true + }, + "3,16\n\n\n4,1" + ], + [ + { + "x": 2.5, + "c": "#bcc562", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#c280be", + "w": 2.75 + }, + "4,12\n\n\n2,0", + { + "x": 0.25, + "c": "#ff7575" + }, + "4,14\n\n\n4,0", + { + "c": "#cccccc" + }, + "4,15", + { + "c": "#ff7575" + }, + "4,16\n\n\n4,0", + { + "x": 0.25, + "c": "#c280be", + "w": 1.75 + }, + "4,12\n\n\n2,1", + "4,13\n\n\n2,1", + { + "x": 0.25, + "c": "#ff7575", + "d": true + }, + "4,14\n\n\n4,1", + { + "x": 1, + "d": true + }, + "4,16\n\n\n4,1" + ], + [ + { + "x": 2.5, + "c": "#6c916f", + "w": 1.25 + }, + "5,0\n\n\n1,0", + { + "w": 1.25 + }, + "5,1\n\n\n1,0", + { + "w": 1.25 + }, + "5,2\n\n\n1,0", + { + "w": 6.25 + }, + "5,6\n\n\n1,0", + { + "w": 1.25 + }, + "5,10\n\n\n1,0", + { + "w": 1.25 + }, + "5,11\n\n\n1,0", + { + "w": 1.25 + }, + "5,12\n\n\n1,0", + { + "w": 1.25 + }, + "5,13\n\n\n1,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,14", + "5,15", + "5,16" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#6c916f", + "w": 1.5 + }, + "5,0\n\n\n1,1", + "5,1\n\n\n1,1", + { + "w": 1.5 + }, + "5,2\n\n\n1,1", + { + "w": 7 + }, + "5,6\n\n\n1,1", + { + "w": 1.5 + }, + "5,11\n\n\n1,1", + "5,12\n\n\n1,1", + { + "w": 1.5 + }, + "5,13\n\n\n1,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "5,0\n\n\n1,2", + { + "d": true + }, + "5,1\n\n\n1,2", + { + "w": 1.5 + }, + "5,2\n\n\n1,2", + { + "w": 7 + }, + "5,6\n\n\n1,2", + { + "w": 1.5 + }, + "5,11\n\n\n1,2", + { + "d": true + }, + "5,12\n\n\n1,2", + { + "w": 1.5 + }, + "5,13\n\n\n1,2" + ] + ] + } +} diff --git a/v3/zykrah/fuyu_hs.json b/v3/zykrah/fuyu_hs.json new file mode 100644 index 0000000000..a4aee899a9 --- /dev/null +++ b/v3/zykrah/fuyu_hs.json @@ -0,0 +1,341 @@ +{ + "name": "Fuyu Hotswap", + "vendorId": "0x7A79", + "productId": "0x4648", + "matrix": { + "rows": 6, + "cols": 17 + }, + "menus": [ + "qmk_rgb_matrix" + ], + "layouts": { + "labels": [ + "Split Backspace", + [ + "Bottom Row", + "6.25U", + "7U", + "WKL" + ], + "Split Right Shift", + "Stepped Caps", + "Numpad Blocker" + ], + "keymap": [ + [ + { + "x": 2.5 + }, + "0,0", + { + "x": 1 + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.5 + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5 + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.25, + "x": 2.5 + }, + "1,0", + "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": "#a7d9d6", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,14", + "1,15", + "1,16", + { + "x": 1, + "c": "#a7d9d6" + }, + "1,13\n\n\n0,1", + "3,13\n\n\n0,1" + ], + [ + { + "x": 2.5, + "c": "#cccccc", + "w": 1.5 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#bf9656", + "w": 1.5 + }, + "2,13", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,14", + "2,15", + "2,16" + ], + [ + { + "c": "#727cb3", + "w": 1.25, + "w2": 1.75, + "l": true + }, + "3,0\n\n\n3,1", + { + "x": 1.25, + "w": 1.75 + }, + "3,0\n\n\n3,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": "#bf9656", + "w": 2.25 + }, + "3,12", + { + "x": 0.25, + "c": "#ff7575" + }, + "3,14\n\n\n4,0", + "3,15\n\n\n4,0", + "3,16\n\n\n4,0", + { + "x": 3.25, + "d": true + }, + "3,14\n\n\n4,1", + { + "d": true + }, + "3,15\n\n\n4,1", + { + "d": true + }, + "3,16\n\n\n4,1" + ], + [ + { + "x": 2.5, + "c": "#bcc562", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#c280be", + "w": 2.75 + }, + "4,12\n\n\n2,0", + { + "x": 0.25, + "c": "#ff7575" + }, + "4,14\n\n\n4,0", + { + "c": "#cccccc" + }, + "4,15", + { + "c": "#ff7575" + }, + "4,16\n\n\n4,0", + { + "x": 0.25, + "c": "#c280be", + "w": 1.75 + }, + "4,12\n\n\n2,1", + "4,13\n\n\n2,1", + { + "x": 0.25, + "c": "#ff7575", + "d": true + }, + "4,14\n\n\n4,1", + { + "x": 1, + "d": true + }, + "4,16\n\n\n4,1" + ], + [ + { + "x": 2.5, + "c": "#6c916f", + "w": 1.25 + }, + "5,0\n\n\n1,0", + { + "w": 1.25 + }, + "5,1\n\n\n1,0", + { + "w": 1.25 + }, + "5,2\n\n\n1,0", + { + "w": 6.25 + }, + "5,6\n\n\n1,0", + { + "w": 1.25 + }, + "5,10\n\n\n1,0", + { + "w": 1.25 + }, + "5,11\n\n\n1,0", + { + "w": 1.25 + }, + "5,12\n\n\n1,0", + { + "w": 1.25 + }, + "5,13\n\n\n1,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,14", + "5,15", + "5,16" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#6c916f", + "w": 1.5 + }, + "5,0\n\n\n1,1", + "5,1\n\n\n1,1", + { + "w": 1.5 + }, + "5,2\n\n\n1,1", + { + "w": 7 + }, + "5,6\n\n\n1,1", + { + "w": 1.5 + }, + "5,11\n\n\n1,1", + "5,12\n\n\n1,1", + { + "w": 1.5 + }, + "5,13\n\n\n1,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "5,0\n\n\n1,2", + { + "d": true + }, + "5,1\n\n\n1,2", + { + "w": 1.5 + }, + "5,2\n\n\n1,2", + { + "w": 7 + }, + "5,6\n\n\n1,2", + { + "w": 1.5 + }, + "5,11\n\n\n1,2", + { + "d": true + }, + "5,12\n\n\n1,2", + { + "w": 1.5 + }, + "5,13\n\n\n1,2" + ] + ] + } +} From 282fdafdf86f7719baaa5cce6d50d1bf1a8c8fe4 Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:42:46 +1100 Subject: [PATCH 2/4] Fix colours --- src/zykrah/fuyu_hs.json | 56 +++++++++++++++++++++++------------------ v3/zykrah/fuyu_hs.json | 56 +++++++++++++++++++++++------------------ 2 files changed, 62 insertions(+), 50 deletions(-) diff --git a/src/zykrah/fuyu_hs.json b/src/zykrah/fuyu_hs.json index a8108d5aab..7f02cfc82d 100644 --- a/src/zykrah/fuyu_hs.json +++ b/src/zykrah/fuyu_hs.json @@ -23,11 +23,13 @@ "keymap": [ [ { - "x": 2.5 + "x": 2.5, + "c": "#777777" }, "0,0", { - "x": 1 + "x": 1, + "c": "#cccccc" }, "0,2", "0,3", @@ -57,9 +59,13 @@ [ { "y": 0.25, - "x": 2.5 + "x": 2.5, + "c": "#aaaaaa" }, "1,0", + { + "c": "#cccccc" + }, "1,1", "1,2", "1,3", @@ -73,7 +79,7 @@ "1,11", "1,12", { - "c": "#a7d9d6", + "c": "#aaaaaa", "w": 2 }, "1,13\n\n\n0,0", @@ -86,7 +92,7 @@ "1,16", { "x": 1, - "c": "#a7d9d6" + "c": "#aaaaaa" }, "1,13\n\n\n0,1", "3,13\n\n\n0,1" @@ -94,10 +100,12 @@ [ { "x": 2.5, - "c": "#cccccc", "w": 1.5 }, "2,0", + { + "c": "#cccccc" + }, "2,1", "2,2", "2,3", @@ -111,13 +119,11 @@ "2,11", "2,12", { - "c": "#bf9656", "w": 1.5 }, "2,13", { - "x": 0.25, - "c": "#cccccc" + "x": 0.25 }, "2,14", "2,15", @@ -125,7 +131,7 @@ ], [ { - "c": "#727cb3", + "c": "#aaaaaa", "w": 1.25, "w2": 1.75, "l": true @@ -151,13 +157,13 @@ "3,10", "3,11", { - "c": "#bf9656", + "c": "#777777", "w": 2.25 }, "3,12", { "x": 0.25, - "c": "#ff7575" + "c": "#cccccc" }, "3,14\n\n\n4,0", "3,15\n\n\n4,0", @@ -179,7 +185,7 @@ [ { "x": 2.5, - "c": "#bcc562", + "c": "#aaaaaa", "w": 2.25 }, "4,0", @@ -197,33 +203,27 @@ "4,10", "4,11", { - "c": "#c280be", + "c": "#aaaaaa", "w": 2.75 }, "4,12\n\n\n2,0", { "x": 0.25, - "c": "#ff7575" - }, - "4,14\n\n\n4,0", - { "c": "#cccccc" }, + "4,14\n\n\n4,0", "4,15", - { - "c": "#ff7575" - }, "4,16\n\n\n4,0", { "x": 0.25, - "c": "#c280be", + "c": "#aaaaaa", "w": 1.75 }, "4,12\n\n\n2,1", "4,13\n\n\n2,1", { "x": 0.25, - "c": "#ff7575", + "c": "#cccccc", "d": true }, "4,14\n\n\n4,1", @@ -236,7 +236,7 @@ [ { "x": 2.5, - "c": "#6c916f", + "c": "#aaaaaa", "w": 1.25 }, "5,0\n\n\n1,0", @@ -249,10 +249,12 @@ }, "5,2\n\n\n1,0", { + "c": "#cccccc", "w": 6.25 }, "5,6\n\n\n1,0", { + "c": "#aaaaaa", "w": 1.25 }, "5,10\n\n\n1,0", @@ -280,7 +282,7 @@ { "y": 0.25, "x": 2.5, - "c": "#6c916f", + "c": "#aaaaaa", "w": 1.5 }, "5,0\n\n\n1,1", @@ -290,10 +292,12 @@ }, "5,2\n\n\n1,1", { + "c": "#cccccc", "w": 7 }, "5,6\n\n\n1,1", { + "c": "#aaaaaa", "w": 1.5 }, "5,11\n\n\n1,1", @@ -318,10 +322,12 @@ }, "5,2\n\n\n1,2", { + "c": "#cccccc", "w": 7 }, "5,6\n\n\n1,2", { + "c": "#aaaaaa", "w": 1.5 }, "5,11\n\n\n1,2", diff --git a/v3/zykrah/fuyu_hs.json b/v3/zykrah/fuyu_hs.json index a4aee899a9..f42da727e9 100644 --- a/v3/zykrah/fuyu_hs.json +++ b/v3/zykrah/fuyu_hs.json @@ -25,11 +25,13 @@ "keymap": [ [ { - "x": 2.5 + "x": 2.5, + "c": "#777777" }, "0,0", { - "x": 1 + "x": 1, + "c": "#cccccc" }, "0,2", "0,3", @@ -59,9 +61,13 @@ [ { "y": 0.25, - "x": 2.5 + "x": 2.5, + "c": "#aaaaaa" }, "1,0", + { + "c": "#cccccc" + }, "1,1", "1,2", "1,3", @@ -75,7 +81,7 @@ "1,11", "1,12", { - "c": "#a7d9d6", + "c": "#aaaaaa", "w": 2 }, "1,13\n\n\n0,0", @@ -88,7 +94,7 @@ "1,16", { "x": 1, - "c": "#a7d9d6" + "c": "#aaaaaa" }, "1,13\n\n\n0,1", "3,13\n\n\n0,1" @@ -96,10 +102,12 @@ [ { "x": 2.5, - "c": "#cccccc", "w": 1.5 }, "2,0", + { + "c": "#cccccc" + }, "2,1", "2,2", "2,3", @@ -113,13 +121,11 @@ "2,11", "2,12", { - "c": "#bf9656", "w": 1.5 }, "2,13", { - "x": 0.25, - "c": "#cccccc" + "x": 0.25 }, "2,14", "2,15", @@ -127,7 +133,7 @@ ], [ { - "c": "#727cb3", + "c": "#aaaaaa", "w": 1.25, "w2": 1.75, "l": true @@ -153,13 +159,13 @@ "3,10", "3,11", { - "c": "#bf9656", + "c": "#777777", "w": 2.25 }, "3,12", { "x": 0.25, - "c": "#ff7575" + "c": "#cccccc" }, "3,14\n\n\n4,0", "3,15\n\n\n4,0", @@ -181,7 +187,7 @@ [ { "x": 2.5, - "c": "#bcc562", + "c": "#aaaaaa", "w": 2.25 }, "4,0", @@ -199,33 +205,27 @@ "4,10", "4,11", { - "c": "#c280be", + "c": "#aaaaaa", "w": 2.75 }, "4,12\n\n\n2,0", { "x": 0.25, - "c": "#ff7575" - }, - "4,14\n\n\n4,0", - { "c": "#cccccc" }, + "4,14\n\n\n4,0", "4,15", - { - "c": "#ff7575" - }, "4,16\n\n\n4,0", { "x": 0.25, - "c": "#c280be", + "c": "#aaaaaa", "w": 1.75 }, "4,12\n\n\n2,1", "4,13\n\n\n2,1", { "x": 0.25, - "c": "#ff7575", + "c": "#cccccc", "d": true }, "4,14\n\n\n4,1", @@ -238,7 +238,7 @@ [ { "x": 2.5, - "c": "#6c916f", + "c": "#aaaaaa", "w": 1.25 }, "5,0\n\n\n1,0", @@ -251,10 +251,12 @@ }, "5,2\n\n\n1,0", { + "c": "#cccccc", "w": 6.25 }, "5,6\n\n\n1,0", { + "c": "#aaaaaa", "w": 1.25 }, "5,10\n\n\n1,0", @@ -282,7 +284,7 @@ { "y": 0.25, "x": 2.5, - "c": "#6c916f", + "c": "#aaaaaa", "w": 1.5 }, "5,0\n\n\n1,1", @@ -292,10 +294,12 @@ }, "5,2\n\n\n1,1", { + "c": "#cccccc", "w": 7 }, "5,6\n\n\n1,1", { + "c": "#aaaaaa", "w": 1.5 }, "5,11\n\n\n1,1", @@ -320,10 +324,12 @@ }, "5,2\n\n\n1,2", { + "c": "#cccccc", "w": 7 }, "5,6\n\n\n1,2", { + "c": "#aaaaaa", "w": 1.5 }, "5,11\n\n\n1,2", From a54f31cefdf124de9a132197d6754217be31130c Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:45:09 +1100 Subject: [PATCH 3/4] Remove V2 definition --- src/zykrah/fuyu_hs.json | 345 ---------------------------------------- 1 file changed, 345 deletions(-) delete mode 100644 src/zykrah/fuyu_hs.json diff --git a/src/zykrah/fuyu_hs.json b/src/zykrah/fuyu_hs.json deleted file mode 100644 index 7f02cfc82d..0000000000 --- a/src/zykrah/fuyu_hs.json +++ /dev/null @@ -1,345 +0,0 @@ -{ - "name": "Fuyu Hotswap", - "vendorId": "0x7A79", - "productId": "0x4648", - "matrix": { - "rows": 6, - "cols": 17 - }, - "lighting": "none", - "layouts": { - "labels": [ - "Split Backspace", - [ - "Bottom Row", - "6.25U", - "7U", - "WKL" - ], - "Split Right Shift", - "Stepped Caps", - "Numpad Blocker" - ], - "keymap": [ - [ - { - "x": 2.5, - "c": "#777777" - }, - "0,0", - { - "x": 1, - "c": "#cccccc" - }, - "0,2", - "0,3", - "0,4", - "0,5", - { - "x": 0.5 - }, - "0,6", - "0,7", - "0,8", - "0,9", - { - "x": 0.5 - }, - "0,10", - "0,11", - "0,12", - "0,13", - { - "x": 0.25 - }, - "0,14", - "0,15", - "0,16" - ], - [ - { - "y": 0.25, - "x": 2.5, - "c": "#aaaaaa" - }, - "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", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,14", - "1,15", - "1,16", - { - "x": 1, - "c": "#aaaaaa" - }, - "1,13\n\n\n0,1", - "3,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 - }, - "2,13", - { - "x": 0.25 - }, - "2,14", - "2,15", - "2,16" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25, - "w2": 1.75, - "l": true - }, - "3,0\n\n\n3,1", - { - "x": 1.25, - "w": 1.75 - }, - "3,0\n\n\n3,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,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,14\n\n\n4,0", - "3,15\n\n\n4,0", - "3,16\n\n\n4,0", - { - "x": 3.25, - "d": true - }, - "3,14\n\n\n4,1", - { - "d": true - }, - "3,15\n\n\n4,1", - { - "d": true - }, - "3,16\n\n\n4,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 2.25 - }, - "4,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": 2.75 - }, - "4,12\n\n\n2,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "4,14\n\n\n4,0", - "4,15", - "4,16\n\n\n4,0", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12\n\n\n2,1", - "4,13\n\n\n2,1", - { - "x": 0.25, - "c": "#cccccc", - "d": true - }, - "4,14\n\n\n4,1", - { - "x": 1, - "d": true - }, - "4,16\n\n\n4,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0\n\n\n1,0", - { - "w": 1.25 - }, - "5,1\n\n\n1,0", - { - "w": 1.25 - }, - "5,2\n\n\n1,0", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6\n\n\n1,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,10\n\n\n1,0", - { - "w": 1.25 - }, - "5,11\n\n\n1,0", - { - "w": 1.25 - }, - "5,12\n\n\n1,0", - { - "w": 1.25 - }, - "5,13\n\n\n1,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,14", - "5,15", - "5,16" - ], - [ - { - "y": 0.25, - "x": 2.5, - "c": "#aaaaaa", - "w": 1.5 - }, - "5,0\n\n\n1,1", - "5,1\n\n\n1,1", - { - "w": 1.5 - }, - "5,2\n\n\n1,1", - { - "c": "#cccccc", - "w": 7 - }, - "5,6\n\n\n1,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,11\n\n\n1,1", - "5,12\n\n\n1,1", - { - "w": 1.5 - }, - "5,13\n\n\n1,1" - ], - [ - { - "x": 2.5, - "w": 1.5 - }, - "5,0\n\n\n1,2", - { - "d": true - }, - "5,1\n\n\n1,2", - { - "w": 1.5 - }, - "5,2\n\n\n1,2", - { - "c": "#cccccc", - "w": 7 - }, - "5,6\n\n\n1,2", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,11\n\n\n1,2", - { - "d": true - }, - "5,12\n\n\n1,2", - { - "w": 1.5 - }, - "5,13\n\n\n1,2" - ] - ] - } -} From 6dd150ddb943fbe2dc7d128b74a828df1d75fb4b Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 16 Nov 2024 01:29:43 +0100 Subject: [PATCH 4/4] Update v3/zykrah/fuyu_hs.json --- v3/zykrah/fuyu_hs.json | 110 ++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 61 deletions(-) diff --git a/v3/zykrah/fuyu_hs.json b/v3/zykrah/fuyu_hs.json index f42da727e9..dfe529721f 100644 --- a/v3/zykrah/fuyu_hs.json +++ b/v3/zykrah/fuyu_hs.json @@ -6,26 +6,27 @@ "rows": 6, "cols": 17 }, + "keycodes": [ + "qmk_lighting" + ], "menus": [ "qmk_rgb_matrix" ], "layouts": { "labels": [ "Split Backspace", + "Split Right Shift", + "Numpad Blocker", [ "Bottom Row", "6.25U", "7U", "WKL" - ], - "Split Right Shift", - "Stepped Caps", - "Numpad Blocker" + ] ], "keymap": [ [ { - "x": 2.5, "c": "#777777" }, "0,0", @@ -60,14 +61,9 @@ ], [ { - "y": 0.25, - "x": 2.5, - "c": "#aaaaaa" + "y": 0.25 }, "1,0", - { - "c": "#cccccc" - }, "1,1", "1,2", "1,3", @@ -93,15 +89,16 @@ "1,15", "1,16", { - "x": 1, - "c": "#aaaaaa" + "x": 1 }, "1,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, "3,13\n\n\n0,1" ], [ { - "x": 2.5, "w": 1.5 }, "2,0", @@ -134,16 +131,9 @@ [ { "c": "#aaaaaa", - "w": 1.25, - "w2": 1.75, - "l": true - }, - "3,0\n\n\n3,1", - { - "x": 1.25, "w": 1.75 }, - "3,0\n\n\n3,0", + "3,0", { "c": "#cccccc" }, @@ -167,26 +157,25 @@ "x": 0.25, "c": "#cccccc" }, - "3,14\n\n\n4,0", - "3,15\n\n\n4,0", - "3,16\n\n\n4,0", + "3,14\n\n\n2,0", + "3,15\n\n\n2,0", + "3,16\n\n\n2,0", { "x": 3.25, "d": true }, - "3,14\n\n\n4,1", + "3,14\n\n\n2,1", { "d": true }, - "3,15\n\n\n4,1", + "3,15\n\n\n2,1", { "d": true }, - "3,16\n\n\n4,1" + "3,16\n\n\n2,1" ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 2.25 }, @@ -208,70 +197,69 @@ "c": "#aaaaaa", "w": 2.75 }, - "4,12\n\n\n2,0", + "4,12\n\n\n1,0", { "x": 0.25, "c": "#cccccc" }, - "4,14\n\n\n4,0", + "4,14\n\n\n2,0", "4,15", - "4,16\n\n\n4,0", + "4,16\n\n\n2,0", { "x": 0.25, "c": "#aaaaaa", "w": 1.75 }, - "4,12\n\n\n2,1", - "4,13\n\n\n2,1", + "4,12\n\n\n1,1", + "4,13\n\n\n1,1", { "x": 0.25, "c": "#cccccc", "d": true }, - "4,14\n\n\n4,1", + "4,14\n\n\n2,1", { "x": 1, "d": true }, - "4,16\n\n\n4,1" + "4,16\n\n\n2,1" ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.25 }, - "5,0\n\n\n1,0", + "5,0\n\n\n3,0", { "w": 1.25 }, - "5,1\n\n\n1,0", + "5,1\n\n\n3,0", { "w": 1.25 }, - "5,2\n\n\n1,0", + "5,2\n\n\n3,0", { "c": "#cccccc", "w": 6.25 }, - "5,6\n\n\n1,0", + "5,6\n\n\n3,0", { "c": "#aaaaaa", "w": 1.25 }, - "5,10\n\n\n1,0", + "5,10\n\n\n3,0", { "w": 1.25 }, - "5,11\n\n\n1,0", + "5,11\n\n\n3,0", { "w": 1.25 }, - "5,12\n\n\n1,0", + "5,12\n\n\n3,0", { "w": 1.25 }, - "5,13\n\n\n1,0", + "5,13\n\n\n3,0", { "x": 0.25, "c": "#cccccc" @@ -283,65 +271,65 @@ [ { "y": 0.25, - "x": 2.5, "c": "#aaaaaa", "w": 1.5 }, - "5,0\n\n\n1,1", - "5,1\n\n\n1,1", + "5,0\n\n\n3,1", + "5,1\n\n\n3,1", { "w": 1.5 }, - "5,2\n\n\n1,1", + "5,2\n\n\n3,1", { "c": "#cccccc", "w": 7 }, - "5,6\n\n\n1,1", + "5,6\n\n\n3,1", { "c": "#aaaaaa", "w": 1.5 }, - "5,11\n\n\n1,1", - "5,12\n\n\n1,1", + "5,11\n\n\n3,1", + "5,12\n\n\n3,1", { "w": 1.5 }, - "5,13\n\n\n1,1" + "5,13\n\n\n3,1" ], [ { - "x": 2.5, + "y": 0.25, "w": 1.5 }, - "5,0\n\n\n1,2", + "5,0\n\n\n3,2", { "d": true }, - "5,1\n\n\n1,2", + "5,1\n\n\n3,2", { "w": 1.5 }, - "5,2\n\n\n1,2", + "5,2\n\n\n3,2", { "c": "#cccccc", "w": 7 }, - "5,6\n\n\n1,2", + "5,6\n\n\n3,2", { "c": "#aaaaaa", "w": 1.5 }, - "5,11\n\n\n1,2", + "5,11\n\n\n3,2", { "d": true }, - "5,12\n\n\n1,2", + "5,12\n\n\n3,2", { "w": 1.5 }, - "5,13\n\n\n1,2" + "5,13\n\n\n3,2" ] ] } } +