From 138e03ba3b4a16543e55d6929c0c5a1d9149f7e5 Mon Sep 17 00:00:00 2001 From: chalex Date: Wed, 21 Feb 2024 21:48:48 -0500 Subject: [PATCH 01/11] add ppr_merro60 --- src/chlx/ppr_merro60/ppr_merro60.json | 268 ++++++++++++++++++++++++++ 1 file changed, 268 insertions(+) create mode 100644 src/chlx/ppr_merro60/ppr_merro60.json diff --git a/src/chlx/ppr_merro60/ppr_merro60.json b/src/chlx/ppr_merro60/ppr_merro60.json new file mode 100644 index 0000000000..9f379806ee --- /dev/null +++ b/src/chlx/ppr_merro60/ppr_merro60.json @@ -0,0 +1,268 @@ +{ + "name" : "chlx ppr.merro60", + "vendorId" : "0x4358", + "productId" : "0x0603", + "matrix" : { + "rows": 10, + "cols": 7 + }, + "layouts" : { + "labels" : [ + "Full Backspace", + ["Enter", "ANSI", "ISO"], + "Full Left Shift", + "Full Right Shift", + ["Bottom Row", "Split", "ANSI", "Tsangan / 10u"] + ], + "keymap" : [ + [ + { + "x": 3, + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "1,0", + "0,1", + "1,1", + "0,2", + "1,2", + "0,3", + "1,3", + "0,4", + "1,4", + "0,5", + "1,5", + "0,6", + "1,6\n\n\n0,0", + "9,6\n\n\n0,0", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,6\n\n\n0,1" + ], + [ + { + "x": 3, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "3,0", + "2,1", + "3,1", + "2,2", + "3,2", + "2,3", + "3,3", + "2,4", + "3,4", + "2,5", + "3,5", + "2,6", + { + "w": 1.5 + }, + "3,6\n\n\n1,0", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "5,6\n\n\n1,1" + ], + [ + { + "x": 3, + "c": "#aaaaaa", + "w": 1.75 + }, + "4,0", + { + "c": "#cccccc" + }, + "5,0", + "4,1", + "5,1", + "4,2", + "5,2", + "4,3", + "5,3", + "4,4", + "5,4", + "4,5", + "5,5", + { + "c": "#777777", + "w": 2.25 + }, + "5,6\n\n\n1,0", + { + "x": 0.75, + "c": "#cccccc" + }, + "4,6\n\n\n1,1" + ], + [ + { + "x": 0.25, + "w": 2.25 + }, + "6,0\n\n\n2,1", + { + "x": 0.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "6,0\n\n\n2,0", + "7,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "6,1", + "7,1", + "6,2", + "7,2", + "6,3", + "7,3", + "6,4", + "7,4", + "6,5", + "7,5", + { + "w": 1.75 + }, + "6,6\n\n\n3,0", + "7,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "7,6\n\n\n3,1" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "9,0\n\n\n4,0", + { + "w": 1.25 + }, + "8,0\n\n\n4,0", + { + "w": 1.25 + }, + "9,2\n\n\n4,0", + { + "c": "#cccccc", + "w": 2.75 + }, + "8,2\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "8,3\n\n\n4,0", + { + "c": "#cccccc", + "w": 2.25 + }, + "9,3\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "9,4\n\n\n4,0", + { + "w": 1.25 + }, + "8,5\n\n\n4,0", + { + "w": 1.25 + }, + "9,5\n\n\n4,0", + { + "w": 1.25 + }, + "8,6\n\n\n4,0" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "9,0\n\n\n4,1", + { + "w": 1.25 + }, + "8,0\n\n\n4,1", + { + "w": 1.25 + }, + "8,2\n\n\n4,1", + { + "c": "#cccccc", + "w": 6.25 + }, + "8,3\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "9,4\n\n\n4,1", + { + "w": 1.25 + }, + "8,5\n\n\n4,1", + { + "w": 1.25 + }, + "9,5\n\n\n4,1", + { + "w": 1.25 + }, + "8,6\n\n\n4,1" + ], + [ + { + "y": 0.25, + "x": 3, + "w": 1.5 + }, + "9,0\n\n\n4,2", + "8,0\n\n\n4,2", + { + "w": 1.5 + }, + "9,2\n\n\n4,2", + { + "c": "#cccccc", + "w": 7 + }, + "8,3\n\n\n4,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "8,5\n\n\n4,2", + "9,5\n\n\n4,2", + { + "w": 1.5 + }, + "8,6\n\n\n4,2" + ] + ] + } +} + From 1f901da14e729c30bd2767326efd0721ca8eb62e Mon Sep 17 00:00:00 2001 From: chalex Date: Thu, 22 Feb 2024 21:02:34 -0500 Subject: [PATCH 02/11] move v3 files from v2 'src' dir to 'v3' --- {src => v3}/chlx/ppr_merro60/ppr_merro60.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {src => v3}/chlx/ppr_merro60/ppr_merro60.json (100%) diff --git a/src/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json similarity index 100% rename from src/chlx/ppr_merro60/ppr_merro60.json rename to v3/chlx/ppr_merro60/ppr_merro60.json From 53544b737c2b098278c2484640b9693766ccb41b Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:42:15 -0500 Subject: [PATCH 03/11] Update v3/chlx/ppr_merro60/ppr_merro60.json Co-authored-by: Duncan Sutherland --- v3/chlx/ppr_merro60/ppr_merro60.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index 9f379806ee..9e9f34b975 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -12,7 +12,7 @@ ["Enter", "ANSI", "ISO"], "Full Left Shift", "Full Right Shift", - ["Bottom Row", "Split", "ANSI", "Tsangan / 10u"] + ["Bottom Row", "Split (Right offset)", "Standard", "Tsangan", "WKL", "7u HHKB", "10u Spacebar", "Split (Left offset)"] ], "keymap" : [ [ From 3da3dc577d42ccc95488c126bd5dd60eb0c38fed Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:42:30 -0500 Subject: [PATCH 04/11] Update v3/chlx/ppr_merro60/ppr_merro60.json Co-authored-by: Duncan Sutherland --- v3/chlx/ppr_merro60/ppr_merro60.json | 1 + 1 file changed, 1 insertion(+) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index 9e9f34b975..f46fb04653 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -199,6 +199,7 @@ ], [ { + "y": 0.25, "x": 3, "w": 1.25 }, From 43b83f21096f9a8281042e1f11be2c7d8d5f89ad Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:42:38 -0500 Subject: [PATCH 05/11] Update v3/chlx/ppr_merro60/ppr_merro60.json Co-authored-by: Duncan Sutherland --- v3/chlx/ppr_merro60/ppr_merro60.json | 1 - 1 file changed, 1 deletion(-) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index f46fb04653..68a316ca25 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -237,7 +237,6 @@ ], [ { - "y": 0.25, "x": 3, "w": 1.5 }, From dab02413d9badf5c525d7da0e3e10f17624f0e83 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:42:53 -0500 Subject: [PATCH 06/11] Update v3/chlx/ppr_merro60/ppr_merro60.json Co-authored-by: Duncan Sutherland --- v3/chlx/ppr_merro60/ppr_merro60.json | 116 +++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index 68a316ca25..555494a82a 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -261,6 +261,122 @@ "w": 1.5 }, "8,6\n\n\n4,2" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "9,0\n\n\n4,3", + { + "x": 1, + "w": 1.5 + }, + "9,2\n\n\n4,3", + { + "c": "#cccccc", + "w": 7 + }, + "8,3\n\n\n4,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "8,5\n\n\n4,3", + { + "x": 1, + "w": 1.5 + }, + "8,6\n\n\n4,3" + ], + [ + { + "x": 4.5 + }, + "8,0\n\n\n4,4", + { + "w": 1.5 + }, + "9,2\n\n\n4,4", + { + "c": "#cccccc", + "w": 7 + }, + "8,3\n\n\n4,4", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "8,5\n\n\n4,4", + "9,5\n\n\n4,4" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "9,0\n\n\n4,5", + "8,0\n\n\n4,5", + { + "c": "#cccccc", + "w": 10 + }, + "8,3\n\n\n4,5", + { + "c": "#aaaaaa" + }, + "9,5\n\n\n4,5", + { + "w": 1.5 + }, + "8,6\n\n\n4,5" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "9,0\n\n\n4,6", + { + "w": 1.25 + }, + "8,0\n\n\n4,6", + { + "w": 1.25 + }, + "9,2\n\n\n4,6", + { + "c": "#cccccc", + "w": 2.25 + }, + "8,2\n\n\n4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "8,3\n\n\n4,6", + { + "c": "#cccccc", + "w": 2.75 + }, + "9,3\n\n\n4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "9,4\n\n\n4,6", + { + "w": 1.25 + }, + "8,5\n\n\n4,6", + { + "w": 1.25 + }, + "9,5\n\n\n4,6", + { + "w": 1.25 + }, + "8,6\n\n\n4,6" ] ] } From 00f7530179c68699056facea1ec48d4dac5b00c7 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:43:03 -0500 Subject: [PATCH 07/11] Update v3/chlx/ppr_merro60/ppr_merro60.json Co-authored-by: Duncan Sutherland --- v3/chlx/ppr_merro60/ppr_merro60.json | 1 + 1 file changed, 1 insertion(+) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index 555494a82a..d706430b8b 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -145,6 +145,7 @@ "6,6\n\n\n3,0", "7,6\n\n\n3,0", { + "x": 0.25, "c": "#aaaaaa", "w": 2.75 }, From b753b8211885e27f2157a20e2c3a6f0de7e5e183 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:43:09 -0500 Subject: [PATCH 08/11] Update v3/chlx/ppr_merro60/ppr_merro60.json Co-authored-by: Duncan Sutherland --- v3/chlx/ppr_merro60/ppr_merro60.json | 1 + 1 file changed, 1 insertion(+) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index d706430b8b..eeaff49759 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -39,6 +39,7 @@ "1,6\n\n\n0,0", "9,6\n\n\n0,0", { + "x": 1, "c": "#aaaaaa", "w": 2 }, From ef7474f12e212a8691ed34e881ced1c8ce158c13 Mon Sep 17 00:00:00 2001 From: chalex Date: Sun, 25 Feb 2024 14:27:00 -0500 Subject: [PATCH 09/11] update key colors for (6,0), (7,0), (6,6), (7,6). tested operational loading in via and running on board. --- v3/chlx/ppr_merro60/ppr_merro60.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index eeaff49759..89f60df539 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -68,6 +68,7 @@ "3,5", "2,6", { + "c": "#aaaaaa", "w": 1.5 }, "3,6\n\n\n1,0", @@ -117,6 +118,7 @@ [ { "x": 0.25, + "c": "#aaaaaa", "w": 2.25 }, "6,0\n\n\n2,1", @@ -126,10 +128,10 @@ "w": 1.25 }, "6,0\n\n\n2,0", - "7,0\n\n\n2,0", { "c": "#cccccc" }, + "7,0\n\n\n2,0", "6,1", "7,1", "6,2", @@ -141,7 +143,8 @@ "6,5", "7,5", { - "w": 1.75 + "w": 1.75, + "c": "#aaaaaa" }, "6,6\n\n\n3,0", "7,6\n\n\n3,0", From 6d5c3c9342b522abd16b282972b443f5c0944ea0 Mon Sep 17 00:00:00 2001 From: chalex Date: Sun, 25 Feb 2024 14:28:33 -0500 Subject: [PATCH 10/11] remove pipe from modifier color code --- v3/chlx/ppr_merro60/ppr_merro60.json | 1 - 1 file changed, 1 deletion(-) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index 89f60df539..05ffcd7b7a 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -68,7 +68,6 @@ "3,5", "2,6", { - "c": "#aaaaaa", "w": 1.5 }, "3,6\n\n\n1,0", From d28a5f16183ae6d7bd8b1a79bf5539aadcdbcf48 Mon Sep 17 00:00:00 2001 From: chalex Date: Sat, 30 Mar 2024 08:07:57 -0400 Subject: [PATCH 11/11] add decal blocks --- v3/chlx/ppr_merro60/ppr_merro60.json | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/v3/chlx/ppr_merro60/ppr_merro60.json b/v3/chlx/ppr_merro60/ppr_merro60.json index 05ffcd7b7a..a4f7472812 100644 --- a/v3/chlx/ppr_merro60/ppr_merro60.json +++ b/v3/chlx/ppr_merro60/ppr_merro60.json @@ -273,7 +273,10 @@ }, "9,0\n\n\n4,3", { - "x": 1, + "d":true + }, + "8,0\n\n\n4,3", + { "w": 1.5 }, "9,2\n\n\n4,3", @@ -288,15 +291,21 @@ }, "8,5\n\n\n4,3", { - "x": 1, + "d":true + }, + "9,5\n\n\n4,3", + { "w": 1.5 }, "8,6\n\n\n4,3" ], [ { - "x": 4.5 + "x": 3, + "w": 1.5, + "d": true }, + "9,0\n\n\n4,4", "8,0\n\n\n4,4", { "w": 1.5 @@ -312,7 +321,12 @@ "w": 1.5 }, "8,5\n\n\n4,4", - "9,5\n\n\n4,4" + "9,5\n\n\n4,4", + { + "w": 1.5, + "d": true + }, + "8,6\n\n\n4,4" ], [ {