From 9c5fa8529be9dddda8ae761f945f4027b9d92abf Mon Sep 17 00:00:00 2001 From: paulgali Date: Mon, 22 Jun 2020 18:11:52 +0400 Subject: [PATCH 1/5] Added VIA JSON for DP60 --- src/astro0/dp60/dp60.json | 250 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 250 insertions(+) create mode 100644 src/astro0/dp60/dp60.json diff --git a/src/astro0/dp60/dp60.json b/src/astro0/dp60/dp60.json new file mode 100644 index 0000000000..f1a2512565 --- /dev/null +++ b/src/astro0/dp60/dp60.json @@ -0,0 +1,250 @@ +{ + "name": "DP60", + "vendorId": "0x60BE", + "productId": "0x00BE", + "lighting": "qmk_rgblight", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "labels": [ + ["Enter", "ANSI", "ISO"], + "Split Backspace", + "Split Left Shift", + ["Bottom Row", "6.25u Standard", "7u WKL", "7u HHKB"], + "Split Right Shift" + ], + "keymap": [ + [ + { + "x": 15.75 + }, + "0,13\n\n\n1,1", + "0,14\n\n\n1,1" + ], + [ + { + "y": 0.25, + "x": 2.75, + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,14\n\n\n1,0" + ], + [ + { + "x": 2.75, + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,14", + { + "x": 2, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,14\n\n\n0,1" + ], + [ + { + "x": 2.75, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#777777", + "w": 2.25 + }, + "2,14\n\n\n0,0", + { + "x": 1, + "c": "#cccccc" + }, + "2,13\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,1", + { + "x": 0.5, + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,12\n\n\n4,0", + { + "x": 0.5, + "c": "#cccccc" + }, + "3,12\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n4,1" + ], + [ + { + "x": 2.75, + "w": 1.25 + }, + "4,0\n\n\n3,0", + { + "w": 1.25 + }, + "4,2\n\n\n3,0", + { + "w": 1.25 + }, + "4,3\n\n\n3,0", + { + "w": 6.25 + }, + "4,7\n\n\n3,0", + { + "w": 1.25 + }, + "4,8\n\n\n3,0", + { + "w": 1.25 + }, + "4,9\n\n\n3,0", + { + "w": 1.25 + }, + "4,10\n\n\n3,0", + { + "w": 1.25 + }, + "4,11\n\n\n3,0" + ], + [ + { + "y": 0.25, + "x": 2.75, + "w": 1.5 + }, + "4,0\n\n\n3,1", + "4,2\n\n\n3,1", + { + "w": 1.5 + }, + "4,3\n\n\n3,1", + { + "w": 7 + }, + "4,7\n\n\n3,1", + { + "w": 1.5 + }, + "4,9\n\n\n3,1", + "4,10\n\n\n3,1", + { + "w": 1.5 + }, + "4,11\n\n\n3,1" + ], + [ + { + "y": 0.25, + "x": 4.25 + }, + "4,2\n\n\n3,2", + { + "w": 1.5 + }, + "4,3\n\n\n3,2", + { + "w": 7 + }, + "4,7\n\n\n3,2", + { + "w": 1.5 + }, + "4,9\n\n\n3,2", + "4,10\n\n\n3,2" + ] + ] + + } +} From 2436df78902a9b958af54f39cd65dfbe2c1c6c14 Mon Sep 17 00:00:00 2001 From: paulgali Date: Mon, 22 Jun 2020 18:44:08 +0400 Subject: [PATCH 2/5] Updated bottom row, removed mispelt directory --- src/{astro0 => astro}/dp60/dp60.json | 52 ++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 6 deletions(-) rename src/{astro0 => astro}/dp60/dp60.json (82%) diff --git a/src/astro0/dp60/dp60.json b/src/astro/dp60/dp60.json similarity index 82% rename from src/astro0/dp60/dp60.json rename to src/astro/dp60/dp60.json index f1a2512565..6a80e77a85 100644 --- a/src/astro0/dp60/dp60.json +++ b/src/astro/dp60/dp60.json @@ -12,10 +12,10 @@ ["Enter", "ANSI", "ISO"], "Split Backspace", "Split Left Shift", - ["Bottom Row", "6.25u Standard", "7u WKL", "7u HHKB"], + ["Bottom Row", "6.25u Standard", "7u Tsangan", "7u WKL", "7u HHKB"], "Split Right Shift" ], - "keymap": [ + "keymap":[ [ { "x": 15.75 @@ -75,7 +75,7 @@ { "w": 1.5 }, - "1,14", + "1,14\n\n\n0,0", { "x": 2, "w": 1.25, @@ -227,9 +227,14 @@ [ { "y": 0.25, - "x": 4.25 + "x": 2.75, + "w": 1.5 + }, + "4,0\n\n\n3,2", + { + "d": true }, - "4,2\n\n\n3,2", + "\n\n\n3,2", { "w": 1.5 }, @@ -242,7 +247,42 @@ "w": 1.5 }, "4,9\n\n\n3,2", - "4,10\n\n\n3,2" + { + "d": true + }, + "\n\n\n3,2", + { + "w": 1.5 + }, + "4,11\n\n\n3,2" + ], + [ + { + "y": 0.25, + "x": 2.75, + "w": 1.5, + "d": true + }, + "\n\n\n3,3", + "4,2\n\n\n3,3", + { + "w": 1.5 + }, + "4,3\n\n\n3,3", + { + "w": 7 + }, + "4,7\n\n\n3,3", + { + "w": 1.5 + }, + "4,9\n\n\n3,3", + "4,10\n\n\n3,3", + { + "w": 1.5, + "d": true + }, + "\n\n\n3,3" ] ] From 16bd52ea4d446e52f9a72bd9e8287b68244f0128 Mon Sep 17 00:00:00 2001 From: paulgali Date: Tue, 23 Jun 2020 15:52:36 +0400 Subject: [PATCH 3/5] Altered JSON, confirmed testing --- src/astro/dp60/dp60.json | 115 ++++++++++++++------------------------- 1 file changed, 42 insertions(+), 73 deletions(-) diff --git a/src/astro/dp60/dp60.json b/src/astro/dp60/dp60.json index 6a80e77a85..71c3957651 100644 --- a/src/astro/dp60/dp60.json +++ b/src/astro/dp60/dp60.json @@ -9,19 +9,21 @@ }, "layouts": { "labels": [ - ["Enter", "ANSI", "ISO"], + ["ANSI / ISO Enter", "ANSI", "ISO"], "Split Backspace", "Split Left Shift", - ["Bottom Row", "6.25u Standard", "7u Tsangan", "7u WKL", "7u HHKB"], - "Split Right Shift" + "Split Right Shift", + ["Bottom Row", "6.25u Standard", "7u WKL", "7u HHKB"] + + ], "keymap":[ [ { "x": 15.75 }, - "0,13\n\n\n1,1", - "0,14\n\n\n1,1" + "0,12\n\n\n1,1", + "0,13\n\n\n1,1" ], [ { @@ -39,17 +41,17 @@ "0,4", "0,5", "0,6", + "4,7", "0,7", "0,8", "0,9", "0,10", "0,11", - "0,12", { "c": "#aaaaaa", "w": 2 }, - "0,14\n\n\n1,0" + "0,13\n\n\n1,0" ], [ { @@ -75,7 +77,7 @@ { "w": 1.5 }, - "1,14\n\n\n0,0", + "1,13\n\n\n0,0", { "x": 2, "w": 1.25, @@ -84,7 +86,7 @@ "h2": 1, "x2": -0.25 }, - "2,14\n\n\n0,1" + "2,13\n\n\n0,1" ], [ { @@ -96,6 +98,7 @@ { "c": "#cccccc" }, + "2,1", "2,2", "2,3", "2,4", @@ -106,17 +109,16 @@ "2,9", "2,10", "2,11", - "2,12", { "c": "#777777", "w": 2.25 }, - "2,14\n\n\n0,0", + "2,13\n\n\n0,0", { "x": 1, "c": "#cccccc" }, - "2,13\n\n\n0,1" + "2,12\n\n\n0,1" ], [ { @@ -151,78 +153,52 @@ "c": "#aaaaaa", "w": 2.75 }, - "3,12\n\n\n4,0", + "3,12\n\n\n3,0", { "x": 0.5, - "c": "#cccccc" + "w": 1.75 }, - "3,12\n\n\n4,1", + "3,12\n\n\n3,1", { - "c": "#aaaaaa", - "w": 1.75 + "c": "#cccccc" }, - "3,13\n\n\n4,1" + "3,13\n\n\n3,1" ], [ { "x": 2.75, + "c": "#aaaaaa", "w": 1.25 }, - "4,0\n\n\n3,0", + "4,0\n\n\n4,0", { "w": 1.25 }, - "4,2\n\n\n3,0", + "4,2\n\n\n4,0", { "w": 1.25 }, - "4,3\n\n\n3,0", + "4,3\n\n\n4,0", { "w": 6.25 }, - "4,7\n\n\n3,0", + "4,6\n\n\n4,0", { "w": 1.25 }, - "4,8\n\n\n3,0", + "4,10\n\n\n4,0", { "w": 1.25 }, - "4,9\n\n\n3,0", + "4,11\n\n\n4,0", { "w": 1.25 }, - "4,10\n\n\n3,0", + "4,12\n\n\n4,0", { "w": 1.25 }, - "4,11\n\n\n3,0" - ], - [ - { - "y": 0.25, - "x": 2.75, - "w": 1.5 - }, - "4,0\n\n\n3,1", - "4,2\n\n\n3,1", - { - "w": 1.5 - }, - "4,3\n\n\n3,1", - { - "w": 7 - }, - "4,7\n\n\n3,1", - { - "w": 1.5 - }, - "4,9\n\n\n3,1", - "4,10\n\n\n3,1", - { - "w": 1.5 - }, - "4,11\n\n\n3,1" + "4,13\n\n\n4,0" ], [ { @@ -230,31 +206,25 @@ "x": 2.75, "w": 1.5 }, - "4,0\n\n\n3,2", - { - "d": true - }, - "\n\n\n3,2", + "4,0\n\n\n4,1", + "4,2\n\n\n4,1", { "w": 1.5 }, - "4,3\n\n\n3,2", + "4,3\n\n\n4,1", { "w": 7 }, - "4,7\n\n\n3,2", + "4,6\n\n\n4,1", { "w": 1.5 }, - "4,9\n\n\n3,2", - { - "d": true - }, - "\n\n\n3,2", + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", { "w": 1.5 }, - "4,11\n\n\n3,2" + "4,13\n\n\n4,1" ], [ { @@ -263,28 +233,27 @@ "w": 1.5, "d": true }, - "\n\n\n3,3", - "4,2\n\n\n3,3", + "\n\n\n4,2", + "4,2\n\n\n4,2", { "w": 1.5 }, - "4,3\n\n\n3,3", + "4,3\n\n\n4,2", { "w": 7 }, - "4,7\n\n\n3,3", + "4,6\n\n\n4,2", { "w": 1.5 }, - "4,9\n\n\n3,3", - "4,10\n\n\n3,3", + "4,11\n\n\n4,2", + "4,12\n\n\n4,2", { "w": 1.5, "d": true }, - "\n\n\n3,3" + "\n\n\n4,2" ] ] - } } From 65f0faad6378f8a303737d32252b8fc58b731a94 Mon Sep 17 00:00:00 2001 From: paulgali Date: Tue, 23 Jun 2020 15:57:19 +0400 Subject: [PATCH 4/5] Altered JSON, confirmed testing --- src/astro/dp60/dp60.json | 115 ++++++++++++++------------------------- 1 file changed, 42 insertions(+), 73 deletions(-) diff --git a/src/astro/dp60/dp60.json b/src/astro/dp60/dp60.json index 6a80e77a85..71c3957651 100644 --- a/src/astro/dp60/dp60.json +++ b/src/astro/dp60/dp60.json @@ -9,19 +9,21 @@ }, "layouts": { "labels": [ - ["Enter", "ANSI", "ISO"], + ["ANSI / ISO Enter", "ANSI", "ISO"], "Split Backspace", "Split Left Shift", - ["Bottom Row", "6.25u Standard", "7u Tsangan", "7u WKL", "7u HHKB"], - "Split Right Shift" + "Split Right Shift", + ["Bottom Row", "6.25u Standard", "7u WKL", "7u HHKB"] + + ], "keymap":[ [ { "x": 15.75 }, - "0,13\n\n\n1,1", - "0,14\n\n\n1,1" + "0,12\n\n\n1,1", + "0,13\n\n\n1,1" ], [ { @@ -39,17 +41,17 @@ "0,4", "0,5", "0,6", + "4,7", "0,7", "0,8", "0,9", "0,10", "0,11", - "0,12", { "c": "#aaaaaa", "w": 2 }, - "0,14\n\n\n1,0" + "0,13\n\n\n1,0" ], [ { @@ -75,7 +77,7 @@ { "w": 1.5 }, - "1,14\n\n\n0,0", + "1,13\n\n\n0,0", { "x": 2, "w": 1.25, @@ -84,7 +86,7 @@ "h2": 1, "x2": -0.25 }, - "2,14\n\n\n0,1" + "2,13\n\n\n0,1" ], [ { @@ -96,6 +98,7 @@ { "c": "#cccccc" }, + "2,1", "2,2", "2,3", "2,4", @@ -106,17 +109,16 @@ "2,9", "2,10", "2,11", - "2,12", { "c": "#777777", "w": 2.25 }, - "2,14\n\n\n0,0", + "2,13\n\n\n0,0", { "x": 1, "c": "#cccccc" }, - "2,13\n\n\n0,1" + "2,12\n\n\n0,1" ], [ { @@ -151,78 +153,52 @@ "c": "#aaaaaa", "w": 2.75 }, - "3,12\n\n\n4,0", + "3,12\n\n\n3,0", { "x": 0.5, - "c": "#cccccc" + "w": 1.75 }, - "3,12\n\n\n4,1", + "3,12\n\n\n3,1", { - "c": "#aaaaaa", - "w": 1.75 + "c": "#cccccc" }, - "3,13\n\n\n4,1" + "3,13\n\n\n3,1" ], [ { "x": 2.75, + "c": "#aaaaaa", "w": 1.25 }, - "4,0\n\n\n3,0", + "4,0\n\n\n4,0", { "w": 1.25 }, - "4,2\n\n\n3,0", + "4,2\n\n\n4,0", { "w": 1.25 }, - "4,3\n\n\n3,0", + "4,3\n\n\n4,0", { "w": 6.25 }, - "4,7\n\n\n3,0", + "4,6\n\n\n4,0", { "w": 1.25 }, - "4,8\n\n\n3,0", + "4,10\n\n\n4,0", { "w": 1.25 }, - "4,9\n\n\n3,0", + "4,11\n\n\n4,0", { "w": 1.25 }, - "4,10\n\n\n3,0", + "4,12\n\n\n4,0", { "w": 1.25 }, - "4,11\n\n\n3,0" - ], - [ - { - "y": 0.25, - "x": 2.75, - "w": 1.5 - }, - "4,0\n\n\n3,1", - "4,2\n\n\n3,1", - { - "w": 1.5 - }, - "4,3\n\n\n3,1", - { - "w": 7 - }, - "4,7\n\n\n3,1", - { - "w": 1.5 - }, - "4,9\n\n\n3,1", - "4,10\n\n\n3,1", - { - "w": 1.5 - }, - "4,11\n\n\n3,1" + "4,13\n\n\n4,0" ], [ { @@ -230,31 +206,25 @@ "x": 2.75, "w": 1.5 }, - "4,0\n\n\n3,2", - { - "d": true - }, - "\n\n\n3,2", + "4,0\n\n\n4,1", + "4,2\n\n\n4,1", { "w": 1.5 }, - "4,3\n\n\n3,2", + "4,3\n\n\n4,1", { "w": 7 }, - "4,7\n\n\n3,2", + "4,6\n\n\n4,1", { "w": 1.5 }, - "4,9\n\n\n3,2", - { - "d": true - }, - "\n\n\n3,2", + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", { "w": 1.5 }, - "4,11\n\n\n3,2" + "4,13\n\n\n4,1" ], [ { @@ -263,28 +233,27 @@ "w": 1.5, "d": true }, - "\n\n\n3,3", - "4,2\n\n\n3,3", + "\n\n\n4,2", + "4,2\n\n\n4,2", { "w": 1.5 }, - "4,3\n\n\n3,3", + "4,3\n\n\n4,2", { "w": 7 }, - "4,7\n\n\n3,3", + "4,6\n\n\n4,2", { "w": 1.5 }, - "4,9\n\n\n3,3", - "4,10\n\n\n3,3", + "4,11\n\n\n4,2", + "4,12\n\n\n4,2", { "w": 1.5, "d": true }, - "\n\n\n3,3" + "\n\n\n4,2" ] ] - } } From dd7396a9e536f51f8760458f6967a6099c70bce1 Mon Sep 17 00:00:00 2001 From: paulgali Date: Tue, 23 Jun 2020 23:42:27 +0400 Subject: [PATCH 5/5] Final JSON Edits --- src/astro/dp60/dp60.json | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/astro/dp60/dp60.json b/src/astro/dp60/dp60.json index 71c3957651..e78695e9e0 100644 --- a/src/astro/dp60/dp60.json +++ b/src/astro/dp60/dp60.json @@ -9,15 +9,13 @@ }, "layouts": { "labels": [ - ["ANSI / ISO Enter", "ANSI", "ISO"], + "ANSI / ISO Enter", "Split Backspace", - "Split Left Shift", - "Split Right Shift", - ["Bottom Row", "6.25u Standard", "7u WKL", "7u HHKB"] - - + "Split Left Shift", "Split Right Shift", + ["Bottom Row", "6.25u Standard", "7u WKL", "7u HHKB"] ], - "keymap":[ + "keymap": + [ [ { "x": 15.75 @@ -174,11 +172,11 @@ { "w": 1.25 }, - "4,2\n\n\n4,0", + "4,1\n\n\n4,0", { "w": 1.25 }, - "4,3\n\n\n4,0", + "4,2\n\n\n4,0", { "w": 6.25 }, @@ -207,11 +205,11 @@ "w": 1.5 }, "4,0\n\n\n4,1", - "4,2\n\n\n4,1", + "4,1\n\n\n4,1", { "w": 1.5 }, - "4,3\n\n\n4,1", + "4,2\n\n\n4,1", { "w": 7 }, @@ -234,11 +232,11 @@ "d": true }, "\n\n\n4,2", - "4,2\n\n\n4,2", + "4,1\n\n\n4,2", { "w": 1.5 }, - "4,3\n\n\n4,2", + "4,2\n\n\n4,2", { "w": 7 },