From 306563a0d628eb4bacacc7c4fca1a3399272fb7f Mon Sep 17 00:00:00 2001 From: ziptyze Date: Fri, 14 Jul 2023 22:00:47 -0400 Subject: [PATCH 01/35] pi60 update (#1938) --- v3/1upkeyboards/pi60/pi60.json | 1565 +++++++++++++++++--------------- 1 file changed, 811 insertions(+), 754 deletions(-) diff --git a/v3/1upkeyboards/pi60/pi60.json b/v3/1upkeyboards/pi60/pi60.json index 4204389ed1..5292b12207 100644 --- a/v3/1upkeyboards/pi60/pi60.json +++ b/v3/1upkeyboards/pi60/pi60.json @@ -1,759 +1,816 @@ { - "name": "pi60", - "vendorId": "0x6F75", - "productId": "0x5604", - "matrix": {"rows": 5, "cols": 16}, - "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", - "Solid Color", - "Gradient Up/Down", - "Gradient Left/Right", - "Breathing", - "Band Sat.", - "Band Val.", - "Pinwheel Sat.", - "Pinwheel Val.", - "Spiral Sat.", - "Spiral Val.", - "Cycle All", - "Cycle Left/Right", - "Cycle Up/Down", - "Rainbow Moving Chevron", - "Cycle Out/In", - "Cycle Out/In Dual", - "Cycle Pinwheel", - "Cycle Spiral", - "Dual Beacon", - "Rainbow Beacon", - "Rainbow Pinwheels", - "Raindrops", - "Jellybean Raindrops", - "Hue Breathing", - "Hue Pendulum", - "Hue Wave", - "Pixel Rain", - "Pixel Flow" - ] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} != 0 && {id_qmk_rgb_matrix_effect} != 1 && {id_qmk_rgb_matrix_effect} != 2 && {id_qmk_rgb_matrix_effect} != 3", - "label": "Effect Speed", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} == 2 || {id_qmk_rgb_matrix_effect} == 3", - "label": "Gradient Range", - "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} != 23 && {id_qmk_rgb_matrix_effect} != 27 && {id_qmk_rgb_matrix_effect} != 28", - "label": "Color", - "type": "color", - "content": ["id_qmk_rgb_matrix_color", 3, 4] - } - ] - } - ] - } - ], - "layouts": { - "labels": [ - ["Split Backspace", "2", "1/1", "1/Enc0"], - ["Stepped Caps", "Normal", "Stepped"], - ["Enter", "ANSI standard", "ISO", "ANSI 1/1.25", "ANSI 1.25/1"], - ["Split Left Shift", "ANSI - 2.25", "ISO - 1.25/1"], - [ - "Split Right Shift", - "1/2.75", - "1/1.75/1", - "1.75/1/1", - "1/1/1", - "1/1.75/Enc1", - "1.75/1/Enc1", - "1/1/Enc1" - ], - [ - "Spacebar", - "6.25U", - "6.25U - 2.75/1.25/2.25", - "6.25U - 2.25/1.25/2.75", - "6U", - "7U", - "7U - 2.75/1.5/2.75", - "7U - 3/1/3", - "7U - 3/Enc2/3", - "10U" - ], - [ - "Left Cluster Options", - "6.25U - 1.25/1.25/1.25", - "6.25U - 1.5/1/1.25", - "7U/6U - 1.25/1.25/1.5", - "7U/6U - 1.5/1/1.5", - "10U - 1.25/1.25", - "10U - 1.5/1" - ], - [ - "Right Cluster Options", - "6.25U/6U - 1.25/1.25/1.25/1.25", - "6.25U/6U - 1.25/1.25/1/1.5", - "6.25U/6U - 1/1/1/1/1", - "6.25U/6U - 1/1.5/1.25/1.25", - "6.25U/6U - 1/1.5/1/1.5", - "7U - 1/1/1/1", - "7U - 1.5/1.25/1.25", - "7U - 1.5/1/1.5", - "10U - 1.25/1.25", - "10U - 1/1.5" - ] + "name": "pi60", + "vendorId": "0x6F75", + "productId": "0x5604", + "matrix": { "rows": 5, "cols": 16}, + "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", + "Solid Color", + "Gradient Up/Down", + "Gradient Left/Right", + "Breathing", + "Band Sat.", + "Band Val.", + "Pinwheel Sat.", + "Pinwheel Val.", + "Spiral Sat.", + "Spiral Val.", + "Cycle All", + "Cycle Left/Right", + "Cycle Up/Down", + "Rainbow Moving Chevron", + "Cycle Out/In", + "Cycle Out/In Dual", + "Cycle Pinwheel", + "Cycle Spiral", + "Dual Beacon", + "Rainbow Beacon", + "Rainbow Pinwheels", + "Raindrops", + "Jellybean Raindrops", + "Hue Breathing", + "Hue Pendulum", + "Hue Wave", + "Pixel Rain", + "Pixel Flow" + ] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} != 0 && {id_qmk_rgb_matrix_effect} != 1 && {id_qmk_rgb_matrix_effect} != 2 && {id_qmk_rgb_matrix_effect} != 3", + "label": "Effect Speed", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} == 2 || {id_qmk_rgb_matrix_effect} == 3", + "label": "Gradient Range", + "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} != 23 && {id_qmk_rgb_matrix_effect} != 27 && {id_qmk_rgb_matrix_effect} != 28", + "label": "Color", + "type": "color", + "content": ["id_qmk_rgb_matrix_color", 3, 4] + } + ] + } + ] + } ], - "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\n\n\n0,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,13\n\n\n0,1", - "0,14\n\n\n0,1", - { - "x": 0.25 - }, - "0,13\n\n\n0,2", - "0,14\n\n\n0,2\n\n\n\n\n\ne0" - ], - [ - { - "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", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "1,13\n\n\n2,0", - { - "x": 1.25, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,13\n\n\n2,1", - { - "x": 1, - "c": "#aaaaaa", - "w": 1.5 - }, - "1,13\n\n\n2,2", - { - "x": 1, - "w": 1.5 - }, - "1,13\n\n\n2,3" - ], - [ - { - "x": 0.5, - "w": 1.25, - "w2": 1.75, - "l": true - }, - "2,15\n\n\n1,1", - { - "x": 0.75, - "w": 1.75 - }, - "2,15\n\n\n1,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\n2,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,12\n\n\n2,1", - { - "x": 1.5 - }, - "2,12\n\n\n2,2", - { - "c": "#777777", - "w": 1.25 - }, - "2,13\n\n\n2,2", - { - "x": 0.25, - "c": "#cccccc", - "w": 1.25 - }, - "2,12\n\n\n2,3", - { - "c": "#777777" - }, - "2,13\n\n\n2,3" - ], - [ - { - "c": "#cccccc", - "w": 1.25 - }, - "3,15\n\n\n3,1", - "3,1\n\n\n3,1", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 2.25 - }, - "3,15\n\n\n3,0", - { - "c": "#cccccc" - }, - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11\n\n\n4,0", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "3,12\n\n\n4,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,11\n\n\n4,1", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,12\n\n\n4,1", - "3,14\n\n\n4,1", - { - "x": 0.25, - "w": 1.75 - }, - "3,11\n\n\n4,2", - "3,12\n\n\n4,2", - "3,14\n\n\n4,2", - { - "x": 0.25 - }, - "3,11\n\n\n4,3", - { - "x": 0.75 - }, - "3,12\n\n\n4,3", - "3,14\n\n\n4,3", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,11\n\n\n4,4", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,12\n\n\n4,4", - "3,14\n\n\n4,4\n\n\n\n\n\ne1", - { - "x": 0.25, - "w": 1.75 - }, - "3,11\n\n\n4,5", - "3,12\n\n\n4,5", - "3,14\n\n\n4,5\n\n\n\n\n\ne1", - { - "x": 0.25 - }, - "3,11\n\n\n4,6", - { - "x": 0.75 - }, - "3,12\n\n\n4,6", - "3,14\n\n\n4,6\n\n\n\n\n\ne1" - ], - [ - { - "x": 2.5, - "c": "#cccccc", - "a": 7, - "w": 3.75, - "d": true - }, - "", - { - "x": -3.75, - "a": 4, - "w": 3.75, - "d": true - }, - "\n\n\n5,0", - { - "x": -3.75, - "c": "#aaaaaa", - "w": 1.25 - }, - "4,15\n\n\n6,0", - { - "w": 1.25 - }, - "4,1\n\n\n6,0", - { - "w": 1.25 - }, - "4,2\n\n\n6,0", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,6\n\n\n5,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,10\n\n\n7,0", - { - "w": 1.25 - }, - "4,11\n\n\n7,0", - { - "w": 1.25 - }, - "4,13\n\n\n7,0", - { - "w": 1.25 - }, - "4,14\n\n\n7,0" - ], - [ - { - "x": 2.5, - "c": "#cccccc", - "w": 3.75, - "d": true - }, - "\n\n\n5,1", - { - "w": 2.75 - }, - "4,4\n\n\n5,1", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,6\n\n\n5,1", - { - "c": "#cccccc", - "w": 2.25 - }, - "4,8\n\n\n5,1" - ], - [ - { - "x": 2.5, - "w": 3.75, - "d": true - }, - "\n\n\n5,2", - { - "w": 2.25 - }, - "4,4\n\n\n5,2", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,6\n\n\n5,2", - { - "c": "#cccccc", - "w": 2.75 - }, - "4,8\n\n\n5,2" - ], - [ - { - "x": 2.5, - "w": 4, - "d": true - }, - "\n\n\n5,3", - { - "w": 6 - }, - "4,6\n\n\n5,3" - ], - [ - { - "x": 2.5, - "w": 4, - "d": true - }, - "\n\n\n5,4", - { - "w": 7 - }, - "4,6\n\n\n5,4" + "layouts": { + "labels": [ + ["Split Backspace", + "2", + "1/1", + "1/Enc0" + ], + ["Stepped Caps", + "Normal", + "Stepped" + ], + ["Enter", + "ANSI standard", + "ISO", + "ANSI 1/1.25", + "ANSI 1.25/1" + ], + ["Left Shift", + "ANSI - 2.25", + "ISO - 1.25/1", + "ANSI - 2" + ], + ["Right Shift", + "1/2.75", + "1/1.75/1", + "1.75/1/1", + "1/1/1", + "1/1.75/Enc1", + "1.75/1/Enc1", + "1/1/Enc1", + "2U Left Shift 1/1/1", + "2U Left Shift 1/1/Enc1" + ], + ["Spacebar", + "6.25U", + "6.25U - 2.75/1.25/2.25", + "6.25U - 2.25/1.25/2.75", + "6U", + "7U", + "7U - 2.75/1.5/2.75", + "7U - 3/1/3", + "7U - 3/Enc2/3", + "10U" + ], + ["Left Cluster Options", + "6.25U - 1.25/1.25/1.25", + "6.25U - 1.5/1/1.25", + "7U/6U - 1.25/1.25/1.5", + "7U/6U - 1.5/1/1.5", + "10U - 1.25/1.25", + "10U - 1.5/1" + ], + ["Right Cluster Options", + "6.25U/6U - 1.25/1.25/1.25/1.25", + "6.25U/6U - 1.25/1.25/1/1.5", + "6.25U/6U - 1/1/1/1/1", + "6.25U/6U - 1/1.5/1.25/1.25", + "6.25U/6U - 1/1.5/1/1.5", + "7U - 1/1/1/1", + "7U - 1.5/1.25/1.25", + "7U - 1.5/1/1.5", + "10U - 1.25/1.25", + "10U - 1/1.5" + ] ], - [ - { - "x": 2.5, - "w": 4, - "d": true - }, - "\n\n\n5,5", - { - "w": 2.75 - }, - "4,4\n\n\n5,5", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,6\n\n\n5,5", - { - "c": "#cccccc", - "w": 2.75 - }, - "4,8\n\n\n5,5" - ], - [ - { - "x": 2.5, - "w": 4, - "d": true - }, - "\n\n\n5,6", - { - "w": 3 - }, - "4,4\n\n\n5,6", - { - "c": "#aaaaaa" - }, - "4,6\n\n\n5,6", - { - "c": "#cccccc", - "w": 3 - }, - "4,8\n\n\n5,6" - ], - [ - { - "x": 2.5, - "w": 4, - "d": true - }, - "\n\n\n5,7", - { - "w": 3 - }, - "4,4\n\n\n5,7", - { - "c": "#aaaaaa" - }, - "4,6\n\n\n5,7\n\n\n\n\n\ne2", - { - "c": "#cccccc", - "w": 3 - }, - "4,8\n\n\n5,7" - ], - [ - { - "x": 2.5, - "w": 2.5, - "d": true - }, - "\n\n\n5,8", - { - "w": 10 - }, - "4,6\n\n\n5,8" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.5 - }, - "4,15\n\n\n6,1", - "4,1\n\n\n6,1", - { - "w": 1.25 - }, - "4,2\n\n\n6,1", - { - "x": 6.25, - "w": 1.25 - }, - "4,10\n\n\n7,1", - { - "w": 1.25 - }, - "4,11\n\n\n7,1", - "4,13\n\n\n7,1", - { - "w": 1.5 - }, - "4,14\n\n\n7,1" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "4,15\n\n\n6,2", - { - "w": 1.25 - }, - "4,1\n\n\n6,2", - { - "w": 1.5 - }, - "4,2\n\n\n6,2", - { - "x": 6 - }, - "4,10\n\n\n7,2", - "4,11\n\n\n7,2", - "4,12\n\n\n7,2", - "4,13\n\n\n7,2", - "4,14\n\n\n7,2" - ], - [ - { - "x": 2.5, - "w": 1.5 - }, - "4,15\n\n\n6,3", - "4,1\n\n\n6,3", - { - "w": 1.5 - }, - "4,2\n\n\n6,3", - { - "x": 6 - }, - "4,10\n\n\n7,3", - { - "w": 1.5 - }, - "4,11\n\n\n7,3", - { - "w": 1.25 - }, - "4,13\n\n\n7,3", - { - "w": 1.25 - }, - "4,14\n\n\n7,3" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "4,15\n\n\n6,4", - { - "w": 1.25 - }, - "4,1\n\n\n6,4", - { - "x": 7.5 - }, - "4,10\n\n\n7,4", - { - "w": 1.5 - }, - "4,11\n\n\n7,4", - "4,13\n\n\n7,4", - { - "w": 1.5 - }, - "4,14\n\n\n7,4" - ], - [ - { - "x": 2.5, - "w": 1.5 - }, - "4,15\n\n\n6,5", - "4,1\n\n\n6,5", - { - "x": 7.5, - "c": "#cccccc", - "d": true - }, - "\n\n\n7,5", - { - "c": "#aaaaaa" - }, - "4,11\n\n\n7,5", - "4,12\n\n\n7,5", - "4,13\n\n\n7,5", - "4,14\n\n\n7,5" - ], - [ - { - "x": 12.5, - "c": "#cccccc", - "d": true - }, - "\n\n\n7,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n7,6", - { - "w": 1.25 - }, - "4,13\n\n\n7,6", - { - "w": 1.25 - }, - "4,14\n\n\n7,6" - ], - [ - { - "x": 12.5, - "c": "#cccccc", - "d": true - }, - "\n\n\n7,7", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n7,7", - "4,13\n\n\n7,7", - { - "w": 1.5 - }, - "4,14\n\n\n7,7" - ], - [ - { - "x": 12.5, - "c": "#cccccc", - "w": 2.5, - "d": true - }, - "\n\n\n7,8", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,13\n\n\n7,8", - { - "w": 1.25 - }, - "4,14\n\n\n7,8" - ], - [ - { - "x": 12.5, - "c": "#cccccc", - "w": 2.5, - "d": true - }, - "\n\n\n7,9", - { - "c": "#aaaaaa" - }, - "4,13\n\n\n7,9", - { - "w": 1.5 - }, - "4,14\n\n\n7,9" + "keymap": [ + [ + { + "c": "#aaaaaa", + "w": 2 + }, + "3,15\n\n\n3,2", + { + "c": "#cccccc" + }, + "3,2\n\n\n3,2", + "3,3\n\n\n3,2", + "3,4\n\n\n3,2", + "3,5\n\n\n3,2", + "3,6\n\n\n3,2", + "3,7\n\n\n3,2", + "3,8\n\n\n3,2", + "3,9\n\n\n3,2", + "3,10\n\n\n3,2", + "3,11\n\n\n3,2" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,15\n\n\n3,1", + { + "c": "#cccccc" + }, + "3,1\n\n\n3,1", + "3,2\n\n\n3,1", + "3,3\n\n\n3,1", + "3,4\n\n\n3,1", + "3,5\n\n\n3,1", + "3,6\n\n\n3,1", + "3,7\n\n\n3,1", + "3,8\n\n\n3,1", + "3,9\n\n\n3,1", + "3,10\n\n\n3,1" + ], + [ + { + "y": 0.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", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1", + { + "x": 0.25 + }, + "0,13\n\n\n0,2", + "0,14\n\n\n0,2\n\n\n\n\n\ne0" + ], + [ + { + "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", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13\n\n\n2,0", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n2,1", + { + "x": 1, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13\n\n\n2,2", + { + "x": 1, + "w": 1.5 + }, + "1,13\n\n\n2,3" + ], + [ + { + "w": 1.75 + }, + "2,15\n\n\n1,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\n2,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,12\n\n\n2,1", + { + "x": 1.5 + }, + "2,12\n\n\n2,2", + { + "c": "#777777", + "w": 1.25 + }, + "2,13\n\n\n2,2", + { + "x": 0.25, + "c": "#cccccc", + "w": 1.25 + }, + "2,12\n\n\n2,3", + { + "c": "#777777" + }, + "2,13\n\n\n2,3", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.25, + "w2": 1.75, + "l": true + }, + "2,15\n\n\n1,1" + ], + [ + { + "w": 2.25 + }, + "3,15\n\n\n3,0", + { + "c": "#cccccc" + }, + "3,2\n\n\n3,0", + "3,3\n\n\n3,0", + "3,4\n\n\n3,0", + "3,5\n\n\n3,0", + "3,6\n\n\n3,0", + "3,7\n\n\n3,0", + "3,8\n\n\n3,0", + "3,9\n\n\n3,0", + "3,10\n\n\n3,0", + "3,11\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,12\n\n\n4,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,11\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12\n\n\n4,1", + "3,14\n\n\n4,1", + { + "x": 0.25, + "w": 1.75 + }, + "3,11\n\n\n4,2", + "3,12\n\n\n4,2", + "3,14\n\n\n4,2", + { + "x": 0.25 + }, + "3,11\n\n\n4,3", + { + "x": 0.75 + }, + "3,12\n\n\n4,3", + "3,14\n\n\n4,3", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,11\n\n\n4,4", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12\n\n\n4,4", + "3,14\n\n\n4,4\n\n\n\n\n\ne1", + { + "x": 0.25, + "w": 1.75 + }, + "3,11\n\n\n4,5", + "3,12\n\n\n4,5", + "3,14\n\n\n4,5\n\n\n\n\n\ne1", + { + "x": 0.25 + }, + "3,11\n\n\n4,6", + { + "x": 0.75 + }, + "3,12\n\n\n4,6", + "3,14\n\n\n4,6\n\n\n\n\n\ne1" + ], + [ + { + "c": "#cccccc", + "a": 7, + "w": 3.75, + "d": true + }, + "", + { + "x": -3.75, + "a": 4, + "w": 3.75, + "d": true + }, + "\n\n\n5,0", + { + "x": -3.75, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,15\n\n\n6,0", + { + "w": 1.25 + }, + "4,1\n\n\n6,0", + { + "w": 1.25 + }, + "4,2\n\n\n6,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n5,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n7,0", + { + "w": 1.25 + }, + "4,11\n\n\n7,0", + { + "w": 1.25 + }, + "4,13\n\n\n7,0", + { + "w": 1.25 + }, + "4,14\n\n\n7,0" + ], + [ + { + "c": "#cccccc", + "w": 3.75, + "d": true + }, + "\n\n\n5,1", + { + "w": 2.75 + }, + "4,4\n\n\n5,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,6\n\n\n5,1", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,8\n\n\n5,1", + { + "x": 1.25, + "w": 0.75, + "d": true + }, + "\n\n\n4,7", + { + "c": "#aaaaaa" + }, + "3,1\n\n\n4,7", + "3,12\n\n\n4,7", + "3,14\n\n\n4,7" + ], + [ + { + "c": "#cccccc", + "w": 3.75, + "d": true + }, + "\n\n\n5,2", + { + "w": 2.25 + }, + "4,4\n\n\n5,2", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,6\n\n\n5,2", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,8\n\n\n5,2", + { + "x": 1.25, + "w": 0.75, + "d": true + }, + "\n\n\n4,8", + { + "c": "#aaaaaa" + }, + "3,1\n\n\n4,8", + "3,12\n\n\n4,8", + "3,14\n\n\n4,8\n\n\n\n\n\ne1" + ], + [ + { + "c": "#cccccc", + "w": 4, + "d": true + }, + "\n\n\n5,3", + { + "w": 6 + }, + "4,6\n\n\n5,3" + ], + [ + { + "w": 4, + "d": true + }, + "\n\n\n5,4", + { + "w": 7 + }, + "4,6\n\n\n5,4" + ], + [ + { + "w": 4, + "d": true + }, + "\n\n\n5,5", + { + "w": 2.75 + }, + "4,4\n\n\n5,5", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,6\n\n\n5,5", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,8\n\n\n5,5" + ], + [ + { + "w": 4, + "d": true + }, + "\n\n\n5,6", + { + "w": 3 + }, + "4,4\n\n\n5,6", + { + "c": "#aaaaaa" + }, + "4,6\n\n\n5,6", + { + "c": "#cccccc", + "w": 3 + }, + "4,8\n\n\n5,6" + ], + [ + { + "w": 4, + "d": true + }, + "\n\n\n5,7", + { + "w": 3 + }, + "4,4\n\n\n5,7", + { + "c": "#aaaaaa" + }, + "4,6\n\n\n5,7\n\n\n\n\n\ne2", + { + "c": "#cccccc", + "w": 3 + }, + "4,8\n\n\n5,7" + ], + [ + { + "w": 2.5, + "d": true + }, + "\n\n\n5,8", + { + "w": 10 + }, + "4,6\n\n\n5,8" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,15\n\n\n6,1", + "4,1\n\n\n6,1", + { + "w": 1.25 + }, + "4,2\n\n\n6,1", + { + "x": 6.25, + "w": 1.25 + }, + "4,10\n\n\n7,1", + { + "w": 1.25 + }, + "4,11\n\n\n7,1", + "4,13\n\n\n7,1", + { + "w": 1.5 + }, + "4,14\n\n\n7,1" + ], + [ + { + "w": 1.25 + }, + "4,15\n\n\n6,2", + { + "w": 1.25 + }, + "4,1\n\n\n6,2", + { + "w": 1.5 + }, + "4,2\n\n\n6,2", + { + "x": 6 + }, + "4,10\n\n\n7,2", + "4,11\n\n\n7,2", + "4,12\n\n\n7,2", + "4,13\n\n\n7,2", + "4,14\n\n\n7,2" + ], + [ + { + "w": 1.5 + }, + "4,15\n\n\n6,3", + "4,1\n\n\n6,3", + { + "w": 1.5 + }, + "4,2\n\n\n6,3", + { + "x": 6 + }, + "4,10\n\n\n7,3", + { + "w": 1.5 + }, + "4,11\n\n\n7,3", + { + "w": 1.25 + }, + "4,13\n\n\n7,3", + { + "w": 1.25 + }, + "4,14\n\n\n7,3" + ], + [ + { + "w": 1.25 + }, + "4,15\n\n\n6,4", + { + "w": 1.25 + }, + "4,1\n\n\n6,4", + { + "x": 7.5 + }, + "4,10\n\n\n7,4", + { + "w": 1.5 + }, + "4,11\n\n\n7,4", + "4,13\n\n\n7,4", + { + "w": 1.5 + }, + "4,14\n\n\n7,4" + ], + [ + { + "w": 1.5 + }, + "4,15\n\n\n6,5", + "4,1\n\n\n6,5", + { + "x": 7.5, + "c": "#cccccc", + "d": true + }, + "\n\n\n7,5", + { + "c": "#aaaaaa" + }, + "4,11\n\n\n7,5", + "4,12\n\n\n7,5", + "4,13\n\n\n7,5", + "4,14\n\n\n7,5" + ], + [ + { + "x": 10, + "c": "#cccccc", + "d": true + }, + "\n\n\n7,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n7,6", + { + "w": 1.25 + }, + "4,13\n\n\n7,6", + { + "w": 1.25 + }, + "4,14\n\n\n7,6" + ], + [ + { + "x": 10, + "c": "#cccccc", + "d": true + }, + "\n\n\n7,7", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n7,7", + "4,13\n\n\n7,7", + { + "w": 1.5 + }, + "4,14\n\n\n7,7" + ], + [ + { + "x": 10, + "c": "#cccccc", + "w": 2.5, + "d": true + }, + "\n\n\n7,8", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,13\n\n\n7,8", + { + "w": 1.25 + }, + "4,14\n\n\n7,8" + ], + [ + { + "x": 10, + "c": "#cccccc", + "w": 2.5, + "d": true + }, + "\n\n\n7,9", + { + "c": "#aaaaaa" + }, + "4,13\n\n\n7,9", + { + "w": 1.5 + }, + "4,14\n\n\n7,9" + ] ] - ] + } } -} From 703d14e3e25702a9aa20e5755baf2afc4516e336 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Fri, 14 Jul 2023 22:01:35 -0400 Subject: [PATCH 02/35] Create 1upOcarina.json (#1944) --- v3/1upkeyboards/1upOcarina/1upOcarina.json | 118 +++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 v3/1upkeyboards/1upOcarina/1upOcarina.json diff --git a/v3/1upkeyboards/1upOcarina/1upOcarina.json b/v3/1upkeyboards/1upOcarina/1upOcarina.json new file mode 100644 index 0000000000..14cbe223d8 --- /dev/null +++ b/v3/1upkeyboards/1upOcarina/1upOcarina.json @@ -0,0 +1,118 @@ +{ + "name": "1upocarina", + "vendorId": "0x6F75", + "productId": "0x5607", + "matrix": {"rows": 1, "cols": 5}, + "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", + "Solid Color", + "Gradient Left/Right", + "Breathing", + "Band Sat.", + "Band Val.", + "Pinwheel Sat.", + "Pinwheel Val.", + "Spiral Sat.", + "Spiral Val.", + "Cycle All", + "Cycle Left/Right", + "Cycle Up/Down", + "Rainbow Moving Chevron", + "Cycle Out/In", + "Cycle Out/In Dual", + "Cycle Pinwheel", + "Cycle Spiral", + "Dual Beacon", + "Rainbow Beacon", + "Rainbow Pinwheels", + "Raindrops", + "Jellybean Raindrops", + "Hue Breathing", + "Hue Pendulum", + "Hue Wave", + "Heatmap", + "Solid Reactive Simple", + "Solid Reactive", + "Solid Reactive Wide", + "Solid Reactive Multiwide", + "Solid Reactive Cross", + "Solid Reactive Multicross", + "Solid Reactive Nexus", + "Solid Reactive Multinexus", + "Splash", + "Multisplash", + "Solid Splash", + "Solid Multisplash" + ] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} != 0 && {id_qmk_rgb_matrix_effect} != 1 && {id_qmk_rgb_matrix_effect} != 2", + "label": "Effect Speed", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} == 2", + "label": "Gradient Range", + "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} != 23 && {id_qmk_rgb_matrix_effect} != 27 && {id_qmk_rgb_matrix_effect} != 28", + "label": "Color", + "type": "color", + "content": ["id_qmk_rgb_matrix_color", 3, 4] + } + ] + } + ] + } + ], + "layouts": { + "labels": [ + "Encoder" + ], + "keymap": [ + [ + "0,0", + "0,1", + { + "x": 1.5 + }, + "0,3", + "0,4" + ], + [ + { + "y": -0.75, + "x": 2.25 + }, + "0,2\n\n\n0,0", + { + "x": 2.5 + }, + "0,2\n\n\n0,1\n\n\n\n\n\ne0" + ] + ] + } +} \ No newline at end of file From 55b08eaac6376b0be3d26453d7c769fee2776c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Fri, 14 Jul 2023 23:02:03 -0300 Subject: [PATCH 03/35] Add support for Mode M256W-S and M256W-H (#1945) --- v3/mode/m256w/m256wh.json | 278 ++++++++++++++++++++++++++++++++++ v3/mode/m256w/m256ws.json | 310 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 588 insertions(+) create mode 100644 v3/mode/m256w/m256wh.json create mode 100644 v3/mode/m256w/m256ws.json diff --git a/v3/mode/m256w/m256wh.json b/v3/mode/m256w/m256wh.json new file mode 100644 index 0000000000..e790375137 --- /dev/null +++ b/v3/mode/m256w/m256wh.json @@ -0,0 +1,278 @@ +{ + "name": "Mode M256W-H Alpha", + "vendorId": "0x00DE", + "productId": "0x5754", + "matrix": {"rows": 6, "cols": 16}, + "menus": [ + { + "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", + "Snake 1", + "Snake 2", + "Snake 3", + "Snake 4", + "Snake 5", + "Snake 6", + "Knight 1", + "Knight 2", + "Knight 3", + "Christmas", + "Gradient 1", + "Gradient 2", + "Gradient 3", + "Gradient 4", + "Gradient 5", + "Gradient 6", + "Gradient 7", + "Gradient 8", + "Gradient 9", + "Gradient 10", + "RGB Test", + "Alternating", + "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] + }, + { + "label": "Second RGB row", + "type": "toggle", + "content": ["id_is_second_rgb_row_active", 0, 0] + } + ] + } + ] + } +], + "keycodes": ["qmk_lighting"], + "layouts": { + "labels": ["7U bottom row"], + "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", + { + "c": "#cccccc" + }, + "0,14" + ], + [ + { + "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", + "1,14" + ], + [ + { + "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": "#cccccc" + }, + "2,14" + ], + [ + { + "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": 1.75 + }, + "3,12", + { + "c": "#777777" + }, + "3,13", + { + "c": "#cccccc" + }, + "3,14" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0\n\n\n0,0", + { + "w": 1.25 + }, + "5,1\n\n\n0,0", + { + "w": 1.25 + }, + "5,2\n\n\n0,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,15\n\n\n0,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n0,0", + { + "w": 1.25 + }, + "4,10\n\n\n0,0", + { + "x": 0.5, + "c": "#777777" + }, + "4,11", + "4,12", + "4,13" + ], + [ + { + "y": 0.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n0,1", + "5,1\n\n\n0,1", + { + "w": 1.5 + }, + "5,2\n\n\n0,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,15\n\n\n0,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n0,1" + ] +] +} +} diff --git a/v3/mode/m256w/m256ws.json b/v3/mode/m256w/m256ws.json new file mode 100644 index 0000000000..86d6287e81 --- /dev/null +++ b/v3/mode/m256w/m256ws.json @@ -0,0 +1,310 @@ +{ + "name": "Mode M256W-S Alpha", + "vendorId": "0x00DE", + "productId": "0x5753", + "matrix": {"rows": 6, "cols": 15}, + "menus": [ + { + "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", + "Snake 1", + "Snake 2", + "Snake 3", + "Snake 4", + "Snake 5", + "Snake 6", + "Knight 1", + "Knight 2", + "Knight 3", + "Christmas", + "Gradient 1", + "Gradient 2", + "Gradient 3", + "Gradient 4", + "Gradient 5", + "Gradient 6", + "Gradient 7", + "Gradient 8", + "Gradient 9", + "Gradient 10", + "RGB Test", + "Alternating", + "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] + }, + { + "label": "Second RGB row", + "type": "toggle", + "content": ["id_is_second_rgb_row_active", 0, 0] + } + ] + } + ] + } +], + "keycodes": ["qmk_lighting"], + "layouts": { + "labels": ["Split Backspace", "ISO Enter", "Split LShift", "7U bottom row"], + "keymap": [ + [ + { + "x": 15.5 + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1" + ], + [ + { + "y": 0.25, + "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\n\n\n0,0", + { + "c": "#cccccc" + }, + "1,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\n1,0", + "4,14", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "5,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,14", + { + "x": 0.25 + }, + "2,12\n\n\n1,1" + ], + [ + { + "w": 1.25 + }, + "3,0\n\n\n2,1", + "3,1\n\n\n2,1", + { + "x": 0.25, + "c": "#aaaaaa", + "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": 1.75 + }, + "3,12", + { + "c": "#777777" + }, + "3,13", + { + "c": "#cccccc" + }, + "3,14" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n3,0", + { + "w": 1.25 + }, + "4,1\n\n\n3,0", + { + "w": 1.25 + }, + "4,2\n\n\n3,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n3,0", + { + "w": 1.25 + }, + "4,10\n\n\n3,0", + { + "x": 0.5, + "c": "#777777" + }, + "4,11", + "4,12", + "4,13" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,0\n\n\n3,1", + "4,1\n\n\n3,1", + { + "w": 1.5 + }, + "4,2\n\n\n3,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n3,1" + ] +] +} +} From 124979eceeeadad0e78e9b30b5248c366625f45a Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 15 Jul 2023 10:03:41 +0800 Subject: [PATCH 04/35] adding ah haven 65 & haven 80 via json (#1948) --- v3/ah/haven65.json | 237 +++++++++++++++++++++++++++++++++++ v3/ah/haven80_hotswap.json | 209 +++++++++++++++++++++++++++++++ v3/ah/haven80_solder.json | 248 +++++++++++++++++++++++++++++++++++++ 3 files changed, 694 insertions(+) create mode 100644 v3/ah/haven65.json create mode 100644 v3/ah/haven80_hotswap.json create mode 100644 v3/ah/haven80_solder.json diff --git a/v3/ah/haven65.json b/v3/ah/haven65.json new file mode 100644 index 0000000000..702883b0e2 --- /dev/null +++ b/v3/ah/haven65.json @@ -0,0 +1,237 @@ +{ + "name": "Atelier_Haven Haven65", + + "vendorId": "0x4446", + "productId": "0x4665", + "keycodes": ["qmk_lighting"], + "menus": + [ + "qmk_rgblight" + ], + "matrix": { "rows": 5, "cols": 15 }, + "layouts": { + "labels":[ + "Split Backspace", + "Iso Enter", + "Split LeftShift", + ["Bottom Row", "Regular 6.25U", "Tsangan 7U","WKL"] + ], + "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", + "0,14", + "0,13\n\n\n0,1", + "1,13\n\n\n0,1" + ], + [ + { + "x": 2.25, + "w": 1.5, + "c": "#aaaaaa" + }, + "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 + }, + "2,13\n\n\n1,0", + "1,14", + { + "x": 1, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25, + "c": "#777777" + }, + "2,12\n\n\n1,1" + ], + [ + { + "x": 2.25, + "w": 1.75, + "c": "#aaaaaa" + }, + "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", + { + "w": 2.25, + "c": "#777777" + }, + "2,12\n\n\n1,0", + {"c": "#cccccc"}, + "2,14", + "2,13\n\n\n1,1" + ], + [ + { + "w": 1.25, + "c": "#aaaaaa" + }, + "3,0\n\n\n2,1", + {"c": "#cccccc"}, + "3,1\n\n\n2,1", + { + "w": 2.25, + "c": "#aaaaaa" + }, + "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", + { + "w": 1.75, + "c": "#aaaaaa" + }, + "3,12", + {"c": "#777777"}, + "3,13", + {"c": "#cccccc"}, + "3,14" + ], + [ + { + "x": 2.25, + "w": 1.25, + "c": "#aaaaaa" + }, + "4,0\n\n\n3,0", + { + "w": 1.25, + "c": "#aaaaaa" + }, + "4,1\n\n\n3,0", + { + "w": 1.25, + "c": "#aaaaaa" + }, + "4,2\n\n\n3,0", + { + "w": 6.25, + "c": "#777777" + }, + "4,6\n\n\n3,0", + { + "w": 1.25, + "c": "#aaaaaa" + }, + "4,10\n\n\n3,0", + { + "w": 1.25, + "c": "#aaaaaa" + }, + "4,9\n\n\n3,0", + { + "x": 0.5, + "c": "#777777" + }, + "4,11", + "4,12", + "4,13" + ], + [ + { + "x": 2.25, + "w": 1.5, + "c": "#aaaaaa" + }, + "4,0\n\n\n3,1", + "4,1\n\n\n3,1", + { + "w": 1.5, + "c": "#aaaaaa" + }, + "4,2\n\n\n3,1", + { + "w": 7, + "c": "#777777" + }, + "4,6\n\n\n3,1", + { + "w": 1.5, + "c": "#aaaaaa" + }, + "4,10\n\n\n3,1" + ], + [ + { + "x": 2.25, + "w": 1.5, + "c": "#aaaaaa" + }, + "4,0\n\n\n3,2", + { + "x": 0.75, + "w": 1.5, + "c": "#aaaaaa" + }, + "4,2\n\n\n3,2", + { + "w": 7, + "c": "#777777" + }, + "4,6\n\n\n3,2", + { + "w": 1.5, + "c": "#aaaaaa" + }, + "4,10\n\n\n3,2" + ] + ] + } +} diff --git a/v3/ah/haven80_hotswap.json b/v3/ah/haven80_hotswap.json new file mode 100644 index 0000000000..76e6526cbd --- /dev/null +++ b/v3/ah/haven80_hotswap.json @@ -0,0 +1,209 @@ +{ + "name": "Atelier_Haven Haven80_Hotswap", + + "vendorId": "0x4446", + "productId": "0x4680", + "keycodes": ["qmk_lighting"], + "menus": + [ + "qmk_rgblight" + ], + + "matrix": { "rows": 11, "cols": 9 }, + + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25, + "c": "#777777" + }, + "0,5", + "0,6", + "0,7", + "5,8", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,7", + "5,6", + "5,5", + "5,4", + { + "x": 0.25 + }, + "5,3", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "5,2", + "5,1", + "5,0" + ], + [ + { + "y": 0.5, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "6,8", + "6,7", + "6,6", + "6,5", + { + "c": "#aaaaaa", + "w": 2 + }, + "6,4", + { + "x": 0.25 + }, + "6,2", + "6,1", + "6,0" + ], + [ + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "7,8", + "7,7", + "7,6", + "7,5", + { + "w": 1.5 + }, + "7,4", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "7,2", + "7,1", + "7,0" + ], + [ + { + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "8,8", + "8,7", + "8,6", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "8,5" + ], + [ + { + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "9,8", + "9,7", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "9,6", + { + "x": 1.25, + "c": "#777777" + }, + "8,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,0", + "10,1", + { + "w": 1.5 + }, + "10,2", + { + "c": "#777777", + "w": 7 + }, + "10,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,5", + "10,6", + { + "w": 1.5 + }, + "10,7", + { + "x": 0.25, + "c": "#777777" + }, + "9,2", + "9,1", + "9,0" + ] + ] + } +} diff --git a/v3/ah/haven80_solder.json b/v3/ah/haven80_solder.json new file mode 100644 index 0000000000..0a6c6c4c8f --- /dev/null +++ b/v3/ah/haven80_solder.json @@ -0,0 +1,248 @@ +{ + "name": "Atelier_Haven Haven80_Solder", + + "vendorId": "0x4446", + "productId": "0x4681", + "keycodes": ["qmk_lighting"], + "menus": + [ + "qmk_rgblight" + ], +"matrix": { "rows": 11, "cols": 9 }, +"layouts": { + "labels":[ + "Split Backspace", + "ISO Enter", + "Split Left Shift", + "Spllit Right Shift" + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25, + "c": "#777777" + }, + "0,5", + "0,6", + "0,7", + "5,8", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,7", + "5,6", + "5,5", + "5,4", + { + "x": 0.25 + }, + "5,3", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "5,2", + "5,1", + "5,0" + ], + [ + { + "y": 0.5, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "6,8", + "6,7", + "6,6", + "6,5", + { + "c": "#aaaaaa", + "w": 2 + }, + "6,4\n\n\n0,0", + { + "c": "#aaaaaa", + "x": 0.25 + }, + "6,2", + "6,1", + "6,0", + { + "x": 0.25 + }, + "6,4\n\n\n0,1", + "6,3\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", + "7,8", + "7,7", + "7,6", + "7,5", + { + "w": 1.5 + }, + "7,4\n\n\n1,0", + { + "c": "#aaaaaa", + "x": 0.25 + }, + "7,2", + "7,1", + "7,0", + { + "c": "#777777", + "x": 1, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "8,5\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "8,8", + "8,7", + "8,6", + { + "c": "#777777", + "w": 2.25 + }, + "8,5\n\n\n1,0", + { + "c": "#aaaaaa", + "x": 3.25 + }, + "7,4\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "9,8", + "9,7", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "9,6\n\n\n3,0", + { + "x": 1.25, + "c": "#777777" + }, + "8,1", + { + "x": 0.5, + "w": 1.25 + }, + "4,0\n\n\n2,1", + "9,3\n\n\n2,1", + { + "x": 1, + "w": 1.75 + }, + "9,6\n\n\n3,1", + "9,5\n\n\n3,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,0", + "10,1", + { + "w": 1.5 + }, + "10,2", + { + "c": "#777777", + "w": 7 + }, + "10,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,5", + "10,6", + { + "w": 1.5 + }, + "10,7", + { + "x": 0.25, + "c": "#777777" + }, + "9,2", + "9,1", + "9,0" + ] + ] + } +} From 8869090d1199c0984da3f0b68697bee9c4859325 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Fri, 14 Jul 2023 23:07:26 -0400 Subject: [PATCH 05/35] Add Leviatan PCB to VIA (#1954) --- v3/cannonkeys/leviatan/leviatan.json | 220 +++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 v3/cannonkeys/leviatan/leviatan.json diff --git a/v3/cannonkeys/leviatan/leviatan.json b/v3/cannonkeys/leviatan/leviatan.json new file mode 100644 index 0000000000..5ac45736ea --- /dev/null +++ b/v3/cannonkeys/leviatan/leviatan.json @@ -0,0 +1,220 @@ +{ + "name": "Leviatan", + "vendorId": "0xCA04", + "productId": "0x0024", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "labels": ["Split Backspace", "ISO Enter", "Split L Shift", "Full R Shift", "6.25U Bottom Row"], + "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\n\n\n0,0", + { + "x": 1 + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1" + ], + [ + { + "x": 2.5, + "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,14\n\n\n1,0", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,14\n\n\n1,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,14\n\n\n1,0", + { + "x": 0.75, + "c": "#aaaaaa" + }, + "2,12\n\n\n1,1" + ], + [ + { + "w": 1.25 + }, + "3,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,1", + { + "x": 0.25, + "c": "#aaaaaa", + "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": 1.75 + }, + "3,12\n\n\n3,0", + "3,14\n\n\n3,0", + { + "x": 0.25, + "w": 2.75 + }, + "3,12\n\n\n3,1" + ], + [ + { + "x": 2.5, + "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,11\n\n\n4,0", + "4,12\n\n\n4,0", + { + "w": 1.5 + }, + "4,14\n\n\n4,0" + ], + [ + { + "y": 0.25, + "x": 2.5, + "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,10\n\n\n4,1", + { + "w": 1.25 + }, + "4,11\n\n\n4,1", + { + "w": 1.25 + }, + "4,12\n\n\n4,1", + { + "w": 1.25 + }, + "4,14\n\n\n4,1" + ] + ] + } + } \ No newline at end of file From d7546cf47c7fcae4d8c31c6d4d9afa2c470ca162 Mon Sep 17 00:00:00 2001 From: Its TLeo <134472524+ItsTLeo@users.noreply.github.com> Date: Sat, 15 Jul 2023 10:30:03 +0700 Subject: [PATCH 06/35] Create itstleo9.json (#1946) --- v3/handwired/itstleo9/itstleo9.json | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 v3/handwired/itstleo9/itstleo9.json diff --git a/v3/handwired/itstleo9/itstleo9.json b/v3/handwired/itstleo9/itstleo9.json new file mode 100644 index 0000000000..c585b4386c --- /dev/null +++ b/v3/handwired/itstleo9/itstleo9.json @@ -0,0 +1,31 @@ +{ + "name": "itstleo9", + "vendorId": "0x4954", + "productId": "0x0001", + "matrix": { + "rows": 3, + "cols": 3 + }, + "layouts": { + "keymap": [ + [ + { + "c": "#000000" + }, + "0,0", + "0,1", + "0,2" + ], + [ + "1,0", + "1,1", + "1,2" + ], + [ + "2,0", + "2,1", + "2,2" + ] + ] + } +} \ No newline at end of file From 1cb5c549645c982579400c7cf350a0796593f4a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jul 2023 13:31:13 +1000 Subject: [PATCH 07/35] Bump semver from 5.7.1 to 5.7.2 (#1952) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index f84d72f0b2..31668f2544 100644 --- a/package-lock.json +++ b/package-lock.json @@ -332,14 +332,6 @@ "node": ">=4.8" } }, - "node_modules/cross-spawn/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" - } - }, "node_modules/decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", @@ -978,6 +970,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -1813,13 +1813,6 @@ "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } } }, "decamelize": { @@ -2293,6 +2286,11 @@ "supports-preserve-symlinks-flag": "^1.0.0" } }, + "semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", From eda05ba1b2b1a63fa247536a7f1fd3649f926421 Mon Sep 17 00:00:00 2001 From: seflm Date: Sat, 29 Jul 2023 07:22:48 +0200 Subject: [PATCH 08/35] Add QVEX Lynepad (#1947) --- v3/qvex/lynepad2/lynepad2.json | 63 ++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 v3/qvex/lynepad2/lynepad2.json diff --git a/v3/qvex/lynepad2/lynepad2.json b/v3/qvex/lynepad2/lynepad2.json new file mode 100644 index 0000000000..32e42a7775 --- /dev/null +++ b/v3/qvex/lynepad2/lynepad2.json @@ -0,0 +1,63 @@ +{ + "name": "QVEX Lynepad", + "productId": "0xE678", + "vendorId": "0x04D8", + "matrix": + { + "rows": 5, + "cols": 4 + }, + "layouts": + { + "keymap": + [ + ["0,0","0,1","0,2","0,3"], + ["1,0","1,1","1,2","1,3"], + ["2,0","2,1","2,2"], + [{"y":-0.75,"x":4.5},"3,0"], + [{"x":3.5},"3,2","4,0\n\n\n\n\n\n\n\n\ne0","3,3"], + [{"x":4.5},"3,1"], + [{"y":0.5,"x":3.25},"4,1\n\n\n\n\n\n\n\n\ne1"] + ] + }, + "keycodes": ["qmk_lighting"], + "menus": + [ + { + "label": "Lighting", + "content": + [ + { + "label": "Backlight", + "content": + [ + { + "label": "Backlight Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_backlight_brightness", 1, 1] + }, + { + "label": "Backlight Effect", + "type": "dropdown", + "content": ["id_qmk_backlight_effect", 1, 2], + "options": [["Off", 0], ["Breathing", 1]] + } + ] + }, + { + "label": "Arc indicator", + "content": + [ + { + "label": "Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgblight_brightness", 2, 1] + } + ] + } + ] + } + ] +} \ No newline at end of file From c851b67d31aa8a2caf63b4ed6088fb40d577d738 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Fri, 28 Jul 2023 23:23:49 -0600 Subject: [PATCH 09/35] Add boardsource/unicorne (#1949) --- v3/boardsource/unicorne/unicorne.json | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 v3/boardsource/unicorne/unicorne.json diff --git a/v3/boardsource/unicorne/unicorne.json b/v3/boardsource/unicorne/unicorne.json new file mode 100644 index 0000000000..fc52f70bed --- /dev/null +++ b/v3/boardsource/unicorne/unicorne.json @@ -0,0 +1,29 @@ +{ + "name": "Unicorne", + "vendorId": "0x4273", + "productId": "0x7563", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_audio", "qmk_rgb_matrix"], + "matrix": {"rows": 8, "cols": 6}, + "layouts":{ + "keymap":[ + [{"y":1,"x":3.5},"0,3",{"x":7.5},"4,3"], + [{"y":-0.875,"x":2.5},"0,2",{"x":1},"0,4",{"x":5.5},"4,4",{"x":1},"4,2"], + [{"y":-0.875,"x":5.5},"0,5",{"x":3.5},"4,5"], + [{"y":-0.875,"x":0.5},"0,0","0,1",{"x":11.5},"4,1","4,0"], + [{"y":-0.375,"x":3.5},"1,3",{"x":7.5},"5,3"], + [{"y":-0.875,"x":2.5},"1,2",{"x":1},"1,4",{"x":5.5},"5,4",{"x":1},"5,2"], + [{"y":-0.875,"x":5.5},"1,5",{"x":3.5},"5,5"], + [{"y":-0.875,"x":0.5},"1,0","1,1",{"x":11.5},"5,1","5,0"], + [{"y":-0.375,"x":3.5},"2,3",{"x":7.5},"6,3"], + [{"y":-0.875,"x":2.5},"2,2",{"x":1},"2,4",{"x":5.5},"6,4",{"x":1},"6,2"], + [{"y":-0.875,"x":5.5},"2,5",{"x":3.5},"6,5"], + [{"y":-0.875,"x":0.5},"2,0","2,1",{"x":11.5},"6,1","6,0"], + [{"y":-0.125,"x":4},"3,3",{"x":6.5},"7,3"], + [{"r":15,"rx":4.5,"ry":9.1,"y":-4.85,"x":-0.5},"3,4"], + [{"r":30,"rx":5.4,"ry":9.3,"y":-5.05,"x":-1.4,"h":1.5},"3,5"], + [{"r":-30,"rx":11.1,"y":-5.05,"x":0.4,"h":1.5},"7,5"], + [{"r":-15,"rx":12,"ry":9.1,"y":-4.85,"x":-0.5},"7,4"] + ] + } +} From 37f81d958673fe9d559c572c69ef04275ef06744 Mon Sep 17 00:00:00 2001 From: Wolf Van Herreweghe Date: Sat, 29 Jul 2023 07:25:42 +0200 Subject: [PATCH 10/35] Fix Labels for Twilight PCB (#1955) Co-authored-by: Wolf --- v3/wolf/twilight/twilight.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/wolf/twilight/twilight.json b/v3/wolf/twilight/twilight.json index 085ac43c8b..f5f65342f5 100644 --- a/v3/wolf/twilight/twilight.json +++ b/v3/wolf/twilight/twilight.json @@ -266,7 +266,7 @@ "Split Backspace", "Split Left Shift", "Split Right Shift", - ["Bottom Row", "6.25U", "7U"] + ["Bottom Row", "7U", "6.25U"] ] } } \ No newline at end of file From 31f8ff509edf8acb17f9167838cc2af03977516d Mon Sep 17 00:00:00 2001 From: kopibeng <52724926+kopibeng@users.noreply.github.com> Date: Sat, 29 Jul 2023 13:26:43 +0800 Subject: [PATCH 11/35] Add support for XT87 (#1956) --- v3/kopibeng/xt87/xt87.json | 310 +++++++++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) create mode 100644 v3/kopibeng/xt87/xt87.json diff --git a/v3/kopibeng/xt87/xt87.json b/v3/kopibeng/xt87/xt87.json new file mode 100644 index 0000000000..226f30e9c7 --- /dev/null +++ b/v3/kopibeng/xt87/xt87.json @@ -0,0 +1,310 @@ +{ + "name": "XT87", + "vendorId": "0x4B50", + "productId": "0x8700", + "matrix": {"rows": 6, "cols": 17}, + "menus": ["qmk_rgblight"], + "keycodes": ["qmk_lighting"], + "layouts": { + "labels": [ + ["Bottom Row", "6.25u", "7u", "WKL"], + "Split Backspace", + "ISO Enter", + "Split Left Shift", + "Split Right Shift" + ], + "keymap": [ + [ + { + "x": 2.75, + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.25, + "x": 2.75 + }, + "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\n\n\n1,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,14", + "1,15", + "1,16", + { + "x": 1.25, + "c": "#aaaaaa" + }, + "2,12\n\n\n1,1", + "1,13\n\n\n1,1" + ], + [ + { + "x": 2.75, + "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", + "3,12", + { + "w": 1.5 + }, + "2,13\n\n\n2,0", + { + "x": 0.25 + }, + "2,14", + "2,15", + "2,16", + { + "x": 2, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n2,1" + ], + [ + { + "x": 2.75, + "c": "#aaaaaa", + "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": "#777777", + "w": 2.25 + }, + "3,13\n\n\n2,0", + { + "x": 4.25, + "c": "#cccccc" + }, + "3,13\n\n\n2,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n3,1", + "4,1\n\n\n3,1", + { + "x": 0.5, + "w": 2.25 + }, + "4,0\n\n\n3,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": 2.75 + }, + "4,12\n\n\n4,0", + { + "x": 1.25, + "c": "#cccccc" + }, + "4,15", + { + "x": 1.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "4,12\n\n\n4,1", + "4,13\n\n\n4,1" + ], + [ + { + "x": 2.75, + "w": 1.25 + }, + "5,0\n\n\n0,0", + { + "w": 1.25 + }, + "5,1\n\n\n0,0", + { + "w": 1.25 + }, + "5,2\n\n\n0,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6\n\n\n0,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10\n\n\n0,0", + { + "w": 1.25 + }, + "5,11\n\n\n0,0", + { + "w": 1.25 + }, + "5,12\n\n\n0,0", + { + "w": 1.25 + }, + "5,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,14", + "5,15", + "4,16" + ], + [ + { + "y": 0.5, + "x": 2.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n0,1", + "5,1\n\n\n0,1", + { + "w": 1.5 + }, + "5,2\n\n\n0,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n0,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11\n\n\n0,1", + "5,12\n\n\n0,1", + { + "w": 1.5 + }, + "5,13\n\n\n0,1" + ], + [ + { + "x": 2.75, + "w": 1.5 + }, + "5,0\n\n\n0,2", + { + "x": 1, + "w": 1.5 + }, + "5,2\n\n\n0,2", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n0,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11\n\n\n0,2", + { + "x": 1, + "w": 1.5 + }, + "5,13\n\n\n0,2" + ] + ] + } +} \ No newline at end of file From e96b377a26d78aa73cc341781fd5008c288a3fd2 Mon Sep 17 00:00:00 2001 From: Arturo Avila <69410272+ADPenrose@users.noreply.github.com> Date: Fri, 28 Jul 2023 23:27:58 -0600 Subject: [PATCH 12/35] Added support for the Mine Keyboard (#1957) --- v3/adpenrose/mine/mine.json | 392 ++++++++++++++++++++++++++++++++++++ 1 file changed, 392 insertions(+) create mode 100644 v3/adpenrose/mine/mine.json diff --git a/v3/adpenrose/mine/mine.json b/v3/adpenrose/mine/mine.json new file mode 100644 index 0000000000..b3e7795b9d --- /dev/null +++ b/v3/adpenrose/mine/mine.json @@ -0,0 +1,392 @@ +{ + "name": "Mine", + "vendorId": "0x4450", + "productId": "0x0006", + "matrix": {"rows": 11, "cols": 10}, + "layouts": { + "labels": ["ISO enter", "Split Left Shift"], + "keymap": [ + [ + { + "y": 0.1, + "x": 23.25 + }, + "0,9\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "y": -0.10000000000000009, + "x": 2.5, + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1", + "1,1", + { + "x": 9.75 + }, + "0,6", + "1,6", + { + "x": 0.25 + }, + "10,6", + "0,7" + ], + [ + { + "y": -0.6499999999999999, + "x": 20.25 + }, + "1,7", + "0,8", + "10,8", + "1,9" + ], + [ + { + "y": -0.1499999999999999, + "x": 15.25 + }, + "10,5" + ], + [ + { + "y": -0.9500000000000002, + "x": 3.1 + }, + "1,0", + "10,0" + ], + [ + { + "y": -0.8999999999999999, + "x": 16.25 + }, + "2,6", + { + "c": "#aaaaaa", + "w": 2 + }, + "9,6", + { + "x": 1, + "c": "#cccccc" + }, + "2,7", + "1,8", + "9,8", + { + "h": 2 + }, + "8,8" + ], + [ + { + "y": -0.10000000000000009, + "x": 2.85, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "9,0", + { + "x": 20.15, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "7,6\n\n\n0,1" + ], + [ + { + "y": -0.8999999999999999, + "x": 16, + "c": "#cccccc" + }, + "3,6", + "8,6", + { + "w": 1.5 + }, + "7,7\n\n\n0,0", + { + "x": 0.75 + }, + "3,7", + "2,8", + "7,8" + ], + [ + { + "y": -0.09999999999999964, + "x": 2.75, + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "8,0", + { + "x": 19 + }, + "6,6\n\n\n0,1" + ], + [ + { + "y": -0.9000000000000004, + "x": 15.25 + }, + "8,5", + "4,6", + { + "c": "#777777", + "w": 2.25 + }, + "7,6\n\n\n0,0", + { + "x": 0.75, + "c": "#cccccc" + }, + "4,7", + "3,8", + "6,8", + { + "h": 2 + }, + "5,8" + ], + [ + { + "y": -0.09999999999999964, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n1,1", + { + "c": "#cccccc" + }, + "7,0\n\n\n1,1", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0\n\n\n1,0", + { + "c": "#cccccc" + }, + "5,1" + ], + [ + { + "y": -0.9000000000000004, + "x": 15 + }, + "4,5", + "7,5", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "5,6", + { + "x": 1.5, + "c": "#cccccc" + }, + "10,7", + "4,8" + ], + [ + { + "y": -0.7399999999999993, + "x": 20, + "c": "#777777" + }, + "5,7" + ], + [ + { + "y": -0.3600000000000003, + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "6,0" + ], + [ + { + "y": -0.9000000000000004, + "x": 15.75, + "w": 1.25 + }, + "5,5", + { + "w": 1.25 + }, + "6,5" + ], + [ + { + "y": -0.75, + "x": 19, + "c": "#777777" + }, + "6,7", + "8,7", + "9,7" + ], + [ + { + "r": 10, + "rx": 3, + "ry": 4.25, + "y": -3.75, + "x": 2.5, + "c": "#cccccc" + }, + "0,2", + "1,2", + { + "x": 0.25 + }, + "0,3", + "1,3" + ], + [ + { + "y": 0.25, + "x": 2 + }, + "2,1", + "10,1", + "2,2", + "10,2", + "2,3" + ], + [ + { + "x": 2.5 + }, + "3,1", + "9,1", + "3,2", + "9,2" + ], + [ + { + "x": 2.75 + }, + "4,1", + "8,1", + "4,2", + "8,2" + ], + [ + { + "x": 3.25 + }, + "7,1", + "5,2", + "7,2", + "3,3" + ], + [ + { + "x": 3.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "6,1", + { + "c": "#cccccc", + "w": 2.75 + }, + "6,2" + ], + [ + { + "r": -10, + "rx": 12.5, + "ry": 4, + "y": -2.5, + "x": -1 + }, + "9,3", + "10,3", + { + "x": 0.25 + }, + "0,4", + "0,5" + ], + [ + { + "ry": 4.25, + "y": -1.5, + "x": -1.25 + }, + "8,3", + "1,4", + "10,4", + "1,5" + ], + [ + { + "x": -1.75 + }, + "7,3", + "2,4", + "9,4", + "2,5", + "9,5" + ], + [ + { + "x": -1.5 + }, + "6,3", + "3,4", + "8,4", + "3,5" + ], + [ + { + "x": -2 + }, + "5,3", + "4,4", + "5,4", + "7,4" + ], + [ + { + "x": -1.75, + "w": 2.25 + }, + "4,3", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "6,4" + ] + ] + } +} From ce633ea21ef520679ce3277b8fe8adabaabac0cf Mon Sep 17 00:00:00 2001 From: Arturo Avila <69410272+ADPenrose@users.noreply.github.com> Date: Fri, 28 Jul 2023 23:28:45 -0600 Subject: [PATCH 13/35] Added support for the AkemiPad (#1958) --- v3/adpenrose/akemipad/akemipad.json | 148 ++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 v3/adpenrose/akemipad/akemipad.json diff --git a/v3/adpenrose/akemipad/akemipad.json b/v3/adpenrose/akemipad/akemipad.json new file mode 100644 index 0000000000..bdfafbe2a8 --- /dev/null +++ b/v3/adpenrose/akemipad/akemipad.json @@ -0,0 +1,148 @@ +{ + "name": "AkemiPad", + "vendorId": "0x4450", + "productId": "0x0004", + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "showIf": "{id_qmk_rgb_matrix_effect} != 0", + "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", + "Solid Color", + "Cycle Left/Right", + "Cycle Up/Down" + ] + }, + { + "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": 6, "cols": 5}, + "layouts": { + "labels": ["Split Plus", "Split Enter", "Split Zero"], + "keymap": [ + [ + { + "x": 1.25, + "c": "#777777" + }, + "0,0", + "0,1", + "0,2", + "0,3" + ], + [ + { + "y": 0.25, + "x": 1.25, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3" + ], + [ + { + "x": 1.25 + }, + "2,0", + "2,1", + "2,2", + { + "c": "#777777", + "h": 2 + }, + "2,3\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,3\n\n\n0,1" + ], + [ + { + "x": 1.25 + }, + "3,0", + "3,1", + "3,2", + { + "x": 1.25 + }, + "3,3\n\n\n0,1" + ], + [ + { + "x": 1.25 + }, + "4,0", + "4,1", + "4,2", + { + "c": "#777777", + "h": 2 + }, + "4,3\n\n\n1,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "4,3\n\n\n1,1" + ], + [ + "5,4\n\n\n\n\n\n\n\n\ne0", + { + "x": 0.25, + "c": "#777777", + "w": 2 + }, + "5,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "5,2", + { + "x": 1.25 + }, + "5,3\n\n\n1,1" + ], + [ + { + "y": 0.25, + "x": 1.25 + }, + "5,0\n\n\n2,1", + "5,1\n\n\n2,1" + ] + ] + } +} From d0fe77022b7f0a0ba7f9e156d69b14b62bfdab3e Mon Sep 17 00:00:00 2001 From: Danny Date: Sat, 29 Jul 2023 01:29:16 -0400 Subject: [PATCH 14/35] Add Chocopad Rev. 1 and Rev. 2 (#1959) --- v3/keebio/chocopad/chocopad-rev1.json | 16 ++++++++++++++++ v3/keebio/chocopad/chocopad-rev2.json | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 v3/keebio/chocopad/chocopad-rev1.json create mode 100644 v3/keebio/chocopad/chocopad-rev2.json diff --git a/v3/keebio/chocopad/chocopad-rev1.json b/v3/keebio/chocopad/chocopad-rev1.json new file mode 100644 index 0000000000..500ae5e2ce --- /dev/null +++ b/v3/keebio/chocopad/chocopad-rev1.json @@ -0,0 +1,16 @@ +{ + "name": "Chocopad Rev. 1", + "vendorId": "0xCB10", + "productId": "0x1144", + "matrix": {"rows": 4, "cols": 4}, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight_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"] + ] + } +} diff --git a/v3/keebio/chocopad/chocopad-rev2.json b/v3/keebio/chocopad/chocopad-rev2.json new file mode 100644 index 0000000000..e4a86db4f5 --- /dev/null +++ b/v3/keebio/chocopad/chocopad-rev2.json @@ -0,0 +1,16 @@ +{ + "name": "Chocopad Rev. 2", + "vendorId": "0xCB10", + "productId": "0x2144", + "matrix": {"rows": 4, "cols": 4}, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], + "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"] + ] + } +} From 085f9d3bb7c1df90acc226f5df8aa8ade95b84df Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 29 Jul 2023 07:30:10 +0200 Subject: [PATCH 15/35] Add kawayo (#1960) --- v3/cipulot/kawayo/kawayo.json | 193 ++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 v3/cipulot/kawayo/kawayo.json diff --git a/v3/cipulot/kawayo/kawayo.json b/v3/cipulot/kawayo/kawayo.json new file mode 100644 index 0000000000..699d3b0a79 --- /dev/null +++ b/v3/cipulot/kawayo/kawayo.json @@ -0,0 +1,193 @@ +{ + "name": "Kawayo", + "vendorId": "0x6369", + "productId": "0x6B7F", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "labels": [ + "Split Backspace", + [ + "Bottom Row", + "7U", + "6.25U" + ] + ], + "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", + { + "x": 1.25, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "0,14\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" + }, + "1,14" + ], + [ + { + "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": "#aaaaaa", + "w": 2.25 + }, + "2,12", + "2,13" + ], + [ + { + "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", + "3,12", + "3,13" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n1,0", + "4,1\n\n\n1,0", + { + "w": 1.5 + }, + "4,2\n\n\n1,0", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n1,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n1,0", + { + "x": 0.5 + }, + "4,11", + "4,12", + "4,13" + ], + [ + { + "y": 0.25, + "w": 1.25 + }, + "4,0\n\n\n1,1", + { + "w": 1.25 + }, + "4,1\n\n\n1,1", + { + "w": 1.25 + }, + "4,2\n\n\n1,1", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,5\n\n\n1,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n1,1", + { + "w": 1.25 + }, + "4,10\n\n\n1,1" + ] + ] + } +} \ No newline at end of file From 471aec47d3e354e7d1eab15f47f106934d063fdb Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Sat, 29 Jul 2023 01:31:48 -0400 Subject: [PATCH 16/35] Add Bastion75 PCB to VIA (#1961) --- v3/cannonkeys/bastion75/bastion75.json | 291 +++++++++++++++++++++++++ 1 file changed, 291 insertions(+) create mode 100644 v3/cannonkeys/bastion75/bastion75.json diff --git a/v3/cannonkeys/bastion75/bastion75.json b/v3/cannonkeys/bastion75/bastion75.json new file mode 100644 index 0000000000..6140ddd8a0 --- /dev/null +++ b/v3/cannonkeys/bastion75/bastion75.json @@ -0,0 +1,291 @@ +{ + "name": "Bastion75", + "vendorId": "0xCA04", + "productId": "0x0022", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight_rgblight"], + "matrix": { + "rows": 6, + "cols": 15 + }, + "layouts": { + "labels": [ + "Split Backspace", + "ISO Enter", + "Split L Shift", + [ + "Bottom Row", + "6.25U", + "7U", + "3/1/3 Split" + ] + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#777777" + }, + "0,0", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,14" + ], + [ + { + "y": 0.25, + "x": 2.5, + "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\n\n\n0,0", + "1,14", + { + "x": 0.5 + }, + "1,13\n\n\n0,1", + "3,12\n\n\n0,1" + ], + [ + { + "x": 2.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", + { + "w": 1.5 + }, + "2,13\n\n\n1,0", + { + "c": "#aaaaaa" + }, + "2,14", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "3,13\n\n\n1,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "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": "#777777", + "w": 2.25 + }, + "3,13\n\n\n1,0", + { + "c": "#aaaaaa" + }, + "3,14", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,13\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "4,1\n\n\n2,1", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0\n\n\n2,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", + "4,13", + "4,14" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "5,0\n\n\n3,0", + { + "w": 1.25 + }, + "5,1\n\n\n3,0", + { + "w": 1.25 + }, + "5,2\n\n\n3,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10\n\n\n3,0", + { + "w": 1.25 + }, + "5,11\n\n\n3,0", + { + "x": 0.5 + }, + "5,12", + "5,13", + "5,14" + ], + [ + { + "y": 0.25, + "x": 2.5, + "w": 1.5 + }, + "5,0\n\n\n3,1", + "5,1\n\n\n3,1", + { + "w": 1.5 + }, + "5,2\n\n\n3,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n3,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11\n\n\n3,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "5,0\n\n\n3,2", + "5,1\n\n\n3,2", + { + "w": 1.5 + }, + "5,2\n\n\n3,2", + { + "c": "#cccccc", + "w": 3 + }, + "5,5\n\n\n3,2", + "5,6\n\n\n3,2", + { + "w": 3 + }, + "5,9\n\n\n3,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11\n\n\n3,2" + ] + ] + } + } \ No newline at end of file From 005c768653e1c637730a020e35bcc67bf12c0aa8 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 29 Jul 2023 07:32:24 +0200 Subject: [PATCH 17/35] Add EC Theca (#1962) --- v3/cipulot/ec_theca/ec_theca.json | 317 ++++++++++++++++++++++++++++++ 1 file changed, 317 insertions(+) create mode 100644 v3/cipulot/ec_theca/ec_theca.json diff --git a/v3/cipulot/ec_theca/ec_theca.json b/v3/cipulot/ec_theca/ec_theca.json new file mode 100644 index 0000000000..272f6da945 --- /dev/null +++ b/v3/cipulot/ec_theca/ec_theca.json @@ -0,0 +1,317 @@ +{ + "name": "EC Theca", + "vendorId": "0x6369", + "productId": "0x6B7E", + "menus": [ + { + "label": "EC Tools", + "content": [ + { + "label": "APC", + "content": [ + { + "label": "Actuation Level", + "type": "range", + "options": [ + 1, + 1023 + ], + "content": [ + "id_apc_actuation_threshold", + 0, + 1 + ] + }, + { + "label": "Release Level", + "type": "range", + "options": [ + 1, + 1023 + ], + "content": [ + "id_apc_release_threshold", + 0, + 2 + ] + } + ] + } + ] + } + ], + "matrix": { + "rows": 6, + "cols": 16 + }, + "layouts": { + "labels": [ + [ + "Bottom Row", + "7U WKL", + "7U WK", + "6.25U" + ] + ], + "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,13", + "0,14", + "0,15" + ], + [ + { + "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", + "2,15" + ], + [ + { + "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", + { + "w": 1.5 + }, + "2,13", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "2,14", + "3,14", + "3,15" + ], + [ + { + "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" + ], + [ + { + "w": 2.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", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,13", + { + "x": 1.25, + "c": "#cccccc" + }, + "4,14" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n0,0", + { + "d": true + }, + "5,1\n\n\n0,0", + { + "w": 1.5 + }, + "5,2\n\n\n0,0", + { + "c": "#cccccc", + "w": 7 + }, + "5,5\n\n\n0,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11\n\n\n0,0", + { + "d": true + }, + "5,12\n\n\n0,0", + { + "w": 1.5 + }, + "5,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,14", + "5,15", + "4,15" + ], + [ + { + "y": 0.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n0,1", + "5,1\n\n\n0,1", + { + "w": 1.5 + }, + "5,2\n\n\n0,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,5\n\n\n0,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11\n\n\n0,1", + "5,12\n\n\n0,1", + { + "w": 1.5 + }, + "5,13\n\n\n0,1" + ], + [ + { + "y": 0.25, + "w": 1.25 + }, + "5,0\n\n\n0,2", + { + "w": 1.25 + }, + "5,1\n\n\n0,2", + { + "w": 1.25 + }, + "5,2\n\n\n0,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,5\n\n\n0,2", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10\n\n\n0,2", + { + "w": 1.25 + }, + "5,11\n\n\n0,2", + { + "w": 1.25 + }, + "5,12\n\n\n0,2", + { + "w": 1.25 + }, + "5,13\n\n\n0,2" + ] + ] + } +} \ No newline at end of file From 1b287a8dc3eae60ba3a6b489298a95b920f588a9 Mon Sep 17 00:00:00 2001 From: Danny Date: Sat, 29 Jul 2023 01:32:59 -0400 Subject: [PATCH 18/35] Add Nyquistpad (#1963) --- v3/keebio/nyquistpad/nyquistpad-rev1.json | 56 +++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 v3/keebio/nyquistpad/nyquistpad-rev1.json diff --git a/v3/keebio/nyquistpad/nyquistpad-rev1.json b/v3/keebio/nyquistpad/nyquistpad-rev1.json new file mode 100644 index 0000000000..319bda753b --- /dev/null +++ b/v3/keebio/nyquistpad/nyquistpad-rev1.json @@ -0,0 +1,56 @@ +{ + "name": "Nyquistpad Rev. 1", + "vendorId": "0xCB10", + "productId": "0x1356", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgb_matrix"], + "matrix": {"rows": 5, "cols": 6}, + "layouts": { + "labels": [ ["Left Space", "1u", "2u"], "Top Left Encoder" ], + "keymap": [ + ["0,0\n\n\n1,0", "0,1", "0,2", "0,3", "0,4", "0,5"], + [ + {"c": "#aaaaaa"}, + "1,0", + {"c": "#cccccc"}, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5" + ], + [ + {"c": "#777777"}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5" + ], + [ + {"c": "#aaaaaa"}, + "3,0", + {"c": "#cccccc"}, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5" + ], + [ + {"c": "#aaaaaa"}, + "4,0", + "4,1", + "4,2", + "4,3", + "4,4\n\n\n0,0", + {"c": "#cccccc"}, + "4,5\n\n\n0,0" + ], + [ {"x": 4, "w": 2}, "4,4\n\n\n0,1" ], + ["0,0\n\n\n1,1\n\n\n\n\n\ne0"] + ] + } +} From f03f18f3f72f00544cf1076d9848f5df3eca73a1 Mon Sep 17 00:00:00 2001 From: Sleepdealr <35879391+Sleepdealr@users.noreply.github.com> Date: Sat, 29 Jul 2023 01:33:29 -0400 Subject: [PATCH 19/35] Update WITF JSON (#1965) --- v3/ramlord/witf/witf.json | 252 +++++++++++++++++++++++++------------- 1 file changed, 169 insertions(+), 83 deletions(-) diff --git a/v3/ramlord/witf/witf.json b/v3/ramlord/witf/witf.json index 322f63ad8a..8d13625296 100644 --- a/v3/ramlord/witf/witf.json +++ b/v3/ramlord/witf/witf.json @@ -9,8 +9,14 @@ "layouts": { "labels": [ "Split Backspace", - "Split LShift", - ["Numpad", "Regular", "Split", "Flipped", "Flipped Split"] + "Split RShift", + [ + "Numpad", + "Regular", + "Split", + "Flipped", + "Flipped Split" + ] ], "keymap": [ [ @@ -24,27 +30,12 @@ }, "0,2", { - "x": 0.5, + "x": 1, "c": "#cccccc" }, "1,2", - "0,3", - "1,3", - "0,4", - { - "x": 0.25, - "c": "#aca693" - }, - "1,5", - "0,6", - { - "x": 1.5 - }, - "1,6", - "0,7", { - "x": 0.75, - "c": "#cccccc" + "x": 9 }, "1,7", "0,8", @@ -72,23 +63,16 @@ "2,1", "3,1", { - "x": 1.25, - "c": "#cccccc" + "x": 1.25 }, "2,2", + { + "c": "#cccccc" + }, "3,2", - "2,3", - "3,3", - "2,4", - "3,4", - "2,5", { - "x": 1 + "x": 9.75 }, - "3,5", - "2,6", - "3,6", - "2,7", "3,7", "2,8", { @@ -97,7 +81,7 @@ }, "2,9\n\n\n0,0", { - "x": 1, + "x": 1.25, "c": "#cccccc" }, "3,9", @@ -127,26 +111,20 @@ "c": "#cccccc" }, "5,2", - "4,3", - "5,3", - "4,4", - "5,4", { - "x": 1.5 + "x": 9.25 }, - "4,5", - "4,6", - "5,6", - "4,7", "5,7", "4,8", "5,8", { + "c": "#aca693", "w": 1.5 }, "4,9", { - "x": 0.75 + "x": 1, + "c": "#cccccc" }, "5,9", "4,10", @@ -171,17 +149,9 @@ "c": "#cccccc" }, "7,2", - "6,3", - "7,3", - "6,4", - "7,4", { - "x": 1.75 + "x": 9.75 }, - "6,5", - "6,6", - "7,6", - "6,7", "7,7", "6,8", { @@ -214,17 +184,9 @@ "c": "#cccccc" }, "9,2", - "8,3", - "9,3", - "8,4", - "9,4", { - "x": 1.25 + "x": 9.25 }, - "8,5", - "8,6", - "7,6", - "8,7", "9,7", "8,8", { @@ -256,26 +218,7 @@ }, "10,2", { - "x": 1.75, - "w": 1.5 - }, - "10,3", - { - "w": 2.25 - }, - "10,4", - "11,4", - { - "x": 0.5, - "w": 2.75 - }, - "10,6", - { - "w": 1.5 - }, - "10,7", - { - "x": 3, + "x": 14.25, "w": 1.5 }, "10,9", @@ -294,7 +237,19 @@ ], [ { - "y": 0.25 + "rx": 7, + "ry": 5.5, + "y": -4.05, + "x": 0.25 + }, + "2,3" + ], + [ + { + "rx": 17.5, + "ry": 1.5, + "y": 6.550000000000001, + "x": -17.5 }, "4,0\n\n\n2,1", { @@ -335,6 +290,7 @@ ], [ { + "x": -17.5, "c": "#cccccc" }, "6,0\n\n\n2,1", @@ -348,6 +304,9 @@ "7,1\n\n\n2,3" ], [ + { + "x": -17.5 + }, "8,0\n\n\n2,1", { "x": 2, @@ -378,6 +337,9 @@ "9,1\n\n\n2,3" ], [ + { + "x": -17.5 + }, "10,0\n\n\n2,1", "11,0\n\n\n2,1", "10,1\n\n\n2,1", @@ -400,11 +362,135 @@ "c": "#aca693", "w": 1.75 }, - "8,9\n\n\n1,1", + "9,8\n\n\n1,1", { "c": "#cccccc" }, - "9,8\n\n\n1,1" + "8,9\n\n\n1,1" + ], + [ + { + "r": 15, + "rx": 7, + "ry": 5.5, + "y": -4.15, + "x": 0.5 + }, + "3,3", + "2,4", + "3,4", + "2,5" + ], + [ + "4,3", + "5,3", + "4,4", + "5,4" + ], + [ + { + "x": 0.25 + }, + "6,3", + "7,3", + "6,4", + "7,4" + ], + [ + { + "x": 0.75 + }, + "8,3", + "9,3", + "8,4", + "9,4" + ], + [ + { + "x": 0.5, + "c": "#aca693", + "w": 1.5 + }, + "10,3", + { + "w": 2.25 + }, + "10,4", + "11,4" + ], + [ + { + "rx": 8.25, + "ry": 1, + "y": -1, + "c": "#cccccc" + }, + "0,3", + "1,3", + "0,4" + ], + [ + { + "r": -15, + "rx": 16.75, + "ry": 0, + "x": -4.25 + }, + "1,5", + "0,6", + "1,6", + "0,7" + ], + [ + { + "rx": 17.5, + "ry": 1.5, + "y": -0.19999999999999996, + "x": -4.75 + }, + "3,5", + "2,6", + "3,6", + "2,7" + ], + [ + { + "x": -5.25 + }, + "4,5", + "4,6", + "5,6", + "4,7" + ], + [ + { + "x": -5 + }, + "6,5", + "6,6", + "7,6", + "6,7" + ], + [ + { + "x": -5.5 + }, + "9,5", + "8,6", + "9,6", + "8,7" + ], + [ + { + "x": -5.5, + "c": "#aca693", + "w": 2.75 + }, + "10,6", + { + "w": 1.5 + }, + "10,7" ] ] } From 673e383c8f9be411a3c127d16efbc22435588527 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Sat, 29 Jul 2023 01:33:54 -0400 Subject: [PATCH 20/35] Add Bastion60 to VIA (#1966) --- v3/cannonkeys/bastion60/bastion60.json | 270 +++++++++++++++++++++++++ 1 file changed, 270 insertions(+) create mode 100644 v3/cannonkeys/bastion60/bastion60.json diff --git a/v3/cannonkeys/bastion60/bastion60.json b/v3/cannonkeys/bastion60/bastion60.json new file mode 100644 index 0000000000..6e442193bf --- /dev/null +++ b/v3/cannonkeys/bastion60/bastion60.json @@ -0,0 +1,270 @@ +{ + "name": "Bastion60", + "vendorId": "0xCA04", + "productId": "0x0020", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight_rgblight"], + "matrix": { + "rows": 5, + "cols": 14 + }, + "layouts": { + "labels": [ + "Split Backspace", + "ISO Enter", + "Split L Shift", + "Split R Shift", + [ + "Bottom Row", + "6.25U", + "7U", + "3/1/3 Split" + ] + ], + "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\n\n\n0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "2,12\n\n\n0,1" + ], + [ + { + "x": 2.5, + "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\n\n\n1,0", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,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\n1,0", + { + "x": 0.75, + "c": "#cccccc" + }, + "1,13\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,1", + { + "x": 0.25, + "c": "#aaaaaa", + "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", + { + "x": 0.25, + "w": 1.75 + }, + "3,12\n\n\n3,1", + "3,13\n\n\n3,1" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "4,0\n\n\n4,0", + { + "w": 1.25 + }, + "4,1\n\n\n4,0", + { + "w": 1.25 + }, + "4,2\n\n\n4,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n4,0", + { + "w": 1.25 + }, + "4,11\n\n\n4,0", + { + "w": 1.25 + }, + "4,12\n\n\n4,0", + { + "w": 1.25 + }, + "4,13\n\n\n4,0" + ], + [ + { + "y": 0.25, + "x": 2.5, + "w": 1.5 + }, + "4,0\n\n\n4,1", + "4,1\n\n\n4,1", + { + "w": 1.5 + }, + "4,2\n\n\n4,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", + { + "w": 1.5 + }, + "4,13\n\n\n4,1" + ], + [ + { + "x": 2.5, + "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": 3 + }, + "4,5\n\n\n4,2", + "4,6\n\n\n4,2", + { + "w": 3 + }, + "4,9\n\n\n4,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n4,2", + "4,12\n\n\n4,2", + { + "w": 1.5 + }, + "4,13\n\n\n4,2" + ] + ] + } +} \ No newline at end of file From 8e70da0c5f390f8ca8fe08d4fee46f54ad1884fb Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Sat, 29 Jul 2023 01:34:16 -0400 Subject: [PATCH 21/35] Add BastionTKL PCB to VIA (#1967) --- v3/cannonkeys/bastiontkl/bastiontkl.json | 327 +++++++++++++++++++++++ 1 file changed, 327 insertions(+) create mode 100644 v3/cannonkeys/bastiontkl/bastiontkl.json diff --git a/v3/cannonkeys/bastiontkl/bastiontkl.json b/v3/cannonkeys/bastiontkl/bastiontkl.json new file mode 100644 index 0000000000..fba085e6a0 --- /dev/null +++ b/v3/cannonkeys/bastiontkl/bastiontkl.json @@ -0,0 +1,327 @@ + +{ + "name": "BastionTKL", + "vendorId": "0xCA04", + "productId": "0x0023", + "matrix": { + "rows": 6, + "cols": 17 + }, + "layouts": { + "labels": [ + ["F Row", "F13", "F12"], + "Split Backspace", + "ISO Enter", + "Split L Shift", + "Split R Shift", + ["Bottom Row", "6.25U", "7U"] + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#777777" + }, + "0,0\n\n\n0,1", + { + "x": 1, + "c": "#cccccc" + }, + "0,2\n\n\n0,1", + "0,3\n\n\n0,1", + "0,4\n\n\n0,1", + "0,5\n\n\n0,1", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,6\n\n\n0,1", + "0,7\n\n\n0,1", + "0,8\n\n\n0,1", + "0,9\n\n\n0,1", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,10\n\n\n0,1", + "0,11\n\n\n0,1", + "0,12\n\n\n0,1", + "0,13\n\n\n0,1" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#777777" + }, + "0,0\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1\n\n\n0,0", + "0,2\n\n\n0,0", + "0,3\n\n\n0,0", + "0,4\n\n\n0,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,5\n\n\n0,0", + "0,6\n\n\n0,0", + "0,7\n\n\n0,0", + "0,8\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,9\n\n\n0,0", + "0,10\n\n\n0,0", + "0,11\n\n\n0,0", + "0,12\n\n\n0,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,13\n\n\n0,0", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.25, + "x": 2.5, + "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\n\n\n1,0", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16", + { + "x": 1, + "c": "#cccccc" + }, + "1,13\n\n\n1,1", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n1,1" + ], + [ + { + "x": 2.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", + { + "w": 1.5 + }, + "2,13\n\n\n2,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "2,14", + "2,15", + "2,16", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "3,13\n\n\n2,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "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": "#777777", + "w": 2.25 + }, + "3,13\n\n\n2,0", + { + "x": 4, + "c": "#cccccc" + }, + "2,13\n\n\n2,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n3,1", + { + "c": "#cccccc" + }, + "4,1\n\n\n3,1", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0\n\n\n3,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": 2.75 + }, + "4,12\n\n\n4,0", + { + "x": 1.25 + }, + "4,15", + { + "x": 1.25, + "w": 1.75 + }, + "4,12\n\n\n4,1", + "4,13\n\n\n4,1" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "5,0\n\n\n5,0", + { + "w": 1.25 + }, + "5,1\n\n\n5,0", + { + "w": 1.25 + }, + "5,2\n\n\n5,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6\n\n\n5,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10\n\n\n5,0", + { + "w": 1.25 + }, + "5,11\n\n\n5,0", + { + "w": 1.25 + }, + "5,12\n\n\n5,0", + { + "w": 1.25 + }, + "5,13\n\n\n5,0", + { + "x": 0.25 + }, + "5,14", + "5,15", + "5,16" + ], + [ + { + "y": 0.25, + "x": 2.5, + "w": 1.5 + }, + "5,0\n\n\n5,1", + "5,1\n\n\n5,1", + { + "w": 1.5 + }, + "5,2\n\n\n5,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n5,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11\n\n\n5,1", + "5,12\n\n\n5,1", + { + "w": 1.5 + }, + "5,13\n\n\n5,1" + ] + ] + } +} \ No newline at end of file From 830c330a56707debe48b4d316581748c73d7bc52 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Sat, 29 Jul 2023 01:36:47 -0400 Subject: [PATCH 22/35] Add Bastion65 to VIA (#1970) --- v3/cannonkeys/bastion65/bastion65.json | 252 +++++++++++++++++++++++++ 1 file changed, 252 insertions(+) create mode 100644 v3/cannonkeys/bastion65/bastion65.json diff --git a/v3/cannonkeys/bastion65/bastion65.json b/v3/cannonkeys/bastion65/bastion65.json new file mode 100644 index 0000000000..df8b4efbfe --- /dev/null +++ b/v3/cannonkeys/bastion65/bastion65.json @@ -0,0 +1,252 @@ +{ + "name": "Bastion65", + "vendorId": "0xCA04", + "productId": "0x0021", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight_rgblight"], + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "labels": [ + "Split Backspace", + "ISO Enter", + "Split L Shift", + ["Bottom Row", "6.25U", "7U", "3/1/3 Split Space"] + ], + "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\n\n\n0,0", + "0,14", + { + "x": 0.5 + }, + "0,13\n\n\n0,1", + "2,12\n\n\n0,1" + ], + [ + { + "x": 2.5, + "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\n\n\n1,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\n1,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\n1,0", + { + "c": "#aaaaaa" + }, + "2,14", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,13\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,1", + { + "x": 0.25, + "c": "#aaaaaa", + "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", + { + "w": 1.75 + }, + "3,12", + { + "c": "#aaaaaa" + }, + "3,13", + "3,14" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "4,0\n\n\n3,0", + { + "w": 1.25 + }, + "4,1\n\n\n3,0", + { + "w": 1.25 + }, + "4,2\n\n\n3,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n3,0", + { + "w": 1.25 + }, + "4,11\n\n\n3,0", + { + "x": 0.5 + }, + "4,12", + "4,13", + "4,14" + ], + [ + { + "y": 0.25, + "x": 2.5, + "w": 1.5 + }, + "4,0\n\n\n3,1", + "4,1\n\n\n3,1", + { + "w": 1.5 + }, + "4,2\n\n\n3,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "4,0\n\n\n3,2", + "4,1\n\n\n3,2", + { + "w": 1.5 + }, + "4,2\n\n\n3,2", + { + "c": "#cccccc", + "w": 3 + }, + "4,5\n\n\n3,2", + "4,6\n\n\n3,2", + { + "w": 3 + }, + "4,9\n\n\n3,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,2" + ] + ] + } +} \ No newline at end of file From 124687dfcc22f9fe2ad52b9d6d18ff23d83b307c Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:41:22 +0800 Subject: [PATCH 23/35] add via support for nemui65 (#1968) --- v3/wuque/nemui65/nemui65.json | 161 ++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 v3/wuque/nemui65/nemui65.json diff --git a/v3/wuque/nemui65/nemui65.json b/v3/wuque/nemui65/nemui65.json new file mode 100644 index 0000000000..60d9c93736 --- /dev/null +++ b/v3/wuque/nemui65/nemui65.json @@ -0,0 +1,161 @@ +{ + "name": "nemui65", + "vendorId": "0x807C", + "productId": "0x0005", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "matrix": {"rows": 5, "cols": 15}, + "layouts": { + "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" + ], + [ + { + "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", + "1,14" + ], + [ + { + "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" + }, + "2,14" + ], + [ + { + "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,12", + { + "c": "#777777" + }, + "3,13", + { + "c": "#aaaaaa" + }, + "3,14" + ], + [ + { + "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" + ] + ] + } +} From 916829f8db655dd9ec32d5ec4e315f8c2f0bda9f Mon Sep 17 00:00:00 2001 From: era <73109780+eerraa@users.noreply.github.com> Date: Sat, 29 Jul 2023 20:48:43 +0900 Subject: [PATCH 24/35] Add support for era/divine (#1971) --- v3/era/divine/divine.json | 310 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) create mode 100644 v3/era/divine/divine.json diff --git a/v3/era/divine/divine.json b/v3/era/divine/divine.json new file mode 100644 index 0000000000..9aebdc82b2 --- /dev/null +++ b/v3/era/divine/divine.json @@ -0,0 +1,310 @@ +{ + "name": "DIVINE", + "vendorId": "0x4552", + "productId": "0x0002", + "matrix": + { + "rows": 5, + "cols": 17 + }, + "layouts": + { + "labels": + [ + "Split Backspace", + "Split Left shift" + ], + "keymap": + [ + [ + { + "y": 0.7, + "x": 0.55, + "c": "#777777" + }, + "0,0", + { + "x": 16, + "c": "#aaaaaa" + }, + "0,16" + ], + [ + { + "y": -0.95, + "x": 3.7, + "c": "#cccccc" + }, + "0,3", + { + "x": 8.600000000000001 + }, + "0,12" + ], + [ + { + "y": -0.95, + "x": 1.7 + }, + "0,1", + "0,2", + { + "x": 10.600000000000001 + }, + "0,13", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,15\n\n\n0,0", + { + "x": 2.9499999999999993 + }, + "0,14\n\n\n0,1", + "0,15\n\n\n0,1" + ], + [ + { + "y": -0.10000000000000009, + "x": 0.35 + }, + "1,0", + { + "x": 16.4 + }, + "1,16" + ], + [ + { + "y": -0.95, + "x": 13, + "c": "#cccccc" + }, + "1,12" + ], + [ + { + "y": -0.95, + "x": 1.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,1", + { + "c": "#cccccc" + }, + "1,2", + { + "x": 10 + }, + "1,13", + "1,14", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,15" + ], + [ + { + "y": -0.10000000000000009, + "x": 0.15 + }, + "2,0" + ], + [ + { + "y": -0.8999999999999999, + "x": 1.3, + "w": 1.75 + }, + "2,1", + { + "c": "#cccccc" + }, + "2,2", + { + "x": 9.349999999999998 + }, + "2,12", + "2,13", + { + "c": "#777777", + "w": 2.25 + }, + "2,15" + ], + [ + { + "x": 1.05, + "c": "#aaaaaa", + "w": 2.25 + }, + "3,1\n\n\n1,0", + { + "c": "#cccccc" + }, + "3,3", + { + "x": 8.8 + }, + "3,12", + "3,13", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,14", + { + "x": 3.1499999999999986, + "w": 1.25 + }, + "3,1\n\n\n1,1", + { + "c": "#cccccc" + }, + "3,2\n\n\n1,1" + ], + [ + { + "y": -0.75, + "x": 17.1, + "c": "#777777" + }, + "3,15" + ], + [ + { + "y": -0.25, + "x": 1.05, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,1" + ], + [ + { + "y": -0.75, + "x": 16.1, + "c": "#777777" + }, + "4,14", + "4,15", + "4,16" + ], + [ + { + "r": 10, + "y": -6.05, + "x": 4.9, + "c": "#cccccc" + }, + "0,4", + "0,5", + "0,6", + "0,7" + ], + [ + { + "x": 4.4 + }, + "1,3", + "1,4", + "1,5", + "1,6" + ], + [ + { + "x": 4.65 + }, + "2,3", + "2,4", + "2,5", + "2,6" + ], + [ + { + "x": 5.1 + }, + "3,4", + "3,5", + "3,6", + "3,7" + ], + [ + { + "x": 6.35, + "w": 2.25 + }, + "4,6", + { + "c": "#aaaaaa" + }, + "4,7" + ], + [ + { + "y": -0.9500000000000002, + "x": 4.85, + "w": 1.5 + }, + "4,4" + ], + [ + { + "r": -10, + "y": -2.05, + "x": 8.8, + "c": "#cccccc" + }, + "0,8", + "0,9", + "0,10", + "0,11" + ], + [ + { + "x": 8.3 + }, + "1,8", + "1,9", + "1,10", + "1,11" + ], + [ + { + "x": 8.55 + }, + "2,8", + "2,9", + "2,10", + "2,11" + ], + [ + { + "x": 8.1 + }, + "3,8", + "3,9", + "3,10", + "3,11" + ], + [ + { + "x": 8.1, + "w": 2.75 + }, + "4,9" + ], + [ + { + "y": -0.9500000000000002, + "x": 10.86, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11" + ] + ] + } +} \ No newline at end of file From d894888fbf11c9c5858711d4cd0bfb4cb21b2f5c Mon Sep 17 00:00:00 2001 From: yiancar Date: Sat, 29 Jul 2023 23:49:55 +0100 Subject: [PATCH 25/35] Update allison.json --- v3/yiancardesigns/allison/allison.json | 193 ++++++++++++++++++++----- 1 file changed, 154 insertions(+), 39 deletions(-) diff --git a/v3/yiancardesigns/allison/allison.json b/v3/yiancardesigns/allison/allison.json index fb0cc73a65..1370754484 100644 --- a/v3/yiancardesigns/allison/allison.json +++ b/v3/yiancardesigns/allison/allison.json @@ -8,34 +8,51 @@ "Split Backspace", "ISO", "Split Left Shift", - "Split Right Shift" + "Split Right Shift", + ["Bottom Row", "WKL", "WK"] ], "keymap": [ [ - {"x": 1.25, "c": "#777777"}, + { + "x": 1.25, + "c": "#777777" + }, "0,0", - {"x": 0.25, "c": "#cccccc"}, + { + "x": 0.25, + "c": "#cccccc" + }, "0,1", "0,2", "0,3", "0,4", - {"x": 0.25}, + { + "x": 0.25 + }, "0,5", "0,6", "0,7", "0,8", - {"x": 0.25}, + { + "x": 0.25 + }, "0,9", "0,10", "0,11", "0,12", - {"x": 0.25}, + { + "x": 0.25 + }, "0,13" ], [ - {"y": 0.25}, + { + "y": 0.25 + }, "1,0", - {"x": 0.25}, + { + "x": 0.25 + }, "1,1", "1,2", "1,3", @@ -49,17 +66,29 @@ "1,11", "1,12", "1,13", - {"c": "#aaaaaa", "w": 2}, + { + "c": "#aaaaaa", + "w": 2 + }, "0,14\n\n\n0,0", - {"x": 1, "c": "#cccccc"}, + { + "x": 1, + "c": "#cccccc" + }, "1,14\n\n\n0,1", "0,14\n\n\n0,1" ], [ "2,0", - {"x": 0.25, "c": "#aaaaaa", "w": 1.5}, + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.5 + }, "2,1", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "2,2", "2,3", "2,4", @@ -72,7 +101,9 @@ "2,11", "2,12", "2,13", - {"w": 1.5}, + { + "w": 1.5 + }, "2,14\n\n\n1,0", { "x": 1.75, @@ -86,11 +117,19 @@ "3,14\n\n\n1,1" ], [ - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,0", - {"x": 0.25, "c": "#aaaaaa", "w": 1.75}, + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.75 + }, "3,1", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "3,2", "3,3", "3,4", @@ -102,16 +141,28 @@ "3,10", "3,11", "3,12", - {"c": "#777777", "w": 2.25}, + { + "c": "#777777", + "w": 2.25 + }, "3,14\n\n\n1,0", - {"x": 0.75, "c": "#cccccc"}, + { + "x": 0.75, + "c": "#cccccc" + }, "3,13\n\n\n1,1" ], [ "4,0", - {"x": 0.25, "c": "#aaaaaa", "w": 2.25}, + { + "x": 0.25, + "c": "#aaaaaa", + "w": 2.25 + }, "4,1\n\n\n2,0", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "4,3", "4,4", "4,5", @@ -122,35 +173,99 @@ "4,10", "4,11", "4,12", - {"c": "#aaaaaa", "w": 2.75}, + { + "c": "#aaaaaa", + "w": 2.75 + }, "4,13\n\n\n3,0", - {"x": 0.25, "w": 1.75}, + { + "x": 0.25, + "w": 1.75 + }, "4,13\n\n\n3,1", "4,14\n\n\n3,1" ], [ - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "5,0", - {"x": 0.25, "c": "#aaaaaa", "w": 1.5}, - "5,1", - {"c": "#cccccc", "d": true}, - "5,2", - {"c": "#aaaaaa", "w": 1.5}, - "5,3", - {"c": "#cccccc", "w": 7}, - "5,8", - {"c": "#aaaaaa", "w": 1.5}, - "5,12", - {"c": "#cccccc", "d": true}, - "5,13", - {"c": "#aaaaaa", "w": 1.5}, - "5,14" + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,1\n\n\n4,0", + { + "c": "#cccccc", + "d": true + }, + "5,2\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,3\n\n\n4,0", + { + "c": "#cccccc", + "w": 7 + }, + "5,8\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,12\n\n\n4,0", + { + "c": "#cccccc", + "d": true + }, + "5,13\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,14\n\n\n4,0" ], [ - {"y": 0.75, "x": 1.25, "w": 1.25}, + { + "y": 0.75, + "x": 1.25, + "w": 1.25 + }, "4,1\n\n\n2,1", - {"c": "#cccccc"}, + { + "c": "#cccccc" + }, "4,2\n\n\n2,1" + ], + [ + { + "x": 1.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,1\n\n\n4,1", + "5,2\n\n\n4,1", + { + "w": 1.5 + }, + "5,3\n\n\n4,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,8\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,12\n\n\n4,1", + "5,13\n\n\n4,1", + { + "w": 1.5 + }, + "5,14\n\n\n4,1" ] ] } From baba6f55cc2e8a0ba0f3fd9b716f555c516afd9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Krasnod=C4=99bski?= <105773062+TheChilledDejw@users.noreply.github.com> Date: Sun, 30 Jul 2023 14:00:28 +0200 Subject: [PATCH 26/35] Repair missing keys in BM60v2 Keyboard (missing 2 keys in scheme) (#1974) --- v3/kprepublic/bm60rgb_v2.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v3/kprepublic/bm60rgb_v2.json b/v3/kprepublic/bm60rgb_v2.json index 6cfbcd5d0c..de75a5627f 100644 --- a/v3/kprepublic/bm60rgb_v2.json +++ b/v3/kprepublic/bm60rgb_v2.json @@ -48,6 +48,7 @@ {"c": "#aaaaaa", "w": 1.75}, "2,0", {"c": "#cccccc"}, + "2,1", "2,2", "2,3", "2,4", @@ -58,14 +59,14 @@ "2,9", "2,10", "2,11", - "2,12", {"c": "#777777", "w": 2.25}, "2,13" ], [ {"c": "#aaaaaa", "w": 2.25}, - "3,1", + "3,0", {"c": "#cccccc"}, + "3,1", "3,2", "3,3", "3,4", @@ -74,7 +75,6 @@ "3,7", "3,8", "3,9", - "3,10", {"c": "#aaaaaa", "w": 1.75}, "3,11", {"c": "#777777"}, From 530511b3882ee54f5ec4f786d439e8cef5f151cc Mon Sep 17 00:00:00 2001 From: yulei Date: Sun, 30 Jul 2023 20:01:27 +0800 Subject: [PATCH 27/35] added support for keyboard nico from neson design (#1969) --- v3/neson_design/nico.json | 217 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 217 insertions(+) create mode 100644 v3/neson_design/nico.json diff --git a/v3/neson_design/nico.json b/v3/neson_design/nico.json new file mode 100644 index 0000000000..70c7540850 --- /dev/null +++ b/v3/neson_design/nico.json @@ -0,0 +1,217 @@ +{ + "name": "Nico", + "vendorId": "0x4E65", + "productId": "0x6E65", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "matrix": { + "rows": 5, + "cols": 17 + }, + "layouts": { + "labels": [ + "Split Backspace", + ["Space Bar", "6.25U", "7U"] + ], + "keymap": + [ + [ + { + "x": 15.5 + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1" + ], + [ + { + "y": 0.25, + "c": "#777777" + }, + "0,15", + "0,16", + { + "x": 0.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": "#777777", + "w": 2 + }, + "0,14\n\n\n0,0", + "4,14" + ], + [ + "1,15", + "1,16", + { + "x": 0.5, + "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": "#777777" + }, + "1,14" + ], + [ + "2,15", + "2,16", + { + "x": 0.5, + "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", + "2,14" + ], + [ + "3,15", + "3,16", + { + "x": 0.5, + "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": 1.75 + }, + "3,12", + { + "c": "#777777" + }, + "3,13", + "3,14" + ], + [ + "4,15", + "4,16", + { + "x": 0.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n1,0", + { + "w": 1.25 + }, + "4,1\n\n\n1,0", + { + "w": 1.25 + }, + "4,2\n\n\n1,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,8\n\n\n1,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n1,0", + { + "w": 1.25 + }, + "4,10\n\n\n1,0", + { + "x": 0.5, + "c": "#777777" + }, + "4,11", + "4,12", + "4,13" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,0\n\n\n1,1", + "4,1\n\n\n1,1", + { + "w": 1.5 + }, + "4,2\n\n\n1,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,8\n\n\n1,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n1,1" + ] +] + } +} \ No newline at end of file From efc0ad4c3d62326654f0198df4048823fcb36934 Mon Sep 17 00:00:00 2001 From: HorrorTroll Date: Sat, 5 Aug 2023 08:43:50 +0700 Subject: [PATCH 28/35] Added support for Caticorn (Solder & Hotswap) (#1972) --- .../chinese_pcb/devil68_pro/devil68_pro.json | 2 +- .../hotswap/caticorn_hotswap.json} | 89 +++++--- .../caticorn/solder/caticorn_solder.json | 199 ++++++++++++++++++ .../chinese_pcb/devil68_pro/devil68_pro.json | 2 +- 4 files changed, 263 insertions(+), 29 deletions(-) rename v3/horrortroll/{chinese_pcb/m63_rgb/m63_rgb.json => caticorn/hotswap/caticorn_hotswap.json} (57%) create mode 100644 v3/horrortroll/caticorn/solder/caticorn_solder.json diff --git a/src/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json b/src/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json index 1cf58f9686..4bca15a252 100644 --- a/src/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json +++ b/src/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json @@ -1,7 +1,7 @@ { "name": "Devil68 Pro", "vendorId": "0x7516", - "productId": "0x6001", + "productId": "0x7001", "lighting": { "extends": "qmk_rgblight", "underglowEffects": [ diff --git a/v3/horrortroll/chinese_pcb/m63_rgb/m63_rgb.json b/v3/horrortroll/caticorn/hotswap/caticorn_hotswap.json similarity index 57% rename from v3/horrortroll/chinese_pcb/m63_rgb/m63_rgb.json rename to v3/horrortroll/caticorn/hotswap/caticorn_hotswap.json index 484cb881e1..9b4f3d2b99 100644 --- a/v3/horrortroll/chinese_pcb/m63_rgb/m63_rgb.json +++ b/v3/horrortroll/caticorn/hotswap/caticorn_hotswap.json @@ -1,33 +1,37 @@ { - "name": "M63 RGB", + "name": "Caticorn Hotswap", "vendorId": "0x7516", "productId": "0x6002", - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgb_matrix"], - "matrix": {"rows": 5, "cols": 14}, + "matrix": {"rows": 6, "cols": 17}, "layouts": { "keymap": [ [ {"c": "#777777"}, "0,0", - {"c": "#cccccc"}, + {"x": 0.25, "c": "#cccccc"}, "0,1", "0,2", "0,3", "0,4", + {"x": 0.25, "c": "#aaaaaa"}, "0,5", "0,6", "0,7", "0,8", + {"x": 0.25, "c": "#cccccc"}, "0,9", "0,10", "0,11", "0,12", - {"c": "#aaaaaa", "w": 2}, - "0,13" + {"x": 0.25, "c": "#aaaaaa"}, + "0,13", + {"x": 0.25}, + "0,14", + "0,15", + "0,16" ], [ - {"c": "#aaaaaa", "w": 1.5}, + {"y": 0.25}, "1,0", {"c": "#cccccc"}, "1,1", @@ -42,11 +46,15 @@ "1,10", "1,11", "1,12", - {"c": "#aaaaaa", "w": 1.5}, - "1,13" + {"c": "#aaaaaa", "w": 2}, + "1,13", + {"x": 0.25}, + "1,14", + "1,15", + "1,16" ], [ - {"c": "#aaaaaa", "w": 1.75}, + {"w": 1.5}, "2,0", {"c": "#cccccc"}, "2,1", @@ -60,11 +68,16 @@ "2,9", "2,10", "2,11", - {"c": "#777777", "w": 2.25}, - "2,13" + "2,12", + {"c": "#aaaaaa", "w": 1.5}, + "2,13", + {"x": 0.25}, + "2,14", + "2,15", + "2,16" ], [ - {"c": "#aaaaaa", "w": 2.25}, + {"w": 1.75}, "3,0", {"c": "#cccccc"}, "3,1", @@ -76,29 +89,51 @@ "3,7", "3,8", "3,9", - {"c": "#aaaaaa", "w": 1.75}, "3,10", - {"c": "#777777"}, - "3,12", - {"c": "#cccccc"}, + "3,11", + {"c": "#777777", "w": 2.25}, "3,13" ], [ - {"c": "#aaaaaa", "w": 1.25}, + {"c": "#aaaaaa", "w": 2.25}, "4,0", - {"w": 1.25}, - "4,1", - {"w": 1.25}, + {"c": "#cccccc"}, "4,2", - {"c": "#777777", "w": 6.25}, + "4,3", + "4,4", "4,5", - {"c": "#aaaaaa"}, + "4,6", + "4,7", + "4,8", "4,9", "4,10", - {"c": "#777777"}, "4,11", - "4,12", - "4,13" + {"c": "#aaaaaa", "w": 2.75}, + "4,13", + {"x": 1.25, "c": "#777777"}, + "4,15" + ], + [ + {"c": "#aaaaaa", "w": 1.25}, + "5,0", + {"w": 1.25}, + "5,1", + {"w": 1.25}, + "5,2", + {"c": "#777777", "w": 6.25}, + "5,6", + {"c": "#aaaaaa", "w": 1.25}, + "5,10", + {"w": 1.25}, + "5,11", + {"w": 1.25}, + "5,12", + {"w": 1.25}, + "5,13", + {"x": 0.25, "c": "#777777"}, + "5,14", + "5,15", + "5,16" ] ] } diff --git a/v3/horrortroll/caticorn/solder/caticorn_solder.json b/v3/horrortroll/caticorn/solder/caticorn_solder.json new file mode 100644 index 0000000000..39605d0694 --- /dev/null +++ b/v3/horrortroll/caticorn/solder/caticorn_solder.json @@ -0,0 +1,199 @@ +{ + "name": "Caticorn Solder", + "vendorId": "0x7516", + "productId": "0x6001", + "matrix": {"rows": 6, "cols": 17}, + "layouts": { + "labels": [ + "F12 / F13", + "Split Backspace", + "Step Caps Lock", + "ANSI / ISO Enter", + "ANSI / ISO Left Shift", + "Split Right Shift", + ["Bottom Row", "6.25U", "Tsangan"] + ], + "keymap": [ + [ + {"x": 2.5, "c": "#777777"}, + "0,0\n\n\n0,1", + {"x": 0.25, "c": "#cccccc"}, + "0,1\n\n\n0,1", + "0,2\n\n\n0,1", + "0,3\n\n\n0,1", + "0,4\n\n\n0,1", + {"x": 0.25, "c": "#aaaaaa"}, + "0,5\n\n\n0,1", + "0,6\n\n\n0,1", + "0,7\n\n\n0,1", + "0,8\n\n\n0,1", + {"x": 0.25, "c": "#cccccc"}, + "0,9\n\n\n0,1", + "0,10\n\n\n0,1", + "0,11\n\n\n0,1", + "0,12\n\n\n0,1", + {"x": 0.25, "c": "#aaaaaa"}, + "0,13\n\n\n0,1" + ], + [ + {"x": 2.5, "c": "#777777"}, + "0,0\n\n\n0,0", + {"x": 1, "c": "#cccccc"}, + "0,2\n\n\n0,0", + "0,3\n\n\n0,0", + "0,4\n\n\n0,0", + "0,5\n\n\n0,0", + {"x": 0.5, "c": "#aaaaaa"}, + "0,6\n\n\n0,0", + "0,7\n\n\n0,0", + "0,8\n\n\n0,0", + "0,9\n\n\n0,0", + {"x": 0.5, "c": "#cccccc"}, + "0,10\n\n\n0,0", + "0,11\n\n\n0,0", + "0,12\n\n\n0,0", + "0,13\n\n\n0,0", + {"x": 0.25, "c": "#aaaaaa"}, + "0,14", + "0,15", + "0,16" + ], + [ + {"y": 0.25, "x": 2.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": 2}, + "1,13\n\n\n1,0", + {"x": 0.25}, + "1,14", + "1,15", + "1,16", + {"x": 1, "c": "#cccccc"}, + "3,14\n\n\n1,1", + {"c": "#aaaaaa"}, + "1,13\n\n\n1,1" + ], + [ + {"x": 2.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\n\n\n3,0", + {"x": 0.25}, + "2,14", + "2,15", + "2,16", + {"x": 1.75, "c": "#777777", "w": 1.25, "h": 2, "w2": 1.5, "h2": 1, "x2": -0.25}, + "3,13\n\n\n3,1" + ], + [ + {"c": "#aaaaaa", "w": 1.25, "w2": 1.75, "l": true}, + "3,0\n\n\n2,1", + {"x": 1.25, "w": 1.75}, + "3,0\n\n\n2,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": "#777777", "w": 2.25}, + "3,13\n\n\n3,0", + {"x": 4, "c": "#cccccc"}, + "2,13\n\n\n3,1" + ], + [ + {"c": "#aaaaaa", "w": 1.25}, + "4,0\n\n\n4,1", + {"c": "#cccccc"}, + "4,1\n\n\n4,1", + {"x": 0.25, "c": "#aaaaaa", "w": 2.25}, + "4,0\n\n\n4,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": 2.75}, + "4,13\n\n\n5,0", + {"x": 1.25, "c": "#777777"}, + "4,15", + {"x": 1.25, "c": "#aaaaaa", "w": 1.75}, + "4,13\n\n\n5,1", + "4,14\n\n\n5,1" + ], + [ + {"x": 2.5, "w": 1.25}, + "5,0\n\n\n6,0", + {"w": 1.25}, + "5,1\n\n\n6,0", + {"w": 1.25}, + "5,2\n\n\n6,0", + {"c": "#777777", "w": 6.25}, + "5,6\n\n\n6,0", + {"c": "#aaaaaa", "w": 1.25}, + "5,10\n\n\n6,0", + {"w": 1.25}, + "5,11\n\n\n6,0", + {"w": 1.25}, + "5,12\n\n\n6,0", + {"w": 1.25}, + "5,13\n\n\n6,0", + {"x": 0.25, "c": "#777777"}, + "5,14", + "5,15", + "5,16" + ], + [ + {"x": 2.5, "c": "#aaaaaa", "w": 1.5}, + "5,0\n\n\n6,1", + "5,1\n\n\n6,1", + {"w": 1.5}, + "5,2\n\n\n6,1", + {"c": "#777777", "w": 7}, + "5,6\n\n\n6,1", + {"c": "#aaaaaa", "w": 1.5}, + "5,11\n\n\n6,1", + "5,12\n\n\n6,1", + {"w": 1.5}, + "5,13\n\n\n6,1" + ] + ] + } +} diff --git a/v3/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json b/v3/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json index 2bd637587b..2fa80800df 100644 --- a/v3/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json +++ b/v3/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json @@ -1,7 +1,7 @@ { "name": "Devil68 Pro", "vendorId": "0x7516", - "productId": "0x6001", + "productId": "0x7001", "keycodes": ["qmk_lighting"], "menus": ["qmk_rgb_matrix"], "matrix": {"rows": 5, "cols": 16}, From c82b41309e466267498fbeb9acb59a5abc1ba3d6 Mon Sep 17 00:00:00 2001 From: Its TLeo <134472524+ItsTLeo@users.noreply.github.com> Date: Sat, 5 Aug 2023 08:44:24 +0700 Subject: [PATCH 29/35] Add itstleo40 to VIA support (#1975) --- v3/itstleo/itstleo40/itstleo40.json | 99 +++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 v3/itstleo/itstleo40/itstleo40.json diff --git a/v3/itstleo/itstleo40/itstleo40.json b/v3/itstleo/itstleo40/itstleo40.json new file mode 100644 index 0000000000..bf0ff366b0 --- /dev/null +++ b/v3/itstleo/itstleo40/itstleo40.json @@ -0,0 +1,99 @@ +{ + "name":"itstleo40", + "vendorId":"0x4954", + "productId":"0x0003", + "matrix":{ + "rows":4, + "cols":12 + }, + "layouts":{ + "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", + { + "c":"#aaaaaa" + }, + "0,11" + ], + [ + "1,0", + { + "c":"#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + { + "c":"#777777" + }, + "1,11" + ], + [ + { + "c":"#aaaaaa" + }, + "2,0", + { + "c":"#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + { + "c":"#aaaaaa" + }, + "2,11" + ], + [ + "3,0", + "3,1", + "3,2", + "3,3", + "3,4", + { + "c":"#cccccc", + "w":2 + }, + "3,5", + { + "c":"#aaaaaa" + }, + "3,7", + "3,8", + "3,9", + "3,10", + "3,11" + ] + ] + } + } \ No newline at end of file From cf1fccd08d7ef9eaf94b2580c4162f72112870fb Mon Sep 17 00:00:00 2001 From: jels <66403163+Jels02@users.noreply.github.com> Date: Sat, 5 Aug 2023 11:45:02 +1000 Subject: [PATCH 30/35] add RGB to jels60 in VIA (#1976) --- src/jels/jels60/jels60_via.json | 4 +--- v3/jels/jels60/jels60_via.json | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/jels/jels60/jels60_via.json b/src/jels/jels60/jels60_via.json index c7cf4f99f1..0476c5243d 100644 --- a/src/jels/jels60/jels60_via.json +++ b/src/jels/jels60/jels60_via.json @@ -2,9 +2,7 @@ "name": "Jels60", "vendorId": "0x006A", "productId": "0x0060", - "lighting": { - "extends": "none" - }, + "lighting": "qmk_rgblight", "matrix": {"rows": 5, "cols": 14}, "layouts": { "labels": [ diff --git a/v3/jels/jels60/jels60_via.json b/v3/jels/jels60/jels60_via.json index 944c549696..360987573c 100644 --- a/v3/jels/jels60/jels60_via.json +++ b/v3/jels/jels60/jels60_via.json @@ -2,6 +2,12 @@ "name": "Jels60", "vendorId": "0x006A", "productId": "0x0060", + "keycodes": [ + "qmk_lighting" + ], + "menus":[ + "qmk_rgblight" + ], "matrix": {"rows": 5, "cols": 14}, "layouts": { "labels": [ From 7aab3f49ace14b7de2e70fa6a093ddf78d39a74a Mon Sep 17 00:00:00 2001 From: tan-t <22813443+tan-t@users.noreply.github.com> Date: Sat, 5 Aug 2023 10:48:41 +0900 Subject: [PATCH 31/35] Add keymap for MOTHWING (#1950) --- v3/mothwing/mothwing.json | 67 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 v3/mothwing/mothwing.json diff --git a/v3/mothwing/mothwing.json b/v3/mothwing/mothwing.json new file mode 100644 index 0000000000..b0882f48eb --- /dev/null +++ b/v3/mothwing/mothwing.json @@ -0,0 +1,67 @@ +{ + "name": "MOTHWING", + "vendorId": "0x4D77", + "productId": "0x0001", + "matrix": {"rows": 8, "cols": 6}, + "layouts": { + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + {"x": 1}, + "4,5", + "4,4", + "4,3", + "4,2", + "4,1", + "4,0" + ], + [ + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + {"x": 1}, + "5,5", + "5,4", + "5,3", + "5,2", + "5,1", + "5,0" + ], + [ + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + {"x": 1}, + "6,5", + "6,4", + "6,3", + "6,2", + "6,1", + "6,0" + ], + [ + {"x": 2, "c": "#aaaaaa"}, + "3,2", + "3,3", + "3,4", + "3,5", + {"x": 1}, + "7,5", + "7,4", + "7,3", + "7,2" + ] + ] + } +} From 592e963405c238624a118073b6f681afdf8c0b9d Mon Sep 17 00:00:00 2001 From: Wolf Van Herreweghe Date: Wed, 9 Aug 2023 04:21:55 +0200 Subject: [PATCH 32/35] Add ziggurat via definition (#1980) Co-authored-by: Wolf --- v3/wolf/ziggurat/ziggurat.json | 377 +++++++++++++++++++++++++++++++++ 1 file changed, 377 insertions(+) create mode 100644 v3/wolf/ziggurat/ziggurat.json diff --git a/v3/wolf/ziggurat/ziggurat.json b/v3/wolf/ziggurat/ziggurat.json new file mode 100644 index 0000000000..65b535a551 --- /dev/null +++ b/v3/wolf/ziggurat/ziggurat.json @@ -0,0 +1,377 @@ +{ + "matrix": { + "cols": 9, + "rows": 10 + }, + "name": "Ziggurat", + "productId": "0x0084", + "vendorId": "0x5453", + "layouts": { + "keymap": [ + [ + { + "c": "#aaaaaa" + }, + "0,0", + { + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#777777", + "x": 0.25 + }, + "0,1", + { + "c": "#cccccc" + }, + "1,1", + { + "c": "#cccccc" + }, + "0,2", + { + "c": "#cccccc" + }, + "1,2", + { + "c": "#cccccc" + }, + "0,3", + { + "c": "#cccccc" + }, + "1,3", + { + "c": "#cccccc" + }, + "0,4", + { + "c": "#cccccc" + }, + "1,4", + { + "c": "#cccccc" + }, + "0,5", + { + "c": "#cccccc" + }, + "1,5", + { + "c": "#cccccc" + }, + "0,6", + { + "c": "#cccccc" + }, + "1,6", + { + "c": "#cccccc" + }, + "7,6", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,7\n\n\n0,0", + { + "c": "#aaaaaa" + }, + "0,8", + { + "c": "#aaaaaa", + "x": 1 + }, + "0,7\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "1,7\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa" + }, + "2,0", + { + "c": "#aaaaaa" + }, + "3,0", + { + "c": "#aaaaaa", + "w": 1.5, + "x": 0.25 + }, + "2,1", + { + "c": "#cccccc" + }, + "3,1", + { + "c": "#cccccc" + }, + "2,2", + { + "c": "#cccccc" + }, + "3,2", + { + "c": "#cccccc" + }, + "2,3", + { + "c": "#cccccc" + }, + "3,3", + { + "c": "#cccccc" + }, + "2,4", + { + "c": "#cccccc" + }, + "3,4", + { + "c": "#cccccc" + }, + "2,5", + { + "c": "#cccccc" + }, + "3,5", + { + "c": "#cccccc" + }, + "2,6", + { + "c": "#cccccc" + }, + "3,6", + { + "c": "#cccccc" + }, + "2,7", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "3,7\n\n\n1,0", + { + "c": "#aaaaaa" + }, + "2,8", + { + "c": "#777777", + "h": 2, + "h2": 1, + "w": 1.25, + "w2": 1.5, + "x": 1.75, + "x2": -0.25 + }, + "5,7\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa" + }, + "4,0", + { + "c": "#aaaaaa" + }, + "5,0", + { + "c": "#aaaaaa", + "w": 1.75, + "x": 0.25 + }, + "4,1", + { + "c": "#cccccc" + }, + "5,1", + { + "c": "#cccccc" + }, + "4,2", + { + "c": "#cccccc" + }, + "5,2", + { + "c": "#cccccc" + }, + "4,3", + { + "c": "#cccccc" + }, + "5,3", + { + "c": "#cccccc" + }, + "4,4", + { + "c": "#cccccc" + }, + "5,4", + { + "c": "#cccccc" + }, + "4,5", + { + "c": "#cccccc" + }, + "5,5", + { + "c": "#cccccc" + }, + "4,6", + { + "c": "#cccccc" + }, + "5,6", + { + "c": "#777777", + "w": 2.25 + }, + "5,7\n\n\n1,0", + { + "c": "#aaaaaa" + }, + "4,8", + { + "c": "#aaaaaa", + "x": 0.75 + }, + "4,7\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa" + }, + "6,0", + { + "c": "#aaaaaa" + }, + "7,0", + { + "c": "#aaaaaa", + "w": 2.25, + "x": 0.25 + }, + "6,1\n\n\n2,0", + { + "c": "#cccccc" + }, + "9,2", + { + "c": "#cccccc" + }, + "6,2", + { + "c": "#cccccc" + }, + "7,2", + { + "c": "#cccccc" + }, + "6,3", + { + "c": "#cccccc" + }, + "7,3", + { + "c": "#cccccc" + }, + "6,4", + { + "c": "#cccccc" + }, + "7,4", + { + "c": "#cccccc" + }, + "6,5", + { + "c": "#cccccc" + }, + "7,5", + { + "c": "#cccccc" + }, + "6,6", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "6,7", + { + "c": "#aaaaaa" + }, + "7,7", + { + "c": "#aaaaaa" + }, + "6,8" + ], + [ + { + "c": "#aaaaaa" + }, + "8,0", + { + "c": "#aaaaaa" + }, + "9,0", + { + "c": "#aaaaaa", + "w": 1.5, + "x": 0.25 + }, + "8,1", + { + "c": "#aaaaaa" + }, + "9,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "8,2", + { + "c": "#cccccc", + "w": 7 + }, + "8,4", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "8,6", + { + "c": "#aaaaaa", + "x": 0.5 + }, + "8,7", + { + "c": "#aaaaaa" + }, + "9,7", + { + "c": "#aaaaaa" + }, + "8,8" + ], + [ + { "c": "#aaaaaa", "w": 1.25, "x": 2.25, "y": 0.5 }, + "6,1\n\n\n2,1", + { + "c": "#aaaaaa" + }, + "7,1\n\n\n2,1" + ] + ], + "labels": ["Split Backspace", "ISO Enter", "Split Left Shift"] + } +} \ No newline at end of file From f4baada7ce8066750a1bb96b52f146133ec8bc1c Mon Sep 17 00:00:00 2001 From: tan-t <22813443+tan-t@users.noreply.github.com> Date: Sat, 12 Aug 2023 17:55:28 +0900 Subject: [PATCH 33/35] [Keyboard] add MOTHWING Legacy layout json (#1978) --- src/mothwing/mothwing.json | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100755 src/mothwing/mothwing.json diff --git a/src/mothwing/mothwing.json b/src/mothwing/mothwing.json new file mode 100755 index 0000000000..949a8d3e92 --- /dev/null +++ b/src/mothwing/mothwing.json @@ -0,0 +1,68 @@ +{ + "name": "MOTHWING", + "vendorId": "0x4D77", + "productId": "0x0001", + "matrix": {"rows": 8, "cols": 6}, + "lighting": "none", + "layouts": { + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + {"x": 1}, + "4,5", + "4,4", + "4,3", + "4,2", + "4,1", + "4,0" + ], + [ + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + {"x": 1}, + "5,5", + "5,4", + "5,3", + "5,2", + "5,1", + "5,0" + ], + [ + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + {"x": 1}, + "6,5", + "6,4", + "6,3", + "6,2", + "6,1", + "6,0" + ], + [ + {"x": 2, "c": "#aaaaaa"}, + "3,2", + "3,3", + "3,4", + "3,5", + {"x": 1}, + "7,5", + "7,4", + "7,3", + "7,2" + ] + ] + } +} From 504a7df1de9815f459eef6c67334f55de8dde2eb Mon Sep 17 00:00:00 2001 From: Wolf Van Herreweghe Date: Sat, 12 Aug 2023 10:55:58 +0200 Subject: [PATCH 34/35] add silhouette via definition (#1979) Co-authored-by: Wolf --- v3/wolf/silhouette/silhouette.json | 268 +++++++++++++++++++++++++++++ 1 file changed, 268 insertions(+) create mode 100644 v3/wolf/silhouette/silhouette.json diff --git a/v3/wolf/silhouette/silhouette.json b/v3/wolf/silhouette/silhouette.json new file mode 100644 index 0000000000..ea9391479b --- /dev/null +++ b/v3/wolf/silhouette/silhouette.json @@ -0,0 +1,268 @@ +{ + "matrix": { + "cols": 17, + "rows": 5 + }, + "name": "Silhouette", + "productId": "0x0080", + "vendorId": "0x5453", + "layouts": { + "keymap": [ + [ + { + "c": "#aaaaaa", + "x": 3 + }, + "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", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13\n\n\n0,0", + { + "c": "#aaaaaa", + "x": 0.25 + }, + "0,14", + { + "c": "#aaaaaa" + }, + "0,15", + { + "c": "#aaaaaa" + }, + "0,16", + { + "c": "#aaaaaa", + "x": 1.5 + }, + "0,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "2,14\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5, + "x": 3 + }, + "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": 1.5 + }, + "1,13\n\n\n3,0", + { + "c": "#aaaaaa", + "x": 0.25 + }, + "1,14", + { + "c": "#aaaaaa" + }, + "1,15", + { + "c": "#aaaaaa" + }, + "1,16", + { + "c": "#777777", + "h": 2, + "h2": 1, + "w": 1.25, + "w2": 1.5, + "x": 2.25, + "x2": -0.25 + }, + "2,13\n\n\n3,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75, + "x": 3 + }, + "2,0", + "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\n3,0", + { + "x": 4.5 + }, + "2,12\n\n\n3,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n1,1", + "3,1\n\n\n1,1", + { + "c": "#aaaaaa", + "w": 2.25, + "x": 0.75 + }, + "3,0\n\n\n1,0", + "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\n2,0", + { + "c": "#aaaaaa", + "x": 1.25 + }, + "3,15", + { + "c": "#aaaaaa", + "w": 1.75, + "x": 1.75 + }, + "3,12\n\n\n2,1", + { + "c": "#aaaaaa" + }, + "3,13\n\n\n2,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25, + "x": 3 + }, + "4,0\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,1\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,2\n\n\n4,0", + { + "c": "#777777", + "w": 6.25 + }, + "4,7\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,11\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,12\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,13\n\n\n4,0", + { + "c": "#aaaaaa", + "x": 0.25 + }, + "4,14", + { + "c": "#aaaaaa" + }, + "4,15", + { + "c": "#aaaaaa" + }, + "4,16" + ], + [ + { "c": "#aaaaaa", "w": 1.5, "x": 3, "y": 0.25 }, + "4,0\n\n\n4,1", + { + "c": "#aaaaaa" + }, + "4,1\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,2\n\n\n4,1", + { + "c": "#777777", + "w": 7 + }, + "4,7\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n4,1", + { + "c": "#aaaaaa" + }, + "4,12\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,13\n\n\n4,1" + ] + ], + "labels": ["Split BackSpace", "Split Left Shift", "Split Right Shift", "ISO Enter", "7U Spacebar"] + } +} \ No newline at end of file From 9ebc9678b7c794ba44f9c4f6aa077ef409649e03 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 12 Aug 2023 10:09:50 +0100 Subject: [PATCH 35/35] Add keyboards Dactyl `lightcycle` and `maximus` (#1936) --- .../dactyl_lightcycle/dactyl_lightcycle.json | 92 +++++++++++++ .../dactyl_maximus/dactyl_maximus.json | 121 ++++++++++++++++++ 2 files changed, 213 insertions(+) create mode 100644 v3/handwired/dactyl_lightcycle/dactyl_lightcycle.json create mode 100644 v3/handwired/dactyl_maximus/dactyl_maximus.json diff --git a/v3/handwired/dactyl_lightcycle/dactyl_lightcycle.json b/v3/handwired/dactyl_lightcycle/dactyl_lightcycle.json new file mode 100644 index 0000000000..ff5ee79e55 --- /dev/null +++ b/v3/handwired/dactyl_lightcycle/dactyl_lightcycle.json @@ -0,0 +1,92 @@ +{ + "name": "Dactyl Lightcycle", + "vendorId": "0x444C", + "productId": "0xA460", + "matrix": {"rows": 10, "cols": 6}, + "layouts": { + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + {"x":5}, + "5,0", + "5,1", + "5,2", + "5,3", + "5,4", + "5,5" + ], + [ + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + {"x":5}, + "6,0", + "6,1", + "6,2", + "6,3", + "6,4", + "6,5" + ], + [ + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + {"h":1.25}, + "3,5", + {"h":1.5}, + "4,5", + {"x":1,"h":1.5}, + "9,0", + {"h":1.25}, + "8,0", + "7,0", + "7,1", + "7,2", + "7,3", + "7,4", + "7,5" + ], + [ + "3,0", + "3,1", + "3,2", + "3,3", + "3,4", + {"h":2}, + "4,2", + {"x":5,"h":2}, + "9,3", + "8,1", + "8,2", + "8,3", + "8,4", + "8,5" + ], + [ + {"y":-0.75, + "x":6, + "h":1.75}, + "4,3", + {"x":3,"h":1.75}, + "9,2" + ], + [ + {"y":-0.75,"x":7,"h":1.5}, + "4,4", + {"x":1,"h":1.5}, + "9,1" + ] + ] + } +} diff --git a/v3/handwired/dactyl_maximus/dactyl_maximus.json b/v3/handwired/dactyl_maximus/dactyl_maximus.json new file mode 100644 index 0000000000..f39d11ab0b --- /dev/null +++ b/v3/handwired/dactyl_maximus/dactyl_maximus.json @@ -0,0 +1,121 @@ +{ + "name": "Dactyl Maximus", + "vendorId": "0x444C", + "productId": "0xA57B", + "matrix": {"rows": 12, "cols": 7}, + "layouts": { + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + {"x": 5}, + "6,0", + "6,1", + "6,2", + "6,3", + "6,4", + "6,5", + "6,6" + ], + [ + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + {"x": 5}, + "7,0", + "7,1", + "7,2", + "7,3", + "7,4", + "7,5", + "7,6" + ], + [ + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + {"x": 5}, + "8,0", + "8,1", + "8,2", + "8,3", + "8,4", + "8,5", + "8,6" + ], + [ + "3,0", + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + {"x": 5}, + "9,0", + "9,1", + "9,2", + "9,3", + "9,4", + "9,5", + "9,6" + ], + [ + "4,0", + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + {"x": 7}, + "10,1", + "10,2", + "10,3", + "10,4", + "10,5", + "10,6" + ], + [ + {"x": 7}, + "4,6", + "5,6", + {"x": 1}, + "11,0", + "10,0" + ], + [ + {"x": 6}, + "5,3", + "5,4", + "5,5", + {"x": 1}, + "11,1", + "11,2", + "11,3" + ], + [ + {"x": 6}, + "5,0", + "5,1", + "5,2", + {"x": 1}, + "11,4", + "11,5", + "11,6" + ] + ] + } +}