From 9eb7736a425ba66bda8168d21331b2db0089214c Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 18 Mar 2024 13:03:39 +0000 Subject: [PATCH 01/15] inital commit --- src/melgeek/mj6xy/mj6xy_rev3.json | 347 +++++++++++++++---- v3/melgeek/mj6xy/mj6xy_rev3.json | 550 +++++++++++++++++++++++++----- 2 files changed, 751 insertions(+), 146 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 44ea268972..8be70e2b3d 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -13,26 +13,34 @@ "ISO Enter", [ "Shift Row", - "default", - "Split_lshift_rshift1", - "Split_lshift_rshift2", - "Split_lshift_rshift3", - "Split_lshift_rshift4" + "ANSI Default", + "ANSI Split RShift", + "ANSI Arrows", + "ISO Default", + "ISO Split RShift", + "ISO Arrows", + "2U LShift ANSI Default", + "2U LShift ANSI 2u RShift", + "2U LShift ISO Default", + "2U LShift ISO 2u RShift" ], [ "Bottom row", - "default", - "6.25U_Spc_Arrow", - "6.0U_Spc_Arrow", - "3.0U_Spc_Arrow", - "Split_3.0U_Arrow", - "7.0U_Spc" + "Default", + "6.25U Spacebar Arrows", + "6U Spacebar Arrows", + "Split 6U Spacebar Arrows", + "Tsangan", + "WKL", + "7U HHKB", + "Tsangan Arrows", + "Minila" ] ], "keymap": [ [ { - "x": 2.5, + "c": "#777777" }, "0,0", @@ -65,7 +73,7 @@ ], [ { - "x": 2.5, + "c": "#aaaaaa", "w": 1.5 }, @@ -102,7 +110,7 @@ ], [ { - "x": 2.5, + "c": "#aaaaaa", "w": 1.75 }, @@ -134,7 +142,7 @@ ], [ { - "x": 2.5, + "c": "#aaaaaa", "w": 2.25 }, @@ -160,7 +168,7 @@ ], [ { - "x": 2.5, + "w": 1.25 }, "4,0\n\n\n3,0", @@ -197,12 +205,12 @@ ], [ { - "x": 2.5, + "y": 0.25, + "c": "#aaaaaa", - "w": 1.25 + "w": 2.25 }, "3,0\n\n\n2,1", - "3,1\n\n\n2,1", { "c": "#cccccc" }, @@ -225,7 +233,7 @@ ], [ { - "x": 2.5, + "c": "#aaaaaa", "w": 2.25 }, @@ -243,6 +251,7 @@ "3,9\n\n\n2,2", "3,10\n\n\n2,2", { + "c": "#aaaaaa", "w": 1.75 }, "3,11\n\n\n2,2", @@ -251,14 +260,15 @@ ], [ { - "x": 2.5, + "c": "#aaaaaa", - "w": 2.0 + "w": 1.25 }, "3,0\n\n\n2,3", { "c": "#cccccc" }, + "3,1\n\n\n2,3", "3,2\n\n\n2,3", "3,3\n\n\n2,3", "3,4\n\n\n2,3", @@ -269,20 +279,23 @@ "3,9\n\n\n2,3", "3,10\n\n\n2,3", "3,11\n\n\n2,3", - "3,12\n\n\n2,3", - "3,13\n\n\n2,3", - "3,14\n\n\n2,3" + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13\n\n\n2,3" ], [ { - "x": 2.5, - "c": "#aaaaaa" + + "c": "#aaaaaa", + "w": 1.25 }, "3,0\n\n\n2,4", - "3,1\n\n\n2,4", { "c": "#cccccc" }, + "3,1\n\n\n2,4", "3,2\n\n\n2,4", "3,3\n\n\n2,4", "3,4\n\n\n2,4", @@ -295,14 +308,151 @@ "3,11\n\n\n2,4", { "c": "#aaaaaa", - "w": 2.0 + "w": 1.75 }, "3,12\n\n\n2,4", "3,14\n\n\n2,4" ], [ { - "x": 2.5, + + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,5", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,5", + "3,2\n\n\n2,5", + "3,3\n\n\n2,5", + "3,4\n\n\n2,5", + "3,5\n\n\n2,5", + "3,6\n\n\n2,5", + "3,7\n\n\n2,5", + "3,8\n\n\n2,5", + "3,9\n\n\n2,5", + "3,10\n\n\n2,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,11\n\n\n2,5", + "3,13\n\n\n2,5", + "3,14\n\n\n2,5" + ], + [ + { + + "c": "#aaaaaa", + "w": 2 + }, + "3,0\n\n\n2,6", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,6", + "3,3\n\n\n2,6", + "3,4\n\n\n2,6", + "3,5\n\n\n2,6", + "3,6\n\n\n2,6", + "3,7\n\n\n2,6", + "3,8\n\n\n2,6", + "3,9\n\n\n2,6", + "3,10\n\n\n2,6", + "3,11\n\n\n2,6", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n2,6", + "3,13\n\n\n2,6", + "3,14\n\n\n2,6" + ], + [ + { + + "c": "#aaaaaa", + "w": 2 + }, + "3,0\n\n\n2,7", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,7", + "3,3\n\n\n2,7", + "3,4\n\n\n2,7", + "3,5\n\n\n2,7", + "3,6\n\n\n2,7", + "3,7\n\n\n2,7", + "3,8\n\n\n2,7", + "3,9\n\n\n2,7", + "3,10\n\n\n2,7", + "3,11\n\n\n2,7", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,12\n\n\n2,7", + "3,14\n\n\n2,7" + ], + [ + { + + "c": "#aaaaaa" + }, + "3,0\n\n\n2,8", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,8", + "3,2\n\n\n2,8", + "3,3\n\n\n2,8", + "3,4\n\n\n2,8", + "3,5\n\n\n2,8", + "3,6\n\n\n2,8", + "3,7\n\n\n2,8", + "3,8\n\n\n2,8", + "3,9\n\n\n2,8", + "3,10\n\n\n2,8", + "3,11\n\n\n2,8", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n2,8", + "3,13\n\n\n2,8", + "3,14\n\n\n2,8" + ], + [ + { + + "c": "#aaaaaa" + }, + "3,0\n\n\n2,9", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,9", + "3,2\n\n\n2,9", + "3,3\n\n\n2,9", + "3,4\n\n\n2,9", + "3,5\n\n\n2,9", + "3,6\n\n\n2,9", + "3,7\n\n\n2,9", + "3,8\n\n\n2,9", + "3,9\n\n\n2,9", + "3,10\n\n\n2,9", + "3,11\n\n\n2,9", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,12\n\n\n2,9", + "3,14\n\n\n2,9" + ], + [ + { + "y": 0.25, + "w": 1.25 }, "4,0\n\n\n3,1", @@ -330,7 +480,7 @@ ], [ { - "x": 2.5, + "w": 1.25 }, "4,0\n\n\n3,2", @@ -344,7 +494,7 @@ "4,2\n\n\n3,2", { "c": "#cccccc", - "w": 6.0 + "w": 6 }, "4,5\n\n\n3,2", { @@ -359,8 +509,8 @@ ], [ { - "x": 2.5, - "w": 1.75 + + "w": 1.25 }, "4,0\n\n\n3,3", { @@ -372,22 +522,18 @@ }, "4,2\n\n\n3,3", { - "w": 1.25 + "c": "#cccccc", + "w": 3 }, "4,3\n\n\n3,3", { - "c": "#cccccc", - "w": 3.0 + "w": 3 }, - "4,5\n\n\n3,3", + "4,8\n\n\n3,3", { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n3,3", - { - "w": 1.25 - }, "4,10\n\n\n3,3", "4,11\n\n\n3,3", "4,12\n\n\n3,3", @@ -396,62 +542,139 @@ ], [ { - "x": 2.5, - "w": 1.25 + + "w": 1.5 }, "4,0\n\n\n3,4", - { - "w": 1.25 - }, "4,1\n\n\n3,4", { - "w": 1.25 + "w": 1.5 }, "4,2\n\n\n3,4", { - "c": "#aaaaaa", - "w": 3.0 - }, - "4,3\n\n\n3,4", - { - "w": 3.0 + "c": "#cccccc", + "w": 7 }, - "4,8\n\n\n3,4", + "4,7\n\n\n3,4", { - "w": 1.25 + "c": "#aaaaaa", + "w": 1.5 }, - "4,10\n\n\n3,4", "4,11\n\n\n3,4", "4,12\n\n\n3,4", - "4,13\n\n\n3,4", + { + "w": 1.5 + }, "4,14\n\n\n3,4" ], [ { - "x": 2.5, + "w": 1.5 }, "4,0\n\n\n3,5", - "4,1\n\n\n3,5", { + "x": 1, "w": 1.5 }, "4,2\n\n\n3,5", { "c": "#cccccc", - "w": 7.0 + "w": 7 }, "4,7\n\n\n3,5", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,5", "4,12\n\n\n3,5", { + "x": 1, "w": 1.5 }, "4,14\n\n\n3,5" + ], + [ + { + "x": 1.5 + }, + "4,1\n\n\n3,6", + { + "w": 1.5 + }, + "4,2\n\n\n3,6", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n3,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,6", + "4,12\n\n\n3,6" + ], + [ + { + + "w": 1.5 + }, + "4,0\n\n\n3,7", + "4,1\n\n\n3,7", + { + "w": 1.5 + }, + "4,2\n\n\n3,7", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n3,7", + { + "c": "#aaaaaa" + }, + "4,11\n\n\n3,7", + "4,12\n\n\n3,7", + "4,13\n\n\n3,7", + "4,14\n\n\n3,7" + ], + [ + { + + "w": 1.75 + }, + "4,0\n\n\n3,8", + { + "w": 1.25 + }, + "4,1\n\n\n3,8", + { + "w": 1.25 + }, + "4,2\n\n\n3,8", + { + "w": 1.25 + }, + "4,3\n\n\n3,8", + { + "c": "#cccccc", + "w": 3 + }, + "4,5\n\n\n3,8", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n3,8", + { + "w": 1.25 + }, + "4,10\n\n\n3,8", + "4,11\n\n\n3,8", + "4,12\n\n\n3,8", + "4,13\n\n\n3,8", + "4,14\n\n\n3,8" ] ] } diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 77036f7ac4..64b6b0fd7c 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -11,27 +11,40 @@ "ISO Enter", [ "Shift Row", - "default", - "Split_lshift_rshift1", - "Split_lshift_rshift2", - "Split_lshift_rshift3", - "Split_lshift_rshift4" + "ANSI Default", + "ANSI Split RShift", + "ANSI Arrows", + "ISO Default", + "ISO Split RShift", + "ISO Arrows", + "2U LShift ANSI Default", + "2U LShift ANSI 2u RShift", + "2U LShift ISO Default", + "2U LShift ISO 2u RShift" ], [ "Bottom row", - "default", - "6.25U_Spc_Arrow", - "6.0U_Spc_Arrow", - "3.0U_Spc_Arrow", - "Split_3.0U_Arrow", - "7.0U_Spc" + "Default", + "6.25U Spacebar Arrows", + "6U Spacebar Arrows", + "Split 6U Spacebar Arrows", + "Tsangan", + "WKL", + "7U HHKB", + "Tsangan Arrows", + "Minila" ] ], "keymap": [ [ - {"x": 2.5, "c": "#777777"}, + { + + "c": "#777777" + }, "0,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "0,1", "0,2", "0,3", @@ -44,16 +57,28 @@ "0,10", "0,11", "0,12", - {"c": "#aaaaaa", "w": 2}, + { + "c": "#aaaaaa", + "w": 2 + }, "0,14\n\n\n0,0", - {"x": 0.5, "c": "#cccccc"}, + { + "x": 0.5, + "c": "#cccccc" + }, "0,13\n\n\n0,1", "0,14\n\n\n0,1" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 1.5}, + { + + "c": "#aaaaaa", + "w": 1.5 + }, "1,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "1,1", "1,2", "1,3", @@ -66,7 +91,9 @@ "1,10", "1,11", "1,12", - {"w": 1.5}, + { + "w": 1.5 + }, "1,13\n\n\n1,0", { "x": 1.25, @@ -80,9 +107,15 @@ "2,13\n\n\n1,1" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 1.75}, + { + + "c": "#aaaaaa", + "w": 1.75 + }, "2,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "2,1", "2,2", "2,3", @@ -94,15 +127,27 @@ "2,9", "2,10", "2,11", - {"c": "#777777", "w": 2.25}, + { + "c": "#777777", + "w": 2.25 + }, "2,13\n\n\n1,0", - {"x": 0.25, "c": "#cccccc"}, + { + "x": 0.25, + "c": "#cccccc" + }, "2,12\n\n\n1,1" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 2.25}, + { + + "c": "#aaaaaa", + "w": 2.25 + }, "3,0\n\n\n2,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2\n\n\n2,0", "3,3\n\n\n2,0", "3,4\n\n\n2,0", @@ -113,32 +158,60 @@ "3,9\n\n\n2,0", "3,10\n\n\n2,0", "3,11\n\n\n2,0", - {"c": "#aaaaaa", "w": 2.75}, + { + "c": "#aaaaaa", + "w": 2.75 + }, "3,13\n\n\n2,0" ], [ - {"x": 2.5, "w": 1.25}, + { + + "w": 1.25 + }, "4,0\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,0", - {"c": "#cccccc", "w": 6.25}, + { + "c": "#cccccc", + "w": 6.25 + }, "4,5\n\n\n3,0", - {"c": "#aaaaaa", "w": 1.25}, + { + "c": "#aaaaaa", + "w": 1.25 + }, "4,10\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,11\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,12\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,14\n\n\n3,0" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 1.25}, + { + "y": 0.25, + + "c": "#aaaaaa", + "w": 2.25 + }, "3,0\n\n\n2,1", - "3,1\n\n\n2,1", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2\n\n\n2,1", "3,3\n\n\n2,1", "3,4\n\n\n2,1", @@ -149,14 +222,23 @@ "3,9\n\n\n2,1", "3,10\n\n\n2,1", "3,11\n\n\n2,1", - {"c": "#aaaaaa", "w": 1.75}, + { + "c": "#aaaaaa", + "w": 1.75 + }, "3,12\n\n\n2,1", "3,14\n\n\n2,1" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 2.25}, + { + + "c": "#aaaaaa", + "w": 2.25 + }, "3,0\n\n\n2,2", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2\n\n\n2,2", "3,3\n\n\n2,2", "3,4\n\n\n2,2", @@ -166,15 +248,25 @@ "3,8\n\n\n2,2", "3,9\n\n\n2,2", "3,10\n\n\n2,2", - {"w": 1.75}, + { + "c": "#aaaaaa", + "w": 1.75 + }, "3,11\n\n\n2,2", "3,13\n\n\n2,2", "3,14\n\n\n2,2" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 2}, + { + + "c": "#aaaaaa", + "w": 1.25 + }, "3,0\n\n\n2,3", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, + "3,1\n\n\n2,3", "3,2\n\n\n2,3", "3,3\n\n\n2,3", "3,4\n\n\n2,3", @@ -185,15 +277,23 @@ "3,9\n\n\n2,3", "3,10\n\n\n2,3", "3,11\n\n\n2,3", - "3,12\n\n\n2,3", - "3,13\n\n\n2,3", - "3,14\n\n\n2,3" + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13\n\n\n2,3" ], [ - {"x": 2.5, "c": "#aaaaaa"}, + { + + "c": "#aaaaaa", + "w": 1.25 + }, "3,0\n\n\n2,4", + { + "c": "#cccccc" + }, "3,1\n\n\n2,4", - {"c": "#cccccc"}, "3,2\n\n\n2,4", "3,3\n\n\n2,4", "3,4\n\n\n2,4", @@ -204,20 +304,172 @@ "3,9\n\n\n2,4", "3,10\n\n\n2,4", "3,11\n\n\n2,4", - {"c": "#aaaaaa", "w": 2}, + { + "c": "#aaaaaa", + "w": 1.75 + }, "3,12\n\n\n2,4", "3,14\n\n\n2,4" ], [ - {"x": 2.5, "w": 1.25}, + { + + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,5", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,5", + "3,2\n\n\n2,5", + "3,3\n\n\n2,5", + "3,4\n\n\n2,5", + "3,5\n\n\n2,5", + "3,6\n\n\n2,5", + "3,7\n\n\n2,5", + "3,8\n\n\n2,5", + "3,9\n\n\n2,5", + "3,10\n\n\n2,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,11\n\n\n2,5", + "3,13\n\n\n2,5", + "3,14\n\n\n2,5" + ], + [ + { + + "c": "#aaaaaa", + "w": 2 + }, + "3,0\n\n\n2,6", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,6", + "3,3\n\n\n2,6", + "3,4\n\n\n2,6", + "3,5\n\n\n2,6", + "3,6\n\n\n2,6", + "3,7\n\n\n2,6", + "3,8\n\n\n2,6", + "3,9\n\n\n2,6", + "3,10\n\n\n2,6", + "3,11\n\n\n2,6", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n2,6", + "3,13\n\n\n2,6", + "3,14\n\n\n2,6" + ], + [ + { + + "c": "#aaaaaa", + "w": 2 + }, + "3,0\n\n\n2,7", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,7", + "3,3\n\n\n2,7", + "3,4\n\n\n2,7", + "3,5\n\n\n2,7", + "3,6\n\n\n2,7", + "3,7\n\n\n2,7", + "3,8\n\n\n2,7", + "3,9\n\n\n2,7", + "3,10\n\n\n2,7", + "3,11\n\n\n2,7", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,12\n\n\n2,7", + "3,14\n\n\n2,7" + ], + [ + { + + "c": "#aaaaaa" + }, + "3,0\n\n\n2,8", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,8", + "3,2\n\n\n2,8", + "3,3\n\n\n2,8", + "3,4\n\n\n2,8", + "3,5\n\n\n2,8", + "3,6\n\n\n2,8", + "3,7\n\n\n2,8", + "3,8\n\n\n2,8", + "3,9\n\n\n2,8", + "3,10\n\n\n2,8", + "3,11\n\n\n2,8", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n2,8", + "3,13\n\n\n2,8", + "3,14\n\n\n2,8" + ], + [ + { + + "c": "#aaaaaa" + }, + "3,0\n\n\n2,9", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,9", + "3,2\n\n\n2,9", + "3,3\n\n\n2,9", + "3,4\n\n\n2,9", + "3,5\n\n\n2,9", + "3,6\n\n\n2,9", + "3,7\n\n\n2,9", + "3,8\n\n\n2,9", + "3,9\n\n\n2,9", + "3,10\n\n\n2,9", + "3,11\n\n\n2,9", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,12\n\n\n2,9", + "3,14\n\n\n2,9" + ], + [ + { + "y": 0.25, + + "w": 1.25 + }, "4,0\n\n\n3,1", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,1", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,1", - {"c": "#cccccc", "w": 6.25}, + { + "c": "#cccccc", + "w": 6.25 + }, "4,5\n\n\n3,1", - {"c": "#aaaaaa"}, + { + "c": "#aaaaaa" + }, "4,10\n\n\n3,1", "4,11\n\n\n3,1", "4,12\n\n\n3,1", @@ -225,15 +477,28 @@ "4,14\n\n\n3,1" ], [ - {"x": 2.5, "w": 1.25}, + { + + "w": 1.25 + }, "4,0\n\n\n3,2", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,2", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,2", - {"c": "#cccccc", "w": 6}, + { + "c": "#cccccc", + "w": 6 + }, "4,5\n\n\n3,2", - {"c": "#aaaaaa", "w": 1.25}, + { + "c": "#aaaaaa", + "w": 1.25 + }, "4,10\n\n\n3,2", "4,11\n\n\n3,2", "4,12\n\n\n3,2", @@ -241,19 +506,32 @@ "4,14\n\n\n3,2" ], [ - {"x": 2.5, "w": 1.75}, + { + + "w": 1.25 + }, "4,0\n\n\n3,3", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,3", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,3", - {"w": 1.25}, + { + "c": "#cccccc", + "w": 3 + }, "4,3\n\n\n3,3", - {"c": "#cccccc", "w": 3}, - "4,5\n\n\n3,3", - {"c": "#aaaaaa", "w": 1.25}, - "4,9\n\n\n3,3", - {"w": 1.25}, + { + "w": 3 + }, + "4,8\n\n\n3,3", + { + "c": "#aaaaaa", + "w": 1.25 + }, "4,10\n\n\n3,3", "4,11\n\n\n3,3", "4,12\n\n\n3,3", @@ -261,36 +539,140 @@ "4,14\n\n\n3,3" ], [ - {"x": 2.5, "w": 1.25}, + { + + "w": 1.5 + }, "4,0\n\n\n3,4", - {"w": 1.25}, "4,1\n\n\n3,4", - {"w": 1.25}, + { + "w": 1.5 + }, "4,2\n\n\n3,4", - {"c": "#aaaaaa", "w": 3}, - "4,3\n\n\n3,4", - {"w": 3}, - "4,8\n\n\n3,4", - {"w": 1.25}, - "4,10\n\n\n3,4", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n3,4", + { + "c": "#aaaaaa", + "w": 1.5 + }, "4,11\n\n\n3,4", "4,12\n\n\n3,4", - "4,13\n\n\n3,4", + { + "w": 1.5 + }, "4,14\n\n\n3,4" ], [ - {"x": 2.5, "w": 1.5}, + { + + "w": 1.5 + }, "4,0\n\n\n3,5", - "4,1\n\n\n3,5", - {"w": 1.5}, + { + "x": 1, + "w": 1.5 + }, "4,2\n\n\n3,5", - {"c": "#cccccc", "w": 7}, + { + "c": "#cccccc", + "w": 7 + }, "4,7\n\n\n3,5", - {"c": "#aaaaaa", "w": 1.5}, - "4,11\n\n\n3,5", + { + "c": "#aaaaaa", + "w": 1.5 + }, "4,12\n\n\n3,5", - {"w": 1.5}, + { + "x": 1, + "w": 1.5 + }, "4,14\n\n\n3,5" + ], + [ + { + "x": 1.5 + }, + "4,1\n\n\n3,6", + { + "w": 1.5 + }, + "4,2\n\n\n3,6", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n3,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,6", + "4,12\n\n\n3,6" + ], + [ + { + + "w": 1.5 + }, + "4,0\n\n\n3,7", + "4,1\n\n\n3,7", + { + "w": 1.5 + }, + "4,2\n\n\n3,7", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n3,7", + { + "c": "#aaaaaa" + }, + "4,11\n\n\n3,7", + "4,12\n\n\n3,7", + "4,13\n\n\n3,7", + "4,14\n\n\n3,7" + ], + [ + { + + "w": 1.75 + }, + "4,0\n\n\n3,8", + { + "w": 1.25 + }, + "4,1\n\n\n3,8", + { + "w": 1.25 + }, + "4,2\n\n\n3,8", + { + "w": 1.25 + }, + "4,3\n\n\n3,8", + { + "c": "#cccccc", + "w": 3 + }, + "4,5\n\n\n3,8", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n3,8", + { + "w": 1.25 + }, + "4,10\n\n\n3,8", + "4,11\n\n\n3,8", + "4,12\n\n\n3,8", + "4,13\n\n\n3,8", + "4,14\n\n\n3,8" ] ] } From d8afe91e88f3d0d5ad43c74ff257c39b3fa16511 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 18 Mar 2024 13:13:00 +0000 Subject: [PATCH 02/15] remove whitespace --- src/melgeek/mj6xy/mj6xy_rev3.json | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 8be70e2b3d..6feddbd7d6 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -73,7 +73,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.5 }, @@ -110,7 +109,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.75 }, @@ -142,7 +140,6 @@ ], [ { - "c": "#aaaaaa", "w": 2.25 }, @@ -206,7 +203,6 @@ [ { "y": 0.25, - "c": "#aaaaaa", "w": 2.25 }, @@ -233,7 +229,6 @@ ], [ { - "c": "#aaaaaa", "w": 2.25 }, @@ -260,7 +255,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.25 }, @@ -287,7 +281,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.25 }, @@ -315,7 +308,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.25 }, @@ -343,7 +335,6 @@ ], [ { - "c": "#aaaaaa", "w": 2 }, @@ -370,7 +361,6 @@ ], [ { - "c": "#aaaaaa", "w": 2 }, @@ -397,7 +387,6 @@ ], [ { - "c": "#aaaaaa" }, "3,0\n\n\n2,8", @@ -424,7 +413,6 @@ ], [ { - "c": "#aaaaaa" }, "3,0\n\n\n2,9", @@ -452,7 +440,6 @@ [ { "y": 0.25, - "w": 1.25 }, "4,0\n\n\n3,1", @@ -480,7 +467,6 @@ ], [ { - "w": 1.25 }, "4,0\n\n\n3,2", @@ -509,7 +495,6 @@ ], [ { - "w": 1.25 }, "4,0\n\n\n3,3", @@ -542,7 +527,6 @@ ], [ { - "w": 1.5 }, "4,0\n\n\n3,4", @@ -569,7 +553,6 @@ ], [ { - "w": 1.5 }, "4,0\n\n\n3,5", @@ -617,7 +600,6 @@ ], [ { - "w": 1.5 }, "4,0\n\n\n3,7", @@ -641,7 +623,6 @@ ], [ { - "w": 1.75 }, "4,0\n\n\n3,8", From 536ac564c9b3e436b7b584875a1c4ac3aedf8b84 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 18 Mar 2024 13:14:46 +0000 Subject: [PATCH 03/15] more whitespace removal --- v3/melgeek/mj6xy/mj6xy_rev3.json | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 64b6b0fd7c..626a1ed9ff 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -38,7 +38,6 @@ "keymap": [ [ { - "c": "#777777" }, "0,0", @@ -71,7 +70,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.5 }, @@ -108,7 +106,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.75 }, @@ -140,7 +137,6 @@ ], [ { - "c": "#aaaaaa", "w": 2.25 }, @@ -166,7 +162,6 @@ ], [ { - "w": 1.25 }, "4,0\n\n\n3,0", @@ -231,7 +226,6 @@ ], [ { - "c": "#aaaaaa", "w": 2.25 }, @@ -258,7 +252,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.25 }, @@ -285,7 +278,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.25 }, @@ -313,7 +305,6 @@ ], [ { - "c": "#aaaaaa", "w": 1.25 }, @@ -341,7 +332,6 @@ ], [ { - "c": "#aaaaaa", "w": 2 }, @@ -368,7 +358,6 @@ ], [ { - "c": "#aaaaaa", "w": 2 }, @@ -395,7 +384,6 @@ ], [ { - "c": "#aaaaaa" }, "3,0\n\n\n2,8", @@ -422,7 +410,6 @@ ], [ { - "c": "#aaaaaa" }, "3,0\n\n\n2,9", @@ -478,7 +465,6 @@ ], [ { - "w": 1.25 }, "4,0\n\n\n3,2", @@ -507,7 +493,6 @@ ], [ { - "w": 1.25 }, "4,0\n\n\n3,3", @@ -540,7 +525,6 @@ ], [ { - "w": 1.5 }, "4,0\n\n\n3,4", @@ -567,7 +551,6 @@ ], [ { - "w": 1.5 }, "4,0\n\n\n3,5", @@ -615,7 +598,6 @@ ], [ { - "w": 1.5 }, "4,0\n\n\n3,7", @@ -639,7 +621,6 @@ ], [ { - "w": 1.75 }, "4,0\n\n\n3,8", From b34121603c7f3c8a10776e9d3004b1c6a56e7ece Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 18 Mar 2024 13:16:17 +0000 Subject: [PATCH 04/15] update mj6xy_rev3.json --- src/melgeek/mj6xy/mj6xy_rev3.json | 2 -- v3/melgeek/mj6xy/mj6xy_rev3.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 6feddbd7d6..23eb133a58 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -40,7 +40,6 @@ "keymap": [ [ { - "c": "#777777" }, "0,0", @@ -165,7 +164,6 @@ ], [ { - "w": 1.25 }, "4,0\n\n\n3,0", diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 626a1ed9ff..3b9140c394 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -199,7 +199,6 @@ [ { "y": 0.25, - "c": "#aaaaaa", "w": 2.25 }, @@ -437,7 +436,6 @@ [ { "y": 0.25, - "w": 1.25 }, "4,0\n\n\n3,1", From 2bc2a01f2ebe4c5e83951c38f2f438bb52e6b235 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 28 Mar 2024 11:52:55 +0000 Subject: [PATCH 05/15] add Stepped Caps lock --- src/melgeek/mj6xy/mj6xy_rev3.json | 454 ++++++++++++++++-------------- v3/melgeek/mj6xy/mj6xy_rev3.json | 454 ++++++++++++++++-------------- 2 files changed, 482 insertions(+), 426 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 23eb133a58..193ad5275b 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -10,6 +10,7 @@ "layouts": { "labels": [ "Split Backspace", + "Stepped", "ISO Enter", [ "Shift Row", @@ -40,6 +41,7 @@ "keymap": [ [ { + "x": 2, "c": "#777777" }, "0,0", @@ -72,6 +74,7 @@ ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.5 }, @@ -94,7 +97,7 @@ { "w": 1.5 }, - "1,13\n\n\n1,0", + "1,13\n\n\n2,0", { "x": 1.25, "c": "#777777", @@ -104,14 +107,21 @@ "h2": 1, "x2": -0.25 }, - "2,13\n\n\n1,1" + "2,13\n\n\n2,1" ], [ { "c": "#aaaaaa", + "w": 1.25, + "w2": 1.75, + "l": true + }, + "2,0\n\n\n1,1", + { + "x": 0.75, "w": 1.75 }, - "2,0", + "2,0\n\n\n1,0", { "c": "#cccccc" }, @@ -130,530 +140,548 @@ "c": "#777777", "w": 2.25 }, - "2,13\n\n\n1,0", + "2,13\n\n\n2,0", { "x": 0.25, "c": "#cccccc" }, - "2,12\n\n\n1,1" + "2,12\n\n\n2,1" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,0", + "3,0\n\n\n3,0", { "c": "#cccccc" }, - "3,2\n\n\n2,0", - "3,3\n\n\n2,0", - "3,4\n\n\n2,0", - "3,5\n\n\n2,0", - "3,6\n\n\n2,0", - "3,7\n\n\n2,0", - "3,8\n\n\n2,0", - "3,9\n\n\n2,0", - "3,10\n\n\n2,0", - "3,11\n\n\n2,0", + "3,2\n\n\n3,0", + "3,3\n\n\n3,0", + "3,4\n\n\n3,0", + "3,5\n\n\n3,0", + "3,6\n\n\n3,0", + "3,7\n\n\n3,0", + "3,8\n\n\n3,0", + "3,9\n\n\n3,0", + "3,10\n\n\n3,0", + "3,11\n\n\n3,0", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n2,0" + "3,13\n\n\n3,0" ], [ { + "x": 2, "w": 1.25 }, - "4,0\n\n\n3,0", + "4,0\n\n\n4,0", { "w": 1.25 }, - "4,1\n\n\n3,0", + "4,1\n\n\n4,0", { "w": 1.25 }, - "4,2\n\n\n3,0", + "4,2\n\n\n4,0", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n3,0", + "4,5\n\n\n4,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,0", + "4,10\n\n\n4,0", { "w": 1.25 }, - "4,11\n\n\n3,0", + "4,11\n\n\n4,0", { "w": 1.25 }, - "4,12\n\n\n3,0", + "4,12\n\n\n4,0", { "w": 1.25 }, - "4,14\n\n\n3,0" + "4,14\n\n\n4,0" ], [ { + "x": 2, "y": 0.25, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,1", + "3,0\n\n\n3,1", { "c": "#cccccc" }, - "3,2\n\n\n2,1", - "3,3\n\n\n2,1", - "3,4\n\n\n2,1", - "3,5\n\n\n2,1", - "3,6\n\n\n2,1", - "3,7\n\n\n2,1", - "3,8\n\n\n2,1", - "3,9\n\n\n2,1", - "3,10\n\n\n2,1", - "3,11\n\n\n2,1", + "3,2\n\n\n3,1", + "3,3\n\n\n3,1", + "3,4\n\n\n3,1", + "3,5\n\n\n3,1", + "3,6\n\n\n3,1", + "3,7\n\n\n3,1", + "3,8\n\n\n3,1", + "3,9\n\n\n3,1", + "3,10\n\n\n3,1", + "3,11\n\n\n3,1", { "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n2,1", - "3,14\n\n\n2,1" + "3,12\n\n\n3,1", + "3,14\n\n\n3,1" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,2", + "3,0\n\n\n3,2", { "c": "#cccccc" }, - "3,2\n\n\n2,2", - "3,3\n\n\n2,2", - "3,4\n\n\n2,2", - "3,5\n\n\n2,2", - "3,6\n\n\n2,2", - "3,7\n\n\n2,2", - "3,8\n\n\n2,2", - "3,9\n\n\n2,2", - "3,10\n\n\n2,2", + "3,2\n\n\n3,2", + "3,3\n\n\n3,2", + "3,4\n\n\n3,2", + "3,5\n\n\n3,2", + "3,6\n\n\n3,2", + "3,7\n\n\n3,2", + "3,8\n\n\n3,2", + "3,9\n\n\n3,2", + "3,10\n\n\n3,2", { "c": "#aaaaaa", "w": 1.75 }, - "3,11\n\n\n2,2", - "3,13\n\n\n2,2", - "3,14\n\n\n2,2" + "3,11\n\n\n3,2", + "3,13\n\n\n3,2", + "3,14\n\n\n3,2" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,3", + "3,0\n\n\n3,3", { "c": "#cccccc" }, - "3,1\n\n\n2,3", - "3,2\n\n\n2,3", - "3,3\n\n\n2,3", - "3,4\n\n\n2,3", - "3,5\n\n\n2,3", - "3,6\n\n\n2,3", - "3,7\n\n\n2,3", - "3,8\n\n\n2,3", - "3,9\n\n\n2,3", - "3,10\n\n\n2,3", - "3,11\n\n\n2,3", + "3,1\n\n\n3,3", + "3,2\n\n\n3,3", + "3,3\n\n\n3,3", + "3,4\n\n\n3,3", + "3,5\n\n\n3,3", + "3,6\n\n\n3,3", + "3,7\n\n\n3,3", + "3,8\n\n\n3,3", + "3,9\n\n\n3,3", + "3,10\n\n\n3,3", + "3,11\n\n\n3,3", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n2,3" + "3,13\n\n\n3,3" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,4", + "3,0\n\n\n3,4", { "c": "#cccccc" }, - "3,1\n\n\n2,4", - "3,2\n\n\n2,4", - "3,3\n\n\n2,4", - "3,4\n\n\n2,4", - "3,5\n\n\n2,4", - "3,6\n\n\n2,4", - "3,7\n\n\n2,4", - "3,8\n\n\n2,4", - "3,9\n\n\n2,4", - "3,10\n\n\n2,4", - "3,11\n\n\n2,4", + "3,1\n\n\n3,4", + "3,2\n\n\n3,4", + "3,3\n\n\n3,4", + "3,4\n\n\n3,4", + "3,5\n\n\n3,4", + "3,6\n\n\n3,4", + "3,7\n\n\n3,4", + "3,8\n\n\n3,4", + "3,9\n\n\n3,4", + "3,10\n\n\n3,4", + "3,11\n\n\n3,4", { "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n2,4", - "3,14\n\n\n2,4" + "3,12\n\n\n3,4", + "3,14\n\n\n3,4" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,5", + "3,0\n\n\n3,5", { "c": "#cccccc" }, - "3,1\n\n\n2,5", - "3,2\n\n\n2,5", - "3,3\n\n\n2,5", - "3,4\n\n\n2,5", - "3,5\n\n\n2,5", - "3,6\n\n\n2,5", - "3,7\n\n\n2,5", - "3,8\n\n\n2,5", - "3,9\n\n\n2,5", - "3,10\n\n\n2,5", + "3,1\n\n\n3,5", + "3,2\n\n\n3,5", + "3,3\n\n\n3,5", + "3,4\n\n\n3,5", + "3,5\n\n\n3,5", + "3,6\n\n\n3,5", + "3,7\n\n\n3,5", + "3,8\n\n\n3,5", + "3,9\n\n\n3,5", + "3,10\n\n\n3,5", { "c": "#aaaaaa", "w": 1.75 }, - "3,11\n\n\n2,5", - "3,13\n\n\n2,5", - "3,14\n\n\n2,5" + "3,11\n\n\n3,5", + "3,13\n\n\n3,5", + "3,14\n\n\n3,5" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2 }, - "3,0\n\n\n2,6", + "3,0\n\n\n3,6", { "c": "#cccccc" }, - "3,2\n\n\n2,6", - "3,3\n\n\n2,6", - "3,4\n\n\n2,6", - "3,5\n\n\n2,6", - "3,6\n\n\n2,6", - "3,7\n\n\n2,6", - "3,8\n\n\n2,6", - "3,9\n\n\n2,6", - "3,10\n\n\n2,6", - "3,11\n\n\n2,6", + "3,2\n\n\n3,6", + "3,3\n\n\n3,6", + "3,4\n\n\n3,6", + "3,5\n\n\n3,6", + "3,6\n\n\n3,6", + "3,7\n\n\n3,6", + "3,8\n\n\n3,6", + "3,9\n\n\n3,6", + "3,10\n\n\n3,6", + "3,11\n\n\n3,6", { "c": "#aaaaaa" }, - "3,12\n\n\n2,6", - "3,13\n\n\n2,6", - "3,14\n\n\n2,6" + "3,12\n\n\n3,6", + "3,13\n\n\n3,6", + "3,14\n\n\n3,6" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2 }, - "3,0\n\n\n2,7", + "3,0\n\n\n3,7", { "c": "#cccccc" }, - "3,2\n\n\n2,7", - "3,3\n\n\n2,7", - "3,4\n\n\n2,7", - "3,5\n\n\n2,7", - "3,6\n\n\n2,7", - "3,7\n\n\n2,7", - "3,8\n\n\n2,7", - "3,9\n\n\n2,7", - "3,10\n\n\n2,7", - "3,11\n\n\n2,7", + "3,2\n\n\n3,7", + "3,3\n\n\n3,7", + "3,4\n\n\n3,7", + "3,5\n\n\n3,7", + "3,6\n\n\n3,7", + "3,7\n\n\n3,7", + "3,8\n\n\n3,7", + "3,9\n\n\n3,7", + "3,10\n\n\n3,7", + "3,11\n\n\n3,7", { "c": "#aaaaaa", "w": 2 }, - "3,12\n\n\n2,7", - "3,14\n\n\n2,7" + "3,12\n\n\n3,7", + "3,14\n\n\n3,7" ], [ { + "x": 2, "c": "#aaaaaa" }, - "3,0\n\n\n2,8", + "3,0\n\n\n3,8", { "c": "#cccccc" }, - "3,1\n\n\n2,8", - "3,2\n\n\n2,8", - "3,3\n\n\n2,8", - "3,4\n\n\n2,8", - "3,5\n\n\n2,8", - "3,6\n\n\n2,8", - "3,7\n\n\n2,8", - "3,8\n\n\n2,8", - "3,9\n\n\n2,8", - "3,10\n\n\n2,8", - "3,11\n\n\n2,8", + "3,1\n\n\n3,8", + "3,2\n\n\n3,8", + "3,3\n\n\n3,8", + "3,4\n\n\n3,8", + "3,5\n\n\n3,8", + "3,6\n\n\n3,8", + "3,7\n\n\n3,8", + "3,8\n\n\n3,8", + "3,9\n\n\n3,8", + "3,10\n\n\n3,8", + "3,11\n\n\n3,8", { "c": "#aaaaaa" }, - "3,12\n\n\n2,8", - "3,13\n\n\n2,8", - "3,14\n\n\n2,8" + "3,12\n\n\n3,8", + "3,13\n\n\n3,8", + "3,14\n\n\n3,8" ], [ { + "x": 2, "c": "#aaaaaa" }, - "3,0\n\n\n2,9", + "3,0\n\n\n3,9", { "c": "#cccccc" }, - "3,1\n\n\n2,9", - "3,2\n\n\n2,9", - "3,3\n\n\n2,9", - "3,4\n\n\n2,9", - "3,5\n\n\n2,9", - "3,6\n\n\n2,9", - "3,7\n\n\n2,9", - "3,8\n\n\n2,9", - "3,9\n\n\n2,9", - "3,10\n\n\n2,9", - "3,11\n\n\n2,9", + "3,1\n\n\n3,9", + "3,2\n\n\n3,9", + "3,3\n\n\n3,9", + "3,4\n\n\n3,9", + "3,5\n\n\n3,9", + "3,6\n\n\n3,9", + "3,7\n\n\n3,9", + "3,8\n\n\n3,9", + "3,9\n\n\n3,9", + "3,10\n\n\n3,9", + "3,11\n\n\n3,9", { "c": "#aaaaaa", "w": 2 }, - "3,12\n\n\n2,9", - "3,14\n\n\n2,9" + "3,12\n\n\n3,9", + "3,14\n\n\n3,9" ], [ { + "x": 2, "y": 0.25, "w": 1.25 }, - "4,0\n\n\n3,1", + "4,0\n\n\n4,1", { "w": 1.25 }, - "4,1\n\n\n3,1", + "4,1\n\n\n4,1", { "w": 1.25 }, - "4,2\n\n\n3,1", + "4,2\n\n\n4,1", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n3,1", + "4,5\n\n\n4,1", { "c": "#aaaaaa" }, - "4,10\n\n\n3,1", - "4,11\n\n\n3,1", - "4,12\n\n\n3,1", - "4,13\n\n\n3,1", - "4,14\n\n\n3,1" + "4,10\n\n\n4,1", + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", + "4,13\n\n\n4,1", + "4,14\n\n\n4,1" ], [ { + "x": 2, "w": 1.25 }, - "4,0\n\n\n3,2", + "4,0\n\n\n4,2", { "w": 1.25 }, - "4,1\n\n\n3,2", + "4,1\n\n\n4,2", { "w": 1.25 }, - "4,2\n\n\n3,2", + "4,2\n\n\n4,2", { "c": "#cccccc", "w": 6 }, - "4,5\n\n\n3,2", + "4,5\n\n\n4,2", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,2", - "4,11\n\n\n3,2", - "4,12\n\n\n3,2", - "4,13\n\n\n3,2", - "4,14\n\n\n3,2" + "4,10\n\n\n4,2", + "4,11\n\n\n4,2", + "4,12\n\n\n4,2", + "4,13\n\n\n4,2", + "4,14\n\n\n4,2" ], [ { + "x": 2, "w": 1.25 }, - "4,0\n\n\n3,3", + "4,0\n\n\n4,3", { "w": 1.25 }, - "4,1\n\n\n3,3", + "4,1\n\n\n4,3", { "w": 1.25 }, - "4,2\n\n\n3,3", + "4,2\n\n\n4,3", { "c": "#cccccc", "w": 3 }, - "4,3\n\n\n3,3", + "4,3\n\n\n4,3", { "w": 3 }, - "4,8\n\n\n3,3", + "4,8\n\n\n4,3", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,3", - "4,11\n\n\n3,3", - "4,12\n\n\n3,3", - "4,13\n\n\n3,3", - "4,14\n\n\n3,3" + "4,10\n\n\n4,3", + "4,11\n\n\n4,3", + "4,12\n\n\n4,3", + "4,13\n\n\n4,3", + "4,14\n\n\n4,3" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,4", - "4,1\n\n\n3,4", + "4,0\n\n\n4,4", + "4,1\n\n\n4,4", { "w": 1.5 }, - "4,2\n\n\n3,4", + "4,2\n\n\n4,4", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,4", + "4,7\n\n\n4,4", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,4", - "4,12\n\n\n3,4", + "4,11\n\n\n4,4", + "4,12\n\n\n4,4", { "w": 1.5 }, - "4,14\n\n\n3,4" + "4,14\n\n\n4,4" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,5", + "4,0\n\n\n4,5", { "x": 1, "w": 1.5 }, - "4,2\n\n\n3,5", + "4,2\n\n\n4,5", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,5", + "4,7\n\n\n4,5", { "c": "#aaaaaa", "w": 1.5 }, - "4,12\n\n\n3,5", + "4,12\n\n\n4,5", { "x": 1, "w": 1.5 }, - "4,14\n\n\n3,5" + "4,14\n\n\n4,5" ], [ { - "x": 1.5 + "x": 3.5 }, - "4,1\n\n\n3,6", + "4,1\n\n\n4,6", { "w": 1.5 }, - "4,2\n\n\n3,6", + "4,2\n\n\n4,6", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,6", + "4,7\n\n\n4,6", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,6", - "4,12\n\n\n3,6" + "4,11\n\n\n4,6", + "4,12\n\n\n4,6" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,7", - "4,1\n\n\n3,7", + "4,0\n\n\n4,7", + "4,1\n\n\n4,7", { "w": 1.5 }, - "4,2\n\n\n3,7", + "4,2\n\n\n4,7", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,7", + "4,7\n\n\n4,7", { "c": "#aaaaaa" }, - "4,11\n\n\n3,7", - "4,12\n\n\n3,7", - "4,13\n\n\n3,7", - "4,14\n\n\n3,7" + "4,11\n\n\n4,7", + "4,12\n\n\n4,7", + "4,13\n\n\n4,7", + "4,14\n\n\n4,7" ], [ { + "x": 2, "w": 1.75 }, - "4,0\n\n\n3,8", + "4,0\n\n\n4,8", { "w": 1.25 }, - "4,1\n\n\n3,8", + "4,1\n\n\n4,8", { "w": 1.25 }, - "4,2\n\n\n3,8", + "4,2\n\n\n4,8", { "w": 1.25 }, - "4,3\n\n\n3,8", + "4,3\n\n\n4,8", { "c": "#cccccc", "w": 3 }, - "4,5\n\n\n3,8", + "4,5\n\n\n4,8", { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n3,8", + "4,9\n\n\n4,8", { "w": 1.25 }, - "4,10\n\n\n3,8", - "4,11\n\n\n3,8", - "4,12\n\n\n3,8", - "4,13\n\n\n3,8", - "4,14\n\n\n3,8" + "4,10\n\n\n4,8", + "4,11\n\n\n4,8", + "4,12\n\n\n4,8", + "4,13\n\n\n4,8", + "4,14\n\n\n4,8" ] ] } diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 3b9140c394..cc9a0d30dc 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -8,6 +8,7 @@ "layouts": { "labels": [ "Split Backspace", + "Stepped", "ISO Enter", [ "Shift Row", @@ -38,6 +39,7 @@ "keymap": [ [ { + "x": 2, "c": "#777777" }, "0,0", @@ -70,6 +72,7 @@ ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.5 }, @@ -92,7 +95,7 @@ { "w": 1.5 }, - "1,13\n\n\n1,0", + "1,13\n\n\n2,0", { "x": 1.25, "c": "#777777", @@ -102,14 +105,21 @@ "h2": 1, "x2": -0.25 }, - "2,13\n\n\n1,1" + "2,13\n\n\n2,1" ], [ { "c": "#aaaaaa", + "w": 1.25, + "w2": 1.75, + "l": true + }, + "2,0\n\n\n1,1", + { + "x": 0.75, "w": 1.75 }, - "2,0", + "2,0\n\n\n1,0", { "c": "#cccccc" }, @@ -128,530 +138,548 @@ "c": "#777777", "w": 2.25 }, - "2,13\n\n\n1,0", + "2,13\n\n\n2,0", { "x": 0.25, "c": "#cccccc" }, - "2,12\n\n\n1,1" + "2,12\n\n\n2,1" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,0", + "3,0\n\n\n3,0", { "c": "#cccccc" }, - "3,2\n\n\n2,0", - "3,3\n\n\n2,0", - "3,4\n\n\n2,0", - "3,5\n\n\n2,0", - "3,6\n\n\n2,0", - "3,7\n\n\n2,0", - "3,8\n\n\n2,0", - "3,9\n\n\n2,0", - "3,10\n\n\n2,0", - "3,11\n\n\n2,0", + "3,2\n\n\n3,0", + "3,3\n\n\n3,0", + "3,4\n\n\n3,0", + "3,5\n\n\n3,0", + "3,6\n\n\n3,0", + "3,7\n\n\n3,0", + "3,8\n\n\n3,0", + "3,9\n\n\n3,0", + "3,10\n\n\n3,0", + "3,11\n\n\n3,0", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n2,0" + "3,13\n\n\n3,0" ], [ { + "x": 2, "w": 1.25 }, - "4,0\n\n\n3,0", + "4,0\n\n\n4,0", { "w": 1.25 }, - "4,1\n\n\n3,0", + "4,1\n\n\n4,0", { "w": 1.25 }, - "4,2\n\n\n3,0", + "4,2\n\n\n4,0", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n3,0", + "4,5\n\n\n4,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,0", + "4,10\n\n\n4,0", { "w": 1.25 }, - "4,11\n\n\n3,0", + "4,11\n\n\n4,0", { "w": 1.25 }, - "4,12\n\n\n3,0", + "4,12\n\n\n4,0", { "w": 1.25 }, - "4,14\n\n\n3,0" + "4,14\n\n\n4,0" ], [ { + "x": 2, "y": 0.25, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,1", + "3,0\n\n\n3,1", { "c": "#cccccc" }, - "3,2\n\n\n2,1", - "3,3\n\n\n2,1", - "3,4\n\n\n2,1", - "3,5\n\n\n2,1", - "3,6\n\n\n2,1", - "3,7\n\n\n2,1", - "3,8\n\n\n2,1", - "3,9\n\n\n2,1", - "3,10\n\n\n2,1", - "3,11\n\n\n2,1", + "3,2\n\n\n3,1", + "3,3\n\n\n3,1", + "3,4\n\n\n3,1", + "3,5\n\n\n3,1", + "3,6\n\n\n3,1", + "3,7\n\n\n3,1", + "3,8\n\n\n3,1", + "3,9\n\n\n3,1", + "3,10\n\n\n3,1", + "3,11\n\n\n3,1", { "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n2,1", - "3,14\n\n\n2,1" + "3,12\n\n\n3,1", + "3,14\n\n\n3,1" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,2", + "3,0\n\n\n3,2", { "c": "#cccccc" }, - "3,2\n\n\n2,2", - "3,3\n\n\n2,2", - "3,4\n\n\n2,2", - "3,5\n\n\n2,2", - "3,6\n\n\n2,2", - "3,7\n\n\n2,2", - "3,8\n\n\n2,2", - "3,9\n\n\n2,2", - "3,10\n\n\n2,2", + "3,2\n\n\n3,2", + "3,3\n\n\n3,2", + "3,4\n\n\n3,2", + "3,5\n\n\n3,2", + "3,6\n\n\n3,2", + "3,7\n\n\n3,2", + "3,8\n\n\n3,2", + "3,9\n\n\n3,2", + "3,10\n\n\n3,2", { "c": "#aaaaaa", "w": 1.75 }, - "3,11\n\n\n2,2", - "3,13\n\n\n2,2", - "3,14\n\n\n2,2" + "3,11\n\n\n3,2", + "3,13\n\n\n3,2", + "3,14\n\n\n3,2" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,3", + "3,0\n\n\n3,3", { "c": "#cccccc" }, - "3,1\n\n\n2,3", - "3,2\n\n\n2,3", - "3,3\n\n\n2,3", - "3,4\n\n\n2,3", - "3,5\n\n\n2,3", - "3,6\n\n\n2,3", - "3,7\n\n\n2,3", - "3,8\n\n\n2,3", - "3,9\n\n\n2,3", - "3,10\n\n\n2,3", - "3,11\n\n\n2,3", + "3,1\n\n\n3,3", + "3,2\n\n\n3,3", + "3,3\n\n\n3,3", + "3,4\n\n\n3,3", + "3,5\n\n\n3,3", + "3,6\n\n\n3,3", + "3,7\n\n\n3,3", + "3,8\n\n\n3,3", + "3,9\n\n\n3,3", + "3,10\n\n\n3,3", + "3,11\n\n\n3,3", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n2,3" + "3,13\n\n\n3,3" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,4", + "3,0\n\n\n3,4", { "c": "#cccccc" }, - "3,1\n\n\n2,4", - "3,2\n\n\n2,4", - "3,3\n\n\n2,4", - "3,4\n\n\n2,4", - "3,5\n\n\n2,4", - "3,6\n\n\n2,4", - "3,7\n\n\n2,4", - "3,8\n\n\n2,4", - "3,9\n\n\n2,4", - "3,10\n\n\n2,4", - "3,11\n\n\n2,4", + "3,1\n\n\n3,4", + "3,2\n\n\n3,4", + "3,3\n\n\n3,4", + "3,4\n\n\n3,4", + "3,5\n\n\n3,4", + "3,6\n\n\n3,4", + "3,7\n\n\n3,4", + "3,8\n\n\n3,4", + "3,9\n\n\n3,4", + "3,10\n\n\n3,4", + "3,11\n\n\n3,4", { "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n2,4", - "3,14\n\n\n2,4" + "3,12\n\n\n3,4", + "3,14\n\n\n3,4" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,5", + "3,0\n\n\n3,5", { "c": "#cccccc" }, - "3,1\n\n\n2,5", - "3,2\n\n\n2,5", - "3,3\n\n\n2,5", - "3,4\n\n\n2,5", - "3,5\n\n\n2,5", - "3,6\n\n\n2,5", - "3,7\n\n\n2,5", - "3,8\n\n\n2,5", - "3,9\n\n\n2,5", - "3,10\n\n\n2,5", + "3,1\n\n\n3,5", + "3,2\n\n\n3,5", + "3,3\n\n\n3,5", + "3,4\n\n\n3,5", + "3,5\n\n\n3,5", + "3,6\n\n\n3,5", + "3,7\n\n\n3,5", + "3,8\n\n\n3,5", + "3,9\n\n\n3,5", + "3,10\n\n\n3,5", { "c": "#aaaaaa", "w": 1.75 }, - "3,11\n\n\n2,5", - "3,13\n\n\n2,5", - "3,14\n\n\n2,5" + "3,11\n\n\n3,5", + "3,13\n\n\n3,5", + "3,14\n\n\n3,5" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2 }, - "3,0\n\n\n2,6", + "3,0\n\n\n3,6", { "c": "#cccccc" }, - "3,2\n\n\n2,6", - "3,3\n\n\n2,6", - "3,4\n\n\n2,6", - "3,5\n\n\n2,6", - "3,6\n\n\n2,6", - "3,7\n\n\n2,6", - "3,8\n\n\n2,6", - "3,9\n\n\n2,6", - "3,10\n\n\n2,6", - "3,11\n\n\n2,6", + "3,2\n\n\n3,6", + "3,3\n\n\n3,6", + "3,4\n\n\n3,6", + "3,5\n\n\n3,6", + "3,6\n\n\n3,6", + "3,7\n\n\n3,6", + "3,8\n\n\n3,6", + "3,9\n\n\n3,6", + "3,10\n\n\n3,6", + "3,11\n\n\n3,6", { "c": "#aaaaaa" }, - "3,12\n\n\n2,6", - "3,13\n\n\n2,6", - "3,14\n\n\n2,6" + "3,12\n\n\n3,6", + "3,13\n\n\n3,6", + "3,14\n\n\n3,6" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2 }, - "3,0\n\n\n2,7", + "3,0\n\n\n3,7", { "c": "#cccccc" }, - "3,2\n\n\n2,7", - "3,3\n\n\n2,7", - "3,4\n\n\n2,7", - "3,5\n\n\n2,7", - "3,6\n\n\n2,7", - "3,7\n\n\n2,7", - "3,8\n\n\n2,7", - "3,9\n\n\n2,7", - "3,10\n\n\n2,7", - "3,11\n\n\n2,7", + "3,2\n\n\n3,7", + "3,3\n\n\n3,7", + "3,4\n\n\n3,7", + "3,5\n\n\n3,7", + "3,6\n\n\n3,7", + "3,7\n\n\n3,7", + "3,8\n\n\n3,7", + "3,9\n\n\n3,7", + "3,10\n\n\n3,7", + "3,11\n\n\n3,7", { "c": "#aaaaaa", "w": 2 }, - "3,12\n\n\n2,7", - "3,14\n\n\n2,7" + "3,12\n\n\n3,7", + "3,14\n\n\n3,7" ], [ { + "x": 2, "c": "#aaaaaa" }, - "3,0\n\n\n2,8", + "3,0\n\n\n3,8", { "c": "#cccccc" }, - "3,1\n\n\n2,8", - "3,2\n\n\n2,8", - "3,3\n\n\n2,8", - "3,4\n\n\n2,8", - "3,5\n\n\n2,8", - "3,6\n\n\n2,8", - "3,7\n\n\n2,8", - "3,8\n\n\n2,8", - "3,9\n\n\n2,8", - "3,10\n\n\n2,8", - "3,11\n\n\n2,8", + "3,1\n\n\n3,8", + "3,2\n\n\n3,8", + "3,3\n\n\n3,8", + "3,4\n\n\n3,8", + "3,5\n\n\n3,8", + "3,6\n\n\n3,8", + "3,7\n\n\n3,8", + "3,8\n\n\n3,8", + "3,9\n\n\n3,8", + "3,10\n\n\n3,8", + "3,11\n\n\n3,8", { "c": "#aaaaaa" }, - "3,12\n\n\n2,8", - "3,13\n\n\n2,8", - "3,14\n\n\n2,8" + "3,12\n\n\n3,8", + "3,13\n\n\n3,8", + "3,14\n\n\n3,8" ], [ { + "x": 2, "c": "#aaaaaa" }, - "3,0\n\n\n2,9", + "3,0\n\n\n3,9", { "c": "#cccccc" }, - "3,1\n\n\n2,9", - "3,2\n\n\n2,9", - "3,3\n\n\n2,9", - "3,4\n\n\n2,9", - "3,5\n\n\n2,9", - "3,6\n\n\n2,9", - "3,7\n\n\n2,9", - "3,8\n\n\n2,9", - "3,9\n\n\n2,9", - "3,10\n\n\n2,9", - "3,11\n\n\n2,9", + "3,1\n\n\n3,9", + "3,2\n\n\n3,9", + "3,3\n\n\n3,9", + "3,4\n\n\n3,9", + "3,5\n\n\n3,9", + "3,6\n\n\n3,9", + "3,7\n\n\n3,9", + "3,8\n\n\n3,9", + "3,9\n\n\n3,9", + "3,10\n\n\n3,9", + "3,11\n\n\n3,9", { "c": "#aaaaaa", "w": 2 }, - "3,12\n\n\n2,9", - "3,14\n\n\n2,9" + "3,12\n\n\n3,9", + "3,14\n\n\n3,9" ], [ { + "x": 2, "y": 0.25, "w": 1.25 }, - "4,0\n\n\n3,1", + "4,0\n\n\n4,1", { "w": 1.25 }, - "4,1\n\n\n3,1", + "4,1\n\n\n4,1", { "w": 1.25 }, - "4,2\n\n\n3,1", + "4,2\n\n\n4,1", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n3,1", + "4,5\n\n\n4,1", { "c": "#aaaaaa" }, - "4,10\n\n\n3,1", - "4,11\n\n\n3,1", - "4,12\n\n\n3,1", - "4,13\n\n\n3,1", - "4,14\n\n\n3,1" + "4,10\n\n\n4,1", + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", + "4,13\n\n\n4,1", + "4,14\n\n\n4,1" ], [ { + "x": 2, "w": 1.25 }, - "4,0\n\n\n3,2", + "4,0\n\n\n4,2", { "w": 1.25 }, - "4,1\n\n\n3,2", + "4,1\n\n\n4,2", { "w": 1.25 }, - "4,2\n\n\n3,2", + "4,2\n\n\n4,2", { "c": "#cccccc", "w": 6 }, - "4,5\n\n\n3,2", + "4,5\n\n\n4,2", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,2", - "4,11\n\n\n3,2", - "4,12\n\n\n3,2", - "4,13\n\n\n3,2", - "4,14\n\n\n3,2" + "4,10\n\n\n4,2", + "4,11\n\n\n4,2", + "4,12\n\n\n4,2", + "4,13\n\n\n4,2", + "4,14\n\n\n4,2" ], [ { + "x": 2, "w": 1.25 }, - "4,0\n\n\n3,3", + "4,0\n\n\n4,3", { "w": 1.25 }, - "4,1\n\n\n3,3", + "4,1\n\n\n4,3", { "w": 1.25 }, - "4,2\n\n\n3,3", + "4,2\n\n\n4,3", { "c": "#cccccc", "w": 3 }, - "4,3\n\n\n3,3", + "4,3\n\n\n4,3", { "w": 3 }, - "4,8\n\n\n3,3", + "4,8\n\n\n4,3", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,3", - "4,11\n\n\n3,3", - "4,12\n\n\n3,3", - "4,13\n\n\n3,3", - "4,14\n\n\n3,3" + "4,10\n\n\n4,3", + "4,11\n\n\n4,3", + "4,12\n\n\n4,3", + "4,13\n\n\n4,3", + "4,14\n\n\n4,3" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,4", - "4,1\n\n\n3,4", + "4,0\n\n\n4,4", + "4,1\n\n\n4,4", { "w": 1.5 }, - "4,2\n\n\n3,4", + "4,2\n\n\n4,4", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,4", + "4,7\n\n\n4,4", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,4", - "4,12\n\n\n3,4", + "4,11\n\n\n4,4", + "4,12\n\n\n4,4", { "w": 1.5 }, - "4,14\n\n\n3,4" + "4,14\n\n\n4,4" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,5", + "4,0\n\n\n4,5", { "x": 1, "w": 1.5 }, - "4,2\n\n\n3,5", + "4,2\n\n\n4,5", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,5", + "4,7\n\n\n4,5", { "c": "#aaaaaa", "w": 1.5 }, - "4,12\n\n\n3,5", + "4,12\n\n\n4,5", { "x": 1, "w": 1.5 }, - "4,14\n\n\n3,5" + "4,14\n\n\n4,5" ], [ { - "x": 1.5 + "x": 3.5 }, - "4,1\n\n\n3,6", + "4,1\n\n\n4,6", { "w": 1.5 }, - "4,2\n\n\n3,6", + "4,2\n\n\n4,6", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,6", + "4,7\n\n\n4,6", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,6", - "4,12\n\n\n3,6" + "4,11\n\n\n4,6", + "4,12\n\n\n4,6" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,7", - "4,1\n\n\n3,7", + "4,0\n\n\n4,7", + "4,1\n\n\n4,7", { "w": 1.5 }, - "4,2\n\n\n3,7", + "4,2\n\n\n4,7", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,7", + "4,7\n\n\n4,7", { "c": "#aaaaaa" }, - "4,11\n\n\n3,7", - "4,12\n\n\n3,7", - "4,13\n\n\n3,7", - "4,14\n\n\n3,7" + "4,11\n\n\n4,7", + "4,12\n\n\n4,7", + "4,13\n\n\n4,7", + "4,14\n\n\n4,7" ], [ { + "x": 2, "w": 1.75 }, - "4,0\n\n\n3,8", + "4,0\n\n\n4,8", { "w": 1.25 }, - "4,1\n\n\n3,8", + "4,1\n\n\n4,8", { "w": 1.25 }, - "4,2\n\n\n3,8", + "4,2\n\n\n4,8", { "w": 1.25 }, - "4,3\n\n\n3,8", + "4,3\n\n\n4,8", { "c": "#cccccc", "w": 3 }, - "4,5\n\n\n3,8", + "4,5\n\n\n4,8", { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n3,8", + "4,9\n\n\n4,8", { "w": 1.25 }, - "4,10\n\n\n3,8", - "4,11\n\n\n3,8", - "4,12\n\n\n3,8", - "4,13\n\n\n3,8", - "4,14\n\n\n3,8" + "4,10\n\n\n4,8", + "4,11\n\n\n4,8", + "4,12\n\n\n4,8", + "4,13\n\n\n4,8", + "4,14\n\n\n4,8" ] ] } From c9a2e21bb8dbfab9f67917f3dfe845107342ad0a Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 28 Mar 2024 12:20:27 +0000 Subject: [PATCH 06/15] lower() --- src/melgeek/mj6xy/mj6xy_rev3.json | 16 ++++++++-------- v3/melgeek/mj6xy/mj6xy_rev3.json | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 193ad5275b..12d5cf84ce 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -20,20 +20,20 @@ "ISO Default", "ISO Split RShift", "ISO Arrows", - "2U LShift ANSI Default", - "2U LShift ANSI 2u RShift", - "2U LShift ISO Default", - "2U LShift ISO 2u RShift" + "2u LShift ANSI Default", + "2u LShift ANSI 2u RShift", + "2u LShift ISO Default", + "2u LShift ISO 2u RShift" ], [ "Bottom row", "Default", - "6.25U Spacebar Arrows", - "6U Spacebar Arrows", - "Split 6U Spacebar Arrows", + "6.25u Spacebar Arrows", + "6u Spacebar Arrows", + "Split 6u Spacebar Arrows", "Tsangan", "WKL", - "7U HHKB", + "7u HHKB", "Tsangan Arrows", "Minila" ] diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index cc9a0d30dc..4e3711bd19 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -18,20 +18,20 @@ "ISO Default", "ISO Split RShift", "ISO Arrows", - "2U LShift ANSI Default", - "2U LShift ANSI 2u RShift", - "2U LShift ISO Default", - "2U LShift ISO 2u RShift" + "2u LShift ANSI Default", + "2u LShift ANSI 2u RShift", + "2u LShift ISO Default", + "2u LShift ISO 2u RShift" ], [ "Bottom row", "Default", - "6.25U Spacebar Arrows", - "6U Spacebar Arrows", - "Split 6U Spacebar Arrows", + "6.25u Spacebar Arrows", + "6u Spacebar Arrows", + "Split 6u Spacebar Arrows", "Tsangan", "WKL", - "7U HHKB", + "7u HHKB", "Tsangan Arrows", "Minila" ] From 1992e106aec7874ab815a955a46c163f1917f4f7 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 28 Mar 2024 15:38:58 +0000 Subject: [PATCH 07/15] update mj6xy_rev3.json --- src/melgeek/mj6xy/mj6xy_rev3.json | 2 +- v3/melgeek/mj6xy/mj6xy_rev3.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 12d5cf84ce..ef83e3b5d9 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -10,7 +10,7 @@ "layouts": { "labels": [ "Split Backspace", - "Stepped", + "Stepped Caps", "ISO Enter", [ "Shift Row", diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 4e3711bd19..b2ff6c8a31 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -8,7 +8,7 @@ "layouts": { "labels": [ "Split Backspace", - "Stepped", + "Stepped Caps", "ISO Enter", [ "Shift Row", From 84b4decf0ef6df116af7c1b15175f4eb7f77cb50 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 3 Apr 2024 00:27:10 +0100 Subject: [PATCH 08/15] add presets --- src/melgeek/mj6xy/mj6xy_rev3.json | 18 ++++++++++++++++++ v3/melgeek/mj6xy/mj6xy_rev3.json | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index ef83e3b5d9..29f23b358f 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -38,6 +38,24 @@ "Minila" ] ], + "presets": { + "ANSI Standard": [0, 0, 0, 0, 0], + "ANSI WK": [0, 0, 0, 0, 4], + "ANSI Tsangan": [1, 0, 0, 1, 4], + "ANSI WKL": [0, 0, 0, 0, 5], + "ANSI HHKB": [1, 0, 0, 1, 6], + "ANSI Arrows": [0, 0, 0, 2, 1], + "ANSI 64-Key": [0, 0, 0, 6, 1], + "ANSI Minila": [0, 0, 0, 6, 8], + "ISO Standard": [0, 0, 1, 3, 0], + "ISO WK": [0, 0, 1, 3, 4], + "ISO Tsangan": [1, 0, 1, 4, 4], + "ISO WKL": [0, 0, 1, 3, 5], + "ISO HHKB": [1, 0, 1, 4, 6], + "ISO Arrows": [0, 0, 1, 5, 1], + "ISO 65-Key": [0, 0, 1, 8, 1], + "ISO Minila": [0, 0, 1, 8, 8] + }, "keymap": [ [ { diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index b2ff6c8a31..5f06666e62 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -36,6 +36,24 @@ "Minila" ] ], + "presets": { + "ANSI Standard": [0, 0, 0, 0, 0], + "ANSI WK": [0, 0, 0, 0, 4], + "ANSI Tsangan": [1, 0, 0, 1, 4], + "ANSI WKL": [0, 0, 0, 0, 5], + "ANSI HHKB": [1, 0, 0, 1, 6], + "ANSI Arrows": [0, 0, 0, 2, 1], + "ANSI 64-Key": [0, 0, 0, 6, 1], + "ANSI Minila": [0, 0, 0, 6, 8], + "ISO Standard": [0, 0, 1, 3, 0], + "ISO WK": [0, 0, 1, 3, 4], + "ISO Tsangan": [1, 0, 1, 4, 4], + "ISO WKL": [0, 0, 1, 3, 5], + "ISO HHKB": [1, 0, 1, 4, 6], + "ISO Arrows": [0, 0, 1, 5, 1], + "ISO 65-Key": [0, 0, 1, 8, 1], + "ISO Minila": [0, 0, 1, 8, 8] + }, "keymap": [ [ { From 24cd37aff3c8a4756d3bda2a78a9939c6a1e44a8 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 3 Apr 2024 00:32:44 +0100 Subject: [PATCH 09/15] format presets --- src/melgeek/mj6xy/mj6xy_rev3.json | 128 ++++++++++++++++++++++++++---- v3/melgeek/mj6xy/mj6xy_rev3.json | 128 ++++++++++++++++++++++++++---- 2 files changed, 224 insertions(+), 32 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 29f23b358f..12320fdb33 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -39,22 +39,118 @@ ] ], "presets": { - "ANSI Standard": [0, 0, 0, 0, 0], - "ANSI WK": [0, 0, 0, 0, 4], - "ANSI Tsangan": [1, 0, 0, 1, 4], - "ANSI WKL": [0, 0, 0, 0, 5], - "ANSI HHKB": [1, 0, 0, 1, 6], - "ANSI Arrows": [0, 0, 0, 2, 1], - "ANSI 64-Key": [0, 0, 0, 6, 1], - "ANSI Minila": [0, 0, 0, 6, 8], - "ISO Standard": [0, 0, 1, 3, 0], - "ISO WK": [0, 0, 1, 3, 4], - "ISO Tsangan": [1, 0, 1, 4, 4], - "ISO WKL": [0, 0, 1, 3, 5], - "ISO HHKB": [1, 0, 1, 4, 6], - "ISO Arrows": [0, 0, 1, 5, 1], - "ISO 65-Key": [0, 0, 1, 8, 1], - "ISO Minila": [0, 0, 1, 8, 8] + "ANSI Standard": [ + 0, + 0, + 0, + 0, + 0 + ], + "ANSI WK": [ + 0, + 0, + 0, + 0, + 4 + ], + "ANSI Tsangan": [ + 1, + 0, + 0, + 1, + 4 + ], + "ANSI WKL": [ + 0, + 0, + 0, + 0, + 5 + ], + "ANSI HHKB": [ + 1, + 0, + 0, + 1, + 6 + ], + "ANSI Arrows": [ + 0, + 0, + 0, + 2, + 1 + ], + "ANSI 64-Key": [ + 0, + 0, + 0, + 6, + 1 + ], + "ANSI Minila": [ + 0, + 0, + 0, + 6, + 8 + ], + "ISO Standard": [ + 0, + 0, + 1, + 3, + 0 + ], + "ISO WK": [ + 0, + 0, + 1, + 3, + 4 + ], + "ISO Tsangan": [ + 1, + 0, + 1, + 4, + 4 + ], + "ISO WKL": [ + 0, + 0, + 1, + 3, + 5 + ], + "ISO HHKB": [ + 1, + 0, + 1, + 4, + 6 + ], + "ISO Arrows": [ + 0, + 0, + 1, + 5, + 1 + ], + "ISO 65-Key": [ + 0, + 0, + 1, + 8, + 1 + ], + "ISO Minila": [ + 0, + 0, + 1, + 8, + 8 + ] }, "keymap": [ [ diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 5f06666e62..1ddf9e9e9f 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -37,22 +37,118 @@ ] ], "presets": { - "ANSI Standard": [0, 0, 0, 0, 0], - "ANSI WK": [0, 0, 0, 0, 4], - "ANSI Tsangan": [1, 0, 0, 1, 4], - "ANSI WKL": [0, 0, 0, 0, 5], - "ANSI HHKB": [1, 0, 0, 1, 6], - "ANSI Arrows": [0, 0, 0, 2, 1], - "ANSI 64-Key": [0, 0, 0, 6, 1], - "ANSI Minila": [0, 0, 0, 6, 8], - "ISO Standard": [0, 0, 1, 3, 0], - "ISO WK": [0, 0, 1, 3, 4], - "ISO Tsangan": [1, 0, 1, 4, 4], - "ISO WKL": [0, 0, 1, 3, 5], - "ISO HHKB": [1, 0, 1, 4, 6], - "ISO Arrows": [0, 0, 1, 5, 1], - "ISO 65-Key": [0, 0, 1, 8, 1], - "ISO Minila": [0, 0, 1, 8, 8] + "ANSI Standard": [ + 0, + 0, + 0, + 0, + 0 + ], + "ANSI WK": [ + 0, + 0, + 0, + 0, + 4 + ], + "ANSI Tsangan": [ + 1, + 0, + 0, + 1, + 4 + ], + "ANSI WKL": [ + 0, + 0, + 0, + 0, + 5 + ], + "ANSI HHKB": [ + 1, + 0, + 0, + 1, + 6 + ], + "ANSI Arrows": [ + 0, + 0, + 0, + 2, + 1 + ], + "ANSI 64-Key": [ + 0, + 0, + 0, + 6, + 1 + ], + "ANSI Minila": [ + 0, + 0, + 0, + 6, + 8 + ], + "ISO Standard": [ + 0, + 0, + 1, + 3, + 0 + ], + "ISO WK": [ + 0, + 0, + 1, + 3, + 4 + ], + "ISO Tsangan": [ + 1, + 0, + 1, + 4, + 4 + ], + "ISO WKL": [ + 0, + 0, + 1, + 3, + 5 + ], + "ISO HHKB": [ + 1, + 0, + 1, + 4, + 6 + ], + "ISO Arrows": [ + 0, + 0, + 1, + 5, + 1 + ], + "ISO 65-Key": [ + 0, + 0, + 1, + 8, + 1 + ], + "ISO Minila": [ + 0, + 0, + 1, + 8, + 8 + ] }, "keymap": [ [ From 477fdf843bc0616b4f4bb060875d2bb0b9ba534d Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 3 Apr 2024 00:39:46 +0100 Subject: [PATCH 10/15] update mj6xy_rev3.json --- src/melgeek/mj6xy/mj6xy_rev3.json | 4 ++-- v3/melgeek/mj6xy/mj6xy_rev3.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 12320fdb33..64b5c2595b 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -26,8 +26,8 @@ "2u LShift ISO 2u RShift" ], [ - "Bottom row", - "Default", + "Bottom Row", + "6.25u Spacebar", "6.25u Spacebar Arrows", "6u Spacebar Arrows", "Split 6u Spacebar Arrows", diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 1ddf9e9e9f..0ee5832b6c 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -24,8 +24,8 @@ "2u LShift ISO 2u RShift" ], [ - "Bottom row", - "Default", + "Bottom Row", + "6.25u Spacebar", "6.25u Spacebar Arrows", "6u Spacebar Arrows", "Split 6u Spacebar Arrows", From b4c040c1f245165ced8c657c8da467407c7c4a9f Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 3 Apr 2024 12:53:23 +0100 Subject: [PATCH 11/15] revert presets --- src/melgeek/mj6xy/mj6xy_rev3.json | 114 ------------------------------ v3/melgeek/mj6xy/mj6xy_rev3.json | 114 ------------------------------ 2 files changed, 228 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 64b5c2595b..6ad0df7f8b 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -38,120 +38,6 @@ "Minila" ] ], - "presets": { - "ANSI Standard": [ - 0, - 0, - 0, - 0, - 0 - ], - "ANSI WK": [ - 0, - 0, - 0, - 0, - 4 - ], - "ANSI Tsangan": [ - 1, - 0, - 0, - 1, - 4 - ], - "ANSI WKL": [ - 0, - 0, - 0, - 0, - 5 - ], - "ANSI HHKB": [ - 1, - 0, - 0, - 1, - 6 - ], - "ANSI Arrows": [ - 0, - 0, - 0, - 2, - 1 - ], - "ANSI 64-Key": [ - 0, - 0, - 0, - 6, - 1 - ], - "ANSI Minila": [ - 0, - 0, - 0, - 6, - 8 - ], - "ISO Standard": [ - 0, - 0, - 1, - 3, - 0 - ], - "ISO WK": [ - 0, - 0, - 1, - 3, - 4 - ], - "ISO Tsangan": [ - 1, - 0, - 1, - 4, - 4 - ], - "ISO WKL": [ - 0, - 0, - 1, - 3, - 5 - ], - "ISO HHKB": [ - 1, - 0, - 1, - 4, - 6 - ], - "ISO Arrows": [ - 0, - 0, - 1, - 5, - 1 - ], - "ISO 65-Key": [ - 0, - 0, - 1, - 8, - 1 - ], - "ISO Minila": [ - 0, - 0, - 1, - 8, - 8 - ] - }, "keymap": [ [ { diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 0ee5832b6c..633836e1c7 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -36,120 +36,6 @@ "Minila" ] ], - "presets": { - "ANSI Standard": [ - 0, - 0, - 0, - 0, - 0 - ], - "ANSI WK": [ - 0, - 0, - 0, - 0, - 4 - ], - "ANSI Tsangan": [ - 1, - 0, - 0, - 1, - 4 - ], - "ANSI WKL": [ - 0, - 0, - 0, - 0, - 5 - ], - "ANSI HHKB": [ - 1, - 0, - 0, - 1, - 6 - ], - "ANSI Arrows": [ - 0, - 0, - 0, - 2, - 1 - ], - "ANSI 64-Key": [ - 0, - 0, - 0, - 6, - 1 - ], - "ANSI Minila": [ - 0, - 0, - 0, - 6, - 8 - ], - "ISO Standard": [ - 0, - 0, - 1, - 3, - 0 - ], - "ISO WK": [ - 0, - 0, - 1, - 3, - 4 - ], - "ISO Tsangan": [ - 1, - 0, - 1, - 4, - 4 - ], - "ISO WKL": [ - 0, - 0, - 1, - 3, - 5 - ], - "ISO HHKB": [ - 1, - 0, - 1, - 4, - 6 - ], - "ISO Arrows": [ - 0, - 0, - 1, - 5, - 1 - ], - "ISO 65-Key": [ - 0, - 0, - 1, - 8, - 1 - ], - "ISO Minila": [ - 0, - 0, - 1, - 8, - 8 - ] - }, "keymap": [ [ { From afaf019601f05c5b794ff50278ec96060cef4040 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 5 Apr 2024 12:58:10 +0100 Subject: [PATCH 12/15] v3 only --- src/melgeek/mj6xy/mj6xy_rev3.json | 795 ++++++++---------------------- v3/melgeek/mj6xy/mj6xy_rev3.json | 5 +- 2 files changed, 206 insertions(+), 594 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 6ad0df7f8b..77036f7ac4 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -2,52 +2,36 @@ "name": "MJ6XY", "vendorId": "0xEDED", "productId": "0x6060", - "lighting": "qmk_backlight_rgblight", - "matrix": { - "rows": 5, - "cols": 15 - }, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight_rgblight"], + "matrix": {"rows": 5, "cols": 15}, "layouts": { "labels": [ "Split Backspace", - "Stepped Caps", "ISO Enter", [ "Shift Row", - "ANSI Default", - "ANSI Split RShift", - "ANSI Arrows", - "ISO Default", - "ISO Split RShift", - "ISO Arrows", - "2u LShift ANSI Default", - "2u LShift ANSI 2u RShift", - "2u LShift ISO Default", - "2u LShift ISO 2u RShift" + "default", + "Split_lshift_rshift1", + "Split_lshift_rshift2", + "Split_lshift_rshift3", + "Split_lshift_rshift4" ], [ - "Bottom Row", - "6.25u Spacebar", - "6.25u Spacebar Arrows", - "6u Spacebar Arrows", - "Split 6u Spacebar Arrows", - "Tsangan", - "WKL", - "7u HHKB", - "Tsangan Arrows", - "Minila" + "Bottom row", + "default", + "6.25U_Spc_Arrow", + "6.0U_Spc_Arrow", + "3.0U_Spc_Arrow", + "Split_3.0U_Arrow", + "7.0U_Spc" ] ], "keymap": [ [ - { - "x": 2, - "c": "#777777" - }, + {"x": 2.5, "c": "#777777"}, "0,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "0,1", "0,2", "0,3", @@ -60,28 +44,16 @@ "0,10", "0,11", "0,12", - { - "c": "#aaaaaa", - "w": 2 - }, + {"c": "#aaaaaa", "w": 2}, "0,14\n\n\n0,0", - { - "x": 0.5, - "c": "#cccccc" - }, + {"x": 0.5, "c": "#cccccc"}, "0,13\n\n\n0,1", "0,14\n\n\n0,1" ], [ - { - "x": 2, - "c": "#aaaaaa", - "w": 1.5 - }, + {"x": 2.5, "c": "#aaaaaa", "w": 1.5}, "1,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "1,1", "1,2", "1,3", @@ -94,10 +66,8 @@ "1,10", "1,11", "1,12", - { - "w": 1.5 - }, - "1,13\n\n\n2,0", + {"w": 1.5}, + "1,13\n\n\n1,0", { "x": 1.25, "c": "#777777", @@ -107,24 +77,12 @@ "h2": 1, "x2": -0.25 }, - "2,13\n\n\n2,1" + "2,13\n\n\n1,1" ], [ - { - "c": "#aaaaaa", - "w": 1.25, - "w2": 1.75, - "l": true - }, - "2,0\n\n\n1,1", - { - "x": 0.75, - "w": 1.75 - }, - "2,0\n\n\n1,0", - { - "c": "#cccccc" - }, + {"x": 2.5, "c": "#aaaaaa", "w": 1.75}, + "2,0", + {"c": "#cccccc"}, "2,1", "2,2", "2,3", @@ -136,552 +94,203 @@ "2,9", "2,10", "2,11", - { - "c": "#777777", - "w": 2.25 - }, - "2,13\n\n\n2,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,12\n\n\n2,1" - ], - [ - { - "x": 2, - "c": "#aaaaaa", - "w": 2.25 - }, - "3,0\n\n\n3,0", - { - "c": "#cccccc" - }, - "3,2\n\n\n3,0", - "3,3\n\n\n3,0", - "3,4\n\n\n3,0", - "3,5\n\n\n3,0", - "3,6\n\n\n3,0", - "3,7\n\n\n3,0", - "3,8\n\n\n3,0", - "3,9\n\n\n3,0", - "3,10\n\n\n3,0", - "3,11\n\n\n3,0", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "3,13\n\n\n3,0" - ], - [ - { - "x": 2, - "w": 1.25 - }, - "4,0\n\n\n4,0", - { - "w": 1.25 - }, - "4,1\n\n\n4,0", - { - "w": 1.25 - }, - "4,2\n\n\n4,0", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,5\n\n\n4,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,10\n\n\n4,0", - { - "w": 1.25 - }, - "4,11\n\n\n4,0", - { - "w": 1.25 - }, - "4,12\n\n\n4,0", - { - "w": 1.25 - }, - "4,14\n\n\n4,0" - ], - [ - { - "x": 2, - "y": 0.25, - "c": "#aaaaaa", - "w": 2.25 - }, - "3,0\n\n\n3,1", - { - "c": "#cccccc" - }, - "3,2\n\n\n3,1", - "3,3\n\n\n3,1", - "3,4\n\n\n3,1", - "3,5\n\n\n3,1", - "3,6\n\n\n3,1", - "3,7\n\n\n3,1", - "3,8\n\n\n3,1", - "3,9\n\n\n3,1", - "3,10\n\n\n3,1", - "3,11\n\n\n3,1", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,12\n\n\n3,1", - "3,14\n\n\n3,1" - ], - [ - { - "x": 2, - "c": "#aaaaaa", - "w": 2.25 - }, - "3,0\n\n\n3,2", - { - "c": "#cccccc" - }, - "3,2\n\n\n3,2", - "3,3\n\n\n3,2", - "3,4\n\n\n3,2", - "3,5\n\n\n3,2", - "3,6\n\n\n3,2", - "3,7\n\n\n3,2", - "3,8\n\n\n3,2", - "3,9\n\n\n3,2", - "3,10\n\n\n3,2", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,11\n\n\n3,2", - "3,13\n\n\n3,2", - "3,14\n\n\n3,2" - ], - [ - { - "x": 2, - "c": "#aaaaaa", - "w": 1.25 - }, - "3,0\n\n\n3,3", - { - "c": "#cccccc" - }, - "3,1\n\n\n3,3", - "3,2\n\n\n3,3", - "3,3\n\n\n3,3", - "3,4\n\n\n3,3", - "3,5\n\n\n3,3", - "3,6\n\n\n3,3", - "3,7\n\n\n3,3", - "3,8\n\n\n3,3", - "3,9\n\n\n3,3", - "3,10\n\n\n3,3", - "3,11\n\n\n3,3", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "3,13\n\n\n3,3" - ], - [ - { - "x": 2, - "c": "#aaaaaa", - "w": 1.25 - }, - "3,0\n\n\n3,4", - { - "c": "#cccccc" - }, - "3,1\n\n\n3,4", - "3,2\n\n\n3,4", - "3,3\n\n\n3,4", - "3,4\n\n\n3,4", - "3,5\n\n\n3,4", - "3,6\n\n\n3,4", - "3,7\n\n\n3,4", - "3,8\n\n\n3,4", - "3,9\n\n\n3,4", - "3,10\n\n\n3,4", - "3,11\n\n\n3,4", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,12\n\n\n3,4", - "3,14\n\n\n3,4" - ], - [ - { - "x": 2, - "c": "#aaaaaa", - "w": 1.25 - }, - "3,0\n\n\n3,5", - { - "c": "#cccccc" - }, - "3,1\n\n\n3,5", - "3,2\n\n\n3,5", - "3,3\n\n\n3,5", - "3,4\n\n\n3,5", - "3,5\n\n\n3,5", - "3,6\n\n\n3,5", - "3,7\n\n\n3,5", - "3,8\n\n\n3,5", - "3,9\n\n\n3,5", - "3,10\n\n\n3,5", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,11\n\n\n3,5", - "3,13\n\n\n3,5", - "3,14\n\n\n3,5" - ], - [ - { - "x": 2, - "c": "#aaaaaa", - "w": 2 - }, - "3,0\n\n\n3,6", - { - "c": "#cccccc" - }, - "3,2\n\n\n3,6", - "3,3\n\n\n3,6", - "3,4\n\n\n3,6", - "3,5\n\n\n3,6", - "3,6\n\n\n3,6", - "3,7\n\n\n3,6", - "3,8\n\n\n3,6", - "3,9\n\n\n3,6", - "3,10\n\n\n3,6", - "3,11\n\n\n3,6", - { - "c": "#aaaaaa" - }, - "3,12\n\n\n3,6", - "3,13\n\n\n3,6", - "3,14\n\n\n3,6" + {"c": "#777777", "w": 2.25}, + "2,13\n\n\n1,0", + {"x": 0.25, "c": "#cccccc"}, + "2,12\n\n\n1,1" ], [ - { - "x": 2, - "c": "#aaaaaa", - "w": 2 - }, - "3,0\n\n\n3,7", - { - "c": "#cccccc" - }, - "3,2\n\n\n3,7", - "3,3\n\n\n3,7", - "3,4\n\n\n3,7", - "3,5\n\n\n3,7", - "3,6\n\n\n3,7", - "3,7\n\n\n3,7", - "3,8\n\n\n3,7", - "3,9\n\n\n3,7", - "3,10\n\n\n3,7", - "3,11\n\n\n3,7", - { - "c": "#aaaaaa", - "w": 2 - }, - "3,12\n\n\n3,7", - "3,14\n\n\n3,7" + {"x": 2.5, "c": "#aaaaaa", "w": 2.25}, + "3,0\n\n\n2,0", + {"c": "#cccccc"}, + "3,2\n\n\n2,0", + "3,3\n\n\n2,0", + "3,4\n\n\n2,0", + "3,5\n\n\n2,0", + "3,6\n\n\n2,0", + "3,7\n\n\n2,0", + "3,8\n\n\n2,0", + "3,9\n\n\n2,0", + "3,10\n\n\n2,0", + "3,11\n\n\n2,0", + {"c": "#aaaaaa", "w": 2.75}, + "3,13\n\n\n2,0" ], [ - { - "x": 2, - "c": "#aaaaaa" - }, - "3,0\n\n\n3,8", - { - "c": "#cccccc" - }, - "3,1\n\n\n3,8", - "3,2\n\n\n3,8", - "3,3\n\n\n3,8", - "3,4\n\n\n3,8", - "3,5\n\n\n3,8", - "3,6\n\n\n3,8", - "3,7\n\n\n3,8", - "3,8\n\n\n3,8", - "3,9\n\n\n3,8", - "3,10\n\n\n3,8", - "3,11\n\n\n3,8", - { - "c": "#aaaaaa" - }, - "3,12\n\n\n3,8", - "3,13\n\n\n3,8", - "3,14\n\n\n3,8" + {"x": 2.5, "w": 1.25}, + "4,0\n\n\n3,0", + {"w": 1.25}, + "4,1\n\n\n3,0", + {"w": 1.25}, + "4,2\n\n\n3,0", + {"c": "#cccccc", "w": 6.25}, + "4,5\n\n\n3,0", + {"c": "#aaaaaa", "w": 1.25}, + "4,10\n\n\n3,0", + {"w": 1.25}, + "4,11\n\n\n3,0", + {"w": 1.25}, + "4,12\n\n\n3,0", + {"w": 1.25}, + "4,14\n\n\n3,0" ], [ - { - "x": 2, - "c": "#aaaaaa" - }, - "3,0\n\n\n3,9", - { - "c": "#cccccc" - }, - "3,1\n\n\n3,9", - "3,2\n\n\n3,9", - "3,3\n\n\n3,9", - "3,4\n\n\n3,9", - "3,5\n\n\n3,9", - "3,6\n\n\n3,9", - "3,7\n\n\n3,9", - "3,8\n\n\n3,9", - "3,9\n\n\n3,9", - "3,10\n\n\n3,9", - "3,11\n\n\n3,9", - { - "c": "#aaaaaa", - "w": 2 - }, - "3,12\n\n\n3,9", - "3,14\n\n\n3,9" + {"x": 2.5, "c": "#aaaaaa", "w": 1.25}, + "3,0\n\n\n2,1", + "3,1\n\n\n2,1", + {"c": "#cccccc"}, + "3,2\n\n\n2,1", + "3,3\n\n\n2,1", + "3,4\n\n\n2,1", + "3,5\n\n\n2,1", + "3,6\n\n\n2,1", + "3,7\n\n\n2,1", + "3,8\n\n\n2,1", + "3,9\n\n\n2,1", + "3,10\n\n\n2,1", + "3,11\n\n\n2,1", + {"c": "#aaaaaa", "w": 1.75}, + "3,12\n\n\n2,1", + "3,14\n\n\n2,1" ], [ - { - "x": 2, - "y": 0.25, - "w": 1.25 - }, - "4,0\n\n\n4,1", - { - "w": 1.25 - }, - "4,1\n\n\n4,1", - { - "w": 1.25 - }, - "4,2\n\n\n4,1", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,5\n\n\n4,1", - { - "c": "#aaaaaa" - }, - "4,10\n\n\n4,1", - "4,11\n\n\n4,1", - "4,12\n\n\n4,1", - "4,13\n\n\n4,1", - "4,14\n\n\n4,1" + {"x": 2.5, "c": "#aaaaaa", "w": 2.25}, + "3,0\n\n\n2,2", + {"c": "#cccccc"}, + "3,2\n\n\n2,2", + "3,3\n\n\n2,2", + "3,4\n\n\n2,2", + "3,5\n\n\n2,2", + "3,6\n\n\n2,2", + "3,7\n\n\n2,2", + "3,8\n\n\n2,2", + "3,9\n\n\n2,2", + "3,10\n\n\n2,2", + {"w": 1.75}, + "3,11\n\n\n2,2", + "3,13\n\n\n2,2", + "3,14\n\n\n2,2" ], [ - { - "x": 2, - "w": 1.25 - }, - "4,0\n\n\n4,2", - { - "w": 1.25 - }, - "4,1\n\n\n4,2", - { - "w": 1.25 - }, - "4,2\n\n\n4,2", - { - "c": "#cccccc", - "w": 6 - }, - "4,5\n\n\n4,2", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,10\n\n\n4,2", - "4,11\n\n\n4,2", - "4,12\n\n\n4,2", - "4,13\n\n\n4,2", - "4,14\n\n\n4,2" + {"x": 2.5, "c": "#aaaaaa", "w": 2}, + "3,0\n\n\n2,3", + {"c": "#cccccc"}, + "3,2\n\n\n2,3", + "3,3\n\n\n2,3", + "3,4\n\n\n2,3", + "3,5\n\n\n2,3", + "3,6\n\n\n2,3", + "3,7\n\n\n2,3", + "3,8\n\n\n2,3", + "3,9\n\n\n2,3", + "3,10\n\n\n2,3", + "3,11\n\n\n2,3", + "3,12\n\n\n2,3", + "3,13\n\n\n2,3", + "3,14\n\n\n2,3" ], [ - { - "x": 2, - "w": 1.25 - }, - "4,0\n\n\n4,3", - { - "w": 1.25 - }, - "4,1\n\n\n4,3", - { - "w": 1.25 - }, - "4,2\n\n\n4,3", - { - "c": "#cccccc", - "w": 3 - }, - "4,3\n\n\n4,3", - { - "w": 3 - }, - "4,8\n\n\n4,3", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,10\n\n\n4,3", - "4,11\n\n\n4,3", - "4,12\n\n\n4,3", - "4,13\n\n\n4,3", - "4,14\n\n\n4,3" + {"x": 2.5, "c": "#aaaaaa"}, + "3,0\n\n\n2,4", + "3,1\n\n\n2,4", + {"c": "#cccccc"}, + "3,2\n\n\n2,4", + "3,3\n\n\n2,4", + "3,4\n\n\n2,4", + "3,5\n\n\n2,4", + "3,6\n\n\n2,4", + "3,7\n\n\n2,4", + "3,8\n\n\n2,4", + "3,9\n\n\n2,4", + "3,10\n\n\n2,4", + "3,11\n\n\n2,4", + {"c": "#aaaaaa", "w": 2}, + "3,12\n\n\n2,4", + "3,14\n\n\n2,4" ], [ - { - "x": 2, - "w": 1.5 - }, - "4,0\n\n\n4,4", - "4,1\n\n\n4,4", - { - "w": 1.5 - }, - "4,2\n\n\n4,4", - { - "c": "#cccccc", - "w": 7 - }, - "4,7\n\n\n4,4", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n4,4", - "4,12\n\n\n4,4", - { - "w": 1.5 - }, - "4,14\n\n\n4,4" + {"x": 2.5, "w": 1.25}, + "4,0\n\n\n3,1", + {"w": 1.25}, + "4,1\n\n\n3,1", + {"w": 1.25}, + "4,2\n\n\n3,1", + {"c": "#cccccc", "w": 6.25}, + "4,5\n\n\n3,1", + {"c": "#aaaaaa"}, + "4,10\n\n\n3,1", + "4,11\n\n\n3,1", + "4,12\n\n\n3,1", + "4,13\n\n\n3,1", + "4,14\n\n\n3,1" ], [ - { - "x": 2, - "w": 1.5 - }, - "4,0\n\n\n4,5", - { - "x": 1, - "w": 1.5 - }, - "4,2\n\n\n4,5", - { - "c": "#cccccc", - "w": 7 - }, - "4,7\n\n\n4,5", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,12\n\n\n4,5", - { - "x": 1, - "w": 1.5 - }, - "4,14\n\n\n4,5" + {"x": 2.5, "w": 1.25}, + "4,0\n\n\n3,2", + {"w": 1.25}, + "4,1\n\n\n3,2", + {"w": 1.25}, + "4,2\n\n\n3,2", + {"c": "#cccccc", "w": 6}, + "4,5\n\n\n3,2", + {"c": "#aaaaaa", "w": 1.25}, + "4,10\n\n\n3,2", + "4,11\n\n\n3,2", + "4,12\n\n\n3,2", + "4,13\n\n\n3,2", + "4,14\n\n\n3,2" ], [ - { - "x": 3.5 - }, - "4,1\n\n\n4,6", - { - "w": 1.5 - }, - "4,2\n\n\n4,6", - { - "c": "#cccccc", - "w": 7 - }, - "4,7\n\n\n4,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n4,6", - "4,12\n\n\n4,6" + {"x": 2.5, "w": 1.75}, + "4,0\n\n\n3,3", + {"w": 1.25}, + "4,1\n\n\n3,3", + {"w": 1.25}, + "4,2\n\n\n3,3", + {"w": 1.25}, + "4,3\n\n\n3,3", + {"c": "#cccccc", "w": 3}, + "4,5\n\n\n3,3", + {"c": "#aaaaaa", "w": 1.25}, + "4,9\n\n\n3,3", + {"w": 1.25}, + "4,10\n\n\n3,3", + "4,11\n\n\n3,3", + "4,12\n\n\n3,3", + "4,13\n\n\n3,3", + "4,14\n\n\n3,3" ], [ - { - "x": 2, - "w": 1.5 - }, - "4,0\n\n\n4,7", - "4,1\n\n\n4,7", - { - "w": 1.5 - }, - "4,2\n\n\n4,7", - { - "c": "#cccccc", - "w": 7 - }, - "4,7\n\n\n4,7", - { - "c": "#aaaaaa" - }, - "4,11\n\n\n4,7", - "4,12\n\n\n4,7", - "4,13\n\n\n4,7", - "4,14\n\n\n4,7" + {"x": 2.5, "w": 1.25}, + "4,0\n\n\n3,4", + {"w": 1.25}, + "4,1\n\n\n3,4", + {"w": 1.25}, + "4,2\n\n\n3,4", + {"c": "#aaaaaa", "w": 3}, + "4,3\n\n\n3,4", + {"w": 3}, + "4,8\n\n\n3,4", + {"w": 1.25}, + "4,10\n\n\n3,4", + "4,11\n\n\n3,4", + "4,12\n\n\n3,4", + "4,13\n\n\n3,4", + "4,14\n\n\n3,4" ], [ - { - "x": 2, - "w": 1.75 - }, - "4,0\n\n\n4,8", - { - "w": 1.25 - }, - "4,1\n\n\n4,8", - { - "w": 1.25 - }, - "4,2\n\n\n4,8", - { - "w": 1.25 - }, - "4,3\n\n\n4,8", - { - "c": "#cccccc", - "w": 3 - }, - "4,5\n\n\n4,8", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,9\n\n\n4,8", - { - "w": 1.25 - }, - "4,10\n\n\n4,8", - "4,11\n\n\n4,8", - "4,12\n\n\n4,8", - "4,13\n\n\n4,8", - "4,14\n\n\n4,8" + {"x": 2.5, "w": 1.5}, + "4,0\n\n\n3,5", + "4,1\n\n\n3,5", + {"w": 1.5}, + "4,2\n\n\n3,5", + {"c": "#cccccc", "w": 7}, + "4,7\n\n\n3,5", + {"c": "#aaaaaa", "w": 1.5}, + "4,11\n\n\n3,5", + "4,12\n\n\n3,5", + {"w": 1.5}, + "4,14\n\n\n3,5" ] ] } diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 633836e1c7..10bde4c6d1 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -601,8 +601,11 @@ ], [ { - "x": 3.5 + "x": 2, + "w": 1.5, + "d": true }, + "\n\n\n4,6", "4,1\n\n\n4,6", { "w": 1.5 From 3545283f316e7cb525bb236593751c5bb7b3720b Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 5 Apr 2024 12:59:46 +0100 Subject: [PATCH 13/15] revert src --- src/melgeek/mj6xy/mj6xy_rev3.json | 289 +++++++++++++++++++++++------- 1 file changed, 225 insertions(+), 64 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 77036f7ac4..44ea268972 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -2,9 +2,11 @@ "name": "MJ6XY", "vendorId": "0xEDED", "productId": "0x6060", - "keycodes": ["qmk_lighting"], - "menus": ["qmk_backlight_rgblight"], - "matrix": {"rows": 5, "cols": 15}, + "lighting": "qmk_backlight_rgblight", + "matrix": { + "rows": 5, + "cols": 15 + }, "layouts": { "labels": [ "Split Backspace", @@ -29,9 +31,14 @@ ], "keymap": [ [ - {"x": 2.5, "c": "#777777"}, + { + "x": 2.5, + "c": "#777777" + }, "0,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "0,1", "0,2", "0,3", @@ -44,16 +51,28 @@ "0,10", "0,11", "0,12", - {"c": "#aaaaaa", "w": 2}, + { + "c": "#aaaaaa", + "w": 2 + }, "0,14\n\n\n0,0", - {"x": 0.5, "c": "#cccccc"}, + { + "x": 0.5, + "c": "#cccccc" + }, "0,13\n\n\n0,1", "0,14\n\n\n0,1" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 1.5}, + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, "1,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "1,1", "1,2", "1,3", @@ -66,7 +85,9 @@ "1,10", "1,11", "1,12", - {"w": 1.5}, + { + "w": 1.5 + }, "1,13\n\n\n1,0", { "x": 1.25, @@ -80,9 +101,15 @@ "2,13\n\n\n1,1" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 1.75}, + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, "2,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "2,1", "2,2", "2,3", @@ -94,15 +121,27 @@ "2,9", "2,10", "2,11", - {"c": "#777777", "w": 2.25}, + { + "c": "#777777", + "w": 2.25 + }, "2,13\n\n\n1,0", - {"x": 0.25, "c": "#cccccc"}, + { + "x": 0.25, + "c": "#cccccc" + }, "2,12\n\n\n1,1" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 2.25}, + { + "x": 2.5, + "c": "#aaaaaa", + "w": 2.25 + }, "3,0\n\n\n2,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2\n\n\n2,0", "3,3\n\n\n2,0", "3,4\n\n\n2,0", @@ -113,32 +152,60 @@ "3,9\n\n\n2,0", "3,10\n\n\n2,0", "3,11\n\n\n2,0", - {"c": "#aaaaaa", "w": 2.75}, + { + "c": "#aaaaaa", + "w": 2.75 + }, "3,13\n\n\n2,0" ], [ - {"x": 2.5, "w": 1.25}, + { + "x": 2.5, + "w": 1.25 + }, "4,0\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,0", - {"c": "#cccccc", "w": 6.25}, + { + "c": "#cccccc", + "w": 6.25 + }, "4,5\n\n\n3,0", - {"c": "#aaaaaa", "w": 1.25}, + { + "c": "#aaaaaa", + "w": 1.25 + }, "4,10\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,11\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,12\n\n\n3,0", - {"w": 1.25}, + { + "w": 1.25 + }, "4,14\n\n\n3,0" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 1.25}, + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, "3,0\n\n\n2,1", "3,1\n\n\n2,1", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2\n\n\n2,1", "3,3\n\n\n2,1", "3,4\n\n\n2,1", @@ -149,14 +216,23 @@ "3,9\n\n\n2,1", "3,10\n\n\n2,1", "3,11\n\n\n2,1", - {"c": "#aaaaaa", "w": 1.75}, + { + "c": "#aaaaaa", + "w": 1.75 + }, "3,12\n\n\n2,1", "3,14\n\n\n2,1" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 2.25}, + { + "x": 2.5, + "c": "#aaaaaa", + "w": 2.25 + }, "3,0\n\n\n2,2", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2\n\n\n2,2", "3,3\n\n\n2,2", "3,4\n\n\n2,2", @@ -166,15 +242,23 @@ "3,8\n\n\n2,2", "3,9\n\n\n2,2", "3,10\n\n\n2,2", - {"w": 1.75}, + { + "w": 1.75 + }, "3,11\n\n\n2,2", "3,13\n\n\n2,2", "3,14\n\n\n2,2" ], [ - {"x": 2.5, "c": "#aaaaaa", "w": 2}, + { + "x": 2.5, + "c": "#aaaaaa", + "w": 2.0 + }, "3,0\n\n\n2,3", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2\n\n\n2,3", "3,3\n\n\n2,3", "3,4\n\n\n2,3", @@ -190,10 +274,15 @@ "3,14\n\n\n2,3" ], [ - {"x": 2.5, "c": "#aaaaaa"}, + { + "x": 2.5, + "c": "#aaaaaa" + }, "3,0\n\n\n2,4", "3,1\n\n\n2,4", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2\n\n\n2,4", "3,3\n\n\n2,4", "3,4\n\n\n2,4", @@ -204,20 +293,35 @@ "3,9\n\n\n2,4", "3,10\n\n\n2,4", "3,11\n\n\n2,4", - {"c": "#aaaaaa", "w": 2}, + { + "c": "#aaaaaa", + "w": 2.0 + }, "3,12\n\n\n2,4", "3,14\n\n\n2,4" ], [ - {"x": 2.5, "w": 1.25}, + { + "x": 2.5, + "w": 1.25 + }, "4,0\n\n\n3,1", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,1", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,1", - {"c": "#cccccc", "w": 6.25}, + { + "c": "#cccccc", + "w": 6.25 + }, "4,5\n\n\n3,1", - {"c": "#aaaaaa"}, + { + "c": "#aaaaaa" + }, "4,10\n\n\n3,1", "4,11\n\n\n3,1", "4,12\n\n\n3,1", @@ -225,15 +329,28 @@ "4,14\n\n\n3,1" ], [ - {"x": 2.5, "w": 1.25}, + { + "x": 2.5, + "w": 1.25 + }, "4,0\n\n\n3,2", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,2", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,2", - {"c": "#cccccc", "w": 6}, + { + "c": "#cccccc", + "w": 6.0 + }, "4,5\n\n\n3,2", - {"c": "#aaaaaa", "w": 1.25}, + { + "c": "#aaaaaa", + "w": 1.25 + }, "4,10\n\n\n3,2", "4,11\n\n\n3,2", "4,12\n\n\n3,2", @@ -241,19 +358,36 @@ "4,14\n\n\n3,2" ], [ - {"x": 2.5, "w": 1.75}, + { + "x": 2.5, + "w": 1.75 + }, "4,0\n\n\n3,3", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,3", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,3", - {"w": 1.25}, + { + "w": 1.25 + }, "4,3\n\n\n3,3", - {"c": "#cccccc", "w": 3}, + { + "c": "#cccccc", + "w": 3.0 + }, "4,5\n\n\n3,3", - {"c": "#aaaaaa", "w": 1.25}, + { + "c": "#aaaaaa", + "w": 1.25 + }, "4,9\n\n\n3,3", - {"w": 1.25}, + { + "w": 1.25 + }, "4,10\n\n\n3,3", "4,11\n\n\n3,3", "4,12\n\n\n3,3", @@ -261,17 +395,31 @@ "4,14\n\n\n3,3" ], [ - {"x": 2.5, "w": 1.25}, + { + "x": 2.5, + "w": 1.25 + }, "4,0\n\n\n3,4", - {"w": 1.25}, + { + "w": 1.25 + }, "4,1\n\n\n3,4", - {"w": 1.25}, + { + "w": 1.25 + }, "4,2\n\n\n3,4", - {"c": "#aaaaaa", "w": 3}, + { + "c": "#aaaaaa", + "w": 3.0 + }, "4,3\n\n\n3,4", - {"w": 3}, + { + "w": 3.0 + }, "4,8\n\n\n3,4", - {"w": 1.25}, + { + "w": 1.25 + }, "4,10\n\n\n3,4", "4,11\n\n\n3,4", "4,12\n\n\n3,4", @@ -279,17 +427,30 @@ "4,14\n\n\n3,4" ], [ - {"x": 2.5, "w": 1.5}, + { + "x": 2.5, + "w": 1.5 + }, "4,0\n\n\n3,5", "4,1\n\n\n3,5", - {"w": 1.5}, + { + "w": 1.5 + }, "4,2\n\n\n3,5", - {"c": "#cccccc", "w": 7}, + { + "c": "#cccccc", + "w": 7.0 + }, "4,7\n\n\n3,5", - {"c": "#aaaaaa", "w": 1.5}, + { + "c": "#aaaaaa", + "w": 1.5 + }, "4,11\n\n\n3,5", "4,12\n\n\n3,5", - {"w": 1.5}, + { + "w": 1.5 + }, "4,14\n\n\n3,5" ] ] From 2cf210958cc5d6dc9cb3f0b6c2109da63d17cd72 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 5 Apr 2024 13:07:24 +0100 Subject: [PATCH 14/15] update mj6xy_rev3.json --- v3/melgeek/mj6xy/mj6xy_rev3.json | 47 ++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 10bde4c6d1..1615eddb06 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -33,6 +33,7 @@ "WKL", "7u HHKB", "Tsangan Arrows", + "Tsangan Arrows WKL", "Minila" ] ], @@ -650,39 +651,63 @@ [ { "x": 2, - "w": 1.75 + "w": 1.5 }, "4,0\n\n\n4,8", + { + "x": 1, + "w": 1.5 + }, + "4,2\n\n\n4,8", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n4,8", + { + "c": "#aaaaaa" + }, + "4,11\n\n\n4,8", + "4,12\n\n\n4,8", + "4,13\n\n\n4,8", + "4,14\n\n\n4,8" + ], + [ + { + "x": 2, + "w": 1.75 + }, + "4,0\n\n\n4,9", { "w": 1.25 }, - "4,1\n\n\n4,8", + "4,1\n\n\n4,9", { "w": 1.25 }, - "4,2\n\n\n4,8", + "4,2\n\n\n4,9", { "w": 1.25 }, - "4,3\n\n\n4,8", + "4,3\n\n\n4,9", { "c": "#cccccc", "w": 3 }, - "4,5\n\n\n4,8", + "4,5\n\n\n4,9", { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n4,8", + "4,9\n\n\n4,9", { "w": 1.25 }, - "4,10\n\n\n4,8", - "4,11\n\n\n4,8", - "4,12\n\n\n4,8", - "4,13\n\n\n4,8", - "4,14\n\n\n4,8" + "4,10\n\n\n4,9", + "4,11\n\n\n4,9", + "4,12\n\n\n4,9", + "4,13\n\n\n4,9", + "4,14\n\n\n4,9" ] ] } From 34c076858e1e1421d4db08ea0133ad2587243fb1 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 8 Apr 2024 11:41:27 +0100 Subject: [PATCH 15/15] Update mj6xy_rev3.json --- v3/melgeek/mj6xy/mj6xy_rev3.json | 47 ++++++++------------------------ 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 1615eddb06..10bde4c6d1 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -33,7 +33,6 @@ "WKL", "7u HHKB", "Tsangan Arrows", - "Tsangan Arrows WKL", "Minila" ] ], @@ -648,66 +647,42 @@ "4,13\n\n\n4,7", "4,14\n\n\n4,7" ], - [ - { - "x": 2, - "w": 1.5 - }, - "4,0\n\n\n4,8", - { - "x": 1, - "w": 1.5 - }, - "4,2\n\n\n4,8", - { - "c": "#cccccc", - "w": 7 - }, - "4,7\n\n\n4,8", - { - "c": "#aaaaaa" - }, - "4,11\n\n\n4,8", - "4,12\n\n\n4,8", - "4,13\n\n\n4,8", - "4,14\n\n\n4,8" - ], [ { "x": 2, "w": 1.75 }, - "4,0\n\n\n4,9", + "4,0\n\n\n4,8", { "w": 1.25 }, - "4,1\n\n\n4,9", + "4,1\n\n\n4,8", { "w": 1.25 }, - "4,2\n\n\n4,9", + "4,2\n\n\n4,8", { "w": 1.25 }, - "4,3\n\n\n4,9", + "4,3\n\n\n4,8", { "c": "#cccccc", "w": 3 }, - "4,5\n\n\n4,9", + "4,5\n\n\n4,8", { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n4,9", + "4,9\n\n\n4,8", { "w": 1.25 }, - "4,10\n\n\n4,9", - "4,11\n\n\n4,9", - "4,12\n\n\n4,9", - "4,13\n\n\n4,9", - "4,14\n\n\n4,9" + "4,10\n\n\n4,8", + "4,11\n\n\n4,8", + "4,12\n\n\n4,8", + "4,13\n\n\n4,8", + "4,14\n\n\n4,8" ] ] }