From 25aff22877ffcce36fdb6fe04e3dd57bc2a97e9a Mon Sep 17 00:00:00 2001 From: rhmokey Date: Wed, 14 Jun 2023 02:34:26 +0800 Subject: [PATCH 01/12] Add mokey12x2 Add mokey12x2 --- src/mokey/mokey12x2/mokey12x2.json | 66 ++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/mokey/mokey12x2/mokey12x2.json diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json new file mode 100644 index 0000000000..32877fdf2e --- /dev/null +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -0,0 +1,66 @@ +{ + "name": "mokey12x2", + "vendorId": "0x6653", + "productId": "0x012A", + "matrix": {"rows": 4,"cols": 5}, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], + "layouts": { + "keymap":[ + [ + { + "x": 0.25, + "w": 1.5, + "h": 1.5 + }, + "0,4", + { + "x": 1, + "w": 1.5, + "h": 1.5 + }, + "1,4" + ], + [ + { + "y": 0.5 + }, + "3,0", + "3,1", + { + "x": 0.5 + }, + "3,2", + "3,3" + ], + [ + { + "y": 0.25, + "x": 0.25 + }, + "0,0", + "0,1", + "0,2", + "0,3" + ], + [ + { + "x": 0.25 + }, + "1,0", + "1,1", + "1,2", + "1,3" + ], + [ + { + "x": 0.25 + }, + "2,0", + "2,1", + "2,2", + "2,3" + ] + ] + } +} \ No newline at end of file From 0397b4d2e66d2f5241950aae2fc4b67bb9cbbe3a Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Wed, 14 Jun 2023 02:46:37 +0800 Subject: [PATCH 02/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 32877fdf2e..8f8467485a 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -3,8 +3,8 @@ "vendorId": "0x6653", "productId": "0x012A", "matrix": {"rows": 4,"cols": 5}, - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgb_matrix"], + "keycodes": [ "qmk_lighting" ], + "menus": [ "qmk_rgb_matrix" ], "layouts": { "keymap":[ [ @@ -63,4 +63,4 @@ ] ] } -} \ No newline at end of file +} From ffac05da0bb9baef972df76b45a3024bd12e05d2 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Wed, 14 Jun 2023 02:52:51 +0800 Subject: [PATCH 03/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 8f8467485a..7072749f64 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -2,7 +2,7 @@ "name": "mokey12x2", "vendorId": "0x6653", "productId": "0x012A", - "matrix": {"rows": 4,"cols": 5}, + "matrix": { "rows": 4,"cols": 5 }, "keycodes": [ "qmk_lighting" ], "menus": [ "qmk_rgb_matrix" ], "layouts": { From d627755c6a6d6dae6fa00a0079471069124e025c Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Wed, 14 Jun 2023 02:56:09 +0800 Subject: [PATCH 04/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 7072749f64..95e9d937c4 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -64,3 +64,4 @@ ] } } + From ff05575a214501c9e4437c2d617f7d421bc622ae Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Wed, 14 Jun 2023 03:10:29 +0800 Subject: [PATCH 05/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 95e9d937c4..8b7ccf8ede 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -3,7 +3,7 @@ "vendorId": "0x6653", "productId": "0x012A", "matrix": { "rows": 4,"cols": 5 }, - "keycodes": [ "qmk_lighting" ], + "menus": [ "qmk_rgb_matrix" ], "layouts": { "keymap":[ From e1ad20797c27c792669a8fcf62ef3a654f61d929 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Wed, 14 Jun 2023 03:16:02 +0800 Subject: [PATCH 06/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 8b7ccf8ede..3a7771cd4b 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -3,8 +3,8 @@ "vendorId": "0x6653", "productId": "0x012A", "matrix": { "rows": 4,"cols": 5 }, + "lighting": "qmk_rgblight", - "menus": [ "qmk_rgb_matrix" ], "layouts": { "keymap":[ [ From 857ee6c768c486ded57bac44a83525f25d50e9d9 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Sun, 18 Jun 2023 10:03:53 +0800 Subject: [PATCH 07/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 3a7771cd4b..3b3f8c9ec3 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -3,8 +3,8 @@ "vendorId": "0x6653", "productId": "0x012A", "matrix": { "rows": 4,"cols": 5 }, - "lighting": "qmk_rgblight", - + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], "layouts": { "keymap":[ [ From 58cbc7cab1b274181e5ee6d281822a6ab3468ccc Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Sun, 18 Jun 2023 10:09:48 +0800 Subject: [PATCH 08/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 113 +++++++++++++++-------------- 1 file changed, 58 insertions(+), 55 deletions(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 3b3f8c9ec3..eeedf75720 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -7,61 +7,64 @@ "menus": ["qmk_rgb_matrix"], "layouts": { "keymap":[ - [ - { - "x": 0.25, - "w": 1.5, - "h": 1.5 - }, - "0,4", - { - "x": 1, - "w": 1.5, - "h": 1.5 - }, - "1,4" - ], - [ - { - "y": 0.5 - }, - "3,0", - "3,1", - { - "x": 0.5 - }, - "3,2", - "3,3" - ], - [ - { - "y": 0.25, - "x": 0.25 - }, - "0,0", - "0,1", - "0,2", - "0,3" - ], - [ - { - "x": 0.25 - }, - "1,0", - "1,1", - "1,2", - "1,3" - ], - [ - { - "x": 0.25 - }, - "2,0", - "2,1", - "2,2", - "2,3" - ] - ] + [ + { + "x": 0.25, + "c": "#777777", + "w": 1.5, + "h": 1.5 + }, + "0,4", + { + "x": 1, + "w": 1.5, + "h": 1.5 + }, + "1,4" + ], + [ + { + "y": 0.5, + "c": "#aaaaaa" + }, + "3,0", + "3,1", + { + "x": 0.5 + }, + "3,2", + "3,3" + ], + [ + { + "y": 0.25, + "x": 0.25, + "c": "#cccccc" + }, + "0,0", + "0,1", + "0,2", + "0,3" + ], + [ + { + "x": 0.25 + }, + "1,0", + "1,1", + "1,2", + "1,3" + ], + [ + { + "x": 0.25 + }, + "2,0", + "2,1", + "2,2", + "2,3" + ] +] } } From f1adf887029a190ff49e574df197c971a76be67d Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Sun, 18 Jun 2023 10:24:22 +0800 Subject: [PATCH 09/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 59 +++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index eeedf75720..fa75a7c84a 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -4,7 +4,63 @@ "productId": "0x012A", "matrix": { "rows": 4,"cols": 5 }, "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgb_matrix"], + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [0, 200], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] + }, + { + "label": "Effect", + "type": "dropdown", + "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] + ] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} != 0", + "label": "Effect Speed", + "type": "range", + "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] + } + ] + } + ] + } + ], "layouts": { "keymap":[ [ @@ -67,4 +123,3 @@ ] } } - From cda2d6346540e01af3075077ee045f0d47ece9b9 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Sun, 18 Jun 2023 10:32:08 +0800 Subject: [PATCH 10/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index fa75a7c84a..6c18cb0028 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -3,64 +3,6 @@ "vendorId": "0x6653", "productId": "0x012A", "matrix": { "rows": 4,"cols": 5 }, - "keycodes": ["qmk_lighting"], - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "Backlight", - "content": [ - { - "label": "Brightness", - "type": "range", - "options": [0, 200], - "content": ["id_qmk_rgb_matrix_brightness", 3, 1] - }, - { - "label": "Effect", - "type": "dropdown", - "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] - ] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} != 0", - "label": "Effect Speed", - "type": "range", - "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] - } - ] - } - ] - } - ], "layouts": { "keymap":[ [ From 0c4d810fe2e5f2c205702cd1a24bd4f1a854cb96 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Sun, 18 Jun 2023 10:35:14 +0800 Subject: [PATCH 11/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 6c18cb0028..4e58b011a5 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -3,6 +3,8 @@ "vendorId": "0x6653", "productId": "0x012A", "matrix": { "rows": 4,"cols": 5 }, + "keycodes": [ "qmk_lighting" ], + "menus": [ "qmk_rgblight" ], "layouts": { "keymap":[ [ From 0c69f651cb964c264bdf6270adce0c2be10cd108 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Sun, 18 Jun 2023 10:48:12 +0800 Subject: [PATCH 12/12] Update mokey12x2.json --- src/mokey/mokey12x2/mokey12x2.json | 60 +++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/src/mokey/mokey12x2/mokey12x2.json b/src/mokey/mokey12x2/mokey12x2.json index 4e58b011a5..fa75a7c84a 100644 --- a/src/mokey/mokey12x2/mokey12x2.json +++ b/src/mokey/mokey12x2/mokey12x2.json @@ -3,8 +3,64 @@ "vendorId": "0x6653", "productId": "0x012A", "matrix": { "rows": 4,"cols": 5 }, - "keycodes": [ "qmk_lighting" ], - "menus": [ "qmk_rgblight" ], + "keycodes": ["qmk_lighting"], + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [0, 200], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] + }, + { + "label": "Effect", + "type": "dropdown", + "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] + ] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} != 0", + "label": "Effect Speed", + "type": "range", + "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] + } + ] + } + ] + } + ], "layouts": { "keymap":[ [