From 6b4d485879eadc4928307246decf2584fbc5c1af Mon Sep 17 00:00:00 2001 From: spbgzh Date: Fri, 3 Sep 2021 02:57:52 +0300 Subject: [PATCH 1/2] Add mammoth75 --- .../mammoth75x.json} | 161 ++++++++++++------ 1 file changed, 112 insertions(+), 49 deletions(-) rename src/wuque/{serneity65/serneity65.json => mammoth75x/mammoth75x.json} (60%) diff --git a/src/wuque/serneity65/serneity65.json b/src/wuque/mammoth75x/mammoth75x.json similarity index 60% rename from src/wuque/serneity65/serneity65.json rename to src/wuque/mammoth75x/mammoth75x.json index 70cdd214e2..e7016daeaa 100644 --- a/src/wuque/serneity65/serneity65.json +++ b/src/wuque/mammoth75x/mammoth75x.json @@ -1,11 +1,11 @@ { - "name": "serneity65", - "vendorId": "0x906B", - "productId": "0x0003", + "name": "mammoth75x", + "vendorId": "0xA06B", + "productId": "0x0004", "lighting": "none", "matrix": { - "rows": 5, - "cols": 15 + "rows": 6, + "cols": 16 }, "layouts": { "labels": [ @@ -16,50 +16,67 @@ "keymap": [ [ { - "y": 0.5, "x": 15.25 }, - "0,13\n\n\n0,1", - "2,13\n\n\n0,1", - { - "x": 1.25, - "w": 1.5, - "h": 1.5 - }, - "4,3", - { - "w": 1.5, - "h": 1.5 - }, - "4,5" + "1,13\n\n\n0,1", + "3,13\n\n\n0,1" ], [ { "x": 2.25 }, "0,0", + { + "x": 0.25 + }, "0,1", "0,2", "0,3", "0,4", + { + "x": 0.25 + }, "0,5", "0,6", "0,7", "0,8", + { + "x": 0.25 + }, "0,9", "0,10", "0,11", "0,12", { - "w": 2 + "x": 0.25 + }, + "0,13" + ], + [ + { + "y": -0.75, + "x": 21, + "w": 1.5, + "h": 1.5 + }, + "5,3", + { + "w": 1.5, + "h": 1.5 + }, + "5,5" + ], + [ + { + "y": -0.5, + "x": 18 }, - "0,13\n\n\n0,0", "0,14" ], [ { - "x": 2.25, - "w": 1.5 + "y": -0.5, + "x": 2.25 }, "1,0", "1,1", @@ -75,14 +92,14 @@ "1,11", "1,12", { - "w": 1.5 + "w": 2 }, - "1,13" + "1,13\n\n\n0,0" ], [ { "x": 2.25, - "w": 1.75 + "w": 1.5 }, "2,0", "2,1", @@ -96,22 +113,24 @@ "2,9", "2,10", "2,11", + "2,12", { - "w": 2.25 + "w": 1.5 }, - "2,12", - "2,14" - ], - [ + "2,13", { - "w": 1.25 + "x": 0.25 }, - "3,0\n\n\n1,1", - "3,1\n\n\n1,1", + "2,14", + "2,15" + ], + [ { - "w": 2.25 + "x": 2.25, + "w": 1.75 }, - "3,0\n\n\n1,0", + "3,0", + "3,1", "3,2", "3,3", "3,4", @@ -123,30 +142,66 @@ "3,10", "3,11", { - "w": 1.75 + "w": 2.25 }, "3,12", - "3,13", - "3,14" + { + "x": 0.25 + }, + "3,14", + "3,15" + ], + [ + { + "w": 1.25 + }, + "4,0\n\n\n1,1", + "4,1\n\n\n1,1", + { + "w": 2.25 + }, + "4,0\n\n\n1,0", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "w": 2.75 + }, + "4,12" + ], + [ + { + "y": -0.75, + "x": 17.5 + }, + "4,14" ], [ { + "y": -0.25, "x": 2.25, "w": 1.25 }, - "4,0", + "5,0", { "w": 1.25 }, - "4,1", + "5,1", { "w": 1.25 }, - "4,2", + "5,2", { "w": 6.25 }, - "4,6\n\n\n2,0", + "5,6\n\n\n2,0", { "w": 1.25 }, @@ -156,26 +211,34 @@ }, "4,11", { - "x": 0.5 + "w": 1.25 + }, + "4,12" + ], + [ + { + "y": -0.75, + "x": 16.5 }, - "4,12", "4,13", - "4,14" + "4,14", + "4,15" ], [ { + "y": -0.25, "x": 6, "w": 2.25 }, - "4,4\n\n\n2,1", + "5,4\n\n\n2,1", { "w": 1.25 }, - "4,6\n\n\n2,1", + "5,6\n\n\n2,1", { "w": 2.75 }, - "4,8\n\n\n2,1" + "5,8\n\n\n2,1" ] ] } From 5651f9ddf3cf40ac669ef77b6ba81398d6a02995 Mon Sep 17 00:00:00 2001 From: spbgzh Date: Fri, 3 Sep 2021 03:00:50 +0300 Subject: [PATCH 2/2] add zoom65 --- .../zoom65/zoom65.json} | 169 ++++++------------ 1 file changed, 59 insertions(+), 110 deletions(-) rename src/{wuque/mammoth75x/mammoth75x.json => meletrix/zoom65/zoom65.json} (61%) diff --git a/src/wuque/mammoth75x/mammoth75x.json b/src/meletrix/zoom65/zoom65.json similarity index 61% rename from src/wuque/mammoth75x/mammoth75x.json rename to src/meletrix/zoom65/zoom65.json index e7016daeaa..17e8f4dca8 100644 --- a/src/wuque/mammoth75x/mammoth75x.json +++ b/src/meletrix/zoom65/zoom65.json @@ -1,82 +1,66 @@ { - "name": "mammoth75x", - "vendorId": "0xA06B", + "name": "zoom65", + "vendorId": "0x806B", "productId": "0x0004", "lighting": "none", "matrix": { - "rows": 6, - "cols": 16 + "rows": 5, + "cols": 15 }, "layouts": { "labels": [ "Split Backspace", + "ISO", "Split Left Shift", "Split Space" ], "keymap": [ [ { + "y": 0.5, "x": 15.25 }, - "1,13\n\n\n0,1", - "3,13\n\n\n0,1" + "0,13\n\n\n0,1", + "2,13\n\n\n0,1", + { + "x": 1.25, + "w": 1.5, + "h": 1.5 + }, + "4,3", + { + "w": 1.5, + "h": 1.5 + }, + "4,5" ], [ { "x": 2.25 }, "0,0", - { - "x": 0.25 - }, "0,1", "0,2", "0,3", "0,4", - { - "x": 0.25 - }, "0,5", "0,6", "0,7", "0,8", - { - "x": 0.25 - }, "0,9", "0,10", "0,11", "0,12", { - "x": 0.25 - }, - "0,13" - ], - [ - { - "y": -0.75, - "x": 21, - "w": 1.5, - "h": 1.5 - }, - "5,3", - { - "w": 1.5, - "h": 1.5 - }, - "5,5" - ], - [ - { - "y": -0.5, - "x": 18 + "w": 2 }, + "0,13\n\n\n0,0", "0,14" ], [ { - "y": -0.5, - "x": 2.25 + "x": 2.25, + "w": 1.5 }, "1,0", "1,1", @@ -92,14 +76,24 @@ "1,11", "1,12", { - "w": 2 + "w": 1.5 }, - "1,13\n\n\n0,0" + "1,13\n\n\n1,0", + "1,14", + { + "x": 1, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "1,13\n\n\n1,1" ], [ { "x": 2.25, - "w": 1.5 + "w": 1.75 }, "2,0", "2,1", @@ -113,24 +107,23 @@ "2,9", "2,10", "2,11", - "2,12", - { - "w": 1.5 - }, - "2,13", { - "x": 0.25 + "w": 2.25 }, + "2,12\n\n\n1,0", "2,14", - "2,15" + "2,12\n\n\n1,1" ], [ { - "x": 2.25, - "w": 1.75 + "w": 1.25 }, - "3,0", - "3,1", + "3,0\n\n\n2,1", + "3,1\n\n\n2,1", + { + "w": 2.25 + }, + "3,0\n\n\n2,0", "3,2", "3,3", "3,4", @@ -142,66 +135,30 @@ "3,10", "3,11", { - "w": 2.25 + "w": 1.75 }, "3,12", - { - "x": 0.25 - }, - "3,14", - "3,15" - ], - [ - { - "w": 1.25 - }, - "4,0\n\n\n1,1", - "4,1\n\n\n1,1", - { - "w": 2.25 - }, - "4,0\n\n\n1,0", - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "w": 2.75 - }, - "4,12" - ], - [ - { - "y": -0.75, - "x": 17.5 - }, - "4,14" + "3,13", + "3,14" ], [ { - "y": -0.25, "x": 2.25, "w": 1.25 }, - "5,0", + "4,0", { "w": 1.25 }, - "5,1", + "4,1", { "w": 1.25 }, - "5,2", + "4,2", { "w": 6.25 }, - "5,6\n\n\n2,0", + "4,6\n\n\n3,0", { "w": 1.25 }, @@ -211,34 +168,26 @@ }, "4,11", { - "w": 1.25 - }, - "4,12" - ], - [ - { - "y": -0.75, - "x": 16.5 + "x": 0.5 }, + "4,12", "4,13", - "4,14", - "4,15" + "4,14" ], [ { - "y": -0.25, "x": 6, "w": 2.25 }, - "5,4\n\n\n2,1", + "4,4\n\n\n3,1", { "w": 1.25 }, - "5,6\n\n\n2,1", + "4,6\n\n\n3,1", { "w": 2.75 }, - "5,8\n\n\n2,1" + "4,8\n\n\n3,1" ] ] }