From 217f1f7164ae9c7ed2f68b9f5c1fac21ebef14f2 Mon Sep 17 00:00:00 2001 From: gskygithub <106651989+gskygithub@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:07:05 +0800 Subject: [PATCH 1/6] Add keyboard --- v3/projectd/ansi/75/projectd_75_ansi.json | 211 ++++++++++++++++++++++ 1 file changed, 211 insertions(+) create mode 100644 v3/projectd/ansi/75/projectd_75_ansi.json diff --git a/v3/projectd/ansi/75/projectd_75_ansi.json b/v3/projectd/ansi/75/projectd_75_ansi.json new file mode 100644 index 0000000000..8efa5419ce --- /dev/null +++ b/v3/projectd/ansi/75/projectd_75_ansi.json @@ -0,0 +1,211 @@ +{ + "name": "ProjectD 75% ANSI", + "vendorId": "0x3233", + "productId": "0x000F", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], + "matrix": {"rows": 11, "cols": 8}, + "layouts": { + "keymap":[ + [ + { + "c": "#777777" + }, + "1,3\nESC", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,6", + "3,6", + "3,1", + "3,3", + { + "x": 0.25 + }, + "0,7", + "6,3", + "7,1", + "7,6", + { + "x": 0.25 + }, + "10,6", + "10,7", + "10,3", + "10,5", + { + "x": 0.25 + }, + "9,7", + { + "x": 0.5 + }, + "6,5" + ], + [ + { + "y": 0.25 + }, + "1,6", + "1,7", + "2,7", + "3,7", + "4,7", + "4,6", + "5,6", + "5,7", + "6,7", + "7,7", + "8,7", + "8,6", + "6,6", + { + "c": "#aaaaaa", + "w": 2 + }, + "10,1", + { + "x":0.5 + }, + "0,2" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,1", + "1,0", + "2,0", + "3,0", + "4,0", + "4,1", + "5,1", + "5,0", + "6,0", + "7,0", + "8,0", + "8,1", + "6,1", + { + "w": 1.5 + }, + "10,2", + { + "x":0.5 + }, + "1,5" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "2,1", + "1,2", + "2,2", + "3,2", + "4,2", + "4,3", + "5,3", + "5,2", + "6,2", + "7,2", + "8,2", + "8,3", + { + "c": "#777777", + "w": 2.25 + }, + "10,4", + { + "x":0.5, + "c": "#aaaaaa" + }, + "2,5" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "0,0", + "1,4", + "2,4", + "3,4", + "4,4", + "4,5", + "5,5", + "5,4", + "6,4", + "7,4", + "8,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "9,1", + { + "x": 0.25, + "y": 0.25, + "c": "#777777" + }, + "3,5", + { + "x": 0.25, + "y": -0.25, + "c": "#aaaaaa" + }, + "7,5" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "0,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "9,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "9,3", + { + "w": 6.25 + }, + "9,4", + { + "c": "#aaaaaa" + }, + "9,5", + { + "c": "#777777" + }, + "9,2", + { + "c": "#aaaaaa" + }, + "0,4", + { + "x":0.25, + "y":0.25, + "c": "#777777" + }, + "0,3", + { + "c": "#777777" + }, + "7,3", + { + "c": "#777777" + }, + "0,5" + ] + ] + } +} From 8a2b435ef12550c9a98005348f03de936c4ff4af Mon Sep 17 00:00:00 2001 From: gskygithub <106651989+gskygithub@users.noreply.github.com> Date: Fri, 20 Oct 2023 18:54:37 +0800 Subject: [PATCH 2/6] Add keyboard --- v3/jukaie/jk01/jk01.json | 167 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 v3/jukaie/jk01/jk01.json diff --git a/v3/jukaie/jk01/jk01.json b/v3/jukaie/jk01/jk01.json new file mode 100644 index 0000000000..c577399d03 --- /dev/null +++ b/v3/jukaie/jk01/jk01.json @@ -0,0 +1,167 @@ +{ + "name": "JK01", + "vendorId": "0x4141", + "productId": "0x0002", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], + "matrix": {"rows": 14, "cols": 8}, + "customKeycodes": [ + {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "Mission Control"}, + {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "Launch Pad"}, + {"name": "Left Option", "title": "Left Option in macOS", "shortName": "Left Option"}, + {"name": "Right Option", "title": "Right Option in macOS", "shortName": "Right Option"}, + {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "Left Command"}, + {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "Right Command"}, + {"name": "Task View", "title": "Task View in windows", "shortName": "Task View"}, + {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File Explorer"} + ], + "layouts": { + "keymap":[ + [ + "1,3\nESC", + { + "x": 1, + "c": "#cccccc" + }, + "2,6", + "3,6", + "3,1", + "3,3", + "0,7", + "6,3", + "7,1", + "7,6", + "10,6", + "10,7", + "10,3", + "10,5", + "9,7", + "0,2" + ], + [ + "1,6", + "1,7", + "2,7", + "3,7", + "4,7", + "4,6", + "5,6", + "5,7", + "6,7", + "7,7", + "8,7", + "8,6", + "6,6", + { + "w": 2 + }, + "10,1", + "12,6" + ], + [ + { + "w": 1.5 + }, + "1,1", + "1,0", + "2,0", + "3,0", + "4,0", + "4,1", + "5,1", + "5,0", + "6,0", + "7,0", + "8,0", + "8,1", + "6,1", + { + "w": 1.5 + }, + "10,2", + "6,5" + ], + [ + { + "w": 1.75 + }, + "2,1", + "1,2", + "2,2", + "3,2", + "4,2", + "4,3", + "5,3", + "5,2", + "6,2", + "7,2", + "8,2", + "8,3", + { + "w": 2.25, + "c": "#777777" + }, + "10,4", + "1,5" + ], + [ + { + "w": 2.25 + }, + "0,0", + "1,4", + "2,4", + "3,4", + "4,4", + "4,5", + "5,5", + "5,4", + "6,4", + "7,4", + "8,5", + { + "w": 1.75 + }, + "9,1", + { + "c": "#777777" + }, + "3,5", + "2,5" + ], + [ + { + "w": 1.25 + }, + "0,6", + { + "w": 1.25 + }, + "9,0", + { + "w": 1.25 + }, + "9,3", + { + "w": 6.25 + }, + "9,4", + "9,5", + "9,2", + "0,4", + { + "c": "#777777" + }, + "0,3", + { + "c": "#777777" + }, + "7,3", + { + "c": "#777777" + }, + "0,5" + ] + ] + } +} From 08a3218fd18cc14ba17c1e3e61a7cab55e9dc21d Mon Sep 17 00:00:00 2001 From: gskygithub <106651989+gskygithub@users.noreply.github.com> Date: Fri, 20 Oct 2023 18:56:03 +0800 Subject: [PATCH 3/6] Delete v3/projectd/ansi/75 directory --- v3/projectd/ansi/75/projectd_75_ansi.json | 211 ---------------------- 1 file changed, 211 deletions(-) delete mode 100644 v3/projectd/ansi/75/projectd_75_ansi.json diff --git a/v3/projectd/ansi/75/projectd_75_ansi.json b/v3/projectd/ansi/75/projectd_75_ansi.json deleted file mode 100644 index 8efa5419ce..0000000000 --- a/v3/projectd/ansi/75/projectd_75_ansi.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "name": "ProjectD 75% ANSI", - "vendorId": "0x3233", - "productId": "0x000F", - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgb_matrix"], - "matrix": {"rows": 11, "cols": 8}, - "layouts": { - "keymap":[ - [ - { - "c": "#777777" - }, - "1,3\nESC", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,6", - "3,6", - "3,1", - "3,3", - { - "x": 0.25 - }, - "0,7", - "6,3", - "7,1", - "7,6", - { - "x": 0.25 - }, - "10,6", - "10,7", - "10,3", - "10,5", - { - "x": 0.25 - }, - "9,7", - { - "x": 0.5 - }, - "6,5" - ], - [ - { - "y": 0.25 - }, - "1,6", - "1,7", - "2,7", - "3,7", - "4,7", - "4,6", - "5,6", - "5,7", - "6,7", - "7,7", - "8,7", - "8,6", - "6,6", - { - "c": "#aaaaaa", - "w": 2 - }, - "10,1", - { - "x":0.5 - }, - "0,2" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "1,1", - "1,0", - "2,0", - "3,0", - "4,0", - "4,1", - "5,1", - "5,0", - "6,0", - "7,0", - "8,0", - "8,1", - "6,1", - { - "w": 1.5 - }, - "10,2", - { - "x":0.5 - }, - "1,5" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "2,1", - "1,2", - "2,2", - "3,2", - "4,2", - "4,3", - "5,3", - "5,2", - "6,2", - "7,2", - "8,2", - "8,3", - { - "c": "#777777", - "w": 2.25 - }, - "10,4", - { - "x":0.5, - "c": "#aaaaaa" - }, - "2,5" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "0,0", - "1,4", - "2,4", - "3,4", - "4,4", - "4,5", - "5,5", - "5,4", - "6,4", - "7,4", - "8,5", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "9,1", - { - "x": 0.25, - "y": 0.25, - "c": "#777777" - }, - "3,5", - { - "x": 0.25, - "y": -0.25, - "c": "#aaaaaa" - }, - "7,5" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "0,6", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "9,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "9,3", - { - "w": 6.25 - }, - "9,4", - { - "c": "#aaaaaa" - }, - "9,5", - { - "c": "#777777" - }, - "9,2", - { - "c": "#aaaaaa" - }, - "0,4", - { - "x":0.25, - "y":0.25, - "c": "#777777" - }, - "0,3", - { - "c": "#777777" - }, - "7,3", - { - "c": "#777777" - }, - "0,5" - ] - ] - } -} From c51ee6c315c77ab8b4d752ea415252dc0de16783 Mon Sep 17 00:00:00 2001 From: gskygithub <106651989+gskygithub@users.noreply.github.com> Date: Mon, 23 Oct 2023 14:42:45 +0800 Subject: [PATCH 4/6] Updated changes --- v3/jukaie/jk01/jk01.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/v3/jukaie/jk01/jk01.json b/v3/jukaie/jk01/jk01.json index c577399d03..686fcd115a 100644 --- a/v3/jukaie/jk01/jk01.json +++ b/v3/jukaie/jk01/jk01.json @@ -5,16 +5,6 @@ "keycodes": ["qmk_lighting"], "menus": ["qmk_rgb_matrix"], "matrix": {"rows": 14, "cols": 8}, - "customKeycodes": [ - {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "Mission Control"}, - {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "Launch Pad"}, - {"name": "Left Option", "title": "Left Option in macOS", "shortName": "Left Option"}, - {"name": "Right Option", "title": "Right Option in macOS", "shortName": "Right Option"}, - {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "Left Command"}, - {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "Right Command"}, - {"name": "Task View", "title": "Task View in windows", "shortName": "Task View"}, - {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File Explorer"} - ], "layouts": { "keymap":[ [ From e1d862ae35529bbf5c03776fe85673126880b7a3 Mon Sep 17 00:00:00 2001 From: gskygithub <106651989+gskygithub@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:33:39 +0800 Subject: [PATCH 5/6] Resolved requested changes --- v3/jukaie/jk01/jk01.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/v3/jukaie/jk01/jk01.json b/v3/jukaie/jk01/jk01.json index 686fcd115a..9c5f0c0b98 100644 --- a/v3/jukaie/jk01/jk01.json +++ b/v3/jukaie/jk01/jk01.json @@ -8,6 +8,9 @@ "layouts": { "keymap":[ [ + { + "c": "#777777" + }, "1,3\nESC", { "x": 1, @@ -50,6 +53,7 @@ ], [ { + "c": "#aaaaaa", "w": 1.5 }, "1,1", @@ -73,6 +77,7 @@ ], [ { + "c": "#aaaaaa", "w": 1.75 }, "2,1", @@ -92,10 +97,14 @@ "c": "#777777" }, "10,4", + { + "c": "#aaaaaa" + }, "1,5" ], [ { + "c": "#aaaaaa", "w": 2.25 }, "0,0", @@ -110,6 +119,7 @@ "7,4", "8,5", { + "c": "#aaaaaa", "w": 1.75 }, "9,1", @@ -117,18 +127,24 @@ "c": "#777777" }, "3,5", + { + "c": "#aaaaaa" + }, "2,5" ], [ { + "c": "#aaaaaa", "w": 1.25 }, "0,6", { + "c": "#aaaaaa", "w": 1.25 }, "9,0", { + "c": "#aaaaaa", "w": 1.25 }, "9,3", @@ -136,8 +152,17 @@ "w": 6.25 }, "9,4", + { + "c": "#aaaaaa" + }, "9,5", + { + "c": "#cccccc" + }, "9,2", + { + "c": "#aaaaaa" + }, "0,4", { "c": "#777777" From e6938cd03d52987bb36995fafdf2fb5a165b90f1 Mon Sep 17 00:00:00 2001 From: gskygithub <106651989+gskygithub@users.noreply.github.com> Date: Tue, 14 Nov 2023 10:59:23 +0800 Subject: [PATCH 6/6] Resolved requested changes --- v3/jukaie/jk01/jk01.json | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/v3/jukaie/jk01/jk01.json b/v3/jukaie/jk01/jk01.json index 9c5f0c0b98..cb0690b814 100644 --- a/v3/jukaie/jk01/jk01.json +++ b/v3/jukaie/jk01/jk01.json @@ -14,7 +14,7 @@ "1,3\nESC", { "x": 1, - "c": "#cccccc" + "c": "#aaaaaa" }, "2,6", "3,6", @@ -32,6 +32,9 @@ "0,2" ], [ + { + "c": "#cccccc" + }, "1,6", "1,7", "2,7", @@ -46,17 +49,23 @@ "8,6", "6,6", { + "c": "#aaaaaa", "w": 2 }, "10,1", + { + "c": "#aaaaaa" + }, "12,6" ], [ { - "c": "#aaaaaa", "w": 1.5 }, "1,1", + { + "c": "#cccccc" + }, "1,0", "2,0", "3,0", @@ -72,15 +81,20 @@ { "w": 1.5 }, - "10,2", + "10,2", + { + "c": "#aaaaaa" + }, "6,5" ], [ { - "c": "#aaaaaa", "w": 1.75 }, "2,1", + { + "c": "#cccccc" + }, "1,2", "2,2", "3,2", @@ -108,6 +122,9 @@ "w": 2.25 }, "0,0", + { + "c": "#cccccc" + }, "1,4", "2,4", "3,4", @@ -149,6 +166,7 @@ }, "9,3", { + "c": "#aaaaaa", "w": 6.25 }, "9,4", @@ -157,7 +175,7 @@ }, "9,5", { - "c": "#cccccc" + "c": "#777777" }, "9,2", {