From 4c18ad5e2e79442f56dd32a395abf83c9f419b02 Mon Sep 17 00:00:00 2001 From: Xelus22 <17491233+Xelus22@users.noreply.github.com> Date: Fri, 7 Jun 2024 22:04:57 +1000 Subject: [PATCH] add naming and move keyhive boards to correct places (#2299) * add naming and move keyhive boards to correct places * apply formatting --------- Co-authored-by: Xelus22 <> --- src/atxkb/1894/1894.json | 26 +- src/boardsource/3x4/3x4.json | 23 +- v3/ah/haven60.json | 15 +- v3/atxkb/1894/1894.json | 34 +- v3/boardsource/3x4/3x4.json | 23 +- v3/cipulot/60xt/60xt.json | 9 +- v3/craftwalk/craftwalk.json | 124 ++++- v3/dcpedit/masonry/masonry.json | 2 +- v3/era/linx3/n87/n87.json | 15 +- v3/era/sirind/tomak/tomak.json | 80 +--- v3/jaykeeb/jk65/jk65.json | 19 +- v3/keebio/irispad/irispad-rev8.json | 206 +++++++- v3/{ => keyhive}/absinthe/absinthe.json | 14 +- v3/keyhive/maypad/maypad.json | 20 + v3/{ => keyhive}/smallice/smallice.json | 8 +- v3/monsgeek/{ => m1}/m1.json | 143 ++---- v3/monsgeek/m5/m5.json | 135 ++---- v3/monsgeek/m6/m6.json | 135 ++---- v3/neson_design/700e.json | 22 +- v3/neson_design/810e.json | 16 +- v3/neson_design/n6.json | 17 +- v3/neson_design/nico.json | 20 +- v3/other/maypad/maypad.json | 49 -- v3/pinky/3/pinky3.json | 605 +++++++++++++----------- v3/syenakeyboards/elaruus/elaruus.json | 26 +- 25 files changed, 793 insertions(+), 993 deletions(-) rename v3/{ => keyhive}/absinthe/absinthe.json (95%) create mode 100644 v3/keyhive/maypad/maypad.json rename v3/{ => keyhive}/smallice/smallice.json (97%) rename v3/monsgeek/{ => m1}/m1.json (62%) delete mode 100644 v3/other/maypad/maypad.json diff --git a/src/atxkb/1894/1894.json b/src/atxkb/1894/1894.json index 3ec998d4db..cf6955f179 100644 --- a/src/atxkb/1894/1894.json +++ b/src/atxkb/1894/1894.json @@ -1,5 +1,5 @@ { - "name": "1894", + "name": "Atxkb 1894", "vendorId": "0x5458", "productId": "0x0001", "matrix": { @@ -9,26 +9,10 @@ "lighting": "qmk_backlight_rgblight", "layouts": { "labels": [ - [ - "Backspace", - "Unified", - "Split" - ], - [ - "Enter", - "ANSI", - "ISO" - ], - [ - "Left Shift", - "ANSI", - "ISO" - ], - [ - "Right Shift", - "Split", - "Unified" - ], + ["Backspace", "Unified", "Split"], + ["Enter", "ANSI", "ISO"], + ["Left Shift", "ANSI", "ISO"], + ["Right Shift", "Split", "Unified"], [ "Bottom Row", "Tsangan", diff --git a/src/boardsource/3x4/3x4.json b/src/boardsource/3x4/3x4.json index 8529f7cad5..7c86d67cad 100644 --- a/src/boardsource/3x4/3x4.json +++ b/src/boardsource/3x4/3x4.json @@ -1,5 +1,5 @@ { - "name": "3x4", + "name": "Boardsource 3x4", "vendorId": "0x4273", "productId": "0x0304", "matrix": { @@ -9,24 +9,9 @@ "lighting": "none", "layouts": { "keymap": [ - [ - "0,0", - "0,1", - "0,2", - "0,3" - ], - [ - "1,0", - "1,1", - "1,2", - "1,3" - ], - [ - "2,0", - "2,1", - "2,2", - "2,3" - ] + ["0,0", "0,1", "0,2", "0,3"], + ["1,0", "1,1", "1,2", "1,3"], + ["2,0", "2,1", "2,2", "2,3"] ] } } diff --git a/v3/ah/haven60.json b/v3/ah/haven60.json index ce3ad5a4d0..0ee787c268 100644 --- a/v3/ah/haven60.json +++ b/v3/ah/haven60.json @@ -2,28 +2,19 @@ "name": "Atelier_Haven Haven60", "vendorId": "0x4446", "productId": "0x4660", - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgblight" - ], "matrix": { "rows": 5, "cols": 14 }, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], "layouts": { "labels": [ "Split Backspace", "ISO Enter", "Split Left Shift", "Split Right Shift", - [ - "Bottom Row", - "Full", - "WKL", - "HHKB (7u)" - ] + ["Bottom Row", "Full", "WKL", "HHKB (7u)"] ], "keymap": [ [ diff --git a/v3/atxkb/1894/1894.json b/v3/atxkb/1894/1894.json index e562448a01..4846563d2b 100644 --- a/v3/atxkb/1894/1894.json +++ b/v3/atxkb/1894/1894.json @@ -1,39 +1,19 @@ { - "name": "1894", + "name": "Atxkb 1894", "vendorId": "0x5458", "productId": "0x0001", "matrix": { "rows": 5, "cols": 14 }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_backlight_rgblight" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight_rgblight"], "layouts": { "labels": [ - [ - "Backspace", - "Unified", - "Split" - ], - [ - "Enter", - "ANSI", - "ISO" - ], - [ - "Left Shift", - "ANSI", - "ISO" - ], - [ - "Right Shift", - "Split", - "Unified" - ], + ["Backspace", "Unified", "Split"], + ["Enter", "ANSI", "ISO"], + ["Left Shift", "ANSI", "ISO"], + ["Right Shift", "Split", "Unified"], [ "Bottom Row", "Tsangan", diff --git a/v3/boardsource/3x4/3x4.json b/v3/boardsource/3x4/3x4.json index 048092b710..206a0cc977 100644 --- a/v3/boardsource/3x4/3x4.json +++ b/v3/boardsource/3x4/3x4.json @@ -1,5 +1,5 @@ { - "name": "3x4", + "name": "Boardsource 3x4", "vendorId": "0x4273", "productId": "0x0304", "matrix": { @@ -8,24 +8,9 @@ }, "layouts": { "keymap": [ - [ - "0,0", - "0,1", - "0,2", - "0,3" - ], - [ - "1,0", - "1,1", - "1,2", - "1,3" - ], - [ - "2,0", - "2,1", - "2,2", - "2,3" - ] + ["0,0", "0,1", "0,2", "0,3"], + ["1,0", "1,1", "1,2", "1,3"], + ["2,0", "2,1", "2,2", "2,3"] ] } } diff --git a/v3/cipulot/60xt/60xt.json b/v3/cipulot/60xt/60xt.json index 80f162f42d..b0c3abc0d2 100644 --- a/v3/cipulot/60xt/60xt.json +++ b/v3/cipulot/60xt/60xt.json @@ -1,5 +1,5 @@ { - "name": "60XT", + "name": "Cipulot 60XT", "vendorId": "0x6369", "productId": "0x6BC2", "matrix": { @@ -14,12 +14,7 @@ "ISO", "Vertical 2U #1", "Vertical 2U #2", - [ - "Bottom Row", - "7U WK", - "7U WKL", - "7U HHKB" - ] + ["Bottom Row", "7U WK", "7U WKL", "7U HHKB"] ], "keymap": [ [ diff --git a/v3/craftwalk/craftwalk.json b/v3/craftwalk/craftwalk.json index ec1dcc1b2f..d48c714851 100644 --- a/v3/craftwalk/craftwalk.json +++ b/v3/craftwalk/craftwalk.json @@ -1,21 +1,107 @@ { - "name": "craftwalk", - "vendorId": "0x7364", - "productId": "0x2E8F", - "matrix": {"rows": 3, "cols": 7}, - "menus": ["qmk_rgblight"], - "keycodes": [ "qmk_lighting" ], - "layouts": { - "keymap": [ - [{"x": 2.5},"0,2"], - [{"y": -0.75, "x": 1.5}, "0,1", {"x": 1}, "0,3"], - [{"y": -0.25, "x": 2.5}, "1,2"], - [{"y": -0.75, "x": 1.5}, "1,1", {"x": 1}, "1,3"], - [{"y": -0.25, "x": 2.5, "c": "#aaaaaa"}, "2,2", {"x": 1, "c": "#cccccc"}, "2,4"], - [{"y": -0.75, "x": 1.5, "c": "#aaaaaa"}, "2,1", {"x": 1}, "2,3"], - [{"r": 20, "rx": 5, "ry": 2.25, "y": 0.5, "x": 0.75, "h": 1.5}, "2,5", {"h": 1.5}, "2,6"], - [{"r": -12, "rx": 0.5, "ry": 1.5, "x": -0.5, "c": "#777777"}, "1,0"], - [{"x": -0.5, "c": "#aaaaaa"}, "2,0"] - ] - } + "name": "craftwalk", + "vendorId": "0x7364", + "productId": "0x2E8F", + "matrix": { + "rows": 3, + "cols": 7 + }, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "layouts": { + "keymap": [ + [ + { + "x": 2.5 + }, + "0,2" + ], + [ + { + "y": -0.75, + "x": 1.5 + }, + "0,1", + { + "x": 1 + }, + "0,3" + ], + [ + { + "y": -0.25, + "x": 2.5 + }, + "1,2" + ], + [ + { + "y": -0.75, + "x": 1.5 + }, + "1,1", + { + "x": 1 + }, + "1,3" + ], + [ + { + "y": -0.25, + "x": 2.5, + "c": "#aaaaaa" + }, + "2,2", + { + "x": 1, + "c": "#cccccc" + }, + "2,4" + ], + [ + { + "y": -0.75, + "x": 1.5, + "c": "#aaaaaa" + }, + "2,1", + { + "x": 1 + }, + "2,3" + ], + [ + { + "r": 20, + "rx": 5, + "ry": 2.25, + "y": 0.5, + "x": 0.75, + "h": 1.5 + }, + "2,5", + { + "h": 1.5 + }, + "2,6" + ], + [ + { + "r": -12, + "rx": 0.5, + "ry": 1.5, + "x": -0.5, + "c": "#777777" + }, + "1,0" + ], + [ + { + "x": -0.5, + "c": "#aaaaaa" + }, + "2,0" + ] + ] + } } diff --git a/v3/dcpedit/masonry/masonry.json b/v3/dcpedit/masonry/masonry.json index 538ab0f4f5..822b8f369a 100644 --- a/v3/dcpedit/masonry/masonry.json +++ b/v3/dcpedit/masonry/masonry.json @@ -210,4 +210,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/era/linx3/n87/n87.json b/v3/era/linx3/n87/n87.json index d371866a44..48f3d2ed71 100644 --- a/v3/era/linx3/n87/n87.json +++ b/v3/era/linx3/n87/n87.json @@ -6,17 +6,10 @@ "rows": 6, "cols": 17 }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgb_matrix" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], "layouts": { - "labels": [ - "Split Backspace", - "Split Right Shift" - ], + "labels": ["Split Backspace", "Split Right Shift"], "keymap": [ [ { @@ -227,4 +220,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/era/sirind/tomak/tomak.json b/v3/era/sirind/tomak/tomak.json index d981eeb827..ae876de0b9 100644 --- a/v3/era/sirind/tomak/tomak.json +++ b/v3/era/sirind/tomak/tomak.json @@ -1,7 +1,7 @@ { "name": "Tomak", - "productId": "0x0006", "vendorId": "0x4552", + "productId": "0x0006", "matrix": { "rows": 12, "cols": 11 @@ -48,9 +48,7 @@ "shortName": "IN Sat-" } ], - "keycodes": [ - "qmk_lighting" - ], + "keycodes": ["qmk_lighting"], "menus": [ { "label": "Lighting", @@ -61,24 +59,13 @@ { "label": "Brightness", "type": "range", - "options": [ - 0, - 255 - ], - "content": [ - "id_qmk_rgb_matrix_brightness", - 3, - 1 - ] + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] }, { "label": "Effect", "type": "dropdown", - "content": [ - "id_qmk_rgb_matrix_effect", - 3, - 2 - ], + "content": ["id_qmk_rgb_matrix_effect", 3, 2], "options": [ "All Off", "Solid Color", @@ -131,25 +118,14 @@ "showIf": "{id_qmk_rgb_matrix_effect} != 0", "label": "Effect Speed", "type": "range", - "options": [ - 0, - 255 - ], - "content": [ - "id_qmk_rgb_matrix_effect_speed", - 3, - 3 - ] + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] }, { "showIf": "{id_qmk_rgb_matrix_effect} != 0 && {id_qmk_rgb_matrix_effect} != 24 && {id_qmk_rgb_matrix_effect} != 28 && {id_qmk_rgb_matrix_effect} != 29 && {id_qmk_rgb_matrix_effect} != 32", "label": "Color", "type": "color", - "content": [ - "id_qmk_rgb_matrix_color", - 3, - 4 - ] + "content": ["id_qmk_rgb_matrix_color", 3, 4] } ] }, @@ -159,56 +135,32 @@ { "label": "Indicator toggle", "type": "toggle", - "content": [ - "id_custom_indicator_toggle", - 0, - 0 - ] + "content": ["id_custom_indicator_toggle", 0, 0] }, { "showIf": "{id_custom_indicator_toggle} != 0", "label": "Override indicator", "type": "toggle", - "content": [ - "id_custom_indicator_override", - 0, - 1 - ] + "content": ["id_custom_indicator_override", 0, 1] }, { "label": "Brightness", "type": "range", - "options": [ - 0, - 255 - ], - "content": [ - "id_custom_indicator_brightness", - 0, - 2 - ] + "options": [0, 255], + "content": ["id_custom_indicator_brightness", 0, 2] }, { "label": "Color", "type": "color", - "content": [ - "id_custom_indicator_color", - 0, - 3 - ] + "content": ["id_custom_indicator_color", 0, 3] } ] } ] } ], - "layouts": - { - "labels": [ - "Split Backspace", - "Split Right shift", - "Split Right space" - ], + "layouts": { + "labels": ["Split Backspace", "Split Right shift", "Split Right space"], "keymap": [ [ { @@ -462,4 +414,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/jaykeeb/jk65/jk65.json b/v3/jaykeeb/jk65/jk65.json index ef52cc59ba..5a9f096d8a 100644 --- a/v3/jaykeeb/jk65/jk65.json +++ b/v3/jaykeeb/jk65/jk65.json @@ -2,7 +2,10 @@ "name": "JK65", "vendorId": "0x414C", "productId": "0x7765", - "matrix": {"rows": 5, "cols": 15}, + "matrix": { + "rows": 5, + "cols": 15 + }, "layouts": { "labels": [ "Split Backspace", @@ -38,7 +41,7 @@ "0,13\n\n\n0,0", "0,14", { - "x":0.25 + "x": 0.25 }, "0,13\n\n\n0,1", "1,13\n\n\n0,1" @@ -48,7 +51,7 @@ "x": 2.5, "w": 1.5 }, - "1,0", + "1,0", { "c": "#cccccc" }, @@ -107,7 +110,7 @@ { "w": 1.25 }, - "3,0\n\n\n1,1", + "3,0\n\n\n1,1", { "c": "#cccccc" }, @@ -117,7 +120,7 @@ "x": 0.25, "w": 2.25 }, - "3,0\n\n\n1,0", + "3,0\n\n\n1,0", { "c": "#cccccc" }, @@ -139,13 +142,13 @@ { "c": "#777777" }, - "3,13", + "3,13", { "c": "#aaaaaa" }, "3,14" ], - [ + [ { "x": 2.5, "w": 1.5 @@ -172,7 +175,7 @@ "4,13", "4,14" ], - [ + [ { "c": "#aaaaaa", "x": 2.5, diff --git a/v3/keebio/irispad/irispad-rev8.json b/v3/keebio/irispad/irispad-rev8.json index 43b96a984b..78a5922684 100644 --- a/v3/keebio/irispad/irispad-rev8.json +++ b/v3/keebio/irispad/irispad-rev8.json @@ -2,7 +2,10 @@ "name": "Irispad Rev. 8", "vendorId": "0xCB10", "productId": "0x8356", - "matrix": {"rows": 5, "cols": 6}, + "matrix": { + "rows": 5, + "cols": 6 + }, "keycodes": ["qmk_lighting"], "menus": ["qmk_rgb_matrix"], "layouts": { @@ -11,39 +14,192 @@ "Top Left Encoder" ], "keymap": [ - [ {"x": 3}, "0,3" ], - [ {"y": -0.87, "x": 2}, "0,2", {"x": 1}, "0,4" ], - [ {"y": -0.88, "x": 5}, "0,5" ], [ - {"y": -0.87, "c": "#777777"}, + { + "x": 3 + }, + "0,3" + ], + [ + { + "y": -0.87, + "x": 2 + }, + "0,2", + { + "x": 1 + }, + "0,4" + ], + [ + { + "y": -0.88, + "x": 5 + }, + "0,5" + ], + [ + { + "y": -0.87, + "c": "#777777" + }, "0,0\n\n\n1,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "0,1", - {"x": 4.25, "c": "#777777"}, + { + "x": 4.25, + "c": "#777777" + }, "0,0\n\n\n1,1\n\n\n\n\n\ne1" ], - [ {"y": -0.38, "x": 3, "c": "#cccccc"}, "1,3" ], - [ {"y": -0.87, "x": 2}, "1,2", {"x": 1}, "1,4" ], - [ {"y": -0.88, "x": 5}, "1,5" ], - [ {"y": -0.87, "c": "#aaaaaa"}, "1,0", {"c": "#cccccc"}, "1,1" ], - [ {"y": -0.38, "x": 3}, "2,3" ], - [ {"y": -0.87, "x": 2}, "2,2", {"x": 1}, "2,4" ], - [ {"y": -0.88, "x": 5}, "2,5" ], - [ {"y": -0.87, "c": "#aaaaaa"}, "2,0", {"c": "#cccccc"}, "2,1" ], - [ {"y": -0.38, "x": 3}, "3,3" ], - [ {"y": -0.87, "x": 2}, "3,2", {"x": 1}, "3,4" ], - [ {"y": -0.88, "x": 5}, "3,5" ], - [ {"y": -0.87, "c": "#aaaaaa"}, "3,0", {"c": "#cccccc"}, "3,1" ], - [ {"y": -0.13, "x": 3.5, "c": "#aaaaaa"}, "4,2" ], - [ {"y": -0.87, "x": 4.5}, "4,3" ], - [ - {"r": 30, "rx": 8, "y": 4.13, "x": 0.6, "c": "#777777"}, + [ + { + "y": -0.38, + "x": 3, + "c": "#cccccc" + }, + "1,3" + ], + [ + { + "y": -0.87, + "x": 2 + }, + "1,2", + { + "x": 1 + }, + "1,4" + ], + [ + { + "y": -0.88, + "x": 5 + }, + "1,5" + ], + [ + { + "y": -0.87, + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1" + ], + [ + { + "y": -0.38, + "x": 3 + }, + "2,3" + ], + [ + { + "y": -0.87, + "x": 2 + }, + "2,2", + { + "x": 1 + }, + "2,4" + ], + [ + { + "y": -0.88, + "x": 5 + }, + "2,5" + ], + [ + { + "y": -0.87, + "c": "#aaaaaa" + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1" + ], + [ + { + "y": -0.38, + "x": 3 + }, + "3,3" + ], + [ + { + "y": -0.87, + "x": 2 + }, + "3,2", + { + "x": 1 + }, + "3,4" + ], + [ + { + "y": -0.88, + "x": 5 + }, + "3,5" + ], + [ + { + "y": -0.87, + "c": "#aaaaaa" + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1" + ], + [ + { + "y": -0.13, + "x": 3.5, + "c": "#aaaaaa" + }, + "4,2" + ], + [ + { + "y": -0.87, + "x": 4.5 + }, + "4,3" + ], + [ + { + "r": 30, + "rx": 8, + "y": 4.13, + "x": 0.6, + "c": "#777777" + }, "4,5\n\n\n0,0", "4,5\n\n\n0,1\n\n\n\n\n\ne0", - {"h": 2}, + { + "h": 2 + }, "4,4\n\n\n0,2" ], - [ {"x": 0.6}, "4,4\n\n\n0,0", "4,4\n\n\n0,1" ] + [ + { + "x": 0.6 + }, + "4,4\n\n\n0,0", + "4,4\n\n\n0,1" + ] ] } } diff --git a/v3/absinthe/absinthe.json b/v3/keyhive/absinthe/absinthe.json similarity index 95% rename from v3/absinthe/absinthe.json rename to v3/keyhive/absinthe/absinthe.json index 85b83b0351..a408ef717e 100644 --- a/v3/absinthe/absinthe.json +++ b/v3/keyhive/absinthe/absinthe.json @@ -6,18 +6,10 @@ "rows": 9, "cols": 9 }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgblight" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], "layouts": { - "labels": [ - "Full Backspace", - "Full Right Shift", - "ANSI" - ], + "labels": ["Full Backspace", "Full Right Shift", "ANSI"], "keymap": [ [ { diff --git a/v3/keyhive/maypad/maypad.json b/v3/keyhive/maypad/maypad.json new file mode 100644 index 0000000000..73b338b0af --- /dev/null +++ b/v3/keyhive/maypad/maypad.json @@ -0,0 +1,20 @@ +{ + "name": "Maypad", + "vendorId": "0x4B48", + "productId": "0x4D50", + "matrix": { + "rows": 5, + "cols": 4 + }, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "layouts": { + "keymap": [ + ["0,0", "0,1", "0,2", "0,3"], + ["1,0", "1,1", "1,2", "1,3"], + ["2,0", "2,1", "2,2", "2,3"], + ["3,0", "3,1", "3,2", "3,3"], + ["4,0", "4,1", "4,2", "4,3"] + ] + } +} diff --git a/v3/smallice/smallice.json b/v3/keyhive/smallice/smallice.json similarity index 97% rename from v3/smallice/smallice.json rename to v3/keyhive/smallice/smallice.json index 4c18991afe..d44f08a829 100644 --- a/v3/smallice/smallice.json +++ b/v3/keyhive/smallice/smallice.json @@ -6,12 +6,8 @@ "rows": 4, "cols": 15 }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgblight" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], "layouts": { "keymap": [ [ diff --git a/v3/monsgeek/m1.json b/v3/monsgeek/m1/m1.json similarity index 62% rename from v3/monsgeek/m1.json rename to v3/monsgeek/m1/m1.json index a194bd1353..3e0f78fac5 100644 --- a/v3/monsgeek/m1.json +++ b/v3/monsgeek/m1/m1.json @@ -13,9 +13,7 @@ "shortName": "RESET" } ], - "keycodes": [ - "qmk_lighting" - ], + "keycodes": ["qmk_lighting"], "menus": [ { "label": "Lighting", @@ -26,126 +24,47 @@ { "label": "Brightness", "type": "range", - "options": [ - 0, - 200 - ], - "content": [ - "id_qmk_rgb_matrix_brightness", - 3, - 1 - ] + "options": [0, 200], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] }, { "label": "Effect", "type": "dropdown", - "content": [ - "id_qmk_rgb_matrix_effect", - 3, - 2 - ], + "content": ["id_qmk_rgb_matrix_effect", 3, 2], "options": [ - [ - "All Off", - 0 - ], - [ - "SOLID_COLOR", - 1 - ], - [ - "BREATHING", - 2 - ], - [ - "CYCLE_ALL", - 3 - ], - [ - "CYCLE_LEFT_RIGHT", - 4 - ], - [ - "CYCLE_UP_DOWN", - 5 - ], - [ - "RAINBOW_MOVING_CHEVRON", - 6 - ], - [ - "CYCLE_OUT_IN", - 7 - ], - [ - "CYCLE_OUT_IN_DUAL", - 8 - ], - [ - "CYCLE_PINWHEEL", - 9 - ], - [ - "CYCLE_SPIRAL", - 10 - ], - [ - "DUAL_BEACON", - 11 - ], - [ - "RAINBOW_BEACON", - 12 - ], - [ - "RAINDROPS", - 13 - ], - [ - "TYPING_HEATMAP", - 14 - ], - [ - "SOLID_REACTIVE_SIMPLE", - 15 - ], - [ - "SOLID_REACTIVE", - 16 - ], - [ - "SOLID_REACTIVE_CROSS", - 17 - ], - [ - "MATRIX_MULTISPLASH", - 18 - ] + ["All Off", 0], + ["SOLID_COLOR", 1], + ["BREATHING", 2], + ["CYCLE_ALL", 3], + ["CYCLE_LEFT_RIGHT", 4], + ["CYCLE_UP_DOWN", 5], + ["RAINBOW_MOVING_CHEVRON", 6], + ["CYCLE_OUT_IN", 7], + ["CYCLE_OUT_IN_DUAL", 8], + ["CYCLE_PINWHEEL", 9], + ["CYCLE_SPIRAL", 10], + ["DUAL_BEACON", 11], + ["RAINBOW_BEACON", 12], + ["RAINDROPS", 13], + ["TYPING_HEATMAP", 14], + ["SOLID_REACTIVE_SIMPLE", 15], + ["SOLID_REACTIVE", 16], + ["SOLID_REACTIVE_CROSS", 17], + ["MATRIX_MULTISPLASH", 18] ] }, { "showIf": "{id_qmk_rgb_matrix_effect} != 0", "label": "Effect Speed", "type": "range", - "options": [ - 0, - 255 - ], - "content": [ - "id_qmk_rgb_matrix_effect_speed", - 3, - 3 - ] + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] }, { "showIf": "{id_qmk_rgb_matrix_effect} != 0", "label": "Color", "type": "color", - "content": [ - "id_qmk_rgb_matrix_color", - 3, - 4 - ] + "content": ["id_qmk_rgb_matrix_color", 3, 4] } ] } @@ -153,15 +72,9 @@ } ], "layouts": { - "labels": [ - "ISO Enter", - "Split Left Shift" - ], + "labels": ["ISO Enter", "Split Left Shift"], "presets": { - "Default": [ - 0, - 0 - ] + "Default": [0, 0] }, "keymap": [ [ diff --git a/v3/monsgeek/m5/m5.json b/v3/monsgeek/m5/m5.json index 43c5d532f0..36f291c791 100644 --- a/v3/monsgeek/m5/m5.json +++ b/v3/monsgeek/m5/m5.json @@ -1,14 +1,12 @@ { - "name": "M5", + "name": "MonsGeek M5", "vendorId": "0xFFFE", "productId": "0x000A", "matrix": { "rows": 6, "cols": 21 }, - "keycodes": [ - "qmk_lighting" - ], + "keycodes": ["qmk_lighting"], "menus": [ { "label": "Lighting", @@ -19,126 +17,47 @@ { "label": "Brightness", "type": "range", - "options": [ - 0, - 200 - ], - "content": [ - "id_qmk_rgb_matrix_brightness", - 3, - 1 - ] + "options": [0, 200], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] }, { "label": "Effect", "type": "dropdown", - "content": [ - "id_qmk_rgb_matrix_effect", - 3, - 2 - ], + "content": ["id_qmk_rgb_matrix_effect", 3, 2], "options": [ - [ - "All Off", - 0 - ], - [ - "SOLID_COLOR", - 1 - ], - [ - "BREATHING", - 2 - ], - [ - "CYCLE_ALL", - 3 - ], - [ - "CYCLE_LEFT_RIGHT", - 4 - ], - [ - "CYCLE_UP_DOWN", - 5 - ], - [ - "RAINBOW_MOVING_CHEVRON", - 6 - ], - [ - "CYCLE_OUT_IN", - 7 - ], - [ - "CYCLE_OUT_IN_DUAL", - 8 - ], - [ - "CYCLE_PINWHEEL", - 9 - ], - [ - "CYCKE_SPIRAL", - 10 - ], - [ - "DUAL_BEACON", - 11 - ], - [ - "RAINBOW_BEACON", - 12 - ], - [ - "RAINDROPS", - 13 - ], - [ - "TYPING_HEATMAP", - 14 - ], - [ - "SOLID_REACTIVE_SIMPLE", - 15 - ], - [ - "SOLID_REACTIVE", - 16 - ], - [ - "SOLID_REACTIVE_NEXUS", - 17 - ], - [ - "MATRIX_MULTISPLASH", - 18 - ] + ["All Off", 0], + ["SOLID_COLOR", 1], + ["BREATHING", 2], + ["CYCLE_ALL", 3], + ["CYCLE_LEFT_RIGHT", 4], + ["CYCLE_UP_DOWN", 5], + ["RAINBOW_MOVING_CHEVRON", 6], + ["CYCLE_OUT_IN", 7], + ["CYCLE_OUT_IN_DUAL", 8], + ["CYCLE_PINWHEEL", 9], + ["CYCKE_SPIRAL", 10], + ["DUAL_BEACON", 11], + ["RAINBOW_BEACON", 12], + ["RAINDROPS", 13], + ["TYPING_HEATMAP", 14], + ["SOLID_REACTIVE_SIMPLE", 15], + ["SOLID_REACTIVE", 16], + ["SOLID_REACTIVE_NEXUS", 17], + ["MATRIX_MULTISPLASH", 18] ] }, { "showIf": "{id_qmk_rgb_matrix_effect} != 0", "label": "Effect Speed", "type": "range", - "options": [ - 0, - 255 - ], - "content": [ - "id_qmk_rgb_matrix_effect_speed", - 3, - 3 - ] + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] }, { "showIf": "{id_qmk_rgb_matrix_effect} != 0", "label": "Color", "type": "color", - "content": [ - "id_qmk_rgb_matrix_color", - 3, - 4 - ] + "content": ["id_qmk_rgb_matrix_color", 3, 4] } ] } diff --git a/v3/monsgeek/m6/m6.json b/v3/monsgeek/m6/m6.json index e8118c48fb..8bf85f4d1f 100644 --- a/v3/monsgeek/m6/m6.json +++ b/v3/monsgeek/m6/m6.json @@ -1,14 +1,12 @@ { - "name": "M6", + "name": "MonsGeek M6", "vendorId": "0xFFFE", "productId": "0x0011", "matrix": { "rows": 5, "cols": 16 }, - "keycodes": [ - "qmk_lighting" - ], + "keycodes": ["qmk_lighting"], "menus": [ { "label": "Lighting", @@ -19,126 +17,47 @@ { "label": "Brightness", "type": "range", - "options": [ - 0, - 200 - ], - "content": [ - "id_qmk_rgb_matrix_brightness", - 3, - 1 - ] + "options": [0, 200], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] }, { "label": "Effect", "type": "dropdown", - "content": [ - "id_qmk_rgb_matrix_effect", - 3, - 2 - ], + "content": ["id_qmk_rgb_matrix_effect", 3, 2], "options": [ - [ - "All Off", - 0 - ], - [ - "SOLID_COLOR", - 1 - ], - [ - "BREATHING", - 2 - ], - [ - "CYCLE_ALL", - 3 - ], - [ - "CYCLE_LEFT_RIGHT", - 4 - ], - [ - "CYCLE_UP_DOWN", - 5 - ], - [ - "RAINBOW_MOVING_CHEVRON", - 6 - ], - [ - "CYCLE_OUT_IN", - 7 - ], - [ - "CYCLE_OUT_IN_DUAL", - 8 - ], - [ - "CYCLE_PINWHEEL", - 9 - ], - [ - "CYCKE_SPIRAL", - 10 - ], - [ - "DUAL_BEACON", - 11 - ], - [ - "RAINBOW_BEACON", - 12 - ], - [ - "RAINDROPS", - 13 - ], - [ - "TYPING_HEATMAP", - 14 - ], - [ - "SOLID_REACTIVE_SIMPLE", - 15 - ], - [ - "SOLID_REACTIVE", - 16 - ], - [ - "SOLID_REACTIVE_CROSS", - 17 - ], - [ - "MATRIX_MULTISPLASH", - 18 - ] + ["All Off", 0], + ["SOLID_COLOR", 1], + ["BREATHING", 2], + ["CYCLE_ALL", 3], + ["CYCLE_LEFT_RIGHT", 4], + ["CYCLE_UP_DOWN", 5], + ["RAINBOW_MOVING_CHEVRON", 6], + ["CYCLE_OUT_IN", 7], + ["CYCLE_OUT_IN_DUAL", 8], + ["CYCLE_PINWHEEL", 9], + ["CYCKE_SPIRAL", 10], + ["DUAL_BEACON", 11], + ["RAINBOW_BEACON", 12], + ["RAINDROPS", 13], + ["TYPING_HEATMAP", 14], + ["SOLID_REACTIVE_SIMPLE", 15], + ["SOLID_REACTIVE", 16], + ["SOLID_REACTIVE_CROSS", 17], + ["MATRIX_MULTISPLASH", 18] ] }, { "showIf": "{id_qmk_rgb_matrix_effect} != 0", "label": "Effect Speed", "type": "range", - "options": [ - 0, - 255 - ], - "content": [ - "id_qmk_rgb_matrix_effect_speed", - 3, - 3 - ] + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] }, { "showIf": "{id_qmk_rgb_matrix_effect} != 0", "label": "Color", "type": "color", - "content": [ - "id_qmk_rgb_matrix_color", - 3, - 4 - ] + "content": ["id_qmk_rgb_matrix_color", 3, 4] } ] } diff --git a/v3/neson_design/700e.json b/v3/neson_design/700e.json index 98676f2115..8180c6b152 100644 --- a/v3/neson_design/700e.json +++ b/v3/neson_design/700e.json @@ -1,31 +1,19 @@ { - "name": "700E", + "name": "Neson Design 700E", "vendorId": "0x4E65", "productId": "0x700E", "matrix": { "rows": 5, "cols": 16 }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgblight" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], "layouts": { "labels": [ "Split Backspace", - [ - "Enter Key", - "ANSI", - "ISO" - ], + ["Enter Key", "ANSI", "ISO"], "Split Left Shift", - [ - "Bottom Row", - "WKL", - "HHKB" - ], + ["Bottom Row", "WKL", "HHKB"], "Split Right Shift" ], "keymap": [ diff --git a/v3/neson_design/810e.json b/v3/neson_design/810e.json index cb3ef3423c..0af8b3712d 100644 --- a/v3/neson_design/810e.json +++ b/v3/neson_design/810e.json @@ -1,28 +1,20 @@ { - "name": "810E", + "name": "Neson Design 810E", "vendorId": "0x4E65", "productId": "0x810E", "matrix": { "rows": 5, "cols": 18 }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgblight" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], "layouts": { "labels": [ "Split Backspace", "ISO", "Split Left Shift", "Split Right Shift", - [ - "Bottom Row", - "Normal", - "HHKB" - ], + ["Bottom Row", "Normal", "HHKB"], "Split 2U 0" ], "keymap": [ diff --git a/v3/neson_design/n6.json b/v3/neson_design/n6.json index d29f179fba..d44a788f8a 100644 --- a/v3/neson_design/n6.json +++ b/v3/neson_design/n6.json @@ -1,26 +1,17 @@ { - "name": "N6", + "name": "Neson Design N6", "vendorId": "0x4E65", "productId": "0x4E36", "matrix": { "rows": 5, "cols": 15 }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgblight" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], "layouts": { "labels": [ "Full Backspace", - [ - "Space Bar", - "625U", - "700U", - "Double Blocker" - ] + ["Space Bar", "625U", "700U", "Double Blocker"] ], "keymap": [ [ diff --git a/v3/neson_design/nico.json b/v3/neson_design/nico.json index 65299d5355..05ed88269d 100644 --- a/v3/neson_design/nico.json +++ b/v3/neson_design/nico.json @@ -1,27 +1,15 @@ { - "name": "Nico", + "name": "Neson Design Nico", "vendorId": "0x4E65", "productId": "0x6E65", "matrix": { "rows": 5, "cols": 17 }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgblight" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], "layouts": { - "labels": [ - "Split Backspace", - [ - "Space Bar", - "6.25U", - "7U", - "HHKB" - ] - ], + "labels": ["Split Backspace", ["Space Bar", "6.25U", "7U", "HHKB"]], "keymap": [ [ { diff --git a/v3/other/maypad/maypad.json b/v3/other/maypad/maypad.json deleted file mode 100644 index 529437daf7..0000000000 --- a/v3/other/maypad/maypad.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "Maypad", - "vendorId": "0x4B48", - "productId": "0x4D50", - "matrix": { - "rows": 5, - "cols": 4 - }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgblight" - ], - "layouts": { - "keymap": [ - [ - "0,0", - "0,1", - "0,2", - "0,3" - ], - [ - "1,0", - "1,1", - "1,2", - "1,3" - ], - [ - "2,0", - "2,1", - "2,2", - "2,3" - ], - [ - "3,0", - "3,1", - "3,2", - "3,3" - ], - [ - "4,0", - "4,1", - "4,2", - "4,3" - ] - ] - } -} diff --git a/v3/pinky/3/pinky3.json b/v3/pinky/3/pinky3.json index 4b90c35051..fbb506606d 100644 --- a/v3/pinky/3/pinky3.json +++ b/v3/pinky/3/pinky3.json @@ -1,290 +1,317 @@ { - "name": "Pinky3", - "vendorId": "0x544E", - "productId": "0x7033", - "matrix": { - "rows": 8, - "cols": 7 - }, - "layouts": { - "keymap": [ - [{ - "y": 1, - "x": 3.5 - }, - "0,3", - { - "x": 10.5 - }, - "4,3" - ], - [{ - "y": -0.875, - "x": 2.5 - }, - "0,2", - { - "x": 1 - }, - "0,4", - { - "x": 8.5 - }, - "4,4", - { - "x": 1 - }, - "4,2" - ], - [{ - "y": -0.875, - "x": 5.5 - }, - "0,5", - { - "x": 6.5 - }, - "4,5" - ], - [{ - "y": -0.875, - "x": 1.5 - }, - "0,1", - { - "x": 14.5 - }, - "4,1", - "4,0" - ], - [{ - "y": -0.995, - "x": 0.5, - "c": "#aaaaaa" - }, - "0,0" - ], - [{ - "y": -0.88, - "x": 6.5, - "c": "#cccccc" - }, - "0,6", - { - "x": 4.5 - }, - "4,6" - ], - [{ - "y": -0.5, - "x": 3.5 - }, - "1,3", - { - "x": 10.5 - }, - "5,3" - ], - [{ - "y": -0.875, - "x": 2.5 - }, - "1,2", - { - "x": 1 - }, - "1,4", - { - "x": 8.5 - }, - "5,4", - { - "x": 1 - }, - "5,2" - ], - [{ - "y": -0.875, - "x": 5.5 - }, - "1,5", - { - "x": 6.5 - }, - "5,5" - ], - [{ - "y": -0.875, - "x": 1.5 - }, - "1,1", - { - "x": 14.5 - }, - "5,1", - "5,0" - ], - [{ - "y": -0.995, - "x": 0.5, - "c": "#aaaaaa" - }, - "1,0" - ], - [{ - "y": -0.88, - "x": 6.5, - "c": "#cccccc" - }, - "1,6", - { - "x": 4.5 - }, - "5,6" - ], - [{ - "y": -0.5, - "x": 3.5 - }, - "2,3", - { - "x": 10.5 - }, - "6,3" - ], - [{ - "y": -0.875, - "x": 2.5 - }, - "2,2", - { - "x": 1 - }, - "2,4", - { - "x": 8.5 - }, - "6,4", - { - "x": 1 - }, - "6,2" - ], - [{ - "y": -0.875, - "x": 5.5 - }, - "2,5", - { - "x": 6.5 - }, - "6,5" - ], - [{ - "y": -0.875, - "x": 1.5 - }, - "2,1", - { - "x": 14.5 - }, - "6,1", - { - "c": "#777777" - }, - "6,0" - ], - [{ - "y": -0.995, - "x": 0.5 - }, - "2,0" - ], - [{ - "y": 0.25, - "x": 15 - }, - "7,3" - ], - [{ - "rx": 4, - "ry": 15, - "y": -10.37, - "x": -0.5 - }, - "3,3" - ], - [{ - "r": 6, - "y": -1, - "x": -0.5, - "c": "#aaaaaa" - }, - "3,4" - ], - [{ - "r": 12, - "y": -1, - "x": -0.5, - "c": "#777777" - }, - "3,5" - ], - [{ - "r": 15, - "rx": 6.5, - "ry": 4.25, - "y": -0.5, - "c": "#aaaaaa" - }, - "2,6" - ], - [{ - "r": 18, - "rx": 4, - "ry": 15, - "y": -10.37, - "x": -0.5, - "c": "#cccccc" - }, - "3,6" - ], - [{ - "r": -18, - "rx": 15.5, - "y": -10.37, - "x": -0.5 - }, - "7,6" - ], - [{ - "r": -15, - "rx": 13, - "ry": 4.25, - "y": -0.5, - "x": -1, - "c": "#aaaaaa" - }, - "6,6" - ], - [{ - "r": -12, - "rx": 15.5, - "ry": 15, - "y": -10.37, - "x": -0.5, - "c": "#777777" - }, - "7,5" - ], - [{ - "r": -6, - "y": -1, - "x": -0.5, - "c": "#aaaaaa" - }, - "7,4" - ] - ] - } -} \ No newline at end of file + "name": "Pinky3", + "vendorId": "0x544E", + "productId": "0x7033", + "matrix": { + "rows": 8, + "cols": 7 + }, + "layouts": { + "keymap": [ + [ + { + "y": 1, + "x": 3.5 + }, + "0,3", + { + "x": 10.5 + }, + "4,3" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "0,2", + { + "x": 1 + }, + "0,4", + { + "x": 8.5 + }, + "4,4", + { + "x": 1 + }, + "4,2" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "0,5", + { + "x": 6.5 + }, + "4,5" + ], + [ + { + "y": -0.875, + "x": 1.5 + }, + "0,1", + { + "x": 14.5 + }, + "4,1", + "4,0" + ], + [ + { + "y": -0.995, + "x": 0.5, + "c": "#aaaaaa" + }, + "0,0" + ], + [ + { + "y": -0.88, + "x": 6.5, + "c": "#cccccc" + }, + "0,6", + { + "x": 4.5 + }, + "4,6" + ], + [ + { + "y": -0.5, + "x": 3.5 + }, + "1,3", + { + "x": 10.5 + }, + "5,3" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "1,2", + { + "x": 1 + }, + "1,4", + { + "x": 8.5 + }, + "5,4", + { + "x": 1 + }, + "5,2" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "1,5", + { + "x": 6.5 + }, + "5,5" + ], + [ + { + "y": -0.875, + "x": 1.5 + }, + "1,1", + { + "x": 14.5 + }, + "5,1", + "5,0" + ], + [ + { + "y": -0.995, + "x": 0.5, + "c": "#aaaaaa" + }, + "1,0" + ], + [ + { + "y": -0.88, + "x": 6.5, + "c": "#cccccc" + }, + "1,6", + { + "x": 4.5 + }, + "5,6" + ], + [ + { + "y": -0.5, + "x": 3.5 + }, + "2,3", + { + "x": 10.5 + }, + "6,3" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "2,2", + { + "x": 1 + }, + "2,4", + { + "x": 8.5 + }, + "6,4", + { + "x": 1 + }, + "6,2" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "2,5", + { + "x": 6.5 + }, + "6,5" + ], + [ + { + "y": -0.875, + "x": 1.5 + }, + "2,1", + { + "x": 14.5 + }, + "6,1", + { + "c": "#777777" + }, + "6,0" + ], + [ + { + "y": -0.995, + "x": 0.5 + }, + "2,0" + ], + [ + { + "y": 0.25, + "x": 15 + }, + "7,3" + ], + [ + { + "rx": 4, + "ry": 15, + "y": -10.37, + "x": -0.5 + }, + "3,3" + ], + [ + { + "r": 6, + "y": -1, + "x": -0.5, + "c": "#aaaaaa" + }, + "3,4" + ], + [ + { + "r": 12, + "y": -1, + "x": -0.5, + "c": "#777777" + }, + "3,5" + ], + [ + { + "r": 15, + "rx": 6.5, + "ry": 4.25, + "y": -0.5, + "c": "#aaaaaa" + }, + "2,6" + ], + [ + { + "r": 18, + "rx": 4, + "ry": 15, + "y": -10.37, + "x": -0.5, + "c": "#cccccc" + }, + "3,6" + ], + [ + { + "r": -18, + "rx": 15.5, + "y": -10.37, + "x": -0.5 + }, + "7,6" + ], + [ + { + "r": -15, + "rx": 13, + "ry": 4.25, + "y": -0.5, + "x": -1, + "c": "#aaaaaa" + }, + "6,6" + ], + [ + { + "r": -12, + "rx": 15.5, + "ry": 15, + "y": -10.37, + "x": -0.5, + "c": "#777777" + }, + "7,5" + ], + [ + { + "r": -6, + "y": -1, + "x": -0.5, + "c": "#aaaaaa" + }, + "7,4" + ] + ] + } +} diff --git a/v3/syenakeyboards/elaruus/elaruus.json b/v3/syenakeyboards/elaruus/elaruus.json index d34c7f3322..43923477a0 100644 --- a/v3/syenakeyboards/elaruus/elaruus.json +++ b/v3/syenakeyboards/elaruus/elaruus.json @@ -1,18 +1,12 @@ { - "name": "SyenaKeyboards Elaruus", - "vendorId": "0x5373", - "productId": "0x6172", - "matrix": { - "cols": 2, - "rows": 1 - }, - "layouts": { - "keymap": [ - [ - "0,0", - "0,1" - ] - ] - } + "name": "SyenaKeyboards Elaruus", + "vendorId": "0x5373", + "productId": "0x6172", + "matrix": { + "rows": 1, + "cols": 2 + }, + "layouts": { + "keymap": [["0,0", "0,1"]] } - \ No newline at end of file +}