From 09e1e4b049c133a2cc6adf2dec7e8936d8065713 Mon Sep 17 00:00:00 2001 From: akyp Date: Wed, 31 Jul 2024 14:44:49 +0100 Subject: [PATCH 01/31] Create desire65.json --- v3/archerkeyboard/desire65/desire65.json | 163 +++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 v3/archerkeyboard/desire65/desire65.json diff --git a/v3/archerkeyboard/desire65/desire65.json b/v3/archerkeyboard/desire65/desire65.json new file mode 100644 index 0000000000..0681ea17b7 --- /dev/null +++ b/v3/archerkeyboard/desire65/desire65.json @@ -0,0 +1,163 @@ +{ + "name": "desire65", + "vendorId": "0x0361", + "productId": "0x0002", + "matrix": { + "rows": 5, + "cols": 16 + }, + "keycodes": [ "qmk_lighting" ], + "menus": [ "qmk_rgblight" ], + "layouts": { + "labels": [ + "Split Backspace" + ], + "keymap": [ + [ + { + "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\n0,0", + "0,15", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + "1,13", + { + "w": 1.5 + }, + "1,14", + { + "c": "#aaaaaa" + }, + "1,15" + ], + [ + { + "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", + { + "c": "#aaaaaa" + }, + "2,15" + ], + [ + { + "w": 2.25 + }, + "3,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": 1.75 + }, + "3,13", + "3,14", + "3,15" + ], + [ + { + "w": 1.5 + }, + "4,0", + "4,2", + { + "w": 1.5 + }, + "4,3", + { + "c": "#cccccc", + "w": 7 + }, + "4,7", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11", + { + "x": 0.5 + }, + "4,13", + "4,14", + "4,15" + ] + ] + } +} \ No newline at end of file From b7e5ad7c2529afe5215ea1a4b153f1cccbcf53e3 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:48:50 +0200 Subject: [PATCH 02/31] Update v3/archerkeyboard/desire65/desire65.json --- v3/archerkeyboard/desire65/desire65.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/v3/archerkeyboard/desire65/desire65.json b/v3/archerkeyboard/desire65/desire65.json index 0681ea17b7..f03a7c86ed 100644 --- a/v3/archerkeyboard/desire65/desire65.json +++ b/v3/archerkeyboard/desire65/desire65.json @@ -6,8 +6,12 @@ "rows": 5, "cols": 16 }, - "keycodes": [ "qmk_lighting" ], - "menus": [ "qmk_rgblight" ], + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgblight" + ], "layouts": { "labels": [ "Split Backspace" @@ -160,4 +164,4 @@ ] ] } -} \ No newline at end of file +} From a37262af34bb2a7f3f8cf32c88c089c34ab23034 Mon Sep 17 00:00:00 2001 From: ai03 Date: Wed, 31 Jul 2024 06:10:40 -0700 Subject: [PATCH 03/31] Add Equinox XL (#2326) * Create equinox_xl.json * Make V3 variant * Update based on new QMK build --- src/ai03/equinox_xl/equinox_xl.json | 191 ++++++++++++++++++++++++++++ v3/ai03/equinox_xl/equinox_xl.json | 190 +++++++++++++++++++++++++++ 2 files changed, 381 insertions(+) create mode 100644 src/ai03/equinox_xl/equinox_xl.json create mode 100644 v3/ai03/equinox_xl/equinox_xl.json diff --git a/src/ai03/equinox_xl/equinox_xl.json b/src/ai03/equinox_xl/equinox_xl.json new file mode 100644 index 0000000000..c43a420b1a --- /dev/null +++ b/src/ai03/equinox_xl/equinox_xl.json @@ -0,0 +1,191 @@ +{ + "name": "Equinox XL", + "vendorId": "0xa103", + "productId": "0x0020", + "lighting": "none", + "matrix": { + "rows": 4, + "cols": 14 + }, + "layouts": { + "labels": [ + ["Enter", "ANSI", "ISO"], + "Split Left Shift", + "Split Right Shift", + "Winkeyless", + "Split Space" + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#777777", + "w": 1.5 + }, + "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": 1.5 + }, + "0,13\n\n\n0,0", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "1,13\n\n\n0,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "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", + { + "c": "#777777", + "w": 2.25 + }, + "1,13\n\n\n0,0", + { + "x": 0.75, + "c": "#aaaaaa" + }, + "0,13\n\n\n0,1" + ], + [ + { + "w": 1.25 + }, + "2,0\n\n\n1,1", + "2,1\n\n\n1,1", + { + "x": 0.25, + "w": 2.25 + }, + "2,0\n\n\n1,0", + { + "c": "#cccccc" + }, + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "2,13\n\n\n2,0", + { + "x": 0.25, + "w": 1.75 + }, + "2,12\n\n\n2,1", + "2,13\n\n\n2,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "3,0\n\n\n3,0", + "3,1\n\n\n3,0", + { + "w": 1.5 + }, + "3,2\n\n\n3,0", + { + "c": "#cccccc", + "w": 7 + }, + "3,7\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "3,11\n\n\n3,0", + "3,12\n\n\n3,0", + { + "w": 1.5 + }, + "3,13\n\n\n3,0" + ], + [ + { + "y": 0.25, + "x": 2.5, + "w": 1.5 + }, + "3,0\n\n\n3,1", + { + "x": 1, + "w": 1.5 + }, + "3,2\n\n\n3,1", + { + "x": 7, + "w": 1.5 + }, + "3,11\n\n\n3,1", + { + "x": 1, + "w": 1.5 + }, + "3,13\n\n\n3,1" + ], + [ + { + "y": 0.25, + "x": 6.5, + "c": "#cccccc", + "w": 3 + }, + "3,5\n\n\n4,1", + "3,7\n\n\n4,1", + { + "w": 3 + }, + "3,9\n\n\n4,1" + ] + ] + } +} diff --git a/v3/ai03/equinox_xl/equinox_xl.json b/v3/ai03/equinox_xl/equinox_xl.json new file mode 100644 index 0000000000..44672e70df --- /dev/null +++ b/v3/ai03/equinox_xl/equinox_xl.json @@ -0,0 +1,190 @@ +{ + "name": "Equinox XL", + "vendorId": "0xa103", + "productId": "0x0020", + "matrix": { + "rows": 4, + "cols": 14 + }, + "layouts": { + "labels": [ + ["Enter", "ANSI", "ISO"], + "Split Left Shift", + "Split Right Shift", + "Winkeyless", + "Split Space" + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#777777", + "w": 1.5 + }, + "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": 1.5 + }, + "0,13\n\n\n0,0", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "1,13\n\n\n0,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "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", + { + "c": "#777777", + "w": 2.25 + }, + "1,13\n\n\n0,0", + { + "x": 0.75, + "c": "#aaaaaa" + }, + "0,13\n\n\n0,1" + ], + [ + { + "w": 1.25 + }, + "2,0\n\n\n1,1", + "2,1\n\n\n1,1", + { + "x": 0.25, + "w": 2.25 + }, + "2,0\n\n\n1,0", + { + "c": "#cccccc" + }, + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "2,13\n\n\n2,0", + { + "x": 0.25, + "w": 1.75 + }, + "2,12\n\n\n2,1", + "2,13\n\n\n2,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "3,0\n\n\n3,0", + "3,1\n\n\n3,0", + { + "w": 1.5 + }, + "3,2\n\n\n3,0", + { + "c": "#cccccc", + "w": 7 + }, + "3,7\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "3,11\n\n\n3,0", + "3,12\n\n\n3,0", + { + "w": 1.5 + }, + "3,13\n\n\n3,0" + ], + [ + { + "y": 0.25, + "x": 2.5, + "w": 1.5 + }, + "3,0\n\n\n3,1", + { + "x": 1, + "w": 1.5 + }, + "3,2\n\n\n3,1", + { + "x": 7, + "w": 1.5 + }, + "3,11\n\n\n3,1", + { + "x": 1, + "w": 1.5 + }, + "3,13\n\n\n3,1" + ], + [ + { + "y": 0.25, + "x": 6.5, + "c": "#cccccc", + "w": 3 + }, + "3,5\n\n\n4,1", + "3,7\n\n\n4,1", + { + "w": 3 + }, + "3,9\n\n\n4,1" + ] + ] + } +} From 96373ee7f912e3f4f639f7e4c46144b1ec8e1269 Mon Sep 17 00:00:00 2001 From: Matt Chan <5021+mattchan@users.noreply.github.com> Date: Sun, 25 Aug 2024 01:58:25 -0400 Subject: [PATCH 04/31] Fix incorrect bottom row order on Atelier Heaven Haven65 (#2334) --- v3/ah/haven65.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v3/ah/haven65.json b/v3/ah/haven65.json index d84256c8fa..21372bae09 100644 --- a/v3/ah/haven65.json +++ b/v3/ah/haven65.json @@ -193,12 +193,12 @@ "w": 1.25, "c": "#aaaaaa" }, - "4,10\n\n\n3,0", + "4,9\n\n\n3,0", { "w": 1.25, "c": "#aaaaaa" }, - "4,9\n\n\n3,0", + "4,10\n\n\n3,0", { "x": 0.5, "c": "#777777" From 1ed1bd7b6060e24a4c522e184582a80b34e7e279 Mon Sep 17 00:00:00 2001 From: Danny Date: Sun, 25 Aug 2024 01:59:11 -0400 Subject: [PATCH 05/31] Add Quefrency Rev. 6 (#2333) --- v3/keebio/quefrency/quefrency-rev6.json | 220 ++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 v3/keebio/quefrency/quefrency-rev6.json diff --git a/v3/keebio/quefrency/quefrency-rev6.json b/v3/keebio/quefrency/quefrency-rev6.json new file mode 100644 index 0000000000..6189a0581f --- /dev/null +++ b/v3/keebio/quefrency/quefrency-rev6.json @@ -0,0 +1,220 @@ +{ + "name": "Quefrency Rev. 6", + "vendorId": "0xCB10", + "productId": "0x6357", + "matrix": {"rows": 10, "cols": 9}, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], + "layouts": { + "labels": [ + ["Left Macropad", "Enabled", "W/Encoder", "No Macro"], + "Split Left Shift", + ["Left Space", "1.25-2.25u", "2.25-1.25u", "1.25-1-1.25u"], + "Right Encoder", + "Split Backspace", + "ISO Enter", + ["Right Shift", "1.75-1u", "2.75u"], + ["Right Space", "2.75u", "1.25-1.5u"], + ["Right Mods", "6x1u", "2x1.25u__3x1u"] + ], + "keymap": [ + [ + {"d": true}, + "0,0\n\n\n0,2", + {"d": true}, + "0,1\n\n\n0,2", + {"x": 0.25, "c": "#aaaaaa"}, + "0,0\n\n\n0,1\n\n\n\n\n\ne0", + "0,1\n\n\n0,1", + {"x": 0.25}, + "0,0\n\n\n0,0", + "0,1\n\n\n0,0", + {"x": 0.5, "c": "#777777"}, + "0,2", + {"c": "#cccccc"}, + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + {"x": 1}, + "5,0", + "5,1", + "5,2", + "5,3", + "5,4", + "5,5", + {"c": "#aaaaaa", "w": 2}, + "5,7\n\n\n4,0", + "5,8\n\n\n3,0", + {"x": 0.5, "c": "#cccccc"}, + "5,6\n\n\n4,1", + "5,7\n\n\n4,1", + {"c": "#aaaaaa"}, + "5,8\n\n\n3,1\n\n\n\n\n\ne1" + ], + [ + {"c": "#cccccc", "d": true}, + "1,0\n\n\n0,2", + {"d": true}, + "1,1\n\n\n0,2", + {"x": 0.25, "c": "#aaaaaa"}, + "1,0\n\n\n0,1", + "1,1\n\n\n0,1", + {"x": 0.25}, + "1,0\n\n\n0,0", + "1,1\n\n\n0,0", + {"x": 0.5, "w": 1.5}, + "1,2", + {"c": "#cccccc"}, + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + {"x": 1}, + "6,0", + "6,1", + "6,2", + "6,3", + "6,4", + "6,5", + "6,6", + {"w": 1.5}, + "6,7\n\n\n5,0", + {"c": "#aaaaaa"}, + "6,8", + { + "x": 1.5, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "6,7\n\n\n5,1" + ], + [ + {"c": "#cccccc", "d": true}, + "2,0\n\n\n0,2", + {"d": true}, + "2,1\n\n\n0,2", + {"x": 0.25, "c": "#aaaaaa"}, + "2,0\n\n\n0,1", + "2,1\n\n\n0,1", + {"x": 0.25}, + "2,0\n\n\n0,0", + "2,1\n\n\n0,0", + {"x": 0.5, "w": 1.75}, + "2,2", + {"c": "#cccccc"}, + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + {"x": 1}, + "7,0", + "7,1", + "7,2", + "7,3", + "7,4", + "7,5", + {"c": "#777777", "w": 2.25}, + "7,7\n\n\n5,0", + {"c": "#aaaaaa"}, + "7,8", + {"x": 0.5, "c": "#cccccc"}, + "7,6\n\n\n5,1" + ], + [ + {"d": true}, + "3,0\n\n\n0,2", + {"d": true}, + "3,1\n\n\n0,2", + {"x": 0.25, "c": "#aaaaaa"}, + "3,0\n\n\n0,1", + "3,1\n\n\n0,1", + {"x": 0.25}, + "3,0\n\n\n0,0", + "3,1\n\n\n0,0", + {"x": 0.5, "w": 2.25}, + "3,2\n\n\n1,0", + {"c": "#cccccc"}, + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + {"x": 1}, + "8,0", + "8,1", + "8,2", + "8,3", + "8,4", + {"c": "#aaaaaa", "w": 1.75}, + "8,6\n\n\n6,0", + "8,7\n\n\n6,0", + "8,8", + {"x": 0.5, "w": 2.75}, + "8,6\n\n\n6,1" + ], + [ + {"c": "#cccccc", "d": true}, + "4,0\n\n\n0,2", + {"d": true}, + "4,1\n\n\n0,2", + {"x": 0.25, "c": "#aaaaaa"}, + "4,0\n\n\n0,1", + "4,1\n\n\n0,1", + {"x": 0.25}, + "4,0\n\n\n0,0", + "4,1\n\n\n0,0", + {"x": 0.5, "w": 1.25}, + "4,2", + {"w": 1.25}, + "4,3", + {"w": 1.25}, + "4,4", + {"w": 1.25}, + "4,5\n\n\n2,0", + {"c": "#cccccc", "w": 2.25}, + "4,7\n\n\n2,0", + {"x": 1, "c": "#aaaaaa", "w": 2.75}, + "9,1\n\n\n7,0", + "9,2\n\n\n8,0", + "9,3\n\n\n8,0", + "9,4\n\n\n8,0", + "9,6", + "9,7", + "9,8" + ], + [ + {"x": 7, "w": 1.25}, + "3,2\n\n\n1,1", + "3,3\n\n\n1,1", + {"x": 1.5, "c": "#cccccc", "w": 2.25}, + "4,5\n\n\n2,1", + {"c": "#aaaaaa", "w": 1.25}, + "4,7\n\n\n2,1", + {"x": 1, "c": "#cccccc", "w": 1.25}, + "9,0\n\n\n7,1", + {"w": 1.5}, + "9,1\n\n\n7,1", + {"c": "#aaaaaa", "w": 1.25}, + "9,2\n\n\n8,1", + {"w": 1.25}, + "9,3\n\n\n8,1" + ], + [ + {"x": 10.75, "c": "#cccccc", "w": 1.25}, + "4,5\n\n\n2,2", + "4,6\n\n\n2,2", + {"c": "#aaaaaa", "w": 1.25}, + "4,7\n\n\n2,2" + ] + ] + } +} From d03360b3dcaff2e8f97b086bf00a505b225438c8 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Sat, 24 Aug 2024 22:59:48 -0700 Subject: [PATCH 06/31] Add extra compatiblity to Sat75 Hotswap PCB (#2332) --- .../satisfaction75_hs/satisfaction75_hs.json | 606 +++++------------- 1 file changed, 160 insertions(+), 446 deletions(-) diff --git a/v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json b/v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json index 6528694cd3..48b745a44e 100644 --- a/v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json +++ b/v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json @@ -1,483 +1,197 @@ { - "name": "Satisfaction75 HS", - "vendorId": "0xCA04", - "productId": "0x0011", - "matrix": { - "rows": 6, - "cols": 15 - }, + "name": "Satisfaction75 HS", + "vendorId": "0xCA04", + "productId": "0x0011", + "matrix": {"rows": 6, "cols": 15}, "customKeycodes": [ - { - "name": "Encoder Press", - "title": "Encoder Press", - "shortName": "EncPrs" - }, - { - "name": "Clock Set", - "title": "Clock Set", - "shortName": "ClkSet" - }, - { - "name": "OLED Mode", - "title": "OLED Mode", - "shortName": "ScrnMd" - } - ], + {"name": "Encoder Press", "title": "Encoder Press", "shortName": "EncPrs"}, + {"name": "Clock Set", "title": "Clock Set", "shortName": "ClkSet"}, + {"name": "OLED Mode", "title": "OLED Mode", "shortName": "ScrnMd"} + ], "menus": [ { - "label": "Custom Features", + "label": "Custom Features", "content": [ { - "label": "General", + "label": "General", "content": [ { - "label": "Default OLED Mode", - "type": "dropdown", - "options": [ - [ - "Default", - 0 - ], - [ - "Time", - 1 - ], - [ - "Off", - 2 - ] - ], - "content": [ - "default_oled_mode", - 0, - 2 - ] - }, + "label": "Default OLED Mode", + "type": "dropdown", + "options": [ ["Default", 0], ["Time", 1], ["Off", 2] ], + "content": ["default_oled_mode", 0, 2] + }, { - "label": "Current OLED Mode", - "type": "dropdown", - "options": [ - [ - "Default", - 0 - ], - [ - "Time", - 1 - ], - [ - "Off", - 2 - ] - ], - "content": [ - "current_oled_mode", - 0, - 4 - ] + "label": "Current OLED Mode", + "type": "dropdown", + "options": [ ["Default", 0], ["Time", 1], ["Off", 2] ], + "content": ["current_oled_mode", 0, 4] } ] - }, + }, { - "label": "Custom Encoder Configuration", + "label": "Custom Encoder Configuration", "content": [ - { - "label": "Custom 0 - CW", - "type": "keycode", - "content": [ - "id_encoder_custom[0][0]", - 0, - 3, - 0, - 0 - ] - }, - { - "label": "Custom 0 - CCW", - "type": "keycode", - "content": [ - "id_encoder_custom[0][1]", - 0, - 3, - 0, - 1 - ] - }, - { - "label": "Custom 0 - Press", - "type": "keycode", - "content": [ - "id_encoder_custom[0][2]", - 0, - 3, - 0, - 2 - ] - }, - { - "label": "Custom 1 - CW", - "type": "keycode", - "content": [ - "id_encoder_custom[1][0]", - 0, - 3, - 1, - 0 - ] - }, - { - "label": "Custom 1 - CCW", - "type": "keycode", - "content": [ - "id_encoder_custom[1][1]", - 0, - 3, - 1, - 1 - ] - }, - { - "label": "Custom 1 - Press", - "type": "keycode", - "content": [ - "id_encoder_custom[1][2]", - 0, - 3, - 1, - 2 - ] - }, - { - "label": "Custom 2 - CW", - "type": "keycode", - "content": [ - "id_encoder_custom[2][0]", - 0, - 3, - 2, - 0 - ] - }, - { - "label": "Custom 2 - CCW", - "type": "keycode", - "content": [ - "id_encoder_custom[2][1]", - 0, - 3, - 2, - 1 - ] - }, - { - "label": "Custom 2 - Press", - "type": "keycode", - "content": [ - "id_encoder_custom[2][2]", - 0, - 3, - 2, - 2 - ] - } + { "label": "Custom 0 - CW", "type": "keycode", "content": ["id_encoder_custom[0][0]", 0, 3, 0, 0] }, + { "label": "Custom 0 - CCW", "type": "keycode", "content": ["id_encoder_custom[0][1]", 0, 3, 0, 1] }, + { "label": "Custom 0 - Press", "type": "keycode", "content": ["id_encoder_custom[0][2]", 0, 3, 0, 2] }, + { "label": "Custom 1 - CW", "type": "keycode", "content": ["id_encoder_custom[1][0]", 0, 3, 1, 0] }, + { "label": "Custom 1 - CCW", "type": "keycode", "content": ["id_encoder_custom[1][1]", 0, 3, 1, 1] }, + { "label": "Custom 1 - Press", "type": "keycode", "content": ["id_encoder_custom[1][2]", 0, 3, 1, 2] }, + { "label": "Custom 2 - CW", "type": "keycode", "content": ["id_encoder_custom[2][0]", 0, 3, 2, 0] }, + { "label": "Custom 2 - CCW", "type": "keycode", "content": ["id_encoder_custom[2][1]", 0, 3, 2, 1] }, + { "label": "Custom 2 - Press", "type": "keycode", "content": ["id_encoder_custom[2][2]", 0, 3, 2, 2] } ] - }, + }, { - "label": "Enabled Encoder Modes", + "label": "Enabled Encoder Modes", "content": [ - { - "label": "Volume", - "type": "toggle", - "content": [ - "id_encoder_modes[0]", - 0, - 1, - 0 - ] - }, - { - "label": "Media", - "type": "toggle", - "content": [ - "id_encoder_modes[1]", - 0, - 1, - 1 - ] - }, - { - "label": "Scroll", - "type": "toggle", - "content": [ - "id_encoder_modes[2]", - 0, - 1, - 2 - ] - }, - { - "label": "Brightness", - "type": "toggle", - "content": [ - "id_encoder_modes[3]", - 0, - 1, - 3 - ] - }, - { - "label": "Backlight", - "type": "toggle", - "content": [ - "id_encoder_modes[4]", - 0, - 1, - 4 - ] - }, - { - "label": "Custom 0", - "type": "toggle", - "content": [ - "id_encoder_modes[5]", - 0, - 1, - 5 - ] - }, - { - "label": "Custom 1", - "type": "toggle", - "content": [ - "id_encoder_modes[6]", - 0, - 1, - 6 - ] - }, - { - "label": "Custom 2", - "type": "toggle", - "content": [ - "id_encoder_modes[7]", - 0, - 1, - 7 - ] - } + { "label": "Volume", "type": "toggle", "content": ["id_encoder_modes[0]", 0, 1, 0] }, + { "label": "Media", "type": "toggle", "content": ["id_encoder_modes[1]", 0, 1, 1] }, + { "label": "Scroll", "type": "toggle", "content": ["id_encoder_modes[2]", 0, 1, 2] }, + { "label": "Brightness", "type": "toggle", "content": ["id_encoder_modes[3]", 0, 1, 3] }, + { "label": "Backlight", "type": "toggle", "content": ["id_encoder_modes[4]", 0, 1, 4] }, + { "label": "Custom 0", "type": "toggle", "content": ["id_encoder_modes[5]", 0, 1, 5] }, + { "label": "Custom 1", "type": "toggle", "content": ["id_encoder_modes[6]", 0, 1, 6] }, + { "label": "Custom 2", "type": "toggle", "content": ["id_encoder_modes[7]", 0, 1, 7] } ] } ] } - ], + ], "layouts": { - "labels": [ - "Split Backspace" - ], + "labels": ["Split Backspace", "7U Spacebar", "3x1U Bottom Row"], "keymap": [ [ - { - "c": "#777777" - }, - "0,0", - { - "x": 0.5, - "c": "#cccccc" - }, - "0,2", - "0,3", - "0,4", - "0,5", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "0,6", - "0,7", - "0,8", - "0,9", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,10", - "0,11", - "0,12", + {"c": "#777777"}, + "0,0", + {"x": 0.5, "c": "#cccccc"}, + "0,2", + "0,3", + "0,4", + "0,5", + {"x": 0.25, "c": "#aaaaaa"}, + "0,6", + "0,7", + "0,8", + "0,9", + {"x": 0.25, "c": "#cccccc"}, + "0,10", + "0,11", + "0,12", "0,13" - ], + ], + [ {"x": 15.5, "c": "#aaaaaa"}, "1,14" ], [ - { - "x": 15.5, - "c": "#aaaaaa" - }, - "1,14" - ], - [ - { - "y": -0.75 - }, - "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", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,13\n\n\n0,0", - { - "x": 2 - }, - "1,13\n\n\n0,1", + {"y": -0.75}, + "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", + {"c": "#aaaaaa", "w": 2}, + "1,13\n\n\n0,0", + {"x": 2}, + "1,13\n\n\n0,1", "0,14\n\n\n0,1" - ], + ], [ - { - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,13", - { - "x": 0.5 - }, + {"w": 1.5}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + {"c": "#aaaaaa", "w": 1.5}, + "2,13", + {"x": 0.5}, "2,14" - ], + ], [ - { - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "3,13", - { - "x": 0.5 - }, + {"w": 1.75}, + "3,0", + {"c": "#cccccc"}, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + {"c": "#aaaaaa", "w": 2.25}, + "3,13", + {"x": 0.5}, "3,14" - ], + ], [ - { - "w": 2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12", - { - "x": 1.5 - }, + {"w": 2.25}, + "4,0", + {"c": "#cccccc"}, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + {"c": "#aaaaaa", "w": 1.75}, + "4,12", + {"x": 1.5}, "4,14" - ], + ], + [ {"y": -0.75, "x": 14.25, "c": "#777777"}, "4,13" ], [ - { - "y": -0.75, - "x": 14.25, - "c": "#777777" - }, - "4,13" - ], + {"y": -0.25, "c": "#aaaaaa", "w": 1.25}, + "5,0\n\n\n1,0", + {"w": 1.25}, + "5,1\n\n\n1,0", + {"w": 1.25}, + "5,2\n\n\n1,0", + {"c": "#cccccc", "w": 6.25}, + "5,6\n\n\n1,0", + {"c": "#aaaaaa", "w": 1.5}, + "5,10\n\n\n2,0", + {"w": 1.5}, + "5,11\n\n\n2,0" + ], + [ {"y": -0.75, "x": 13.25, "c": "#777777"}, "5,12", "5,13", "5,14" ], [ - { - "y": -0.25, - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0", - { - "w": 1.25 - }, - "5,1", - { - "w": 1.25 - }, - "5,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,10", - { - "w": 1.5 - }, - "5,11" - ], - [ - { - "y": -0.75, - "x": 13.25, - "c": "#777777" - }, - "5,12", - "5,13", - "5,14" + {"c": "#aaaaaa", "w": 1.5}, + "5,0\n\n\n1,1", + {"w": 1.5}, + "5,1\n\n\n1,1", + {"c": "#cccccc", "w": 7}, + "5,6\n\n\n1,1", + {"c": "#aaaaaa"}, + "5,10\n\n\n2,1", + "5,11\n\n\n2,1", + "5,9\n\n\n2,1" ] ] } -} +} \ No newline at end of file From 92e58d1b8628b2555c1fc18db62dc2bf4a6c5fcf Mon Sep 17 00:00:00 2001 From: Xelus22 <17491233+Xelus22@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:57:11 +1000 Subject: [PATCH 07/31] Update pull_request_template.md Add VIA userspace keymap link requirement and to checklist --- .github/pull_request_template.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index fc818d57b3..e55a2e9855 100755 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -18,11 +18,20 @@ +## VIA Keymap Pull Request + + + + + + + ## Checklist - [ ] The VIA support for this keyboard is **MERGED** in QMK master already **(MANDATORY)** +- [ ] VIA keymap is **MERGED** in VIA userspace master already **(MANDATORY)** - [ ] The VIA definition follows the guide here: https://caniusevia.com/docs/layouts - [ ] I have a V3 JSON version for this keyboard definition.**(MANDATORY)** - [ ] I have formatted the JSON file to have consistent formatting with the rest of the repository. From 6068572c5e5289d614e9c59f21dd53f62031aaec Mon Sep 17 00:00:00 2001 From: Xelus22 <17491233+Xelus22@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:58:49 +1000 Subject: [PATCH 08/31] Update pull_request_template.md with 0.26.0 and after to require VIA userspace keymap PR --- .github/pull_request_template.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e55a2e9855..266a3b0125 100755 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -23,6 +23,8 @@ + + From 2ef2fd3231984d448cb6fd1ef73e6df58ed34ef9 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Fri, 22 Mar 2024 10:17:36 +0100 Subject: [PATCH 09/31] Create waffling80_rev_b_ansi.json --- v3/4pplet/waffling80_rev_b_ansi.json | 291 +++++++++++++++++++++++++++ 1 file changed, 291 insertions(+) create mode 100644 v3/4pplet/waffling80_rev_b_ansi.json diff --git a/v3/4pplet/waffling80_rev_b_ansi.json b/v3/4pplet/waffling80_rev_b_ansi.json new file mode 100644 index 0000000000..afaa61eb55 --- /dev/null +++ b/v3/4pplet/waffling80_rev_b_ansi.json @@ -0,0 +1,291 @@ +{ + "name": "waffling80 Rev B ANSI HS", + "vendorId": "0x4444", + "productId": "0x0010", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "matrix": {"rows": 12, "cols": 8}, + "layouts": { + "labels": [ + "F13", + "Split Backspace", + "Split Right Shift", + "WKL", + "Split Space" + ], + "keymap": +[ + [ + { + "x": 2.75, + "c": "#aaaaaa" + }, + "0,0\n\n\n0,1", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,0\n\n\n0,1", + "0,1\n\n\n0,1", + "1,1\n\n\n0,1", + "0,2\n\n\n0,1", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "1,2\n\n\n0,1", + "0,3\n\n\n0,1", + "1,3\n\n\n0,1", + "0,4\n\n\n0,1", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,4\n\n\n0,1", + "0,5\n\n\n0,1", + "1,5\n\n\n0,1", + "0,6\n\n\n0,1", + { + "x": 0.25 + }, + "1,6\n\n\n0,1", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,7\n\n\n0,1", + "1,7\n\n\n0,1", + "3,7\n\n\n0,1" + ], + [ + { + "y": 0.5, + "x": 2.75 + }, + "0,0\n\n\n0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,1\n\n\n0,0", + "1,1\n\n\n0,0", + "0,2\n\n\n0,0", + "1,2\n\n\n0,0", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,3\n\n\n0,0", + "1,3\n\n\n0,0", + "0,4\n\n\n0,0", + "1,4\n\n\n0,0", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,5\n\n\n0,0", + "1,5\n\n\n0,0", + "0,6\n\n\n0,0", + "1,6\n\n\n0,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,7\n\n\n0,0", + "1,7\n\n\n0,0", + "3,7\n\n\n0,0" + ], + [ + { + "y": 0.25, + "x": 2.75, + "c": "#cccccc" + }, + "2,0", + "3,0", + "2,1", + "3,1", + "2,2", + "3,2", + "2,3", + "3,3", + "2,4", + "3,4", + "2,5", + "2,5", + "2,6", + { + "c": "#aaaaaa", + "w": 2 + }, + "6,7\n\n\n1,0", + { + "x": 0.25 + }, + "2,7", + "5,7", + "9,7", + { + "x": 1, + "c": "#cccccc" + }, + "3,6\n\n\n1,1", + "6,7\n\n\n1,1" + ], + [ + { + "x": 2.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "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", + "4,6", + { + "w": 1.5 + }, + "5,6", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "4,7", + "7,7", + "11,7" + ], + [ + { + "x": 2.75, + "w": 1.75 + }, + "6,0", + { + "c": "#cccccc" + }, + "7,0", + "6,1", + "7,1", + "6,2", + "7,2", + "6,3", + "7,3", + "6,4", + "7,4", + "6,5", + "7,5", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "7,6" + ], + [ + { + "x": 2.75, + "w": 2.25 + }, + "8,0", + { + "c": "#cccccc" + }, + "8,1", + "9,1", + "8,2", + "9,2", + "8,3", + "9,3", + "8,4", + "9,4", + "8,5", + "9,5", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "8,6\n\n\n2,0", + { + "x": 1.25 + }, + "8,7", + { + "x": 1.25, + "c": "#cccccc", + "w": 1.75 + }, + "8,6\n\n\n2,1", + "9,6\n\n\n2,1" + ], + [ + { + "x": 2.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "10,0", + "11,1\n\n\n3,0", + { + "w": 1.5 + }, + "10,1", + { + "c": "#cccccc", + "w": 7 + }, + "10,3\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "11,4", + "10,5\n\n\n3,0", + { + "w": 1.5 + }, + "11,5", + { + "x": 0.25 + }, + "10,6", + "11,6", + "10,7" + ], + [ + { + "x": 4.25, + "d": true + }, + "11,1\n\n\n3,1", + { + "x": 1.5, + "c": "#cccccc", + "w": 3 + }, + "11,2\n\n\n4,1", + "10,3\n\n\n4,1", + { + "w": 3 + }, + "11,3\n\n\n4,1", + { + "x": 1.5, + "c": "#aaaaaa", + "d": true + }, + "10,5\n\n\n3,1" + ] +] + } +} From b4d861f6be206687c2b161c255656196f9f5e726 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Wed, 27 Mar 2024 14:17:37 +0100 Subject: [PATCH 10/31] Update waffling80_rev_b_ansi.json --- v3/4pplet/waffling80_rev_b_ansi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/4pplet/waffling80_rev_b_ansi.json b/v3/4pplet/waffling80_rev_b_ansi.json index afaa61eb55..79860272de 100644 --- a/v3/4pplet/waffling80_rev_b_ansi.json +++ b/v3/4pplet/waffling80_rev_b_ansi.json @@ -112,7 +112,7 @@ "2,4", "3,4", "2,5", - "2,5", + "3,5", "2,6", { "c": "#aaaaaa", From 7e2d1558cc384e85687674fcfcd00c15fd66d778 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Fri, 19 Apr 2024 08:58:19 +0200 Subject: [PATCH 11/31] Update v3/4pplet/waffling80_rev_b_ansi.json Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com> --- v3/4pplet/waffling80_rev_b_ansi.json | 561 ++++++++++++++------------- 1 file changed, 284 insertions(+), 277 deletions(-) diff --git a/v3/4pplet/waffling80_rev_b_ansi.json b/v3/4pplet/waffling80_rev_b_ansi.json index 79860272de..a9c2c0ef64 100644 --- a/v3/4pplet/waffling80_rev_b_ansi.json +++ b/v3/4pplet/waffling80_rev_b_ansi.json @@ -2,9 +2,16 @@ "name": "waffling80 Rev B ANSI HS", "vendorId": "0x4444", "productId": "0x0010", - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgblight"], - "matrix": {"rows": 12, "cols": 8}, + "matrix": { + "rows": 12, + "cols": 8 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgblight" + ], "layouts": { "labels": [ "F13", @@ -13,279 +20,279 @@ "WKL", "Split Space" ], - "keymap": -[ - [ - { - "x": 2.75, - "c": "#aaaaaa" - }, - "0,0\n\n\n0,1", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,0\n\n\n0,1", - "0,1\n\n\n0,1", - "1,1\n\n\n0,1", - "0,2\n\n\n0,1", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "1,2\n\n\n0,1", - "0,3\n\n\n0,1", - "1,3\n\n\n0,1", - "0,4\n\n\n0,1", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,4\n\n\n0,1", - "0,5\n\n\n0,1", - "1,5\n\n\n0,1", - "0,6\n\n\n0,1", - { - "x": 0.25 - }, - "1,6\n\n\n0,1", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "0,7\n\n\n0,1", - "1,7\n\n\n0,1", - "3,7\n\n\n0,1" - ], - [ - { - "y": 0.5, - "x": 2.75 - }, - "0,0\n\n\n0,0", - { - "x": 1, - "c": "#cccccc" - }, - "0,1\n\n\n0,0", - "1,1\n\n\n0,0", - "0,2\n\n\n0,0", - "1,2\n\n\n0,0", - { - "x": 0.5, - "c": "#aaaaaa" - }, - "0,3\n\n\n0,0", - "1,3\n\n\n0,0", - "0,4\n\n\n0,0", - "1,4\n\n\n0,0", - { - "x": 0.5, - "c": "#cccccc" - }, - "0,5\n\n\n0,0", - "1,5\n\n\n0,0", - "0,6\n\n\n0,0", - "1,6\n\n\n0,0", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "0,7\n\n\n0,0", - "1,7\n\n\n0,0", - "3,7\n\n\n0,0" - ], - [ - { - "y": 0.25, - "x": 2.75, - "c": "#cccccc" - }, - "2,0", - "3,0", - "2,1", - "3,1", - "2,2", - "3,2", - "2,3", - "3,3", - "2,4", - "3,4", - "2,5", - "3,5", - "2,6", - { - "c": "#aaaaaa", - "w": 2 - }, - "6,7\n\n\n1,0", - { - "x": 0.25 - }, - "2,7", - "5,7", - "9,7", - { - "x": 1, - "c": "#cccccc" - }, - "3,6\n\n\n1,1", - "6,7\n\n\n1,1" - ], - [ - { - "x": 2.75, - "c": "#aaaaaa", - "w": 1.5 - }, - "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", - "4,6", - { - "w": 1.5 - }, - "5,6", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "4,7", - "7,7", - "11,7" - ], - [ - { - "x": 2.75, - "w": 1.75 - }, - "6,0", - { - "c": "#cccccc" - }, - "7,0", - "6,1", - "7,1", - "6,2", - "7,2", - "6,3", - "7,3", - "6,4", - "7,4", - "6,5", - "7,5", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "7,6" - ], - [ - { - "x": 2.75, - "w": 2.25 - }, - "8,0", - { - "c": "#cccccc" - }, - "8,1", - "9,1", - "8,2", - "9,2", - "8,3", - "9,3", - "8,4", - "9,4", - "8,5", - "9,5", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "8,6\n\n\n2,0", - { - "x": 1.25 - }, - "8,7", - { - "x": 1.25, - "c": "#cccccc", - "w": 1.75 - }, - "8,6\n\n\n2,1", - "9,6\n\n\n2,1" - ], - [ - { - "x": 2.75, - "c": "#aaaaaa", - "w": 1.5 - }, - "10,0", - "11,1\n\n\n3,0", - { - "w": 1.5 - }, - "10,1", - { - "c": "#cccccc", - "w": 7 - }, - "10,3\n\n\n4,0", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "11,4", - "10,5\n\n\n3,0", - { - "w": 1.5 - }, - "11,5", - { - "x": 0.25 - }, - "10,6", - "11,6", - "10,7" - ], - [ - { - "x": 4.25, - "d": true - }, - "11,1\n\n\n3,1", - { - "x": 1.5, - "c": "#cccccc", - "w": 3 - }, - "11,2\n\n\n4,1", - "10,3\n\n\n4,1", - { - "w": 3 - }, - "11,3\n\n\n4,1", - { - "x": 1.5, - "c": "#aaaaaa", - "d": true - }, - "10,5\n\n\n3,1" - ] -] + "keymap": [ + [ + { + "x": 2.75, + "c": "#aaaaaa" + }, + "0,0\n\n\n0,1", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,0\n\n\n0,1", + "0,1\n\n\n0,1", + "1,1\n\n\n0,1", + "0,2\n\n\n0,1", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "1,2\n\n\n0,1", + "0,3\n\n\n0,1", + "1,3\n\n\n0,1", + "0,4\n\n\n0,1", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,4\n\n\n0,1", + "0,5\n\n\n0,1", + "1,5\n\n\n0,1", + "0,6\n\n\n0,1", + { + "x": 0.25 + }, + "1,6\n\n\n0,1", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,7\n\n\n0,1", + "1,7\n\n\n0,1", + "3,7\n\n\n0,1" + ], + [ + { + "y": 0.5, + "x": 2.75 + }, + "0,0\n\n\n0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,1\n\n\n0,0", + "1,1\n\n\n0,0", + "0,2\n\n\n0,0", + "1,2\n\n\n0,0", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,3\n\n\n0,0", + "1,3\n\n\n0,0", + "0,4\n\n\n0,0", + "1,4\n\n\n0,0", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,5\n\n\n0,0", + "1,5\n\n\n0,0", + "0,6\n\n\n0,0", + "1,6\n\n\n0,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,7\n\n\n0,0", + "1,7\n\n\n0,0", + "3,7\n\n\n0,0" + ], + [ + { + "y": 0.25, + "x": 2.75, + "c": "#cccccc" + }, + "2,0", + "3,0", + "2,1", + "3,1", + "2,2", + "3,2", + "2,3", + "3,3", + "2,4", + "3,4", + "2,5", + "3,5", + "2,6", + { + "c": "#aaaaaa", + "w": 2 + }, + "6,7\n\n\n1,0", + { + "x": 0.25 + }, + "2,7", + "5,7", + "9,7", + { + "x": 1, + "c": "#cccccc" + }, + "3,6\n\n\n1,1", + "6,7\n\n\n1,1" + ], + [ + { + "x": 2.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "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", + "4,6", + { + "w": 1.5 + }, + "5,6", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "4,7", + "7,7", + "11,7" + ], + [ + { + "x": 2.75, + "w": 1.75 + }, + "6,0", + { + "c": "#cccccc" + }, + "7,0", + "6,1", + "7,1", + "6,2", + "7,2", + "6,3", + "7,3", + "6,4", + "7,4", + "6,5", + "7,5", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "7,6" + ], + [ + { + "x": 2.75, + "w": 2.25 + }, + "8,0", + { + "c": "#cccccc" + }, + "8,1", + "9,1", + "8,2", + "9,2", + "8,3", + "9,3", + "8,4", + "9,4", + "8,5", + "9,5", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "8,6\n\n\n2,0", + { + "x": 1.25 + }, + "8,7", + { + "x": 1.25, + "c": "#cccccc", + "w": 1.75 + }, + "8,6\n\n\n2,1", + "9,6\n\n\n2,1" + ], + [ + { + "x": 2.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "10,0", + "11,1\n\n\n3,0", + { + "w": 1.5 + }, + "10,1", + { + "c": "#cccccc", + "w": 7 + }, + "10,3\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "11,4", + "10,5\n\n\n3,0", + { + "w": 1.5 + }, + "11,5", + { + "x": 0.25 + }, + "10,6", + "11,6", + "10,7" + ], + [ + { + "x": 4.25, + "d": true + }, + "11,1\n\n\n3,1", + { + "x": 1.5, + "c": "#cccccc", + "w": 3 + }, + "11,2\n\n\n4,1", + "10,3\n\n\n4,1", + { + "w": 3 + }, + "11,3\n\n\n4,1", + { + "x": 1.5, + "c": "#aaaaaa", + "d": true + }, + "10,5\n\n\n3,1" + ] + ] } } + From a7649baacdd6be374124632f2416bc40aaa6102b Mon Sep 17 00:00:00 2001 From: 4pplet Date: Fri, 26 Apr 2024 14:16:42 +0200 Subject: [PATCH 12/31] Update waffling80_rev_b_ansi.json --- v3/4pplet/waffling80_rev_b_ansi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/4pplet/waffling80_rev_b_ansi.json b/v3/4pplet/waffling80_rev_b_ansi.json index a9c2c0ef64..1fb43c0711 100644 --- a/v3/4pplet/waffling80_rev_b_ansi.json +++ b/v3/4pplet/waffling80_rev_b_ansi.json @@ -1,7 +1,7 @@ { "name": "waffling80 Rev B ANSI HS", "vendorId": "0x4444", - "productId": "0x0010", + "productId": "0x0017", "matrix": { "rows": 12, "cols": 8 From bb739341ef4ed15363d3106676f015cdb71b62a5 Mon Sep 17 00:00:00 2001 From: eerraa Date: Sat, 10 Aug 2024 17:03:03 +0900 Subject: [PATCH 13/31] 2U backspace matrix fix 2U backspace matrix fix --- v3/era/linx3/fave65s/fave65s.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/era/linx3/fave65s/fave65s.json b/v3/era/linx3/fave65s/fave65s.json index bc3a980ccd..fbd131a01d 100644 --- a/v3/era/linx3/fave65s/fave65s.json +++ b/v3/era/linx3/fave65s/fave65s.json @@ -246,7 +246,7 @@ "c": "#aaaaaa", "w": 2 }, - "0,14\n\n\n0,0", + "0,13\n\n\n0,0", { "c": "#cccccc" }, From 7948346929b0761fd8e567e8b8b412f621ecfbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Tue, 1 Oct 2024 03:25:39 -0300 Subject: [PATCH 14/31] Add initial TypeK support (#2342) * Add initial TypeK support * add to menus --- v3/typek/typek.json | 408 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 408 insertions(+) create mode 100755 v3/typek/typek.json diff --git a/v3/typek/typek.json b/v3/typek/typek.json new file mode 100755 index 0000000000..3740f304a1 --- /dev/null +++ b/v3/typek/typek.json @@ -0,0 +1,408 @@ +{ + "name": "gok TypeK", + "vendorId": "0x7179", + "productId": "0x8475", + "menus": ["qmk_rgblight", + { + "label": "Indicators", + "content":[ + { + "label": "Right indicator", + "content": [ + { + "label": "Enable right indicator", + "type": "toggle", + "content": ["id_ind1_enabled", 0, 1] + }, + { + "showIf": "{id_ind1_enabled} == 1", + "label": "Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_ind1_brightness", 0, 2] + }, + { + "showIf": "{id_ind1_enabled} == 1", + "label": "Color", + "type": "color", + "content": ["id_ind1_color", 0, 3] + }, + { + "showIf": "{id_ind1_enabled} == 1", + "label": "Function 1", + "type": "dropdown", + "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], + "content": ["id_ind1_func1", 0, 4] + }, { + "showIf": "{id_ind1_enabled} == 1", + "label": "Function 2", + "type": "dropdown", + "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], + "content": ["id_ind1_func2", 0, 5] + } + ] + }, + { + "label": "Central indicator", + "content": [ + { + "label": "Enable central indicator", + "type": "toggle", + "content": ["id_ind2_enabled", 0, 6] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "label": "Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_ind2_brightness", 0, 7] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "label": "Color", + "type": "color", + "content": ["id_ind2_color", 0, 8] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "label": "Function 1", + "type": "dropdown", + "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], + "content": ["id_ind2_func1", 0, 9] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "label": "Function 2", + "type": "dropdown", + "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], + "content": ["id_ind2_func2", 0, 10] + } + ] + }, + { + "label": "Left indicator", + "content": [ + { + "label": "Enable left indicator", + "type": "toggle", + "content": ["id_ind3_enabled", 0, 11] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "label": "Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_ind3_brightness", 0, 12] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "label": "Color", + "type": "color", + "content": ["id_ind3_color", 0, 13] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "label": "Function 1", + "type": "dropdown", + "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], + "content": ["id_ind3_func1", 0, 14] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "label": "Function 2", + "type": "dropdown", + "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], + "content": ["id_ind3_func2", 0, 15] + } + ] + } + + ] + } + ], + "keycodes": ["qmk_lighting"], + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": ["Split backspace", "Split left space", "Split right space", "Split right shift"], + "keymap": [ + [ + { + "x": 17.15, + "c": "#aaaaaa" + }, + "0,13\n\n\n0,1", + "2,13\n\n\n0,1" + ], + [ + { + "y": 0.19999999999999996, + "x": 15.15, + "c": "#cccccc" + }, + "0,11" + ], + [ + { + "y": -0.9500000000000002, + "x": 0.75, + "c": "#777777" + }, + "0,0", + { + "x": 0.7000000000000002, + "c": "#cccccc" + }, + "0,1", + "0,2", + { + "x": 11.7 + }, + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13\n\n\n0,0" + ], + [ + { + "y": -0.04999999999999982, + "x": 15, + "c": "#cccccc" + }, + "1,11" + ], + [ + { + "y": -0.9500000000000002, + "x": 0.5 + }, + "1,0", + { + "x": 0.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,1", + { + "c": "#cccccc" + }, + "1,2", + { + "x": 11.25 + }, + "1,12", + "1,13", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10" + ], + [ + { + "x": 0.25, + "c": "#cccccc" + }, + "2,0", + { + "x": 0.7999999999999998, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,1", + { + "c": "#cccccc" + }, + "2,2", + { + "x": 10.600000000000001 + }, + "2,11", + { + "x": -3.552713678800501e-15 + }, + "2,12", + { + "c": "#777777", + "w": 2.25 + }, + "4,11" + ], + [ + { + "c": "#cccccc" + }, + "3,0", + { + "x": 0.8, + "c": "#aaaaaa", + "w": 2.25 + }, + "3,1", + { + "c": "#cccccc" + }, + "3,2", + { + "x": 10.05 + }, + "3,11", + "3,12", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,13\n\n\n3,0", + { + "x": 1.1499999999999986, + "w": 1.25 + }, + "3,13\n\n\n3,1", + { + "c": "#cccccc" + }, + "4,12\n\n\n3,1" + ], + [ + { + "x": 1.8, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,1", + { + "x": 14.05, + "w": 1.5 + }, + "4,13" + ], + [ + { + "r": 10, + "y": -6, + "x": 4.8, + "c": "#cccccc" + }, + "0,3", + "0,4", + "0,5", + "0,6", + "4,6" + ], + [ + { + "x": 5.35 + }, + "1,3", + "1,4", + "1,5", + "1,6" + ], + [ + { + "x": 5.6 + }, + "2,3", + "2,4", + "2,5", + "2,6" + ], + [ + { + "x": 6.05 + }, + "3,3", + "3,4", + "3,5", + "3,6" + ], + [ + { + "x": 6.1, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,2", + { + "c": "#cccccc", + "w": 3 + }, + "4,4\n\n\n1,0" + ], + [ + { + "x": 7.6, + "w": 2 + }, + "4,4\n\n\n1,1", + { + "c": "#aaaaaa" + }, + "4,5\n\n\n1,1" + ], + [ + { + "r": -10, + "y": -2.6, + "x": 10.45, + "c": "#cccccc" + }, + "0,7", + "0,8", + "0,9", + "0,10" + ], + [ + { + "x": 10.05 + }, + "1,7", + "1,8", + "1,9", + "1,10" + ], + [ + { + "x": 10.2 + }, + "2,7", + "2,8", + "2,9", + "2,10" + ], + [ + { + "x": 9.75 + }, + "3,7", + "3,8", + "3,9", + "3,10" + ], + [ + { + "x": 9.25, + "w": 3 + }, + "4,8\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,9" + ], + [ + { + "x": 9.25 + }, + "4,7\n\n\n2,1", + { + "c": "#cccccc", + "w": 2 + }, + "4,8\n\n\n2,1" + ] +] +} +} From 7fcd37ea9b1f44c060492e9167a71b0b8f893905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Tue, 1 Oct 2024 03:31:09 -0300 Subject: [PATCH 15/31] Add initial support got G60R -S and -H (#2343) --- v3/bowlkeyboards/geassrevival/g60r-h.json | 153 ++++++++++++++ v3/bowlkeyboards/geassrevival/g60r-s.json | 246 ++++++++++++++++++++++ 2 files changed, 399 insertions(+) create mode 100644 v3/bowlkeyboards/geassrevival/g60r-h.json create mode 100644 v3/bowlkeyboards/geassrevival/g60r-s.json diff --git a/v3/bowlkeyboards/geassrevival/g60r-h.json b/v3/bowlkeyboards/geassrevival/g60r-h.json new file mode 100644 index 0000000000..29f395f31f --- /dev/null +++ b/v3/bowlkeyboards/geassrevival/g60r-h.json @@ -0,0 +1,153 @@ +{ + "name": "G60R-H", + "vendorId": "0x4257", + "productId": "0x4753", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + "Split backspace", + "Split right shift" + ], + "keymap": [ + [ + { + "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,13\n\n\n0,0", + { + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "4,12\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "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,13" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,13" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,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\n1,0", + { + "w": 1.75 + }, + "3,12\n\n\n1,1", + "3,13\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "4,0", + "4,1", + { + "w": 1.5 + }, + "4,2", + { + "c": "#cccccc", + "w": 7 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10", + "4,11", + { + "w": 1.5 + }, + "4,13" + ] +] +} +} diff --git a/v3/bowlkeyboards/geassrevival/g60r-s.json b/v3/bowlkeyboards/geassrevival/g60r-s.json new file mode 100644 index 0000000000..b2e4d9cefd --- /dev/null +++ b/v3/bowlkeyboards/geassrevival/g60r-s.json @@ -0,0 +1,246 @@ +{ + "name": "G60R-S", + "vendorId": "0x4257", + "productId": "0x4752", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight"], + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + "Split backspace", + "ISO enter", + "Split left shift", + "Split right shift", + ["Bottom row", "7U", "6.25U", "6U"] + ], + "keymap": [ + [ + { + "x": 2.25, + "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,13\n\n\n0,0", + { + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "4,12\n\n\n0,1" + ], + [ + { + "x": 2.25, + "c": "#aaaaaa", + "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,13\n\n\n1,0", + { + "x": 1, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,1" + ], + [ + { + "x": 2.25, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,13\n\n\n1,0", + { + "c": "#cccccc" + }, + "2,12\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,1", + "3,1\n\n\n2,1", + { + "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\n3,0", + { + "w": 1.75 + }, + "3,12\n\n\n3,1", + "3,13\n\n\n3,1" + ], + [ + { + "x": 2.25, + "w": 1.5 + }, + "4,0\n\n\n4,0", + "4,1\n\n\n4,0", + { + "w": 1.5 + }, + "4,2\n\n\n4,0", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,9\n\n\n4,0", + "4,11\n\n\n4,0", + { + "w": 1.5 + }, + "4,13\n\n\n4,0" + ], + [ + { + "x": 2.25, + "w": 1.5 + }, + "4,0\n\n\n4,2", + "4,1\n\n\n4,2", + { + "w": 1.5 + }, + "4,2\n\n\n4,2", + { + "c": "#cccccc", + "w": 6 + }, + "4,6\n\n\n4,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,9\n\n\n4,2", + "4,10\n\n\n4,2", + "4,11\n\n\n4,2", + { + "w": 1.5 + }, + "4,13\n\n\n4,2" + ], + [ + { + "x": 2.25, + "w": 1.25 + }, + "4,0\n\n\n4,1", + { + "w": 1.25 + }, + "4,1\n\n\n4,1", + { + "w": 1.25 + }, + "4,2\n\n\n4,1", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n4,1", + { + "w": 1.25 + }, + "4,10\n\n\n4,1", + { + "w": 1.25 + }, + "4,11\n\n\n4,1", + { + "w": 1.25 + }, + "4,13\n\n\n4,1" + ] +] +} +} From 7cbc8a4a8f2b5b340b9c917498d27c5a8b241755 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 5 Oct 2024 04:14:49 +0200 Subject: [PATCH 16/31] Formatting and fix of Type-K duality --- src/ai03/equinox_xl/equinox_xl.json | 8 +- v3/4pplet/waffling80_rev_b_ansi.json | 1 - v3/ai03/equinox_xl/equinox_xl.json | 6 +- v3/bowlkeyboards/geassrevival/g60r-h.json | 287 +++--- v3/bowlkeyboards/geassrevival/g60r-s.json | 478 ++++----- .../satisfaction75_hs/satisfaction75_hs.json | 626 +++++++++--- v3/cipulot/ec_typek/ec_typek_advanced.json | 719 ++++++++++++++ .../{ec_typek.json => ec_typek_basic.json} | 0 v3/eason/meow65/meow65.json | 399 ++++---- v3/keebio/quefrency/quefrency-rev6.json | 305 ++++-- v3/typek/typek.json | 940 ++++++++++-------- .../keycult_tkl/keycult_tkl.json | 5 +- 12 files changed, 2572 insertions(+), 1202 deletions(-) create mode 100644 v3/cipulot/ec_typek/ec_typek_advanced.json rename v3/cipulot/ec_typek/{ec_typek.json => ec_typek_basic.json} (100%) diff --git a/src/ai03/equinox_xl/equinox_xl.json b/src/ai03/equinox_xl/equinox_xl.json index c43a420b1a..2c0622a607 100644 --- a/src/ai03/equinox_xl/equinox_xl.json +++ b/src/ai03/equinox_xl/equinox_xl.json @@ -2,14 +2,18 @@ "name": "Equinox XL", "vendorId": "0xa103", "productId": "0x0020", - "lighting": "none", "matrix": { "rows": 4, "cols": 14 }, + "lighting": "none", "layouts": { "labels": [ - ["Enter", "ANSI", "ISO"], + [ + "Enter", + "ANSI", + "ISO" + ], "Split Left Shift", "Split Right Shift", "Winkeyless", diff --git a/v3/4pplet/waffling80_rev_b_ansi.json b/v3/4pplet/waffling80_rev_b_ansi.json index 1fb43c0711..f74831deb7 100644 --- a/v3/4pplet/waffling80_rev_b_ansi.json +++ b/v3/4pplet/waffling80_rev_b_ansi.json @@ -295,4 +295,3 @@ ] } } - diff --git a/v3/ai03/equinox_xl/equinox_xl.json b/v3/ai03/equinox_xl/equinox_xl.json index 44672e70df..f9d06103c6 100644 --- a/v3/ai03/equinox_xl/equinox_xl.json +++ b/v3/ai03/equinox_xl/equinox_xl.json @@ -8,7 +8,11 @@ }, "layouts": { "labels": [ - ["Enter", "ANSI", "ISO"], + [ + "Enter", + "ANSI", + "ISO" + ], "Split Left Shift", "Split Right Shift", "Winkeyless", diff --git a/v3/bowlkeyboards/geassrevival/g60r-h.json b/v3/bowlkeyboards/geassrevival/g60r-h.json index 29f395f31f..6e9db99b28 100644 --- a/v3/bowlkeyboards/geassrevival/g60r-h.json +++ b/v3/bowlkeyboards/geassrevival/g60r-h.json @@ -2,152 +2,155 @@ "name": "G60R-H", "vendorId": "0x4257", "productId": "0x4753", - "matrix": {"rows": 5, "cols": 14}, + "matrix": { + "rows": 5, + "cols": 14 + }, "layouts": { "labels": [ "Split backspace", "Split right shift" ], "keymap": [ - [ - { - "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,13\n\n\n0,0", - { - "c": "#cccccc" - }, - "0,13\n\n\n0,1", - "4,12\n\n\n0,1" - ], - [ - { - "c": "#aaaaaa", - "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,13" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "c": "#777777", - "w": 2.25 - }, - "2,13" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "3,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\n1,0", - { - "w": 1.75 - }, - "3,12\n\n\n1,1", - "3,13\n\n\n1,1" - ], - [ - { - "w": 1.5 - }, - "4,0", - "4,1", - { - "w": 1.5 - }, - "4,2", - { - "c": "#cccccc", - "w": 7 - }, - "4,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,10", - "4,11", - { - "w": 1.5 - }, - "4,13" - ] -] -} + [ + { + "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,13\n\n\n0,0", + { + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "4,12\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "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,13" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,13" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,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\n1,0", + { + "w": 1.75 + }, + "3,12\n\n\n1,1", + "3,13\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "4,0", + "4,1", + { + "w": 1.5 + }, + "4,2", + { + "c": "#cccccc", + "w": 7 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10", + "4,11", + { + "w": 1.5 + }, + "4,13" + ] + ] + } } diff --git a/v3/bowlkeyboards/geassrevival/g60r-s.json b/v3/bowlkeyboards/geassrevival/g60r-s.json index b2e4d9cefd..328d07d3f3 100644 --- a/v3/bowlkeyboards/geassrevival/g60r-s.json +++ b/v3/bowlkeyboards/geassrevival/g60r-s.json @@ -2,245 +2,257 @@ "name": "G60R-S", "vendorId": "0x4257", "productId": "0x4752", - "keycodes": ["qmk_lighting"], - "menus": ["qmk_backlight"], - "matrix": {"rows": 5, "cols": 14}, + "matrix": { + "rows": 5, + "cols": 14 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_backlight" + ], "layouts": { "labels": [ "Split backspace", "ISO enter", "Split left shift", "Split right shift", - ["Bottom row", "7U", "6.25U", "6U"] + [ + "Bottom row", + "7U", + "6.25U", + "6U" + ] ], "keymap": [ - [ - { - "x": 2.25, - "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,13\n\n\n0,0", - { - "c": "#cccccc" - }, - "0,13\n\n\n0,1", - "4,12\n\n\n0,1" - ], - [ - { - "x": 2.25, - "c": "#aaaaaa", - "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,13\n\n\n1,0", - { - "x": 1, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,13\n\n\n1,1" - ], - [ - { - "x": 2.25, - "c": "#aaaaaa", - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "c": "#777777", - "w": 2.25 - }, - "2,13\n\n\n1,0", - { - "c": "#cccccc" - }, - "2,12\n\n\n1,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "3,0\n\n\n2,1", - "3,1\n\n\n2,1", - { - "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\n3,0", - { - "w": 1.75 - }, - "3,12\n\n\n3,1", - "3,13\n\n\n3,1" - ], - [ - { - "x": 2.25, - "w": 1.5 - }, - "4,0\n\n\n4,0", - "4,1\n\n\n4,0", - { - "w": 1.5 - }, - "4,2\n\n\n4,0", - { - "c": "#cccccc", - "w": 7 - }, - "4,6\n\n\n4,0", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,9\n\n\n4,0", - "4,11\n\n\n4,0", - { - "w": 1.5 - }, - "4,13\n\n\n4,0" - ], - [ - { - "x": 2.25, - "w": 1.5 - }, - "4,0\n\n\n4,2", - "4,1\n\n\n4,2", - { - "w": 1.5 - }, - "4,2\n\n\n4,2", - { - "c": "#cccccc", - "w": 6 - }, - "4,6\n\n\n4,2", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,9\n\n\n4,2", - "4,10\n\n\n4,2", - "4,11\n\n\n4,2", - { - "w": 1.5 - }, - "4,13\n\n\n4,2" - ], - [ - { - "x": 2.25, - "w": 1.25 - }, - "4,0\n\n\n4,1", - { - "w": 1.25 - }, - "4,1\n\n\n4,1", - { - "w": 1.25 - }, - "4,2\n\n\n4,1", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,6\n\n\n4,1", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,9\n\n\n4,1", - { - "w": 1.25 - }, - "4,10\n\n\n4,1", - { - "w": 1.25 - }, - "4,11\n\n\n4,1", - { - "w": 1.25 - }, - "4,13\n\n\n4,1" - ] -] -} + [ + { + "x": 2.25, + "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,13\n\n\n0,0", + { + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "4,12\n\n\n0,1" + ], + [ + { + "x": 2.25, + "c": "#aaaaaa", + "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,13\n\n\n1,0", + { + "x": 1, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,1" + ], + [ + { + "x": 2.25, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,13\n\n\n1,0", + { + "c": "#cccccc" + }, + "2,12\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,1", + "3,1\n\n\n2,1", + { + "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\n3,0", + { + "w": 1.75 + }, + "3,12\n\n\n3,1", + "3,13\n\n\n3,1" + ], + [ + { + "x": 2.25, + "w": 1.5 + }, + "4,0\n\n\n4,0", + "4,1\n\n\n4,0", + { + "w": 1.5 + }, + "4,2\n\n\n4,0", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,9\n\n\n4,0", + "4,11\n\n\n4,0", + { + "w": 1.5 + }, + "4,13\n\n\n4,0" + ], + [ + { + "x": 2.25, + "w": 1.5 + }, + "4,0\n\n\n4,2", + "4,1\n\n\n4,2", + { + "w": 1.5 + }, + "4,2\n\n\n4,2", + { + "c": "#cccccc", + "w": 6 + }, + "4,6\n\n\n4,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,9\n\n\n4,2", + "4,10\n\n\n4,2", + "4,11\n\n\n4,2", + { + "w": 1.5 + }, + "4,13\n\n\n4,2" + ], + [ + { + "x": 2.25, + "w": 1.25 + }, + "4,0\n\n\n4,1", + { + "w": 1.25 + }, + "4,1\n\n\n4,1", + { + "w": 1.25 + }, + "4,2\n\n\n4,1", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n4,1", + { + "w": 1.25 + }, + "4,10\n\n\n4,1", + { + "w": 1.25 + }, + "4,11\n\n\n4,1", + { + "w": 1.25 + }, + "4,13\n\n\n4,1" + ] + ] + } } diff --git a/v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json b/v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json index 48b745a44e..3e92cbe7ef 100644 --- a/v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json +++ b/v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json @@ -1,197 +1,507 @@ { - "name": "Satisfaction75 HS", - "vendorId": "0xCA04", - "productId": "0x0011", - "matrix": {"rows": 6, "cols": 15}, + "name": "Satisfaction75 HS", + "vendorId": "0xCA04", + "productId": "0x0011", + "matrix": { + "rows": 6, + "cols": 15 + }, "customKeycodes": [ - {"name": "Encoder Press", "title": "Encoder Press", "shortName": "EncPrs"}, - {"name": "Clock Set", "title": "Clock Set", "shortName": "ClkSet"}, - {"name": "OLED Mode", "title": "OLED Mode", "shortName": "ScrnMd"} - ], + { + "name": "Encoder Press", + "title": "Encoder Press", + "shortName": "EncPrs" + }, + { + "name": "Clock Set", + "title": "Clock Set", + "shortName": "ClkSet" + }, + { + "name": "OLED Mode", + "title": "OLED Mode", + "shortName": "ScrnMd" + } + ], "menus": [ { - "label": "Custom Features", + "label": "Custom Features", "content": [ { - "label": "General", + "label": "General", "content": [ { - "label": "Default OLED Mode", - "type": "dropdown", - "options": [ ["Default", 0], ["Time", 1], ["Off", 2] ], - "content": ["default_oled_mode", 0, 2] - }, + "label": "Default OLED Mode", + "type": "dropdown", + "options": [ + [ + "Default", + 0 + ], + [ + "Time", + 1 + ], + [ + "Off", + 2 + ] + ], + "content": [ + "default_oled_mode", + 0, + 2 + ] + }, { - "label": "Current OLED Mode", - "type": "dropdown", - "options": [ ["Default", 0], ["Time", 1], ["Off", 2] ], - "content": ["current_oled_mode", 0, 4] + "label": "Current OLED Mode", + "type": "dropdown", + "options": [ + [ + "Default", + 0 + ], + [ + "Time", + 1 + ], + [ + "Off", + 2 + ] + ], + "content": [ + "current_oled_mode", + 0, + 4 + ] } ] - }, + }, { - "label": "Custom Encoder Configuration", + "label": "Custom Encoder Configuration", "content": [ - { "label": "Custom 0 - CW", "type": "keycode", "content": ["id_encoder_custom[0][0]", 0, 3, 0, 0] }, - { "label": "Custom 0 - CCW", "type": "keycode", "content": ["id_encoder_custom[0][1]", 0, 3, 0, 1] }, - { "label": "Custom 0 - Press", "type": "keycode", "content": ["id_encoder_custom[0][2]", 0, 3, 0, 2] }, - { "label": "Custom 1 - CW", "type": "keycode", "content": ["id_encoder_custom[1][0]", 0, 3, 1, 0] }, - { "label": "Custom 1 - CCW", "type": "keycode", "content": ["id_encoder_custom[1][1]", 0, 3, 1, 1] }, - { "label": "Custom 1 - Press", "type": "keycode", "content": ["id_encoder_custom[1][2]", 0, 3, 1, 2] }, - { "label": "Custom 2 - CW", "type": "keycode", "content": ["id_encoder_custom[2][0]", 0, 3, 2, 0] }, - { "label": "Custom 2 - CCW", "type": "keycode", "content": ["id_encoder_custom[2][1]", 0, 3, 2, 1] }, - { "label": "Custom 2 - Press", "type": "keycode", "content": ["id_encoder_custom[2][2]", 0, 3, 2, 2] } + { + "label": "Custom 0 - CW", + "type": "keycode", + "content": [ + "id_encoder_custom[0][0]", + 0, + 3, + 0, + 0 + ] + }, + { + "label": "Custom 0 - CCW", + "type": "keycode", + "content": [ + "id_encoder_custom[0][1]", + 0, + 3, + 0, + 1 + ] + }, + { + "label": "Custom 0 - Press", + "type": "keycode", + "content": [ + "id_encoder_custom[0][2]", + 0, + 3, + 0, + 2 + ] + }, + { + "label": "Custom 1 - CW", + "type": "keycode", + "content": [ + "id_encoder_custom[1][0]", + 0, + 3, + 1, + 0 + ] + }, + { + "label": "Custom 1 - CCW", + "type": "keycode", + "content": [ + "id_encoder_custom[1][1]", + 0, + 3, + 1, + 1 + ] + }, + { + "label": "Custom 1 - Press", + "type": "keycode", + "content": [ + "id_encoder_custom[1][2]", + 0, + 3, + 1, + 2 + ] + }, + { + "label": "Custom 2 - CW", + "type": "keycode", + "content": [ + "id_encoder_custom[2][0]", + 0, + 3, + 2, + 0 + ] + }, + { + "label": "Custom 2 - CCW", + "type": "keycode", + "content": [ + "id_encoder_custom[2][1]", + 0, + 3, + 2, + 1 + ] + }, + { + "label": "Custom 2 - Press", + "type": "keycode", + "content": [ + "id_encoder_custom[2][2]", + 0, + 3, + 2, + 2 + ] + } ] - }, + }, { - "label": "Enabled Encoder Modes", + "label": "Enabled Encoder Modes", "content": [ - { "label": "Volume", "type": "toggle", "content": ["id_encoder_modes[0]", 0, 1, 0] }, - { "label": "Media", "type": "toggle", "content": ["id_encoder_modes[1]", 0, 1, 1] }, - { "label": "Scroll", "type": "toggle", "content": ["id_encoder_modes[2]", 0, 1, 2] }, - { "label": "Brightness", "type": "toggle", "content": ["id_encoder_modes[3]", 0, 1, 3] }, - { "label": "Backlight", "type": "toggle", "content": ["id_encoder_modes[4]", 0, 1, 4] }, - { "label": "Custom 0", "type": "toggle", "content": ["id_encoder_modes[5]", 0, 1, 5] }, - { "label": "Custom 1", "type": "toggle", "content": ["id_encoder_modes[6]", 0, 1, 6] }, - { "label": "Custom 2", "type": "toggle", "content": ["id_encoder_modes[7]", 0, 1, 7] } + { + "label": "Volume", + "type": "toggle", + "content": [ + "id_encoder_modes[0]", + 0, + 1, + 0 + ] + }, + { + "label": "Media", + "type": "toggle", + "content": [ + "id_encoder_modes[1]", + 0, + 1, + 1 + ] + }, + { + "label": "Scroll", + "type": "toggle", + "content": [ + "id_encoder_modes[2]", + 0, + 1, + 2 + ] + }, + { + "label": "Brightness", + "type": "toggle", + "content": [ + "id_encoder_modes[3]", + 0, + 1, + 3 + ] + }, + { + "label": "Backlight", + "type": "toggle", + "content": [ + "id_encoder_modes[4]", + 0, + 1, + 4 + ] + }, + { + "label": "Custom 0", + "type": "toggle", + "content": [ + "id_encoder_modes[5]", + 0, + 1, + 5 + ] + }, + { + "label": "Custom 1", + "type": "toggle", + "content": [ + "id_encoder_modes[6]", + 0, + 1, + 6 + ] + }, + { + "label": "Custom 2", + "type": "toggle", + "content": [ + "id_encoder_modes[7]", + 0, + 1, + 7 + ] + } ] } ] } - ], + ], "layouts": { - "labels": ["Split Backspace", "7U Spacebar", "3x1U Bottom Row"], + "labels": [ + "Split Backspace", + "7U Spacebar", + "3x1U Bottom Row" + ], "keymap": [ [ - {"c": "#777777"}, - "0,0", - {"x": 0.5, "c": "#cccccc"}, - "0,2", - "0,3", - "0,4", - "0,5", - {"x": 0.25, "c": "#aaaaaa"}, - "0,6", - "0,7", - "0,8", - "0,9", - {"x": 0.25, "c": "#cccccc"}, - "0,10", - "0,11", - "0,12", + { + "c": "#777777" + }, + "0,0", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,10", + "0,11", + "0,12", "0,13" - ], - [ {"x": 15.5, "c": "#aaaaaa"}, "1,14" ], + ], [ - {"y": -0.75}, - "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", - {"c": "#aaaaaa", "w": 2}, - "1,13\n\n\n0,0", - {"x": 2}, - "1,13\n\n\n0,1", + { + "x": 15.5, + "c": "#aaaaaa" + }, + "1,14" + ], + [ + { + "y": -0.75 + }, + "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", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "x": 2 + }, + "1,13\n\n\n0,1", "0,14\n\n\n0,1" - ], + ], [ - {"w": 1.5}, - "2,0", - {"c": "#cccccc"}, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - {"c": "#aaaaaa", "w": 1.5}, - "2,13", - {"x": 0.5}, + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,13", + { + "x": 0.5 + }, "2,14" - ], + ], [ - {"w": 1.75}, - "3,0", - {"c": "#cccccc"}, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - {"c": "#aaaaaa", "w": 2.25}, - "3,13", - {"x": 0.5}, + { + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,13", + { + "x": 0.5 + }, "3,14" - ], + ], [ - {"w": 2.25}, - "4,0", - {"c": "#cccccc"}, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - {"c": "#aaaaaa", "w": 1.75}, - "4,12", - {"x": 1.5}, + { + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "4,12", + { + "x": 1.5 + }, "4,14" - ], - [ {"y": -0.75, "x": 14.25, "c": "#777777"}, "4,13" ], + ], [ - {"y": -0.25, "c": "#aaaaaa", "w": 1.25}, - "5,0\n\n\n1,0", - {"w": 1.25}, - "5,1\n\n\n1,0", - {"w": 1.25}, - "5,2\n\n\n1,0", - {"c": "#cccccc", "w": 6.25}, - "5,6\n\n\n1,0", - {"c": "#aaaaaa", "w": 1.5}, - "5,10\n\n\n2,0", - {"w": 1.5}, + { + "y": -0.75, + "x": 14.25, + "c": "#777777" + }, + "4,13" + ], + [ + { + "y": -0.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0\n\n\n1,0", + { + "w": 1.25 + }, + "5,1\n\n\n1,0", + { + "w": 1.25 + }, + "5,2\n\n\n1,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6\n\n\n1,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,10\n\n\n2,0", + { + "w": 1.5 + }, "5,11\n\n\n2,0" - ], - [ {"y": -0.75, "x": 13.25, "c": "#777777"}, "5,12", "5,13", "5,14" ], + ], + [ + { + "y": -0.75, + "x": 13.25, + "c": "#777777" + }, + "5,12", + "5,13", + "5,14" + ], [ - {"c": "#aaaaaa", "w": 1.5}, - "5,0\n\n\n1,1", - {"w": 1.5}, - "5,1\n\n\n1,1", - {"c": "#cccccc", "w": 7}, - "5,6\n\n\n1,1", - {"c": "#aaaaaa"}, - "5,10\n\n\n2,1", - "5,11\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n1,1", + { + "w": 1.5 + }, + "5,1\n\n\n1,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n1,1", + { + "c": "#aaaaaa" + }, + "5,10\n\n\n2,1", + "5,11\n\n\n2,1", "5,9\n\n\n2,1" ] ] } -} \ No newline at end of file +} diff --git a/v3/cipulot/ec_typek/ec_typek_advanced.json b/v3/cipulot/ec_typek/ec_typek_advanced.json new file mode 100644 index 0000000000..c0b60d3a55 --- /dev/null +++ b/v3/cipulot/ec_typek/ec_typek_advanced.json @@ -0,0 +1,719 @@ +{ + "name": "Type-K EC", + "vendorId": "0x6369", + "productId": "0x6BCC", + "matrix": { + "rows": 5, + "cols": 15 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgblight", + { + "label": "Indicators", + "content": [ + { + "label": "Left indicator", + "content": [ + { + "label": "Enable Left Indicator", + "type": "toggle", + "content": [ + "id_ind3_enabled", + 0, + 11 + ] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [ + 0, + 255 + ], + "content": [ + "id_ind3_brightness", + 0, + 12 + ] + }, + { + "label": "Color", + "type": "color", + "content": [ + "id_ind3_color", + 0, + 13 + ] + }, + { + "label": "Function 1", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind3_func1", + 0, + 14 + ] + }, + { + "label": "Function 2", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind3_func2", + 0, + 15 + ] + } + ] + } + ] + }, + { + "label": "Central indicator", + "content": [ + { + "label": "Enable Central Indicator", + "type": "toggle", + "content": [ + "id_ind2_enabled", + 0, + 6 + ] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [ + 0, + 255 + ], + "content": [ + "id_ind2_brightness", + 0, + 7 + ] + }, + { + "label": "Color", + "type": "color", + "content": [ + "id_ind2_color", + 0, + 8 + ] + }, + { + "label": "Function 1", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind2_func1", + 0, + 9 + ] + }, + { + "label": "Function 2", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind2_func2", + 0, + 10 + ] + } + ] + } + ] + }, + { + "label": "Right indicator", + "content": [ + { + "label": "Enable Right Indicator", + "type": "toggle", + "content": [ + "id_ind1_enabled", + 0, + 1 + ] + }, + { + "showIf": "{id_ind1_enabled} == 1", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [ + 0, + 255 + ], + "content": [ + "id_ind1_brightness", + 0, + 2 + ] + }, + { + "label": "Color", + "type": "color", + "content": [ + "id_ind1_color", + 0, + 3 + ] + }, + { + "label": "Function 1", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind1_func1", + 0, + 4 + ] + }, + { + "label": "Function 2", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind1_func2", + 0, + 5 + ] + } + ] + } + ] + } + ] + }, + { + "label": "EC Tools", + "content": [ + { + "label": "Actuation", + "content": [ + { + "label": "Mode", + "type": "dropdown", + "options": [ + "APC", + "Rapid Trigger" + ], + "content": [ + "id_actuation_mode", + 0, + 16 + ] + }, + { + "showIf": "{id_actuation_mode} == 0", + "content": [ + { + "label": "Actuation Level (0% | 100%)", + "type": "range", + "options": [ + 1, + 1023 + ], + "content": [ + "id_mode_0_actuation_threshold", + 0, + 17 + ] + }, + { + "label": "Release Level (0% | 100%, ALWAYS < Actuation Level)", + "type": "range", + "options": [ + 1, + 1023 + ], + "content": [ + "id_mode_0_release_threshold", + 0, + 18 + ] + }, + { + "label": "Apply & save changes", + "type": "button", + "options": [ + 0 + ], + "content": [ + "id_save_threshold_data", + 0, + 19 + ] + } + ] + }, + { + "showIf": "{id_actuation_mode} == 1", + "content": [ + { + "label": "Initial Deadzone Offset (0% | 100%)", + "type": "range", + "options": [ + 1, + 1023 + ], + "content": [ + "id_mode_1_initial_deadzone_offset", + 0, + 20 + ] + }, + { + "label": "Actuation Offset (1-255)", + "type": "range", + "options": [ + 1, + 255 + ], + "content": [ + "id_mode_1_actuation_offset", + 0, + 21 + ] + }, + { + "label": "Release Offset (1-255)", + "type": "range", + "options": [ + 1, + 255 + ], + "content": [ + "id_mode_1_release_offset", + 0, + 22 + ] + }, + { + "label": "Apply & save changes", + "type": "button", + "options": [ + 1 + ], + "content": [ + "id_save_threshold_data", + 0, + 19 + ] + } + ] + } + ] + }, + { + "label": "Calibration", + "content": [ + { + "label": "Bottoming Calibration", + "type": "toggle", + "content": [ + "id_bottoming_calibration", + 0, + 23 + ] + }, + { + "label": "Noise Floor Calibration (DO NOT PRESS ANY KEY WHILE CLICKING)", + "type": "button", + "options": [ + 0 + ], + "content": [ + "id_noise_floor_calibration", + 0, + 24 + ] + }, + { + "label": "Show Calibration Data", + "type": "button", + "options": [ + 0 + ], + "content": [ + "id_show_calibration_data", + 0, + 25 + ] + }, + { + "label": "Clear Bottoming Calibration Data", + "type": "button", + "options": [ + 0 + ], + "content": [ + "id_clear_bottoming_calibration_data", + 0, + 26 + ] + } + ] + } + ] + } + ], + "layouts": { + "labels": [ + "Unified Backspace", + "Split Left Space", + "Split Right Space", + "Split Right Shift" + ], + "keymap": [ + [ + { + "x": 17.15, + "c": "#aaaaaa", + "w": 2 + }, + "0,14\n\n\n0,1" + ], + [ + { + "y": 0.2, + "x": 15.15, + "c": "#cccccc" + }, + "0,11" + ], + [ + { + "y": -0.95, + "x": 17.15 + }, + "0,13\n\n\n0,0", + { + "c": "#aaaaaa" + }, + "0,14\n\n\n0,0" + ], + [ + { + "y": -1, + "x": 0.75, + "c": "#777777" + }, + "1,0", + { + "x": 0.7, + "c": "#cccccc" + }, + "0,0", + "0,1", + { + "x": 11.7 + }, + "0,12" + ], + [ + { + "y": -0.05, + "x": 15 + }, + "1,11" + ], + [ + { + "y": -0.95, + "x": 0.5 + }, + "2,0", + { + "x": 0.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,1", + { + "c": "#cccccc" + }, + "1,2", + { + "x": 11.25 + }, + "1,12", + "1,13", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,14" + ], + [ + { + "x": 0.25, + "c": "#cccccc" + }, + "3,0", + { + "x": 0.8, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,1", + { + "c": "#cccccc" + }, + "2,2", + { + "x": 10.6 + }, + "2,11", + "2,12", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "2,14" + ], + [ + { + "c": "#cccccc" + }, + "4,0", + { + "x": 0.8, + "c": "#aaaaaa", + "w": 2.25 + }, + "3,1", + { + "c": "#cccccc" + }, + "3,2", + { + "x": 10.05 + }, + "3,11", + "3,12", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,13\n\n\n3,0", + { + "x": 1.15, + "w": 1.25 + }, + "3,13\n\n\n3,1", + { + "c": "#cccccc" + }, + "3,14\n\n\n3,1" + ], + [ + { + "x": 1.8, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,1", + { + "x": 14.05, + "w": 1.5 + }, + "4,13" + ], + [ + { + "r": 10, + "y": -6, + "x": 4.8, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + "0,6" + ], + [ + { + "x": 5.35 + }, + "1,3", + "1,4", + "1,5", + "1,6" + ], + [ + { + "x": 5.6 + }, + "2,3", + "2,4", + "2,5", + "2,6" + ], + [ + { + "x": 6.05 + }, + "3,3", + "3,4", + "3,5", + "3,6" + ], + [ + { + "x": 6.1, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,3", + { + "c": "#cccccc", + "w": 3 + }, + "4,5\n\n\n1,0" + ], + [ + { + "x": 7.6, + "w": 2 + }, + "4,5\n\n\n1,1", + { + "c": "#aaaaaa" + }, + "4,6\n\n\n1,1" + ], + [ + { + "r": -10, + "y": -2.6, + "x": 10.45, + "c": "#cccccc" + }, + "0,7", + "0,8", + "0,9", + "0,10" + ], + [ + { + "x": 10.05 + }, + "1,7", + "1,8", + "1,9", + "1,10" + ], + [ + { + "x": 10.2 + }, + "2,7", + "2,8", + "2,9", + "2,10" + ], + [ + { + "x": 9.75 + }, + "3,7", + "3,8", + "3,9", + "3,10" + ], + [ + { + "x": 9.25, + "w": 3 + }, + "4,8\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10" + ], + [ + { + "x": 9.25 + }, + "4,7\n\n\n2,1", + { + "c": "#cccccc", + "w": 2 + }, + "4,8\n\n\n2,1" + ] + ] + } +} diff --git a/v3/cipulot/ec_typek/ec_typek.json b/v3/cipulot/ec_typek/ec_typek_basic.json similarity index 100% rename from v3/cipulot/ec_typek/ec_typek.json rename to v3/cipulot/ec_typek/ec_typek_basic.json diff --git a/v3/eason/meow65/meow65.json b/v3/eason/meow65/meow65.json index 116ff20ac9..58db41121c 100644 --- a/v3/eason/meow65/meow65.json +++ b/v3/eason/meow65/meow65.json @@ -1,196 +1,203 @@ -{ - "name": "meow65", - "vendorId": "0x68F4", - "productId": "0x70A0", - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgblight"], - "matrix": {"rows": 5, "cols": 15}, -"layouts": { -"labels":[ - "ISO Enter", - "Split Left Shift" - ], - "keymap":[ - [ - { - "x": 2.5, - "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,13", - { - "c": "#cccccc" - }, - "0,14" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "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,13\n\n\n0,0", - "1,14", - { - "x": 1.25, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,13\n\n\n0,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "c": "#777777", - "w": 2.25 - }, - "2,13\n\n\n0,0", - { - "c": "#cccccc" - }, - "2,14", - { - "x": 0.25 - }, - "2,12\n\n\n0,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "3,0\n\n\n1,1", - { - "c": "#cccccc" - }, - "3,1\n\n\n1,1", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 2.25 - }, - "3,0\n\n\n1,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": 1.75 - }, - "3,12", - { - "c": "#777777" - }, - "3,13" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0", - { - "w": 1.25 - }, - "4,1", - { - "w": 1.25 - }, - "4,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,6", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,10", - { - "w": 1.25 - }, - "4,11", - { - "x": 0.5, - "c": "#777777" - }, - "4,12", - "4,13", - "4,14" - ] - ] - } -} +{ + "name": "meow65", + "vendorId": "0x68F4", + "productId": "0x70A0", + "matrix": { + "rows": 5, + "cols": 15 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgblight" + ], + "layouts": { + "labels": [ + "ISO Enter", + "Split Left Shift" + ], + "keymap": [ + [ + { + "x": 2.5, + "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,13", + { + "c": "#cccccc" + }, + "0,14" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "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,13\n\n\n0,0", + "1,14", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n0,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,13\n\n\n0,0", + { + "c": "#cccccc" + }, + "2,14", + { + "x": 0.25 + }, + "2,12\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n1,1", + { + "c": "#cccccc" + }, + "3,1\n\n\n1,1", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0\n\n\n1,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": 1.75 + }, + "3,12", + { + "c": "#777777" + }, + "3,13" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10", + { + "w": 1.25 + }, + "4,11", + { + "x": 0.5, + "c": "#777777" + }, + "4,12", + "4,13", + "4,14" + ] + ] + } +} diff --git a/v3/keebio/quefrency/quefrency-rev6.json b/v3/keebio/quefrency/quefrency-rev6.json index 6189a0581f..1a8f98efc8 100644 --- a/v3/keebio/quefrency/quefrency-rev6.json +++ b/v3/keebio/quefrency/quefrency-rev6.json @@ -2,78 +2,148 @@ "name": "Quefrency Rev. 6", "vendorId": "0xCB10", "productId": "0x6357", - "matrix": {"rows": 10, "cols": 9}, - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgb_matrix"], + "matrix": { + "rows": 10, + "cols": 9 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgb_matrix" + ], "layouts": { "labels": [ - ["Left Macropad", "Enabled", "W/Encoder", "No Macro"], + [ + "Left Macropad", + "Enabled", + "W/Encoder", + "No Macro" + ], "Split Left Shift", - ["Left Space", "1.25-2.25u", "2.25-1.25u", "1.25-1-1.25u"], + [ + "Left Space", + "1.25-2.25u", + "2.25-1.25u", + "1.25-1-1.25u" + ], "Right Encoder", "Split Backspace", "ISO Enter", - ["Right Shift", "1.75-1u", "2.75u"], - ["Right Space", "2.75u", "1.25-1.5u"], - ["Right Mods", "6x1u", "2x1.25u__3x1u"] + [ + "Right Shift", + "1.75-1u", + "2.75u" + ], + [ + "Right Space", + "2.75u", + "1.25-1.5u" + ], + [ + "Right Mods", + "6x1u", + "2x1.25u__3x1u" + ] ], "keymap": [ [ - {"d": true}, + { + "d": true + }, "0,0\n\n\n0,2", - {"d": true}, + { + "d": true + }, "0,1\n\n\n0,2", - {"x": 0.25, "c": "#aaaaaa"}, + { + "x": 0.25, + "c": "#aaaaaa" + }, "0,0\n\n\n0,1\n\n\n\n\n\ne0", "0,1\n\n\n0,1", - {"x": 0.25}, + { + "x": 0.25 + }, "0,0\n\n\n0,0", "0,1\n\n\n0,0", - {"x": 0.5, "c": "#777777"}, + { + "x": 0.5, + "c": "#777777" + }, "0,2", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "0,3", "0,4", "0,5", "0,6", "0,7", "0,8", - {"x": 1}, + { + "x": 1 + }, "5,0", "5,1", "5,2", "5,3", "5,4", "5,5", - {"c": "#aaaaaa", "w": 2}, + { + "c": "#aaaaaa", + "w": 2 + }, "5,7\n\n\n4,0", "5,8\n\n\n3,0", - {"x": 0.5, "c": "#cccccc"}, + { + "x": 0.5, + "c": "#cccccc" + }, "5,6\n\n\n4,1", "5,7\n\n\n4,1", - {"c": "#aaaaaa"}, + { + "c": "#aaaaaa" + }, "5,8\n\n\n3,1\n\n\n\n\n\ne1" ], [ - {"c": "#cccccc", "d": true}, + { + "c": "#cccccc", + "d": true + }, "1,0\n\n\n0,2", - {"d": true}, + { + "d": true + }, "1,1\n\n\n0,2", - {"x": 0.25, "c": "#aaaaaa"}, + { + "x": 0.25, + "c": "#aaaaaa" + }, "1,0\n\n\n0,1", "1,1\n\n\n0,1", - {"x": 0.25}, + { + "x": 0.25 + }, "1,0\n\n\n0,0", "1,1\n\n\n0,0", - {"x": 0.5, "w": 1.5}, + { + "x": 0.5, + "w": 1.5 + }, "1,2", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "1,3", "1,4", "1,5", "1,6", "1,7", - {"x": 1}, + { + "x": 1 + }, "6,0", "6,1", "6,2", @@ -81,9 +151,13 @@ "6,4", "6,5", "6,6", - {"w": 1.5}, + { + "w": 1.5 + }, "6,7\n\n\n5,0", - {"c": "#aaaaaa"}, + { + "c": "#aaaaaa" + }, "6,8", { "x": 1.5, @@ -97,92 +171,165 @@ "6,7\n\n\n5,1" ], [ - {"c": "#cccccc", "d": true}, + { + "c": "#cccccc", + "d": true + }, "2,0\n\n\n0,2", - {"d": true}, + { + "d": true + }, "2,1\n\n\n0,2", - {"x": 0.25, "c": "#aaaaaa"}, + { + "x": 0.25, + "c": "#aaaaaa" + }, "2,0\n\n\n0,1", "2,1\n\n\n0,1", - {"x": 0.25}, + { + "x": 0.25 + }, "2,0\n\n\n0,0", "2,1\n\n\n0,0", - {"x": 0.5, "w": 1.75}, + { + "x": 0.5, + "w": 1.75 + }, "2,2", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "2,3", "2,4", "2,5", "2,6", "2,7", - {"x": 1}, + { + "x": 1 + }, "7,0", "7,1", "7,2", "7,3", "7,4", "7,5", - {"c": "#777777", "w": 2.25}, + { + "c": "#777777", + "w": 2.25 + }, "7,7\n\n\n5,0", - {"c": "#aaaaaa"}, + { + "c": "#aaaaaa" + }, "7,8", - {"x": 0.5, "c": "#cccccc"}, + { + "x": 0.5, + "c": "#cccccc" + }, "7,6\n\n\n5,1" ], [ - {"d": true}, + { + "d": true + }, "3,0\n\n\n0,2", - {"d": true}, + { + "d": true + }, "3,1\n\n\n0,2", - {"x": 0.25, "c": "#aaaaaa"}, + { + "x": 0.25, + "c": "#aaaaaa" + }, "3,0\n\n\n0,1", "3,1\n\n\n0,1", - {"x": 0.25}, + { + "x": 0.25 + }, "3,0\n\n\n0,0", "3,1\n\n\n0,0", - {"x": 0.5, "w": 2.25}, + { + "x": 0.5, + "w": 2.25 + }, "3,2\n\n\n1,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,4", "3,5", "3,6", "3,7", "3,8", - {"x": 1}, + { + "x": 1 + }, "8,0", "8,1", "8,2", "8,3", "8,4", - {"c": "#aaaaaa", "w": 1.75}, + { + "c": "#aaaaaa", + "w": 1.75 + }, "8,6\n\n\n6,0", "8,7\n\n\n6,0", "8,8", - {"x": 0.5, "w": 2.75}, + { + "x": 0.5, + "w": 2.75 + }, "8,6\n\n\n6,1" ], [ - {"c": "#cccccc", "d": true}, + { + "c": "#cccccc", + "d": true + }, "4,0\n\n\n0,2", - {"d": true}, + { + "d": true + }, "4,1\n\n\n0,2", - {"x": 0.25, "c": "#aaaaaa"}, + { + "x": 0.25, + "c": "#aaaaaa" + }, "4,0\n\n\n0,1", "4,1\n\n\n0,1", - {"x": 0.25}, + { + "x": 0.25 + }, "4,0\n\n\n0,0", "4,1\n\n\n0,0", - {"x": 0.5, "w": 1.25}, + { + "x": 0.5, + "w": 1.25 + }, "4,2", - {"w": 1.25}, + { + "w": 1.25 + }, "4,3", - {"w": 1.25}, + { + "w": 1.25 + }, "4,4", - {"w": 1.25}, + { + "w": 1.25 + }, "4,5\n\n\n2,0", - {"c": "#cccccc", "w": 2.25}, + { + "c": "#cccccc", + "w": 2.25 + }, "4,7\n\n\n2,0", - {"x": 1, "c": "#aaaaaa", "w": 2.75}, + { + "x": 1, + "c": "#aaaaaa", + "w": 2.75 + }, "9,1\n\n\n7,0", "9,2\n\n\n8,0", "9,3\n\n\n8,0", @@ -192,27 +339,55 @@ "9,8" ], [ - {"x": 7, "w": 1.25}, + { + "x": 7, + "w": 1.25 + }, "3,2\n\n\n1,1", "3,3\n\n\n1,1", - {"x": 1.5, "c": "#cccccc", "w": 2.25}, + { + "x": 1.5, + "c": "#cccccc", + "w": 2.25 + }, "4,5\n\n\n2,1", - {"c": "#aaaaaa", "w": 1.25}, + { + "c": "#aaaaaa", + "w": 1.25 + }, "4,7\n\n\n2,1", - {"x": 1, "c": "#cccccc", "w": 1.25}, + { + "x": 1, + "c": "#cccccc", + "w": 1.25 + }, "9,0\n\n\n7,1", - {"w": 1.5}, + { + "w": 1.5 + }, "9,1\n\n\n7,1", - {"c": "#aaaaaa", "w": 1.25}, + { + "c": "#aaaaaa", + "w": 1.25 + }, "9,2\n\n\n8,1", - {"w": 1.25}, + { + "w": 1.25 + }, "9,3\n\n\n8,1" ], [ - {"x": 10.75, "c": "#cccccc", "w": 1.25}, + { + "x": 10.75, + "c": "#cccccc", + "w": 1.25 + }, "4,5\n\n\n2,2", "4,6\n\n\n2,2", - {"c": "#aaaaaa", "w": 1.25}, + { + "c": "#aaaaaa", + "w": 1.25 + }, "4,7\n\n\n2,2" ] ] diff --git a/v3/typek/typek.json b/v3/typek/typek.json index 3740f304a1..627d1b5584 100755 --- a/v3/typek/typek.json +++ b/v3/typek/typek.json @@ -1,408 +1,542 @@ { - "name": "gok TypeK", - "vendorId": "0x7179", - "productId": "0x8475", - "menus": ["qmk_rgblight", + "name": "gok TypeK", + "vendorId": "0x7179", + "productId": "0x8475", + "matrix": { + "rows": 5, + "cols": 14 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgblight", + { + "label": "Indicators", + "content": [ + { + "label": "Right indicator", + "content": [ { - "label": "Indicators", - "content":[ - { - "label": "Right indicator", - "content": [ - { - "label": "Enable right indicator", - "type": "toggle", - "content": ["id_ind1_enabled", 0, 1] - }, - { - "showIf": "{id_ind1_enabled} == 1", - "label": "Brightness", - "type": "range", - "options": [0, 255], - "content": ["id_ind1_brightness", 0, 2] - }, - { - "showIf": "{id_ind1_enabled} == 1", - "label": "Color", - "type": "color", - "content": ["id_ind1_color", 0, 3] - }, - { - "showIf": "{id_ind1_enabled} == 1", - "label": "Function 1", - "type": "dropdown", - "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], - "content": ["id_ind1_func1", 0, 4] - }, { - "showIf": "{id_ind1_enabled} == 1", - "label": "Function 2", - "type": "dropdown", - "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], - "content": ["id_ind1_func2", 0, 5] - } - ] - }, - { - "label": "Central indicator", - "content": [ - { - "label": "Enable central indicator", - "type": "toggle", - "content": ["id_ind2_enabled", 0, 6] - }, - { - "showIf": "{id_ind2_enabled} == 1", - "label": "Brightness", - "type": "range", - "options": [0, 255], - "content": ["id_ind2_brightness", 0, 7] - }, - { - "showIf": "{id_ind2_enabled} == 1", - "label": "Color", - "type": "color", - "content": ["id_ind2_color", 0, 8] - }, - { - "showIf": "{id_ind2_enabled} == 1", - "label": "Function 1", - "type": "dropdown", - "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], - "content": ["id_ind2_func1", 0, 9] - }, - { - "showIf": "{id_ind2_enabled} == 1", - "label": "Function 2", - "type": "dropdown", - "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], - "content": ["id_ind2_func2", 0, 10] - } - ] - }, - { - "label": "Left indicator", - "content": [ - { - "label": "Enable left indicator", - "type": "toggle", - "content": ["id_ind3_enabled", 0, 11] - }, - { - "showIf": "{id_ind3_enabled} == 1", - "label": "Brightness", - "type": "range", - "options": [0, 255], - "content": ["id_ind3_brightness", 0, 12] - }, - { - "showIf": "{id_ind3_enabled} == 1", - "label": "Color", - "type": "color", - "content": ["id_ind3_color", 0, 13] - }, - { - "showIf": "{id_ind3_enabled} == 1", - "label": "Function 1", - "type": "dropdown", - "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], - "content": ["id_ind3_func1", 0, 14] - }, - { - "showIf": "{id_ind3_enabled} == 1", - "label": "Function 2", - "type": "dropdown", - "options": ["None", "Caps Lock", "Num Lock", "Scroll Lock", "Layer 0", "Layer 1", "Layer 2", "Layer 3"], - "content": ["id_ind3_func2", 0, 15] - } - ] - } - - ] + "label": "Enable right indicator", + "type": "toggle", + "content": [ + "id_ind1_enabled", + 0, + 1 + ] + }, + { + "showIf": "{id_ind1_enabled} == 1", + "label": "Brightness", + "type": "range", + "options": [ + 0, + 255 + ], + "content": [ + "id_ind1_brightness", + 0, + 2 + ] + }, + { + "showIf": "{id_ind1_enabled} == 1", + "label": "Color", + "type": "color", + "content": [ + "id_ind1_color", + 0, + 3 + ] + }, + { + "showIf": "{id_ind1_enabled} == 1", + "label": "Function 1", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind1_func1", + 0, + 4 + ] + }, + { + "showIf": "{id_ind1_enabled} == 1", + "label": "Function 2", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind1_func2", + 0, + 5 + ] + } + ] + }, + { + "label": "Central indicator", + "content": [ + { + "label": "Enable central indicator", + "type": "toggle", + "content": [ + "id_ind2_enabled", + 0, + 6 + ] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "label": "Brightness", + "type": "range", + "options": [ + 0, + 255 + ], + "content": [ + "id_ind2_brightness", + 0, + 7 + ] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "label": "Color", + "type": "color", + "content": [ + "id_ind2_color", + 0, + 8 + ] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "label": "Function 1", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind2_func1", + 0, + 9 + ] + }, + { + "showIf": "{id_ind2_enabled} == 1", + "label": "Function 2", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind2_func2", + 0, + 10 + ] + } + ] + }, + { + "label": "Left indicator", + "content": [ + { + "label": "Enable left indicator", + "type": "toggle", + "content": [ + "id_ind3_enabled", + 0, + 11 + ] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "label": "Brightness", + "type": "range", + "options": [ + 0, + 255 + ], + "content": [ + "id_ind3_brightness", + 0, + 12 + ] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "label": "Color", + "type": "color", + "content": [ + "id_ind3_color", + 0, + 13 + ] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "label": "Function 1", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind3_func1", + 0, + 14 + ] + }, + { + "showIf": "{id_ind3_enabled} == 1", + "label": "Function 2", + "type": "dropdown", + "options": [ + "None", + "Caps Lock", + "Num Lock", + "Scroll Lock", + "Layer 0", + "Layer 1", + "Layer 2", + "Layer 3" + ], + "content": [ + "id_ind3_func2", + 0, + 15 + ] + } + ] + } + ] } - ], - "keycodes": ["qmk_lighting"], - "matrix": {"rows": 5, "cols": 14}, - "layouts": { - "labels": ["Split backspace", "Split left space", "Split right space", "Split right shift"], - "keymap": [ - [ - { - "x": 17.15, - "c": "#aaaaaa" - }, - "0,13\n\n\n0,1", - "2,13\n\n\n0,1" ], - [ - { - "y": 0.19999999999999996, - "x": 15.15, - "c": "#cccccc" - }, - "0,11" - ], - [ - { - "y": -0.9500000000000002, - "x": 0.75, - "c": "#777777" - }, - "0,0", - { - "x": 0.7000000000000002, - "c": "#cccccc" - }, - "0,1", - "0,2", - { - "x": 11.7 - }, - "0,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "0,13\n\n\n0,0" - ], - [ - { - "y": -0.04999999999999982, - "x": 15, - "c": "#cccccc" - }, - "1,11" - ], - [ - { - "y": -0.9500000000000002, - "x": 0.5 - }, - "1,0", - { - "x": 0.75, - "c": "#aaaaaa", - "w": 1.5 - }, - "1,1", - { - "c": "#cccccc" - }, - "1,2", - { - "x": 11.25 - }, - "1,12", - "1,13", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,10" - ], - [ - { - "x": 0.25, - "c": "#cccccc" - }, - "2,0", - { - "x": 0.7999999999999998, - "c": "#aaaaaa", - "w": 1.75 - }, - "2,1", - { - "c": "#cccccc" - }, - "2,2", - { - "x": 10.600000000000001 - }, - "2,11", - { - "x": -3.552713678800501e-15 - }, - "2,12", - { - "c": "#777777", - "w": 2.25 - }, - "4,11" - ], - [ - { - "c": "#cccccc" - }, - "3,0", - { - "x": 0.8, - "c": "#aaaaaa", - "w": 2.25 - }, - "3,1", - { - "c": "#cccccc" - }, - "3,2", - { - "x": 10.05 - }, - "3,11", - "3,12", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "3,13\n\n\n3,0", - { - "x": 1.1499999999999986, - "w": 1.25 - }, - "3,13\n\n\n3,1", - { - "c": "#cccccc" - }, - "4,12\n\n\n3,1" - ], - [ - { - "x": 1.8, - "c": "#aaaaaa", - "w": 1.5 - }, - "4,1", - { - "x": 14.05, - "w": 1.5 - }, - "4,13" - ], - [ - { - "r": 10, - "y": -6, - "x": 4.8, - "c": "#cccccc" - }, - "0,3", - "0,4", - "0,5", - "0,6", - "4,6" - ], - [ - { - "x": 5.35 - }, - "1,3", - "1,4", - "1,5", - "1,6" - ], - [ - { - "x": 5.6 - }, - "2,3", - "2,4", - "2,5", - "2,6" - ], - [ - { - "x": 6.05 - }, - "3,3", - "3,4", - "3,5", - "3,6" - ], - [ - { - "x": 6.1, - "c": "#aaaaaa", - "w": 1.5 - }, - "4,2", - { - "c": "#cccccc", - "w": 3 - }, - "4,4\n\n\n1,0" - ], - [ - { - "x": 7.6, - "w": 2 - }, - "4,4\n\n\n1,1", - { - "c": "#aaaaaa" - }, - "4,5\n\n\n1,1" - ], - [ - { - "r": -10, - "y": -2.6, - "x": 10.45, - "c": "#cccccc" - }, - "0,7", - "0,8", - "0,9", - "0,10" - ], - [ - { - "x": 10.05 - }, - "1,7", - "1,8", - "1,9", - "1,10" - ], - [ - { - "x": 10.2 - }, - "2,7", - "2,8", - "2,9", - "2,10" - ], - [ - { - "x": 9.75 - }, - "3,7", - "3,8", - "3,9", - "3,10" - ], - [ - { - "x": 9.25, - "w": 3 - }, - "4,8\n\n\n2,0", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,9" - ], - [ - { - "x": 9.25 - }, - "4,7\n\n\n2,1", - { - "c": "#cccccc", - "w": 2 - }, - "4,8\n\n\n2,1" - ] -] -} + "layouts": { + "labels": [ + "Split backspace", + "Split left space", + "Split right space", + "Split right shift" + ], + "keymap": [ + [ + { + "x": 17.15, + "c": "#aaaaaa" + }, + "0,13\n\n\n0,1", + "2,13\n\n\n0,1" + ], + [ + { + "y": 0.19999999999999996, + "x": 15.15, + "c": "#cccccc" + }, + "0,11" + ], + [ + { + "y": -0.9500000000000002, + "x": 0.75, + "c": "#777777" + }, + "0,0", + { + "x": 0.7000000000000002, + "c": "#cccccc" + }, + "0,1", + "0,2", + { + "x": 11.7 + }, + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13\n\n\n0,0" + ], + [ + { + "y": -0.04999999999999982, + "x": 15, + "c": "#cccccc" + }, + "1,11" + ], + [ + { + "y": -0.9500000000000002, + "x": 0.5 + }, + "1,0", + { + "x": 0.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,1", + { + "c": "#cccccc" + }, + "1,2", + { + "x": 11.25 + }, + "1,12", + "1,13", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10" + ], + [ + { + "x": 0.25, + "c": "#cccccc" + }, + "2,0", + { + "x": 0.7999999999999998, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,1", + { + "c": "#cccccc" + }, + "2,2", + { + "x": 10.600000000000001 + }, + "2,11", + { + "x": -3.552713678800501e-15 + }, + "2,12", + { + "c": "#777777", + "w": 2.25 + }, + "4,11" + ], + [ + { + "c": "#cccccc" + }, + "3,0", + { + "x": 0.8, + "c": "#aaaaaa", + "w": 2.25 + }, + "3,1", + { + "c": "#cccccc" + }, + "3,2", + { + "x": 10.05 + }, + "3,11", + "3,12", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,13\n\n\n3,0", + { + "x": 1.1499999999999986, + "w": 1.25 + }, + "3,13\n\n\n3,1", + { + "c": "#cccccc" + }, + "4,12\n\n\n3,1" + ], + [ + { + "x": 1.8, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,1", + { + "x": 14.05, + "w": 1.5 + }, + "4,13" + ], + [ + { + "r": 10, + "y": -6, + "x": 4.8, + "c": "#cccccc" + }, + "0,3", + "0,4", + "0,5", + "0,6", + "4,6" + ], + [ + { + "x": 5.35 + }, + "1,3", + "1,4", + "1,5", + "1,6" + ], + [ + { + "x": 5.6 + }, + "2,3", + "2,4", + "2,5", + "2,6" + ], + [ + { + "x": 6.05 + }, + "3,3", + "3,4", + "3,5", + "3,6" + ], + [ + { + "x": 6.1, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,2", + { + "c": "#cccccc", + "w": 3 + }, + "4,4\n\n\n1,0" + ], + [ + { + "x": 7.6, + "w": 2 + }, + "4,4\n\n\n1,1", + { + "c": "#aaaaaa" + }, + "4,5\n\n\n1,1" + ], + [ + { + "r": -10, + "y": -2.6, + "x": 10.45, + "c": "#cccccc" + }, + "0,7", + "0,8", + "0,9", + "0,10" + ], + [ + { + "x": 10.05 + }, + "1,7", + "1,8", + "1,9", + "1,10" + ], + [ + { + "x": 10.2 + }, + "2,7", + "2,8", + "2,9", + "2,10" + ], + [ + { + "x": 9.75 + }, + "3,7", + "3,8", + "3,9", + "3,10" + ], + [ + { + "x": 9.25, + "w": 3 + }, + "4,8\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,9" + ], + [ + { + "x": 9.25 + }, + "4,7\n\n\n2,1", + { + "c": "#cccccc", + "w": 2 + }, + "4,8\n\n\n2,1" + ] + ] + } } diff --git a/v3/yiancardesigns/keycult_tkl/keycult_tkl.json b/v3/yiancardesigns/keycult_tkl/keycult_tkl.json index f41d607da6..6c5cff374d 100644 --- a/v3/yiancardesigns/keycult_tkl/keycult_tkl.json +++ b/v3/yiancardesigns/keycult_tkl/keycult_tkl.json @@ -2,7 +2,10 @@ "name": "Keycult TKL", "vendorId": "0x8968", "productId": "0x6336", - "matrix": {"rows": 6, "cols": 17}, + "matrix": { + "rows": 6, + "cols": 17 + }, "layouts": { "labels": [ [ From b543b9ede1f4e52cdbb320956a59eb4e9ea05c67 Mon Sep 17 00:00:00 2001 From: yiancar Date: Sun, 6 Oct 2024 11:50:34 -0600 Subject: [PATCH 17/31] Fix spelling mistake on custom RGB effects --- src/yiancardesigns/nebula12b/nebula12b.json | 2 +- src/yiancardesigns/nebula68b/nebula68b.json | 2 +- src/yiancardesigns/nk20/nk20.json | 2 +- src/yiancardesigns/nk65b/nk65b.json | 2 +- v3/coban/pad9a/pad9a.json | 2 +- v3/doio/kb12/kb12-01.json | 2 +- v3/doio/kb30/kb30-01.json | 2 +- v3/dotmod/dymium65.json | 2 +- v3/dp3000/dp3000-rev1.json | 2 +- v3/era/sirind/tomak/tomak.json | 2 +- v3/geekboards/macropad_v2/macropad_v2.json | 2 +- v3/mechlovin/adelais/adelais_en_ciel-rev3.json | 2 +- v3/momokai/momokai_tap_duo.json | 2 +- v3/momokai/momokai_tap_trio.json | 2 +- v3/qwertykeys/qk100/qk100_ansi.json | 2 +- v3/wilba_tech/wt6_kh/wt6_kh.json | 2 +- v3/wilba_tech/wt8_kh/wt8_kh.json | 2 +- v3/xelus/pachi/xelus_pachi_rgb_rev2.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/yiancardesigns/nebula12b/nebula12b.json b/src/yiancardesigns/nebula12b/nebula12b.json index 376eeda846..ed4e17df25 100644 --- a/src/yiancardesigns/nebula12b/nebula12b.json +++ b/src/yiancardesigns/nebula12b/nebula12b.json @@ -174,7 +174,7 @@ 1 ], [ - "Spash", + "Splash", 1 ], [ diff --git a/src/yiancardesigns/nebula68b/nebula68b.json b/src/yiancardesigns/nebula68b/nebula68b.json index 409c52e459..de4fe5f2c1 100644 --- a/src/yiancardesigns/nebula68b/nebula68b.json +++ b/src/yiancardesigns/nebula68b/nebula68b.json @@ -174,7 +174,7 @@ 1 ], [ - "Spash", + "Splash", 1 ], [ diff --git a/src/yiancardesigns/nk20/nk20.json b/src/yiancardesigns/nk20/nk20.json index 5548a6bf5a..53160cae48 100644 --- a/src/yiancardesigns/nk20/nk20.json +++ b/src/yiancardesigns/nk20/nk20.json @@ -174,7 +174,7 @@ 1 ], [ - "Spash", + "Splash", 1 ], [ diff --git a/src/yiancardesigns/nk65b/nk65b.json b/src/yiancardesigns/nk65b/nk65b.json index 026d8894dc..a6b112317e 100644 --- a/src/yiancardesigns/nk65b/nk65b.json +++ b/src/yiancardesigns/nk65b/nk65b.json @@ -174,7 +174,7 @@ 1 ], [ - "Spash", + "Splash", 1 ], [ diff --git a/v3/coban/pad9a/pad9a.json b/v3/coban/pad9a/pad9a.json index 2bc4dea377..bde9a2e61e 100644 --- a/v3/coban/pad9a/pad9a.json +++ b/v3/coban/pad9a/pad9a.json @@ -50,7 +50,7 @@ "Solid Reactive Simple", "Solid Reactive Wide", "Solid Reactive Nexus", - "Spash" + "Splash" ] }, { diff --git a/v3/doio/kb12/kb12-01.json b/v3/doio/kb12/kb12-01.json index 4a6fc55bc6..4f36ad9857 100644 --- a/v3/doio/kb12/kb12-01.json +++ b/v3/doio/kb12/kb12-01.json @@ -76,7 +76,7 @@ "Solid Reactive Multi Cross", "Solid Reactive Nexus", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Multi Splash", "Solid Splash", "Solid Multi Splash" diff --git a/v3/doio/kb30/kb30-01.json b/v3/doio/kb30/kb30-01.json index 776c17db73..aa9118a2d7 100644 --- a/v3/doio/kb30/kb30-01.json +++ b/v3/doio/kb30/kb30-01.json @@ -64,7 +64,7 @@ "Solid Reactive Multi Cross", "Solid Reactive Nexus", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Multi Splash", "Solid Splash", "Solid Multi Splash" diff --git a/v3/dotmod/dymium65.json b/v3/dotmod/dymium65.json index f736fb1a78..be7c672491 100644 --- a/v3/dotmod/dymium65.json +++ b/v3/dotmod/dymium65.json @@ -58,7 +58,7 @@ "Solid Reactive Multi Wide", "Solid Reactive Cross", "Solid Reactive Multi Nexus", - "Spash" + "Splash" ] }, { diff --git a/v3/dp3000/dp3000-rev1.json b/v3/dp3000/dp3000-rev1.json index 78ec7f612f..8975039c76 100644 --- a/v3/dp3000/dp3000-rev1.json +++ b/v3/dp3000/dp3000-rev1.json @@ -61,7 +61,7 @@ "Solid Reactive Simple", "Solid Reactive", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Solid Splash" ] }, diff --git a/v3/era/sirind/tomak/tomak.json b/v3/era/sirind/tomak/tomak.json index 265391c55d..09f36d7625 100644 --- a/v3/era/sirind/tomak/tomak.json +++ b/v3/era/sirind/tomak/tomak.json @@ -121,7 +121,7 @@ "Solid Reactive Multi Cross", "Solid Reactive Nexus", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Multi Splash", "Solid Splash", "Solid Multi Splash" diff --git a/v3/geekboards/macropad_v2/macropad_v2.json b/v3/geekboards/macropad_v2/macropad_v2.json index f6ea25e322..6779398d2f 100644 --- a/v3/geekboards/macropad_v2/macropad_v2.json +++ b/v3/geekboards/macropad_v2/macropad_v2.json @@ -122,7 +122,7 @@ 18 ], [ - "Spash", + "Splash", 19 ], [ diff --git a/v3/mechlovin/adelais/adelais_en_ciel-rev3.json b/v3/mechlovin/adelais/adelais_en_ciel-rev3.json index a498054f4f..911df9c6e8 100644 --- a/v3/mechlovin/adelais/adelais_en_ciel-rev3.json +++ b/v3/mechlovin/adelais/adelais_en_ciel-rev3.json @@ -131,7 +131,7 @@ "Solid Reactive Multi Cross", "Solid Reactive Nexus", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Multi Splash", "Solid Splash", "Solid Multi Splash" diff --git a/v3/momokai/momokai_tap_duo.json b/v3/momokai/momokai_tap_duo.json index 86af78d06e..4cd3273f45 100644 --- a/v3/momokai/momokai_tap_duo.json +++ b/v3/momokai/momokai_tap_duo.json @@ -62,7 +62,7 @@ "Solid Reactive Multi Wide", "Solid Reactive Nexus", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Solid Splash" ] }, diff --git a/v3/momokai/momokai_tap_trio.json b/v3/momokai/momokai_tap_trio.json index 6902e6f324..8053c79b8a 100644 --- a/v3/momokai/momokai_tap_trio.json +++ b/v3/momokai/momokai_tap_trio.json @@ -60,7 +60,7 @@ "Solid Reactive", "Solid Reactive Multi Wide", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Multi Splash", "Solid Splash" ] diff --git a/v3/qwertykeys/qk100/qk100_ansi.json b/v3/qwertykeys/qk100/qk100_ansi.json index 2bae03332a..995e1938e4 100644 --- a/v3/qwertykeys/qk100/qk100_ansi.json +++ b/v3/qwertykeys/qk100/qk100_ansi.json @@ -232,7 +232,7 @@ "Solid Reactive Multi Cross", "Solid Reactive Nexus", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Multi Splash", "Solid Splash", "Solid Multi Splash" diff --git a/v3/wilba_tech/wt6_kh/wt6_kh.json b/v3/wilba_tech/wt6_kh/wt6_kh.json index 079f7d5562..70afe275e7 100644 --- a/v3/wilba_tech/wt6_kh/wt6_kh.json +++ b/v3/wilba_tech/wt6_kh/wt6_kh.json @@ -59,7 +59,7 @@ "Solid Reactive Wide", "Solid Reactive Cross", "Solid Reactive Nexus", - "Spash", + "Splash", "Solid Splash" ] }, diff --git a/v3/wilba_tech/wt8_kh/wt8_kh.json b/v3/wilba_tech/wt8_kh/wt8_kh.json index f8c00be9a1..1a29cbb2a5 100644 --- a/v3/wilba_tech/wt8_kh/wt8_kh.json +++ b/v3/wilba_tech/wt8_kh/wt8_kh.json @@ -56,7 +56,7 @@ "Solid Reactive Wide", "Solid Reactive Cross", "Solid Reactive Nexus", - "Spash", + "Splash", "Solid Splash", "Custom 1", "Custom 2", diff --git a/v3/xelus/pachi/xelus_pachi_rgb_rev2.json b/v3/xelus/pachi/xelus_pachi_rgb_rev2.json index 354ddf8606..2431a77585 100644 --- a/v3/xelus/pachi/xelus_pachi_rgb_rev2.json +++ b/v3/xelus/pachi/xelus_pachi_rgb_rev2.json @@ -77,7 +77,7 @@ "Solid Reactive Multi Cross", "Solid Reactive Nexus", "Solid Reactive Multi Nexus", - "Spash", + "Splash", "Multi Splash", "Solid Splash", "Solid Multi Splash" From 7c39ec5309792ba686270f744e9820bfd7c71bc7 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:45:41 +0200 Subject: [PATCH 18/31] Update the-via/reader dependency to 1.9.0 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 893e8bd33e..7f46788011 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "license": "GPL-3.0", "dependencies": { - "@the-via/reader": "^1.8.0", + "@the-via/reader": "^1.9.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", "@types/rimraf": "^3.0.2", @@ -62,9 +62,9 @@ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "node_modules/@the-via/reader": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@the-via/reader/-/reader-1.8.0.tgz", - "integrity": "sha512-XtzO4zbBHlvy0i30N+7O+cTwkeco/+NQW1sjumKoY4+1v41KLJNhxGxqvK/WAKgJ8/whx5J/JLWErC6MXN5WOg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@the-via/reader/-/reader-1.9.0.tgz", + "integrity": "sha512-uvxZpLmzzqh76wMbk9vXFo0fbph7qKNU83AC7gzj09gRGCvOVvN5UIdgm5hwXfAH0DZ9SaL+4e/RRmFpVHwDlQ==", "dependencies": { "invariant": "^2.2.4", "typescript-json-validator": "2.4.2" @@ -1584,9 +1584,9 @@ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "@the-via/reader": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@the-via/reader/-/reader-1.8.0.tgz", - "integrity": "sha512-XtzO4zbBHlvy0i30N+7O+cTwkeco/+NQW1sjumKoY4+1v41KLJNhxGxqvK/WAKgJ8/whx5J/JLWErC6MXN5WOg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@the-via/reader/-/reader-1.9.0.tgz", + "integrity": "sha512-uvxZpLmzzqh76wMbk9vXFo0fbph7qKNU83AC7gzj09gRGCvOVvN5UIdgm5hwXfAH0DZ9SaL+4e/RRmFpVHwDlQ==", "requires": { "invariant": "^2.2.4", "typescript-json-validator": "2.4.2" diff --git a/package.json b/package.json index cebb5df175..be39e68d81 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "simple-git-hooks": "^2.8.1" }, "dependencies": { - "@the-via/reader": "^1.8.0", + "@the-via/reader": "^1.9.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", "@types/rimraf": "^3.0.2", From 36271b264c4c9a265f40ed04930a850bb4b453a1 Mon Sep 17 00:00:00 2001 From: eason <98533237+EasonQian1@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:57:45 +0800 Subject: [PATCH 19/31] Add files via upload --- v3/void65h/void65h.json | 141 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 v3/void65h/void65h.json diff --git a/v3/void65h/void65h.json b/v3/void65h/void65h.json new file mode 100644 index 0000000000..d0b6076a09 --- /dev/null +++ b/v3/void65h/void65h.json @@ -0,0 +1,141 @@ +{ + "name": "VOID65H", + "vendorId": "0x51D7", + "productId": "0x5517", + "matrix": {"rows": 5, "cols": 16}, +"layouts": { +"labels":[ + "Backspace" + ], + "keymap":[ + [ + { + "x": 15.5, + "c": "#aaaaaa" + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1" + ], + [ + { + "x": 2.5, + "c": "#cccccc" + }, + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "w": 2 + }, + "0,13\n\n\n0,0", + "0,15" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "1,0", + "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,13", + "1,14" + ], + [ + { + "x": 2.5, + "w": 1.75 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "w": 2.25 + }, + "2,13", + "2,14" + ], + [ + { + "x": 2.5, + "w": 2.25 + }, + "3,0", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "w": 1.75 + }, + "3,12", + "3,13", + "3,14" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "4,0", + "4,1", + { + "w": 1.5 + }, + "4,2", + { + "w": 7 + }, + "4,6", + { + "w": 1.5 + }, + "4,11", + { + "x": 0.5 + }, + "4,12", + "4,13", + "4,14" + ] + ] + } +} From 1b88301106a909123993da94aa6931061414439f Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:02:50 +0200 Subject: [PATCH 20/31] Update v3/void65h/void65h.json --- v3/void65h/void65h.json | 56 ++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/v3/void65h/void65h.json b/v3/void65h/void65h.json index d0b6076a09..4f123e8a84 100644 --- a/v3/void65h/void65h.json +++ b/v3/void65h/void65h.json @@ -2,26 +2,23 @@ "name": "VOID65H", "vendorId": "0x51D7", "productId": "0x5517", - "matrix": {"rows": 5, "cols": 16}, -"layouts": { -"labels":[ - "Backspace" - ], - "keymap":[ + "matrix": { + "rows": 5, + "cols": 16 + }, + "layouts": { + "labels": [ + "Split Backspace" + ], + "keymap": [ [ { - "x": 15.5, "c": "#aaaaaa" }, - "0,13\n\n\n0,1", - "0,14\n\n\n0,1" - ], - [ + "0,0", { - "x": 2.5, "c": "#cccccc" }, - "0,0", "0,1", "0,2", "0,3", @@ -35,17 +32,29 @@ "0,11", "0,12", { + "c": "#aaaaaa", "w": 2 }, "0,13\n\n\n0,0", - "0,15" + "0,15", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "0,14\n\n\n0,1" ], [ { - "x": 2.5, "w": 1.5 }, "1,0", + { + "c": "#cccccc" + }, "1,1", "1,2", "1,3", @@ -62,14 +71,19 @@ "w": 1.5 }, "1,13", + { + "c": "#aaaaaa" + }, "1,14" ], [ { - "x": 2.5, "w": 1.75 }, "2,0", + { + "c": "#cccccc" + }, "2,1", "2,2", "2,3", @@ -82,6 +96,7 @@ "2,10", "2,11", { + "c": "#aaaaaa", "w": 2.25 }, "2,13", @@ -89,10 +104,12 @@ ], [ { - "x": 2.5, "w": 2.25 }, "3,0", + { + "c": "#cccccc" + }, "3,2", "3,3", "3,4", @@ -104,6 +121,7 @@ "3,10", "3,11", { + "c": "#aaaaaa", "w": 1.75 }, "3,12", @@ -112,7 +130,6 @@ ], [ { - "x": 2.5, "w": 1.5 }, "4,0", @@ -122,10 +139,12 @@ }, "4,2", { + "c": "#cccccc", "w": 7 }, "4,6", { + "c": "#aaaaaa", "w": 1.5 }, "4,11", @@ -139,3 +158,4 @@ ] } } + From 920840af64ae2580cff2dcdc72b0cdbab7c58c8e Mon Sep 17 00:00:00 2001 From: yiancar Date: Mon, 23 Sep 2024 13:53:09 -0600 Subject: [PATCH 21/31] Create nk_classic_tkl_iso.json --- .../nk_classic_tkl_iso.json | 213 ++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json diff --git a/v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json b/v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json new file mode 100644 index 0000000000..8e64eb8fe4 --- /dev/null +++ b/v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json @@ -0,0 +1,213 @@ +{ + "name": "NK_ Classic TKL", + "vendorId": "0x8968", + "productId": "0x4E55", + "matrix": { + "rows": 6, + "cols": 17 + }, + "customKeycodes": [ + { + "name": "NK_ Retro RGB", + "title": "NK_ Retro RGB", + "shortName": "RETRO" + } + ], + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgb_matrix" + ], + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,5", + "0,6", + "0,7", + "0,8", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,9", + "0,10", + "0,11", + "0,12", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.25, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16" + ], + [ + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "3,13", + { + "x": 0.25 + }, + "2,14", + "2,15", + "2,16" + ], + [ + { + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + "3,12" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,12", + { + "x": 1.25 + }, + "4,15" + ], + [ + { + "w": 1.5 + }, + "5,0", + "5,1", + { + "w": 1.5 + }, + "5,2", + { + "c": "#cccccc", + "w": 7 + }, + "5,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11", + "5,12", + { + "w": 1.5 + }, + "5,13", + { + "x": 0.25 + }, + "5,14", + "5,15", + "5,16" + ] + ] + } +} From 08ce5aaaf0250c00c07a0604809b215c3594c2e1 Mon Sep 17 00:00:00 2001 From: yiancar Date: Tue, 8 Oct 2024 18:59:08 +0100 Subject: [PATCH 22/31] Update nk_classic_tkl_iso.json --- v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json b/v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json index 8e64eb8fe4..083ac70559 100644 --- a/v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json +++ b/v3/yiancardesigns/nk_classic_tkl_iso/nk_classic_tkl_iso.json @@ -1,5 +1,5 @@ { - "name": "NK_ Classic TKL", + "name": "NK_ Classic TKL ISO", "vendorId": "0x8968", "productId": "0x4E55", "matrix": { From 3e67dead8482bc3e082b938f4f62e94376f65e7e Mon Sep 17 00:00:00 2001 From: zlabkeeb <160311066+zlabkeeb@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:33:41 +0000 Subject: [PATCH 23/31] Add VRYNBOARD VIA --- v3/zlabkeeb/vrynboard/vrynboard.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 v3/zlabkeeb/vrynboard/vrynboard.json diff --git a/v3/zlabkeeb/vrynboard/vrynboard.json b/v3/zlabkeeb/vrynboard/vrynboard.json new file mode 100644 index 0000000000..9d330e25c1 --- /dev/null +++ b/v3/zlabkeeb/vrynboard/vrynboard.json @@ -0,0 +1,18 @@ +{ + "name": "VRYNBOARD", + "vendorId": "0x4154", + "productId": "0x4445", + "matrix": { + "rows": 4, + "cols": 3 + }, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], + "layouts": { + "keymap": [ + ["1,0", "1,1", "1,2"], + ["2,0", "2,1", "2,2"], + ["3,0", "3,1", "3,2"] + ] + } +} From 9f817fa18abdd38dc8e4e35c69e9309c559e9d13 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:14:34 +0200 Subject: [PATCH 24/31] Update v3/zlabkeeb/vrynboard/vrynboard.json --- v3/zlabkeeb/vrynboard/vrynboard.json | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/v3/zlabkeeb/vrynboard/vrynboard.json b/v3/zlabkeeb/vrynboard/vrynboard.json index 9d330e25c1..f8f07737d2 100644 --- a/v3/zlabkeeb/vrynboard/vrynboard.json +++ b/v3/zlabkeeb/vrynboard/vrynboard.json @@ -6,13 +6,30 @@ "rows": 4, "cols": 3 }, - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgb_matrix"], + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgb_matrix" + ], "layouts": { "keymap": [ - ["1,0", "1,1", "1,2"], - ["2,0", "2,1", "2,2"], - ["3,0", "3,1", "3,2"] + [ + "1,0", + "1,1", + "1,2" + ], + [ + "2,0", + "2,1", + "2,2" + ], + [ + "3,0", + "3,1", + "3,2" + ] ] } } + From d6b3f7a025fe457f217295dfcf5fd2bb239ece4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Wed, 28 Aug 2024 17:56:56 +0700 Subject: [PATCH 25/31] Update support for Tyson60s --- v3/trnthsn/tyson60s.json | 152 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 v3/trnthsn/tyson60s.json diff --git a/v3/trnthsn/tyson60s.json b/v3/trnthsn/tyson60s.json new file mode 100644 index 0000000000..bd02890c26 --- /dev/null +++ b/v3/trnthsn/tyson60s.json @@ -0,0 +1,152 @@ +{ + "name": "Tyson60s", + "vendorId": "0x5453", + "productId": "0x2311", + "menus": ["qmk_rgblight"], + "keycodes": ["qmk_lighting"], + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": ["Split Backspace", "2.75U Right Shift"], + "keymap": [ + [ + { + "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 + }, + "2,13\n\n\n0,0", + { + "x": 0.25 + }, + "0,13\n\n\n0,1", + "2,13\n\n\n0,1" + ], + [ + { + "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", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13" + ], + [ + { + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,12" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,11\n\n\n1,0", + "3,12\n\n\n1,0", + { + "x": 0.25, + "w": 2.75 + }, + "3,12\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "4,0", + "4,1", + { + "w": 1.5 + }, + "4,2", + { + "c": "#cccccc", + "w": 7 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10", + "4,11", + { + "w": 1.5 + }, + "4,12" + ] + ] + } +} From 65b903ad6e827206f74bc3c7b62cb140e319945b Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:21:53 +0200 Subject: [PATCH 26/31] Update v3/trnthsn/tyson60s.json --- v3/trnthsn/tyson60s.json | 311 ++++++++++++++++++++------------------- 1 file changed, 161 insertions(+), 150 deletions(-) diff --git a/v3/trnthsn/tyson60s.json b/v3/trnthsn/tyson60s.json index bd02890c26..62d7bf8ee3 100644 --- a/v3/trnthsn/tyson60s.json +++ b/v3/trnthsn/tyson60s.json @@ -1,152 +1,163 @@ { - "name": "Tyson60s", - "vendorId": "0x5453", - "productId": "0x2311", - "menus": ["qmk_rgblight"], - "keycodes": ["qmk_lighting"], - "matrix": {"rows": 5, "cols": 14}, - "layouts": { - "labels": ["Split Backspace", "2.75U Right Shift"], - "keymap": [ - [ - { - "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 - }, - "2,13\n\n\n0,0", - { - "x": 0.25 - }, - "0,13\n\n\n0,1", - "2,13\n\n\n0,1" - ], - [ - { - "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", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "1,13" - ], - [ - { - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "c": "#777777", - "w": 2.25 - }, - "2,12" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,11\n\n\n1,0", - "3,12\n\n\n1,0", - { - "x": 0.25, - "w": 2.75 - }, - "3,12\n\n\n1,1" - ], - [ - { - "w": 1.5 - }, - "4,0", - "4,1", - { - "w": 1.5 - }, - "4,2", - { - "c": "#cccccc", - "w": 7 - }, - "4,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,10", - "4,11", - { - "w": 1.5 - }, - "4,12" - ] - ] - } + "name": "Tyson60s", + "vendorId": "0x5453", + "productId": "0x2311", + "matrix": { + "rows": 5, + "cols": 14 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgblight" + ], + "layouts": { + "labels": [ + "Split Backspace", + "2.75U Right Shift" + ], + "keymap": [ + [ + { + "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 + }, + "2,13\n\n\n0,0", + { + "x": 0.25 + }, + "0,13\n\n\n0,1", + "2,13\n\n\n0,1" + ], + [ + { + "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,13" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,12" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,11\n\n\n1,0", + "3,12\n\n\n1,0", + { + "x": 0.25, + "w": 2.75 + }, + "3,12\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "4,0", + "4,1", + { + "w": 1.5 + }, + "4,2", + { + "c": "#cccccc", + "w": 7 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10", + "4,11", + { + "w": 1.5 + }, + "4,12" + ] + ] + } } + From 81ec245f3f91651831023ab1cb84d59181c01c40 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Sat, 25 May 2024 20:13:32 -0600 Subject: [PATCH 27/31] initial --- v3/boardsource/sessanta/sessanta.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 v3/boardsource/sessanta/sessanta.json diff --git a/v3/boardsource/sessanta/sessanta.json b/v3/boardsource/sessanta/sessanta.json new file mode 100644 index 0000000000..50d5dbc7c9 --- /dev/null +++ b/v3/boardsource/sessanta/sessanta.json @@ -0,0 +1,19 @@ +{ + "name": "Sessanta", + "vendorId": "0x4273", + "productId": "0x17AC", + "matrix": {"rows": 8, "cols": 9}, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], + "layouts": { + "labesl": [["Bottom Row", "ANSI", "Split"]], + "keymap": [ + ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","1,0","1,1","1,2","1,3",{"w": 2},"1,4"], + [{"w": 1.5},"1,5","1,6","1,7","1,8","2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8",{"w": 1.5},"3,0"], + [{"w": 1.75},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","4,0","4,1","4,2","4,3",{"w": 2.25},"4,4","4,5"], + [{"w": 2.25},"4,6","4,7","4,8","5,0","5,1","5,2","5,3","5,4","5,5","5,6","5,7",{"w": 2.75},"5,8","6,0"], + [{"w": 1.25},"6,1",{"w": 1.25},"6,2",{"w": 1.25},"6,3",{"w": 6.25},"6,4\n\n\n0,0",{"w": 1.25},"6,5",{"w": 1.25},"6,6",{"w": 1.25},"6,7",{"w": 1.25},"6,8","7,0"], + [{"x": 3.75,"w": 1.5},"7,1\n\n\n0,1","7,2\n\n\n0,1",{"w": 1.25},"6,4\n\n\n0,1","7,3\n\n\n0,1",{"w": 1.5},"7,4\n\n\n0,1"] + ] + } +} From 8987db190bfdf1769dad7454f2c50d1eeea33cfe Mon Sep 17 00:00:00 2001 From: jack Date: Wed, 7 Aug 2024 15:37:48 -0600 Subject: [PATCH 28/31] Update v3/boardsource/sessanta/sessanta.json Co-authored-by: Xelus22 <17491233+Xelus22@users.noreply.github.com> --- v3/boardsource/sessanta/sessanta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/boardsource/sessanta/sessanta.json b/v3/boardsource/sessanta/sessanta.json index 50d5dbc7c9..e16cafd817 100644 --- a/v3/boardsource/sessanta/sessanta.json +++ b/v3/boardsource/sessanta/sessanta.json @@ -6,7 +6,7 @@ "keycodes": ["qmk_lighting"], "menus": ["qmk_rgb_matrix"], "layouts": { - "labesl": [["Bottom Row", "ANSI", "Split"]], + "labels": [["Bottom Row", "ANSI", "Split"]], "keymap": [ ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","1,0","1,1","1,2","1,3",{"w": 2},"1,4"], [{"w": 1.5},"1,5","1,6","1,7","1,8","2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8",{"w": 1.5},"3,0"], From 80e50333cffddf2f49828f0ecf8c5268d5ed2c49 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:39:15 +0200 Subject: [PATCH 29/31] Update v3/boardsource/sessanta/sessanta.json --- v3/boardsource/sessanta/sessanta.json | 200 +++++++++++++++++++++++--- 1 file changed, 183 insertions(+), 17 deletions(-) diff --git a/v3/boardsource/sessanta/sessanta.json b/v3/boardsource/sessanta/sessanta.json index e16cafd817..e281fa8c82 100644 --- a/v3/boardsource/sessanta/sessanta.json +++ b/v3/boardsource/sessanta/sessanta.json @@ -1,19 +1,185 @@ { - "name": "Sessanta", - "vendorId": "0x4273", - "productId": "0x17AC", - "matrix": {"rows": 8, "cols": 9}, - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgb_matrix"], - "layouts": { - "labels": [["Bottom Row", "ANSI", "Split"]], - "keymap": [ - ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","1,0","1,1","1,2","1,3",{"w": 2},"1,4"], - [{"w": 1.5},"1,5","1,6","1,7","1,8","2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8",{"w": 1.5},"3,0"], - [{"w": 1.75},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","4,0","4,1","4,2","4,3",{"w": 2.25},"4,4","4,5"], - [{"w": 2.25},"4,6","4,7","4,8","5,0","5,1","5,2","5,3","5,4","5,5","5,6","5,7",{"w": 2.75},"5,8","6,0"], - [{"w": 1.25},"6,1",{"w": 1.25},"6,2",{"w": 1.25},"6,3",{"w": 6.25},"6,4\n\n\n0,0",{"w": 1.25},"6,5",{"w": 1.25},"6,6",{"w": 1.25},"6,7",{"w": 1.25},"6,8","7,0"], - [{"x": 3.75,"w": 1.5},"7,1\n\n\n0,1","7,2\n\n\n0,1",{"w": 1.25},"6,4\n\n\n0,1","7,3\n\n\n0,1",{"w": 1.5},"7,4\n\n\n0,1"] - ] - } + "name": "Sessanta", + "vendorId": "0x4273", + "productId": "0x17AC", + "matrix": { + "rows": 8, + "cols": 9 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgb_matrix" + ], + "layouts": { + "labels": [ + [ + "Bottom Row", + "ANSI", + "Split" + ] + ], + "keymap": [ + [ + { + "c": "#aaaaaa" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "1,0", + "1,1", + "1,2", + "1,3", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,4" + ], + [ + { + "w": 1.5 + }, + "1,5", + { + "c": "#cccccc" + }, + "1,6", + "1,7", + "1,8", + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + { + "w": 1.5 + }, + "3,0" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,1", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "4,0", + "4,1", + "4,2", + "4,3", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,4", + "4,5" + ], + [ + { + "w": 2.25 + }, + "4,6", + { + "c": "#cccccc" + }, + "4,7", + "4,8", + "5,0", + "5,1", + "5,2", + "5,3", + "5,4", + "5,5", + "5,6", + "5,7", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "5,8", + "6,0" + ], + [ + { + "w": 1.25 + }, + "6,1", + { + "w": 1.25 + }, + "6,2", + { + "w": 1.25 + }, + "6,3", + { + "c": "#cccccc", + "w": 6.25 + }, + "6,4\n\n\n0,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "6,5", + { + "w": 1.25 + }, + "6,6", + { + "w": 1.25 + }, + "6,7", + { + "w": 1.25 + }, + "6,8", + "7,0" + ], + [ + { + "x": 3.75, + "c": "#cccccc", + "w": 1.5 + }, + "7,1\n\n\n0,1", + "7,2\n\n\n0,1", + { + "w": 1.25 + }, + "6,4\n\n\n0,1", + "7,3\n\n\n0,1", + { + "w": 1.5 + }, + "7,4\n\n\n0,1" + ] + ] + } } + From 7edd10d2ceaae3a061aafe1e93d38b76ab798f0c Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:02:29 +0200 Subject: [PATCH 30/31] Part.1-75-HS fix PR --- .../{t75/t75.json => part_1_75/part_1_75_hs/part_1_75_hs.json} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename v3/vertex/{t75/t75.json => part_1_75/part_1_75_hs/part_1_75_hs.json} (99%) diff --git a/v3/vertex/t75/t75.json b/v3/vertex/part_1_75/part_1_75_hs/part_1_75_hs.json similarity index 99% rename from v3/vertex/t75/t75.json rename to v3/vertex/part_1_75/part_1_75_hs/part_1_75_hs.json index 0e9263af0d..3c9e5934a0 100644 --- a/v3/vertex/t75/t75.json +++ b/v3/vertex/part_1_75/part_1_75_hs/part_1_75_hs.json @@ -1,5 +1,5 @@ { - "name": "T75", + "name": "Part.1-75-HS", "vendorId": "0x28E9", "productId": "0x3006", "matrix": { From 19865aa2c5ac3ef821bdc55308a5aced02f8f66a Mon Sep 17 00:00:00 2001 From: akyp Date: Tue, 8 Oct 2024 22:22:30 +0100 Subject: [PATCH 31/31] Change to custom menu RGB Light explicit declaration to match the enabled effects --- v3/archerkeyboard/desire65/desire65.json | 72 ++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/v3/archerkeyboard/desire65/desire65.json b/v3/archerkeyboard/desire65/desire65.json index f03a7c86ed..4e1b47eb45 100644 --- a/v3/archerkeyboard/desire65/desire65.json +++ b/v3/archerkeyboard/desire65/desire65.json @@ -6,11 +6,75 @@ "rows": 5, "cols": 16 }, - "keycodes": [ - "qmk_lighting" - ], + "keycodes": [ "qmk_lighting" ], "menus": [ - "qmk_rgblight" + { + "label": "Lighting", + "content": [ + { + "label": "Underglow", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgblight_brightness", 2, 1] + }, + { + "label": "Effect", + "type": "dropdown", + "content": ["id_qmk_rgblight_effect", 2, 2], + "options": [ + "All Off", + "Solid Color", + "Breathing 1", + "Breathing 2", + "Breathing 3", + "Breathing 4", + "Rainbow Mood 1", + "Rainbow Mood 2", + "Rainbow Mood 3", + "Rainbow Swirl 1", + "Rainbow Swirl 2", + "Rainbow Swirl 3", + "Rainbow Swirl 4", + "Rainbow Swirl 5", + "Rainbow Swirl 6", + "Gradient 1", + "Gradient 2", + "Gradient 3", + "Gradient 4", + "Gradient 5", + "Gradient 6", + "Gradient 7", + "Gradient 8", + "Gradient 9", + "Gradient 10", + "Twinkle 1", + "Twinkle 2", + "Twinkle 3", + "Twinkle 4", + "Twinkle 5", + "Twinkle 6" + ] + }, + { + "showIf": "{id_qmk_rgblight_effect} != 0", + "label": "Effect Speed", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgblight_effect_speed", 2, 3] + }, + { + "showIf": "{id_qmk_rgblight_effect} != 0 && {id_qmk_rgblight_effect} != 35", + "label": "Color", + "type": "color", + "content": ["id_qmk_rgblight_color", 2, 4] + } + ] + } + ] + } ], "layouts": { "labels": [