From 3b2ef49d7dc26fb6dc87ad673a892db9e369e385 Mon Sep 17 00:00:00 2001 From: sdk66 <2371260634@qq.com> Date: Fri, 19 Apr 2024 15:00:36 +0800 Subject: [PATCH 1/3] create rk839us.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit create rk839us.json，frist commit --- v3/rk/rk839/rk839us.json | 227 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 v3/rk/rk839/rk839us.json diff --git a/v3/rk/rk839/rk839us.json b/v3/rk/rk839/rk839us.json new file mode 100644 index 0000000000..62aadfeba0 --- /dev/null +++ b/v3/rk/rk839/rk839us.json @@ -0,0 +1,227 @@ +{ + "name": "RK-R65", + "vendorId": "0x342d", + "productId": "0xe453", + "keycodes": ["qmk_lighting"], + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [0, 255], + "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], + ["Alphas Mods", 2], + ["Gradient Up Down", 3], + ["Gradient Left Right", 4], + ["Breathing", 5], + ["Band Sat", 6], + ["Band Val", 7], + ["Band Pinwheel Sat", 8], + ["Band Pinwheel Val", 9], + ["Band Spiral Sat", 10], + ["Band Spiral Val", 11], + ["Cycle All", 12], + ["Cycle Left Right", 13], + ["Cycle Up Down", 14], + ["Rainbow Moving Chevron", 15], + ["Cycle Out In", 16], + ["Cycle Out In Dual", 17], + ["Cycle Pinwheel", 18], + ["Cycle Spiral", 19], + ["Dual Beacon", 20], + ["Rainbow Beacon", 21], + ["Rainbow Pinwheels", 22], + ["Raindrops", 23], + ["Jellybean Raindrops", 24], + ["Hue Breathing", 25], + ["Hue Pendulum", 26], + ["Hue Wave", 27], + ["Pixel Rain", 28], + ["Pixel Flow", 29], + ["Pixel Fractal", 30], + ["Typing Heatmap", 31], + ["Digital Rain", 32], + ["Solid Reactive Simple", 33], + ["Solid Reactive", 34], + ["Solid Reactive Wide", 35], + ["Solid Reactive Multiwide", 36], + ["Solid Reactive Cross", 37], + ["Solid Reactive Multicross", 38], + ["Solid Reactive Nexus", 39], + ["Solid Reactive Multinexus", 40], + ["Splash", 41], + ["Multisplash", 42], + ["Solid Splash", 43], + ["Solid Multisplash", 44], + ["Close All", 45] + ] + }, + { + "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 && {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] + } + ] + } + ] + } + ], + "matrix": {"rows": 5, "cols": 15}, + "customKeycodes": [ + {"name": "BT DEV1","title": "BT Device 1","shortName": "DEV1"}, + {"name": "BT DEV2","title": "BT Device 2","shortName": "DEV2"}, + {"name": "BT DEV3","title": "BT Device 3","shortName": "DEV3"}, + {"name": "BT DEV4","title": "BT Device 4","shortName": "DEV4"}, + {"name": "BT DEV5","title": "BT Device 5","shortName": "DEV5"}, + {"name": "2.4G","title": "2.4G","shortName": "DEV 2.4G"}, + {"name": "USB","title": "USB","shortName": "DEV USB"} + ], + "layouts": { + "keymap": + [ + [ + { + "y": 1 + }, + "0,0", + "0,1", + "0,2\n2", + "0,3\n3", + "0,4\n4", + "0,5", + "0,6\n6", + "0,7\n7", + "0,8\n8", + "0,9\n9", + "0,10\n0", + "0,11\n-", + "0,12\n=", + { + "w": 2 + }, + "0,13\n\n\n\n\n\nBackspace", + "0,14\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "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\n[", + "1,12\n]", + { + "w": 1.5 + }, + "1,13\n\\", + "1,14" + ], + [ + { + "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\n;", + "2,11\n'", + { + "w": 2.25 + }, + "2,13\n\n\n\n\n\nEnter", + "2,14" + ], + [ + { + "w": 2.25 + }, + "3,0\n\n\n\n\n\nShift", + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8\n,", + "3,9\n.", + "3,10\n/", + { + "w": 1.75 + }, + "3,11\n\n\n\n\n\nShift", + "3,13\n\n\n\n\n\n\n\n\n↑", + "3,14" + ], + [ + { + "w": 1.25 + }, + "4,0\n\n\n\n\n\nCtrl", + { + "w": 1.25 + }, + "4,1\n\n\n\n\n\nWin", + { + "w": 1.25 + }, + "4,2\n\n\n\n\n\nAlt", + { + "w": 6.25 + }, + "4,5", + { + "w": 1.25 + }, + "4,8\n\n\n\n\n\nAlt", + { + "w": 1.25 + }, + "4,9\n\n\n\n\n\nFn", + { + "x": 0.5 + }, + "4,11\n\n\n\n\n\n\n\n\n←", + "4,13\n\n\n\n\n\n\n\n\n↓", + "4,14" + ] + ] + } +} From 4701b9adb9c41456f7d81cc7f50bebeeac170bd2 Mon Sep 17 00:00:00 2001 From: sdk66 <2371260634@qq.com> Date: Fri, 19 Apr 2024 15:20:36 +0800 Subject: [PATCH 2/3] Update rk839us.json update rk839us.json --- v3/rk/rk839/rk839us.json | 159 +++++++++------------------------------ 1 file changed, 34 insertions(+), 125 deletions(-) diff --git a/v3/rk/rk839/rk839us.json b/v3/rk/rk839/rk839us.json index 62aadfeba0..fc22b9d633 100644 --- a/v3/rk/rk839/rk839us.json +++ b/v3/rk/rk839/rk839us.json @@ -2,101 +2,10 @@ "name": "RK-R65", "vendorId": "0x342d", "productId": "0xe453", - "keycodes": ["qmk_lighting"], - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "Backlight", - "content": [ - { - "label": "Brightness", - "type": "range", - "options": [0, 255], - "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], - ["Alphas Mods", 2], - ["Gradient Up Down", 3], - ["Gradient Left Right", 4], - ["Breathing", 5], - ["Band Sat", 6], - ["Band Val", 7], - ["Band Pinwheel Sat", 8], - ["Band Pinwheel Val", 9], - ["Band Spiral Sat", 10], - ["Band Spiral Val", 11], - ["Cycle All", 12], - ["Cycle Left Right", 13], - ["Cycle Up Down", 14], - ["Rainbow Moving Chevron", 15], - ["Cycle Out In", 16], - ["Cycle Out In Dual", 17], - ["Cycle Pinwheel", 18], - ["Cycle Spiral", 19], - ["Dual Beacon", 20], - ["Rainbow Beacon", 21], - ["Rainbow Pinwheels", 22], - ["Raindrops", 23], - ["Jellybean Raindrops", 24], - ["Hue Breathing", 25], - ["Hue Pendulum", 26], - ["Hue Wave", 27], - ["Pixel Rain", 28], - ["Pixel Flow", 29], - ["Pixel Fractal", 30], - ["Typing Heatmap", 31], - ["Digital Rain", 32], - ["Solid Reactive Simple", 33], - ["Solid Reactive", 34], - ["Solid Reactive Wide", 35], - ["Solid Reactive Multiwide", 36], - ["Solid Reactive Cross", 37], - ["Solid Reactive Multicross", 38], - ["Solid Reactive Nexus", 39], - ["Solid Reactive Multinexus", 40], - ["Splash", 41], - ["Multisplash", 42], - ["Solid Splash", 43], - ["Solid Multisplash", 44], - ["Close All", 45] - ] - }, - { - "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 && {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] - } - ] - } - ] - } - ], - "matrix": {"rows": 5, "cols": 15}, - "customKeycodes": [ - {"name": "BT DEV1","title": "BT Device 1","shortName": "DEV1"}, - {"name": "BT DEV2","title": "BT Device 2","shortName": "DEV2"}, - {"name": "BT DEV3","title": "BT Device 3","shortName": "DEV3"}, - {"name": "BT DEV4","title": "BT Device 4","shortName": "DEV4"}, - {"name": "BT DEV5","title": "BT Device 5","shortName": "DEV5"}, - {"name": "2.4G","title": "2.4G","shortName": "DEV 2.4G"}, - {"name": "USB","title": "USB","shortName": "DEV USB"} - ], + "matrix": { + "rows": 5, + "cols": 15 + }, "layouts": { "keymap": [ @@ -106,21 +15,21 @@ }, "0,0", "0,1", - "0,2\n2", - "0,3\n3", - "0,4\n4", + "0,2", + "0,3", + "0,4", "0,5", - "0,6\n6", - "0,7\n7", - "0,8\n8", - "0,9\n9", - "0,10\n0", - "0,11\n-", - "0,12\n=", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", { "w": 2 }, - "0,13\n\n\n\n\n\nBackspace", + "0,13", "0,14\n\n\n\n\n\n\n\n\ne0" ], [ @@ -138,12 +47,12 @@ "1,8", "1,9", "1,10", - "1,11\n[", - "1,12\n]", + "1,11", + "1,12", { "w": 1.5 }, - "1,13\n\\", + "1,13", "1,14" ], [ @@ -160,19 +69,19 @@ "2,7", "2,8", "2,9", - "2,10\n;", - "2,11\n'", + "2,10", + "2,11", { "w": 2.25 }, - "2,13\n\n\n\n\n\nEnter", + "2,13", "2,14" ], [ { "w": 2.25 }, - "3,0\n\n\n\n\n\nShift", + "3,0", "3,1", "3,2", "3,3", @@ -180,29 +89,29 @@ "3,5", "3,6", "3,7", - "3,8\n,", - "3,9\n.", - "3,10\n/", + "3,8", + "3,9", + "3,10", { "w": 1.75 }, - "3,11\n\n\n\n\n\nShift", - "3,13\n\n\n\n\n\n\n\n\n↑", + "3,11", + "3,13", "3,14" ], [ { "w": 1.25 }, - "4,0\n\n\n\n\n\nCtrl", + "4,0", { "w": 1.25 }, - "4,1\n\n\n\n\n\nWin", + "4,1", { "w": 1.25 }, - "4,2\n\n\n\n\n\nAlt", + "4,2", { "w": 6.25 }, @@ -210,16 +119,16 @@ { "w": 1.25 }, - "4,8\n\n\n\n\n\nAlt", + "4,8", { "w": 1.25 }, - "4,9\n\n\n\n\n\nFn", + "4,9", { "x": 0.5 }, - "4,11\n\n\n\n\n\n\n\n\n←", - "4,13\n\n\n\n\n\n\n\n\n↓", + "4,11", + "4,13", "4,14" ] ] From 7cfcd6d57001b9f7fca7c909cad006c01aa2131d Mon Sep 17 00:00:00 2001 From: sdk66 <2371260634@qq.com> Date: Fri, 19 Apr 2024 17:03:36 +0800 Subject: [PATCH 3/3] 186862 Upload it after re-editing --- v3/rk/rk839/rk839.json | 135 ++++++++++++++++++++++++++++++++++++++ v3/rk/rk839/rk839us.json | 136 --------------------------------------- 2 files changed, 135 insertions(+), 136 deletions(-) create mode 100644 v3/rk/rk839/rk839.json delete mode 100644 v3/rk/rk839/rk839us.json diff --git a/v3/rk/rk839/rk839.json b/v3/rk/rk839/rk839.json new file mode 100644 index 0000000000..2780cd8fc4 --- /dev/null +++ b/v3/rk/rk839/rk839.json @@ -0,0 +1,135 @@ +{ + "name": "RK-R65", + "vendorId": "0x342d", + "productId": "0xE453", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "keymap": [ + [ + { + "y": 1 + }, + "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", + "0,14\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "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" + ], + [ + { + "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" + ], + [ + { + "w": 2.25 + }, + "3,0", + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + { + "w": 1.75 + }, + "3,11", + "3,13", + "3,14" + ], + [ + { + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "w": 6.25 + }, + "4,5", + { + "w": 1.25 + }, + "4,8", + { + "w": 1.25 + }, + "4,9", + { + "x": 0.5 + }, + "4,11", + "4,13", + "4,14" + ] + ] + } +} diff --git a/v3/rk/rk839/rk839us.json b/v3/rk/rk839/rk839us.json deleted file mode 100644 index fc22b9d633..0000000000 --- a/v3/rk/rk839/rk839us.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "name": "RK-R65", - "vendorId": "0x342d", - "productId": "0xe453", - "matrix": { - "rows": 5, - "cols": 15 - }, - "layouts": { - "keymap": - [ - [ - { - "y": 1 - }, - "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", - "0,14\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "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" - ], - [ - { - "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" - ], - [ - { - "w": 2.25 - }, - "3,0", - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - { - "w": 1.75 - }, - "3,11", - "3,13", - "3,14" - ], - [ - { - "w": 1.25 - }, - "4,0", - { - "w": 1.25 - }, - "4,1", - { - "w": 1.25 - }, - "4,2", - { - "w": 6.25 - }, - "4,5", - { - "w": 1.25 - }, - "4,8", - { - "w": 1.25 - }, - "4,9", - { - "x": 0.5 - }, - "4,11", - "4,13", - "4,14" - ] - ] - } -}