From 0b3e564cd8924d1ffa556bbf572b832f3ca550bb Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 29 Apr 2024 11:34:58 +0100 Subject: [PATCH 1/2] revamp gh60 --- v3/gh60/revc/revc.json | 181 +++++++++++++++++++++++++++++---------- v3/gh60/satan/satan.json | 181 +++++++++++++++++++++++++++++---------- 2 files changed, 276 insertions(+), 86 deletions(-) diff --git a/v3/gh60/revc/revc.json b/v3/gh60/revc/revc.json index d2ea297f2e..449225f559 100644 --- a/v3/gh60/revc/revc.json +++ b/v3/gh60/revc/revc.json @@ -9,23 +9,52 @@ "layouts": { "labels": [ "Split Backspace", - "ISO Enter", - "Split Left Shift", - "Split Right Shift", [ - "Bottom Row", + "Enter Cluster", "ANSI", - "7U", + "ISO", + "Split ANSI" + ], + "ISO Left Shift", + [ + "Right Shift", + "Standard", + "Tsangan", + "ABNT2" + ], + [ + "Left Modifiers", + "Standard", + "Tsangan", "WKL", - "HHKB" + "HHKB", + "LWKL" + ], + [ + "Spacebar", + "Standard", + "Tsangan", + "LWKL" + ], + [ + "Right Modifiers", + "Standard", + "Tsangan", + "WKL", + "HHKB", + "Infinity" ] ], "keymap": [ [ { - "x": 2.5 + "x": 2.5, + "c": "#777777" }, "0,0", + { + "c": "#cccccc" + }, "0,1", "0,2", "0,3", @@ -78,18 +107,25 @@ "1,13\n\n\n1,0", { "x": 1.25, - "c": "#aaaaaa", + "c": "#777777", "w": 1.25, "h": 2, "w2": 1.5, "h2": 1, "x2": -0.25 }, - "2,13\n\n\n1,1" + "2,13\n\n\n1,1", + { + "x": 1, + "c": "#cccccc", + "w": 1.5 + }, + "1,13\n\n\n1,2" ], [ { "x": 2.5, + "c": "#aaaaaa", "w": 1.75 }, "2,0", @@ -108,7 +144,7 @@ "2,10", "2,11", { - "c": "#aaaaaa", + "c": "#777777", "w": 2.25 }, "2,13\n\n\n1,0", @@ -116,7 +152,16 @@ "x": 0.25, "c": "#cccccc" }, - "2,12\n\n\n1,1" + "2,12\n\n\n1,1", + { + "x": 1.5 + }, + "2,12\n\n\n1,2", + { + "c": "#777777", + "w": 1.25 + }, + "2,13\n\n\n1,2" ], [ { @@ -157,11 +202,27 @@ "w": 1.75 }, "3,13\n\n\n3,1", - "3,12\n\n\n3,1" + "3,12\n\n\n3,1", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,12\n\n\n3,2", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n3,2" ], [ { "x": 2.5, + "w": 3.75, + "d": true + }, + "\n\n\n5,0", + { + "x": -3.75, "w": 1.25 }, "4,0\n\n\n4,0", @@ -177,29 +238,43 @@ "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n4,0", + "4,5\n\n\n5,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n4,0", + "4,10\n\n\n6,0", { "w": 1.25 }, - "4,11\n\n\n4,0", + "4,11\n\n\n6,0", { "w": 1.25 }, - "4,12\n\n\n4,0", + "4,12\n\n\n6,0", { "w": 1.25 }, - "4,13\n\n\n4,0" + "4,13\n\n\n6,0" ], [ { "y": 0.25, "x": 2.5, + "w": 4, + "d": true + }, + "\n\n\n5,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n5,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", "w": 1.5 }, "4,0\n\n\n4,1", @@ -209,20 +284,21 @@ }, "4,2\n\n\n4,1", { + "x": 6, "c": "#cccccc", - "w": 7 + "d": true }, - "4,5\n\n\n4,1", + "\n\n\n6,1", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n4,1", - "4,12\n\n\n4,1", + "4,11\n\n\n6,1", + "4,12\n\n\n6,1", { "w": 1.5 }, - "4,13\n\n\n4,1" + "4,13\n\n\n6,1" ], [ { @@ -231,69 +307,88 @@ }, "4,0\n\n\n4,2", { + "x": 1, + "w": 1.5 + }, + "4,2\n\n\n4,2", + { + "x": 6, "c": "#cccccc", "d": true }, - "\n\n\n4,2", + "\n\n\n6,2", { "c": "#aaaaaa", "w": 1.5 }, - "4,2\n\n\n4,2", + "4,11\n\n\n6,2", + { + "x": 1, + "w": 1.5 + }, + "4,13\n\n\n6,2" + ], + [ { + "x": 2.5, "c": "#cccccc", - "w": 7 + "w": 1.5, + "d": true }, - "4,5\n\n\n4,2", + "\n\n\n4,3", + { + "c": "#aaaaaa" + }, + "4,1\n\n\n4,3", { - "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n4,2", + "4,2\n\n\n4,3", { + "x": 6, "c": "#cccccc", "d": true }, - "\n\n\n4,2", + "\n\n\n6,3", { "c": "#aaaaaa", "w": 1.5 }, - "4,13\n\n\n4,2" + "4,11\n\n\n6,3", + "4,12\n\n\n6,3" ], [ { "x": 2.5, - "c": "#cccccc", - "w": 1.5, + "w": 3, "d": true }, - "\n\n\n4,3", + "\n\n\n5,2", { - "c": "#aaaaaa" + "x": -3, + "w": 1.5 }, - "4,1\n\n\n4,3", + "4,0\n\n\n4,4", { "w": 1.5 }, - "4,2\n\n\n4,3", + "4,1\n\n\n4,4", { "c": "#cccccc", "w": 7 }, - "4,5\n\n\n4,3", + "4,5\n\n\n5,2", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n4,3", - "4,12\n\n\n4,3", + "4,10\n\n\n6,4", + "4,11\n\n\n6,4", + "4,12\n\n\n6,4", { - "c": "#cccccc", - "w": 1.5, - "d": true + "w": 1.5 }, - "\n\n\n4,3" + "4,13\n\n\n6,4" ] ] } diff --git a/v3/gh60/satan/satan.json b/v3/gh60/satan/satan.json index bbce0dfdd3..fe21cdad3e 100644 --- a/v3/gh60/satan/satan.json +++ b/v3/gh60/satan/satan.json @@ -15,23 +15,52 @@ "layouts": { "labels": [ "Split Backspace", - "ISO Enter", - "Split Left Shift", - "Split Right Shift", [ - "Bottom Row", + "Enter Cluster", "ANSI", - "7U", + "ISO", + "Split ANSI" + ], + "ISO Left Shift", + [ + "Right Shift", + "Standard", + "Tsangan", + "ABNT2" + ], + [ + "Left Modifiers", + "Standard", + "Tsangan", "WKL", - "HHKB" + "HHKB", + "LWKL" + ], + [ + "Spacebar", + "Standard", + "Tsangan", + "LWKL" + ], + [ + "Right Modifiers", + "Standard", + "Tsangan", + "WKL", + "HHKB", + "Infinity" ] ], "keymap": [ [ { - "x": 2.5 + "x": 2.5, + "c": "#777777" }, "0,0", + { + "c": "#cccccc" + }, "0,1", "0,2", "0,3", @@ -84,18 +113,25 @@ "1,13\n\n\n1,0", { "x": 1.25, - "c": "#aaaaaa", + "c": "#777777", "w": 1.25, "h": 2, "w2": 1.5, "h2": 1, "x2": -0.25 }, - "2,13\n\n\n1,1" + "2,13\n\n\n1,1", + { + "x": 1, + "c": "#cccccc", + "w": 1.5 + }, + "1,13\n\n\n1,2" ], [ { "x": 2.5, + "c": "#aaaaaa", "w": 1.75 }, "2,0", @@ -114,7 +150,7 @@ "2,10", "2,11", { - "c": "#aaaaaa", + "c": "#777777", "w": 2.25 }, "2,13\n\n\n1,0", @@ -122,7 +158,16 @@ "x": 0.25, "c": "#cccccc" }, - "2,12\n\n\n1,1" + "2,12\n\n\n1,1", + { + "x": 1.5 + }, + "2,12\n\n\n1,2", + { + "c": "#777777", + "w": 1.25 + }, + "2,13\n\n\n1,2" ], [ { @@ -163,11 +208,27 @@ "w": 1.75 }, "3,13\n\n\n3,1", - "3,12\n\n\n3,1" + "3,12\n\n\n3,1", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,12\n\n\n3,2", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n3,2" ], [ { "x": 2.5, + "w": 3.75, + "d": true + }, + "\n\n\n5,0", + { + "x": -3.75, "w": 1.25 }, "4,0\n\n\n4,0", @@ -183,29 +244,43 @@ "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n4,0", + "4,5\n\n\n5,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n4,0", + "4,10\n\n\n6,0", { "w": 1.25 }, - "4,11\n\n\n4,0", + "4,11\n\n\n6,0", { "w": 1.25 }, - "4,12\n\n\n4,0", + "4,12\n\n\n6,0", { "w": 1.25 }, - "4,13\n\n\n4,0" + "4,13\n\n\n6,0" ], [ { "y": 0.25, "x": 2.5, + "w": 4, + "d": true + }, + "\n\n\n5,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n5,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", "w": 1.5 }, "4,0\n\n\n4,1", @@ -215,20 +290,21 @@ }, "4,2\n\n\n4,1", { + "x": 6, "c": "#cccccc", - "w": 7 + "d": true }, - "4,5\n\n\n4,1", + "\n\n\n6,1", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n4,1", - "4,12\n\n\n4,1", + "4,11\n\n\n6,1", + "4,12\n\n\n6,1", { "w": 1.5 }, - "4,13\n\n\n4,1" + "4,13\n\n\n6,1" ], [ { @@ -237,69 +313,88 @@ }, "4,0\n\n\n4,2", { + "x": 1, + "w": 1.5 + }, + "4,2\n\n\n4,2", + { + "x": 6, "c": "#cccccc", "d": true }, - "\n\n\n4,2", + "\n\n\n6,2", { "c": "#aaaaaa", "w": 1.5 }, - "4,2\n\n\n4,2", + "4,11\n\n\n6,2", + { + "x": 1, + "w": 1.5 + }, + "4,13\n\n\n6,2" + ], + [ { + "x": 2.5, "c": "#cccccc", - "w": 7 + "w": 1.5, + "d": true }, - "4,5\n\n\n4,2", + "\n\n\n4,3", + { + "c": "#aaaaaa" + }, + "4,1\n\n\n4,3", { - "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n4,2", + "4,2\n\n\n4,3", { + "x": 6, "c": "#cccccc", "d": true }, - "\n\n\n4,2", + "\n\n\n6,3", { "c": "#aaaaaa", "w": 1.5 }, - "4,13\n\n\n4,2" + "4,11\n\n\n6,3", + "4,12\n\n\n6,3" ], [ { "x": 2.5, - "c": "#cccccc", - "w": 1.5, + "w": 3, "d": true }, - "\n\n\n4,3", + "\n\n\n5,2", { - "c": "#aaaaaa" + "x": -3, + "w": 1.5 }, - "4,1\n\n\n4,3", + "4,0\n\n\n4,4", { "w": 1.5 }, - "4,2\n\n\n4,3", + "4,1\n\n\n4,4", { "c": "#cccccc", "w": 7 }, - "4,5\n\n\n4,3", + "4,5\n\n\n5,2", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n4,3", - "4,12\n\n\n4,3", + "4,10\n\n\n6,4", + "4,11\n\n\n6,4", + "4,12\n\n\n6,4", { - "c": "#cccccc", - "w": 1.5, - "d": true + "w": 1.5 }, - "\n\n\n4,3" + "4,13\n\n\n6,4" ] ] } From 02c8c4ce2c8a1f167d908e87b43c31dd26a07f9c Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 8 Jul 2024 19:25:35 +0100 Subject: [PATCH 2/2] reformat --- v3/gh60/revc/revc.json | 157 ++++++++++++++++++++++----------------- v3/gh60/satan/satan.json | 157 ++++++++++++++++++++++----------------- 2 files changed, 178 insertions(+), 136 deletions(-) diff --git a/v3/gh60/revc/revc.json b/v3/gh60/revc/revc.json index 449225f559..63b8c1e1f2 100644 --- a/v3/gh60/revc/revc.json +++ b/v3/gh60/revc/revc.json @@ -23,26 +23,14 @@ "ABNT2" ], [ - "Left Modifiers", + "Bottom Row", "Standard", "Tsangan", "WKL", + "7u HHKB", + "Infinity Hacker", "HHKB", "LWKL" - ], - [ - "Spacebar", - "Standard", - "Tsangan", - "LWKL" - ], - [ - "Right Modifiers", - "Standard", - "Tsangan", - "WKL", - "HHKB", - "Infinity" ] ], "keymap": [ @@ -217,12 +205,6 @@ [ { "x": 2.5, - "w": 3.75, - "d": true - }, - "\n\n\n5,0", - { - "x": -3.75, "w": 1.25 }, "4,0\n\n\n4,0", @@ -238,43 +220,29 @@ "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n5,0", + "4,5\n\n\n4,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n6,0", + "4,10\n\n\n4,0", { "w": 1.25 }, - "4,11\n\n\n6,0", + "4,11\n\n\n4,0", { "w": 1.25 }, - "4,12\n\n\n6,0", + "4,12\n\n\n4,0", { "w": 1.25 }, - "4,13\n\n\n6,0" + "4,13\n\n\n4,0" ], [ { "y": 0.25, "x": 2.5, - "w": 4, - "d": true - }, - "\n\n\n5,1", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n5,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", "w": 1.5 }, "4,0\n\n\n4,1", @@ -284,21 +252,20 @@ }, "4,2\n\n\n4,1", { - "x": 6, "c": "#cccccc", - "d": true + "w": 7 }, - "\n\n\n6,1", + "4,5\n\n\n4,1", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,1", - "4,12\n\n\n6,1", + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", { "w": 1.5 }, - "4,13\n\n\n6,1" + "4,13\n\n\n4,1" ], [ { @@ -312,21 +279,20 @@ }, "4,2\n\n\n4,2", { - "x": 6, "c": "#cccccc", - "d": true + "w": 7 }, - "\n\n\n6,2", + "4,5\n\n\n4,2", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,2", + "4,11\n\n\n4,2", { "x": 1, "w": 1.5 }, - "4,13\n\n\n6,2" + "4,13\n\n\n4,2" ], [ { @@ -345,50 +311,105 @@ }, "4,2\n\n\n4,3", { - "x": 6, "c": "#cccccc", - "d": true + "w": 7 }, - "\n\n\n6,3", + "4,5\n\n\n4,3", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,3", - "4,12\n\n\n6,3" + "4,11\n\n\n4,3", + "4,12\n\n\n4,3" ], [ { "x": 2.5, - "w": 3, - "d": true + "w": 1.5 }, - "\n\n\n5,2", + "4,0\n\n\n4,4", + "4,1\n\n\n4,4", { - "x": -3, "w": 1.5 }, - "4,0\n\n\n4,4", + "4,2\n\n\n4,4", { + "c": "#cccccc", + "w": 6 + }, + "4,5\n\n\n4,4", + { + "c": "#aaaaaa", "w": 1.5 }, - "4,1\n\n\n4,4", + "4,10\n\n\n4,4", + "4,11\n\n\n4,4", + "4,12\n\n\n4,4", { + "w": 1.5 + }, + "4,13\n\n\n4,4" + ], + [ + { + "x": 2.5, "c": "#cccccc", - "w": 7 + "w": 1.5, + "d": true }, - "4,5\n\n\n5,2", + "\n\n\n4,5", + { + "c": "#aaaaaa" + }, + "4,1\n\n\n4,5", + { + "w": 1.5 + }, + "4,2\n\n\n4,5", + { + "c": "#cccccc", + "w": 6 + }, + "4,5\n\n\n4,5", { "c": "#aaaaaa", "w": 1.5 }, - "4,10\n\n\n6,4", - "4,11\n\n\n6,4", - "4,12\n\n\n6,4", + "4,10\n\n\n4,5", + "4,11\n\n\n4,5" + ], + [ { + "x": 2.5, "w": 1.5 }, - "4,13\n\n\n6,4" + "4,0\n\n\n4,6", + { + "w": 1.5 + }, + "4,1\n\n\n4,6", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n4,6", + { + "w": 1.25 + }, + "4,11\n\n\n4,6", + { + "w": 1.25 + }, + "4,12\n\n\n4,6", + { + "w": 1.25 + }, + "4,13\n\n\n4,6" ] ] } diff --git a/v3/gh60/satan/satan.json b/v3/gh60/satan/satan.json index fe21cdad3e..9b544d3ec2 100644 --- a/v3/gh60/satan/satan.json +++ b/v3/gh60/satan/satan.json @@ -29,26 +29,14 @@ "ABNT2" ], [ - "Left Modifiers", + "Bottom Row", "Standard", "Tsangan", "WKL", + "7u HHKB", + "Infinity Hacker", "HHKB", "LWKL" - ], - [ - "Spacebar", - "Standard", - "Tsangan", - "LWKL" - ], - [ - "Right Modifiers", - "Standard", - "Tsangan", - "WKL", - "HHKB", - "Infinity" ] ], "keymap": [ @@ -223,12 +211,6 @@ [ { "x": 2.5, - "w": 3.75, - "d": true - }, - "\n\n\n5,0", - { - "x": -3.75, "w": 1.25 }, "4,0\n\n\n4,0", @@ -244,43 +226,29 @@ "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n5,0", + "4,5\n\n\n4,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n6,0", + "4,10\n\n\n4,0", { "w": 1.25 }, - "4,11\n\n\n6,0", + "4,11\n\n\n4,0", { "w": 1.25 }, - "4,12\n\n\n6,0", + "4,12\n\n\n4,0", { "w": 1.25 }, - "4,13\n\n\n6,0" + "4,13\n\n\n4,0" ], [ { "y": 0.25, "x": 2.5, - "w": 4, - "d": true - }, - "\n\n\n5,1", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n5,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", "w": 1.5 }, "4,0\n\n\n4,1", @@ -290,21 +258,20 @@ }, "4,2\n\n\n4,1", { - "x": 6, "c": "#cccccc", - "d": true + "w": 7 }, - "\n\n\n6,1", + "4,5\n\n\n4,1", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,1", - "4,12\n\n\n6,1", + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", { "w": 1.5 }, - "4,13\n\n\n6,1" + "4,13\n\n\n4,1" ], [ { @@ -318,21 +285,20 @@ }, "4,2\n\n\n4,2", { - "x": 6, "c": "#cccccc", - "d": true + "w": 7 }, - "\n\n\n6,2", + "4,5\n\n\n4,2", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,2", + "4,11\n\n\n4,2", { "x": 1, "w": 1.5 }, - "4,13\n\n\n6,2" + "4,13\n\n\n4,2" ], [ { @@ -351,50 +317,105 @@ }, "4,2\n\n\n4,3", { - "x": 6, "c": "#cccccc", - "d": true + "w": 7 }, - "\n\n\n6,3", + "4,5\n\n\n4,3", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,3", - "4,12\n\n\n6,3" + "4,11\n\n\n4,3", + "4,12\n\n\n4,3" ], [ { "x": 2.5, - "w": 3, - "d": true + "w": 1.5 }, - "\n\n\n5,2", + "4,0\n\n\n4,4", + "4,1\n\n\n4,4", { - "x": -3, "w": 1.5 }, - "4,0\n\n\n4,4", + "4,2\n\n\n4,4", { + "c": "#cccccc", + "w": 6 + }, + "4,5\n\n\n4,4", + { + "c": "#aaaaaa", "w": 1.5 }, - "4,1\n\n\n4,4", + "4,10\n\n\n4,4", + "4,11\n\n\n4,4", + "4,12\n\n\n4,4", { + "w": 1.5 + }, + "4,13\n\n\n4,4" + ], + [ + { + "x": 2.5, "c": "#cccccc", - "w": 7 + "w": 1.5, + "d": true }, - "4,5\n\n\n5,2", + "\n\n\n4,5", + { + "c": "#aaaaaa" + }, + "4,1\n\n\n4,5", + { + "w": 1.5 + }, + "4,2\n\n\n4,5", + { + "c": "#cccccc", + "w": 6 + }, + "4,5\n\n\n4,5", { "c": "#aaaaaa", "w": 1.5 }, - "4,10\n\n\n6,4", - "4,11\n\n\n6,4", - "4,12\n\n\n6,4", + "4,10\n\n\n4,5", + "4,11\n\n\n4,5" + ], + [ { + "x": 2.5, "w": 1.5 }, - "4,13\n\n\n6,4" + "4,0\n\n\n4,6", + { + "w": 1.5 + }, + "4,1\n\n\n4,6", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n4,6", + { + "w": 1.25 + }, + "4,11\n\n\n4,6", + { + "w": 1.25 + }, + "4,12\n\n\n4,6", + { + "w": 1.25 + }, + "4,13\n\n\n4,6" ] ] }