From fd76a44b644e07a6bf5b8a70c7304baa626b2eca Mon Sep 17 00:00:00 2001 From: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com> Date: Wed, 20 Dec 2023 00:46:40 +0700 Subject: [PATCH 01/40] Add support for De60fs --- v3/deemen17/de60fs.json | 235 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 v3/deemen17/de60fs.json diff --git a/v3/deemen17/de60fs.json b/v3/deemen17/de60fs.json new file mode 100644 index 0000000000..ad3edb91ac --- /dev/null +++ b/v3/deemen17/de60fs.json @@ -0,0 +1,235 @@ +{ + "name": "De60fs Rev.1", + "vendorId": "0xDE17", + "productId": "0x60F0", + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "RGB 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, 3], + "content": ["id_qmk_rgblight_effect_speed", 2, 3] + }, + { + "showIf": "{id_qmk_rgblight_effect} != 6 && {id_qmk_rgblight_effect} != 7 && {id_qmk_rgblight_effect} != 8 && {id_qmk_rgblight_effect} != 9 && {id_qmk_rgblight_effect} != 10 && {id_qmk_rgblight_effect} != 0 && {id_qmk_rgblight_effect} != 11 && {id_qmk_rgblight_effect} != 12 && {id_qmk_rgblight_effect} != 13 && {id_qmk_rgblight_effect} != 14 && {id_qmk_rgblight_effect} != 35", + "label": "Color", + "type": "color", + "content": ["id_qmk_rgblight_color", 2, 4] + } + ] + } + ] + } + ], + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + "Split Backspace", + "2.75U Right Shift" + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13\n\n\n0,0", + { + "x": 0.25 + }, + "0,13\n\n\n0,1", + "2,12\n\n\n0,1" + ], + [ + { + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13" + ], + [ + { + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,13" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12\n\n\n1,0", + "3,13\n\n\n1,0", + { + "x": 0.25, + "w": 2.75 + }, + "3,12\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "4,0", + "4,1", + { + "w": 1.5 + }, + "4,2", + { + "c": "#cccccc", + "w": 7 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11", + "4,12", + { + "w": 1.5 + }, + "4,13" + ] + ] + } +} + \ No newline at end of file From 8c5ca91bdf719d7bc26ad1a0809b39075371879a Mon Sep 17 00:00:00 2001 From: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com> Date: Mon, 22 Jan 2024 23:36:14 +0700 Subject: [PATCH 02/40] Add keycodes for lighting --- v3/deemen17/de60fs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/v3/deemen17/de60fs.json b/v3/deemen17/de60fs.json index ad3edb91ac..7f5789a2ef 100644 --- a/v3/deemen17/de60fs.json +++ b/v3/deemen17/de60fs.json @@ -83,6 +83,7 @@ ] } ], + "keycodes": ["qmk_lighting"], "matrix": {"rows": 5, "cols": 14}, "layouts": { "labels": [ From 886e9d9ee1d5ee4f224891cb18ba5ae316dace6b Mon Sep 17 00:00:00 2001 From: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com> Date: Sat, 3 Feb 2024 08:26:32 +0700 Subject: [PATCH 03/40] Update v3/deemen17/de60fs.json Co-authored-by: Xelus22 <17491233+Xelus22@users.noreply.github.com> --- v3/deemen17/de60fs.json | 82 +---------------------------------------- 1 file changed, 1 insertion(+), 81 deletions(-) diff --git a/v3/deemen17/de60fs.json b/v3/deemen17/de60fs.json index 7f5789a2ef..411663d23b 100644 --- a/v3/deemen17/de60fs.json +++ b/v3/deemen17/de60fs.json @@ -2,87 +2,7 @@ "name": "De60fs Rev.1", "vendorId": "0xDE17", "productId": "0x60F0", - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "RGB 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, 3], - "content": ["id_qmk_rgblight_effect_speed", 2, 3] - }, - { - "showIf": "{id_qmk_rgblight_effect} != 6 && {id_qmk_rgblight_effect} != 7 && {id_qmk_rgblight_effect} != 8 && {id_qmk_rgblight_effect} != 9 && {id_qmk_rgblight_effect} != 10 && {id_qmk_rgblight_effect} != 0 && {id_qmk_rgblight_effect} != 11 && {id_qmk_rgblight_effect} != 12 && {id_qmk_rgblight_effect} != 13 && {id_qmk_rgblight_effect} != 14 && {id_qmk_rgblight_effect} != 35", - "label": "Color", - "type": "color", - "content": ["id_qmk_rgblight_color", 2, 4] - } - ] - } - ] - } - ], + "menus": [ "qmk_rgblight" ], "keycodes": ["qmk_lighting"], "matrix": {"rows": 5, "cols": 14}, "layouts": { From 64ee97a6582cb0f0071f9cef0aa082afc4d5c899 Mon Sep 17 00:00:00 2001 From: Derek Date: Thu, 28 Mar 2024 09:15:25 -0400 Subject: [PATCH 04/40] Create sodium62.json --- v3/sodium62/sodium62.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 v3/sodium62/sodium62.json diff --git a/v3/sodium62/sodium62.json b/v3/sodium62/sodium62.json new file mode 100644 index 0000000000..d9955e77f5 --- /dev/null +++ b/v3/sodium62/sodium62.json @@ -0,0 +1,30 @@ +{ + "name": "sodium62", + "vendorId": "0x6E61", + "productId": "0x636C", + "matrix": { + "rows": 10, + "cols": 7 + }, + "layouts": { + "keymap": [ + [{"x":3},"0,3",{"x":7},"5,3"], + [{"y":-0.75,"x":2},"0,2",{"x":1},"0,4",{"x":5},"5,4",{"x":1},"5,2"], + [{"y":-0.75},"0,0","0,1",{"x":3},"0,5",{"x":3},"5,5",{"x":3},"5,1","5,0"], + [{"y":-0.5,"x":3},"1,3",{"x":7},"6,3"], + [{"y":-0.75,"x":2},"1,2",{"x":1},"1,4",{"x":5},"6,4",{"x":1},"6,2"], + [{"y":-0.75},"1,0","1,1",{"x":3},"1,5",{"x":3},"6,5",{"x":3},"6,1","6,0"], + [{"y":-0.5,"x":3},"2,3",{"x":7},"7,3"], + [{"y":-0.75,"x":2},"2,2",{"x":1},"2,4",{"x":5},"7,4",{"x":1},"7,2"], + [{"y":-0.75},"2,0","2,1",{"x":3},"2,5",{"x":3},"7,5",{"x":3},"7,1","7,0"], + [{"y":-0.5,"x":3},"3,3",{"x":7},"8,3"], + [{"y":-0.75,"x":2},"3,2",{"x":1},"3,4",{"x":5},"8,4",{"x":1},"8,2"], + [{"y":-0.75},"3,0","3,1",{"x":3},"3,5",{"x":3},"8,5",{"x":3},"8,1","8,0"], + [{"y":-0.5,"x":3},"4,3",{"x":7},"9,3"], + [{"y":-0.75,"x":2},"4,2",{"x":1},"4,4",{"x":5},"9,4",{"x":1},"9,2"], + [{"y":-0.75},"4,0","4,1",{"x":3},"4,5","4,6",{"x":1},"9,6","9,5",{"x":3},"9,1","9,0"] + + ] + } +} + \ No newline at end of file From 8305f36daa28a635373be811578036e724be8f43 Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 3 Apr 2024 14:37:41 -0400 Subject: [PATCH 05/40] Update v3/sodium62/sodium62.json Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com> --- v3/sodium62/sodium62.json | 290 ++++++++++++++++++++++++++++++++++---- 1 file changed, 262 insertions(+), 28 deletions(-) diff --git a/v3/sodium62/sodium62.json b/v3/sodium62/sodium62.json index d9955e77f5..0dfcf53798 100644 --- a/v3/sodium62/sodium62.json +++ b/v3/sodium62/sodium62.json @@ -1,30 +1,264 @@ { - "name": "sodium62", - "vendorId": "0x6E61", - "productId": "0x636C", - "matrix": { - "rows": 10, - "cols": 7 - }, - "layouts": { - "keymap": [ - [{"x":3},"0,3",{"x":7},"5,3"], - [{"y":-0.75,"x":2},"0,2",{"x":1},"0,4",{"x":5},"5,4",{"x":1},"5,2"], - [{"y":-0.75},"0,0","0,1",{"x":3},"0,5",{"x":3},"5,5",{"x":3},"5,1","5,0"], - [{"y":-0.5,"x":3},"1,3",{"x":7},"6,3"], - [{"y":-0.75,"x":2},"1,2",{"x":1},"1,4",{"x":5},"6,4",{"x":1},"6,2"], - [{"y":-0.75},"1,0","1,1",{"x":3},"1,5",{"x":3},"6,5",{"x":3},"6,1","6,0"], - [{"y":-0.5,"x":3},"2,3",{"x":7},"7,3"], - [{"y":-0.75,"x":2},"2,2",{"x":1},"2,4",{"x":5},"7,4",{"x":1},"7,2"], - [{"y":-0.75},"2,0","2,1",{"x":3},"2,5",{"x":3},"7,5",{"x":3},"7,1","7,0"], - [{"y":-0.5,"x":3},"3,3",{"x":7},"8,3"], - [{"y":-0.75,"x":2},"3,2",{"x":1},"3,4",{"x":5},"8,4",{"x":1},"8,2"], - [{"y":-0.75},"3,0","3,1",{"x":3},"3,5",{"x":3},"8,5",{"x":3},"8,1","8,0"], - [{"y":-0.5,"x":3},"4,3",{"x":7},"9,3"], - [{"y":-0.75,"x":2},"4,2",{"x":1},"4,4",{"x":5},"9,4",{"x":1},"9,2"], - [{"y":-0.75},"4,0","4,1",{"x":3},"4,5","4,6",{"x":1},"9,6","9,5",{"x":3},"9,1","9,0"] - - ] - } + "name": "sodium62", + "vendorId": "0x6E61", + "productId": "0x636C", + "matrix": { + "rows": 10, + "cols": 7 + }, + "layouts": { + "keymap": [ + [ + { + "x": 3 + }, + "0,3", + { + "x": 7 + }, + "5,3" + ], + [ + { + "y": -0.75, + "x": 2 + }, + "0,2", + { + "x": 1 + }, + "0,4", + { + "x": 5 + }, + "5,4", + { + "x": 1 + }, + "5,2" + ], + [ + { + "y": -0.75 + }, + "0,0", + "0,1", + { + "x": 3 + }, + "0,5", + { + "x": 3 + }, + "5,5", + { + "x": 3 + }, + "5,1", + "5,0" + ], + [ + { + "y": -0.5, + "x": 3 + }, + "1,3", + { + "x": 7 + }, + "6,3" + ], + [ + { + "y": -0.75, + "x": 2 + }, + "1,2", + { + "x": 1 + }, + "1,4", + { + "x": 5 + }, + "6,4", + { + "x": 1 + }, + "6,2" + ], + [ + { + "y": -0.75 + }, + "1,0", + "1,1", + { + "x": 3 + }, + "1,5", + { + "x": 3 + }, + "6,5", + { + "x": 3 + }, + "6,1", + "6,0" + ], + [ + { + "y": -0.5, + "x": 3 + }, + "2,3", + { + "x": 7 + }, + "7,3" + ], + [ + { + "y": -0.75, + "x": 2 + }, + "2,2", + { + "x": 1 + }, + "2,4", + { + "x": 5 + }, + "7,4", + { + "x": 1 + }, + "7,2" + ], + [ + { + "y": -0.75 + }, + "2,0", + "2,1", + { + "x": 3 + }, + "2,5", + { + "x": 3 + }, + "7,5", + { + "x": 3 + }, + "7,1", + "7,0" + ], + [ + { + "y": -0.5, + "x": 3 + }, + "3,3", + { + "x": 7 + }, + "8,3" + ], + [ + { + "y": -0.75, + "x": 2 + }, + "3,2", + { + "x": 1 + }, + "3,4", + { + "x": 5 + }, + "8,4", + { + "x": 1 + }, + "8,2" + ], + [ + { + "y": -0.75 + }, + "3,0", + "3,1", + { + "x": 3 + }, + "3,5", + { + "x": 3 + }, + "8,5", + { + "x": 3 + }, + "8,1", + "8,0" + ], + [ + { + "y": -0.5, + "x": 3 + }, + "4,3", + { + "x": 7 + }, + "9,3" + ], + [ + { + "y": -0.75, + "x": 2 + }, + "4,2", + { + "x": 1 + }, + "4,4", + { + "x": 5 + }, + "9,4", + { + "x": 1 + }, + "9,2" + ], + [ + { + "y": -0.75 + }, + "4,0", + "4,1", + { + "x": 3 + }, + "4,5", + "4,6", + { + "x": 1 + }, + "9,6", + "9,5", + { + "x": 3 + }, + "9,1", + "9,0" + ] + ] + } } - \ No newline at end of file From d156557e93b81d2ded2979ef5cee1e20ef632f11 Mon Sep 17 00:00:00 2001 From: archetype-made Date: Thu, 4 Apr 2024 10:06:06 -0700 Subject: [PATCH 06/40] Create Minerva_LX_via_040424.json First support for Archetype Minerva LX --- .../minervalx/Minerva_LX_via_040424.json | 248 ++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 v3/archetype/minervalx/Minerva_LX_via_040424.json diff --git a/v3/archetype/minervalx/Minerva_LX_via_040424.json b/v3/archetype/minervalx/Minerva_LX_via_040424.json new file mode 100644 index 0000000000..7dff933114 --- /dev/null +++ b/v3/archetype/minervalx/Minerva_LX_via_040424.json @@ -0,0 +1,248 @@ +{ + "name": "Minerva LX", + "vendorId": "0x5453", + "productId": "0x0100", + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight"], + "matrix": { "rows": 5, "cols": 15 }, + "layouts": { + "labels": [ + "Split Backspace", + "Split Left Shift", + [ + "Bottom Row", + "Tsangan", + "Tsangan-Split", + "ANSI" + ] + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,14", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "2,12\n\n\n0,1", + "0,13\n\n\n0,1" + ], + [ + { + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,13", + { + "x": 0.25 + }, + "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", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,14" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12\n\n\n1,0", + "3,13\n\n\n1,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,14", + { + "x": 0.5, + "c": "#aaaaaa", + "w": 2.75 + }, + "3,12\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n2,0", + "4,1\n\n\n2,0", + { + "w": 1.5 + }, + "4,2\n\n\n2,0", + { + "w": 7 + }, + "4,6\n\n\n2,0", + { + "w": 1.5 + }, + "4,10\n\n\n2,0", + "4,12\n\n\n2,0", + { + "w": 1.5 + }, + "4,13\n\n\n2,0", + { + "x": 0.25 + }, + "4,14" + ], + [ + { + "y": 0.25, + "w": 1.5 + }, + "4,0\n\n\n2,1", + "4,1\n\n\n2,1", + { + "w": 1.5 + }, + "4,2\n\n\n2,1", + { + "w": 3 + }, + "4,4\n\n\n2,1", + "4,6\n\n\n2,1", + { + "w": 3 + }, + "4,8\n\n\n2,1", + { + "w": 1.5 + }, + "4,10\n\n\n2,1", + "4,12\n\n\n2,1", + { + "w": 1.5 + }, + "4,13\n\n\n2,1" + ], + [ + { + "w": 1.25 + }, + "4,0\n\n\n2,2", + { + "w": 1.25 + }, + "4,1\n\n\n2,2", + { + "w": 1.25 + }, + "4,2\n\n\n2,2", + { + "w": 6.25 + }, + "4,6\n\n\n2,2", + { + "w": 1.25 + }, + "4,9\n\n\n2,2", + { + "w": 1.25 + }, + "4,10\n\n\n2,2", + { + "w": 1.25 + }, + "4,12\n\n\n2,2", + { + "w": 1.25 + }, + "4,13\n\n\n2,2" + ] + ] + } +} From 25b6bca126554688c1452fd3390f97fe82288742 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 9 Apr 2024 02:21:52 +0200 Subject: [PATCH 07/40] Update v3/archetype/minervalx/Minerva_LX_via_040424.json Co-authored-by: Duncan Sutherland --- v3/archetype/minervalx/Minerva_LX_via_040424.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/v3/archetype/minervalx/Minerva_LX_via_040424.json b/v3/archetype/minervalx/Minerva_LX_via_040424.json index 7dff933114..58735ea580 100644 --- a/v3/archetype/minervalx/Minerva_LX_via_040424.json +++ b/v3/archetype/minervalx/Minerva_LX_via_040424.json @@ -2,9 +2,16 @@ "name": "Minerva LX", "vendorId": "0x5453", "productId": "0x0100", - "keycodes": ["qmk_lighting"], - "menus": ["qmk_backlight"], - "matrix": { "rows": 5, "cols": 15 }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_backlight" + ], + "matrix": { + "rows": 5, + "cols": 15 + }, "layouts": { "labels": [ "Split Backspace", From 5303f348dd0cd02bdccb24312b89a2af491a2f5d Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 9 Apr 2024 02:21:57 +0200 Subject: [PATCH 08/40] Update v3/archetype/minervalx/Minerva_LX_via_040424.json Co-authored-by: Duncan Sutherland --- v3/archetype/minervalx/Minerva_LX_via_040424.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/archetype/minervalx/Minerva_LX_via_040424.json b/v3/archetype/minervalx/Minerva_LX_via_040424.json index 58735ea580..a8252b62b4 100644 --- a/v3/archetype/minervalx/Minerva_LX_via_040424.json +++ b/v3/archetype/minervalx/Minerva_LX_via_040424.json @@ -22,7 +22,7 @@ "Tsangan-Split", "ANSI" ] - ], + ], "keymap": [ [ { From a17c74fbd739b97154a79054e5934fd13c1e9c13 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 9 Apr 2024 02:22:02 +0200 Subject: [PATCH 09/40] Update v3/archetype/minervalx/Minerva_LX_via_040424.json Co-authored-by: Duncan Sutherland --- v3/archetype/minervalx/Minerva_LX_via_040424.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/v3/archetype/minervalx/Minerva_LX_via_040424.json b/v3/archetype/minervalx/Minerva_LX_via_040424.json index a8252b62b4..ffa0de340b 100644 --- a/v3/archetype/minervalx/Minerva_LX_via_040424.json +++ b/v3/archetype/minervalx/Minerva_LX_via_040424.json @@ -17,10 +17,10 @@ "Split Backspace", "Split Left Shift", [ - "Bottom Row", - "Tsangan", - "Tsangan-Split", - "ANSI" + "Bottom Row", + "Tsangan", + "Tsangan-Split", + "ANSI" ] ], "keymap": [ From 293085c8b48ddf2d8f14ff2c6f497af8393d16aa Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 9 Apr 2024 02:23:07 +0200 Subject: [PATCH 10/40] Update v3/archetype/minervalx/Minerva_LX_via_040424.json --- v3/archetype/minervalx/Minerva_LX_via_040424.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/v3/archetype/minervalx/Minerva_LX_via_040424.json b/v3/archetype/minervalx/Minerva_LX_via_040424.json index ffa0de340b..acd6ce1382 100644 --- a/v3/archetype/minervalx/Minerva_LX_via_040424.json +++ b/v3/archetype/minervalx/Minerva_LX_via_040424.json @@ -2,16 +2,16 @@ "name": "Minerva LX", "vendorId": "0x5453", "productId": "0x0100", + "matrix": { + "rows": 5, + "cols": 15 + }, "keycodes": [ "qmk_lighting" ], "menus": [ "qmk_backlight" ], - "matrix": { - "rows": 5, - "cols": 15 - }, "layouts": { "labels": [ "Split Backspace", @@ -253,3 +253,4 @@ ] } } + From d2dc386e197dcedcf78aaa31e76ae9fc1a3b4b15 Mon Sep 17 00:00:00 2001 From: era Date: Thu, 11 Apr 2024 15:14:47 +0900 Subject: [PATCH 11/40] Add Linx3 N8X Add Linx3 N8X --- v3/era/linx3/n8x.json | 212 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) create mode 100644 v3/era/linx3/n8x.json diff --git a/v3/era/linx3/n8x.json b/v3/era/linx3/n8x.json new file mode 100644 index 0000000000..fd6c7cbf88 --- /dev/null +++ b/v3/era/linx3/n8x.json @@ -0,0 +1,212 @@ +{ + "name": "N8X", + "vendorId": "0x4552", + "productId": "0x0007", + "keycodes": ["qmk_lighting"], + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "label": "Backlight Brightness", + "type": "range", + "options": [0, 10], + "content": ["id_custom_backlight_brightness", 0, 0] + }, + { + "label": "Backlight Effect", + "type": "dropdown", + "content": ["id_custom_backlight_effect", 0, 1], + "options": [["None", 0], ["Breathing", 1], ["Blink-Out on Keypress", 2], ["Blink-In on Keypress", 3]] + }, + { + "showIf": "{id_custom_backlight_effect} == 1", + "label": "Breating Period", + "type": "range", + "options": [1, 10], + "content": ["id_custom_breathing_period", 0, 2] + }, + { + "showIf": "{id_custom_backlight_effect} == 2 || {id_custom_backlight_effect} == 3", + "label": "Blink Speed", + "type": "range", + "options": [1, 10], + "content": ["id_custom_blink_speed", 0, 3] + } + ] + } + ] + } + ], + "matrix": {"rows": 6, "cols": 17}, + "layouts": { + "labels": [ + "Split backspace", + "ISO enter", + "Split left shift", + "Split right shift", + "7U bottom row" + ], + "keymap": [ + [ + {"x": 2.5, "c": "#777777"}, + "0,0", + {"x": 1, "c": "#cccccc"}, + "0,2", + "0,3", + "0,4", + "0,5", + {"x": 0.5}, + "0,6", + "0,7", + "0,8", + "0,9", + {"x": 0.5}, + "0,10", + "0,11", + "0,12", + "0,13", + {"x": 0.25}, + "0,14", + "0,15", + "0,16" + ], + [ + {"y": 0.5, "x": 2.5}, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + {"c": "#aaaaaa", "w": 2}, + "1,13\n\n\n0,0", + {"x": 0.25,"c": "#cccccc"}, + "2,14", + "1,15", + "1,16", + {"x": 1.25}, + "1,13\n\n\n0,1", + "1,14\n\n\n0,1" + ], + [ + {"x": 2.5, "c": "#aaaaaa", "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", + {"x": 0.25}, + "3,14", + "2,15", + "2,16", + {"x": 2, "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", + {"x": 4.25, "c": "#cccccc"}, + "3,12\n\n\n1,1" + ], + [ + {"c": "#aaaaaa", "w": 1.25}, + "4,0\n\n\n2,1", + "4,1\n\n\n2,1", + {"x": 0.25, "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": 2.75 + }, + "4,12\n\n\n3,0", + {"x": 1.25, "c": "#cccccc"}, + "4,15", + {"x": 1.5, "c": "#aaaaaa", "w": 1.75}, + "4,12\n\n\n3,1", + "4,13\n\n\n3,1" + ], + [ + {"x": 2.5, "w": 1.25}, + "5,0\n\n\n4,0", + {"w": 1.25}, + "5,1\n\n\n4,0", + {"w": 1.25}, + "5,2\n\n\n4,0", + {"c": "#cccccc", "w": 6.25 + }, + "5,6\n\n\n4,0", + {"c": "#aaaaaa", "w": 1.25}, + "5,9\n\n\n4,0", + {"w": 1.25}, + "5,10\n\n\n4,0", + {"w": 1.25}, + "5,11\n\n\n4,0", + {"w": 1.25}, + "5,13\n\n\n4,0", + {"x": 0.25, "c": "#cccccc"}, + "5,14", + "5,15", + "5,16" + ], + [ + {"y": 0.25, "x": 2.5, "c": "#aaaaaa", "w": 1.5}, + "5,0\n\n\n4,1", + "5,1\n\n\n4,1", + {"w": 1.5}, + "5,2\n\n\n4,1", + {"c": "#cccccc", "w": 7}, + "5,6\n\n\n4,1", + {"c": "#aaaaaa", "w": 1.5}, + "5,10\n\n\n4,1", + "5,11\n\n\n4,1", + {"w": 1.5}, + "5,13\n\n\n4,1" + ] + ] + } +} \ No newline at end of file From 7fb4bed8f85e1a93cac99c1e0a300e862146b731 Mon Sep 17 00:00:00 2001 From: era Date: Thu, 11 Apr 2024 17:07:01 +0900 Subject: [PATCH 12/40] Move directory Move directory from era/linx3 to era/linx3/n8x --- v3/era/linx3/{ => n8x}/n8x.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename v3/era/linx3/{ => n8x}/n8x.json (100%) diff --git a/v3/era/linx3/n8x.json b/v3/era/linx3/n8x/n8x.json similarity index 100% rename from v3/era/linx3/n8x.json rename to v3/era/linx3/n8x/n8x.json From 79432e7387bd7e1feb3e2fd50320881ad873a511 Mon Sep 17 00:00:00 2001 From: casuanoob Date: Thu, 11 Apr 2024 19:04:12 +1000 Subject: [PATCH 13/40] Add mechstudio/chapter1.json --- v3/mechstudio/chapter1/chapter1.json | 234 +++++++++++++++++++++++++++ v3/mechstudio/{ => dawn}/dawn.json | 0 2 files changed, 234 insertions(+) create mode 100644 v3/mechstudio/chapter1/chapter1.json rename v3/mechstudio/{ => dawn}/dawn.json (100%) diff --git a/v3/mechstudio/chapter1/chapter1.json b/v3/mechstudio/chapter1/chapter1.json new file mode 100644 index 0000000000..b9552fa18c --- /dev/null +++ b/v3/mechstudio/chapter1/chapter1.json @@ -0,0 +1,234 @@ +{ + "name": "Chapter-1", + "vendorId": "0x4D53", + "productId": "0x0006", + "matrix": { + "rows": 5, + "cols": 16 + }, + "layouts": { + "labels": [ + "Split Backspace", + "ISO Enter", + "Split Shift" + ], + "presets": { + "ANSI": [ + 0, + 0, + 0 + ], + "ISO": [ + 0, + 1, + 1 + ] + }, + "keymap": [ + [ + { + "x": 15.5 + }, + "0,15\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "y": -0.75, + "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": 2, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,13\n\n\n1,0", + { + "x": 0.5 + }, + "1,15", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,1" + ], + [ + { + "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.5, + "c": "#cccccc" + }, + "2,15", + { + "x": 0.25 + }, + "2,12\n\n\n1,1" + ], + [ + { + "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", + { + "x": 1.5, + "c": "#cccccc" + }, + "3,15" + ], + [ + { + "y": -0.75, + "x": 14.25, + "c": "#777777" + }, + "3,14" + ], + [ + { + "y": -0.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10", + { + "w": 1.5 + }, + "4,11" + ], + [ + { + "y": -0.75, + "x": 13.25, + "c": "#777777" + }, + "4,13", + "4,14", + "4,15" + ], + [ + { + "y": 0.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,1" + ] + ] + } +} \ No newline at end of file diff --git a/v3/mechstudio/dawn.json b/v3/mechstudio/dawn/dawn.json similarity index 100% rename from v3/mechstudio/dawn.json rename to v3/mechstudio/dawn/dawn.json From bebc464725c2de34d2e2e1f5e023a89859bb500d Mon Sep 17 00:00:00 2001 From: casuanoob Date: Thu, 11 Apr 2024 19:06:20 +1000 Subject: [PATCH 14/40] change name --- v3/mechstudio/chapter1/chapter1.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v3/mechstudio/chapter1/chapter1.json b/v3/mechstudio/chapter1/chapter1.json index b9552fa18c..00d3e7159b 100644 --- a/v3/mechstudio/chapter1/chapter1.json +++ b/v3/mechstudio/chapter1/chapter1.json @@ -1,5 +1,5 @@ { - "name": "Chapter-1", + "name": "Chapter 1", "vendorId": "0x4D53", "productId": "0x0006", "matrix": { @@ -231,4 +231,4 @@ ] ] } -} \ No newline at end of file +} From 5d24947a40bbe5a064aa5275362df68b25c23c16 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 11 Apr 2024 18:00:59 +0200 Subject: [PATCH 15/40] Update is0gr.json Fix to match the production run codes. --- v3/cannonkeys/is0gr/is0gr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v3/cannonkeys/is0gr/is0gr.json b/v3/cannonkeys/is0gr/is0gr.json index 5ff00ce3c9..98ed9d2d9a 100644 --- a/v3/cannonkeys/is0gr/is0gr.json +++ b/v3/cannonkeys/is0gr/is0gr.json @@ -1,7 +1,7 @@ { "name": "is0GR", - "vendorId": "0xCA04", - "productId": "0x0028", + "vendorId": "0x0028", + "productId": "0xCA04", "matrix": { "rows": 1, "cols": 1 From 365a4ab32425a6bb638ba49fe3db830e0a6346bc Mon Sep 17 00:00:00 2001 From: mjbogusz Date: Thu, 11 Apr 2024 21:23:26 +0200 Subject: [PATCH 16/40] Add Atlantis PS17 --- v3/atlantis/ps17/ps17.json | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 v3/atlantis/ps17/ps17.json diff --git a/v3/atlantis/ps17/ps17.json b/v3/atlantis/ps17/ps17.json new file mode 100644 index 0000000000..b12c672ad7 --- /dev/null +++ b/v3/atlantis/ps17/ps17.json @@ -0,0 +1,61 @@ +{ + "name": "Atlantis PS17", + "vendorId": "0x0015", + "productId": "0x414B", + "menus": ["qmk_rgb_matrix"], + "matrix": { + "rows": 11, + "cols": 4 + }, + "layouts": { + "keymap": [ + [ + "0,1\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3" + ], + [ + "2,0", + "2,1", + "2,2", + { + "h": 2 + }, + "2,3" + ], + [ + "3,0", + "3,1", + "3,2" + ], + [ + "4,0", + "4,1", + "4,2", + { + "c": "#777777", + "h": 2 + }, + "4,3" + ], + [ + { + "c": "#cccccc", + "w": 2 + }, + "5,0", + "5,2" + ] + ] + } +} From 398cb77df449a4ba1a1776b20b7e13dff3a93eaa Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:10:05 +0200 Subject: [PATCH 17/40] Update v3/atlantis/ps17/ps17.json --- v3/atlantis/ps17/ps17.json | 124 +++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 59 deletions(-) diff --git a/v3/atlantis/ps17/ps17.json b/v3/atlantis/ps17/ps17.json index b12c672ad7..322f6aef22 100644 --- a/v3/atlantis/ps17/ps17.json +++ b/v3/atlantis/ps17/ps17.json @@ -1,61 +1,67 @@ { - "name": "Atlantis PS17", - "vendorId": "0x0015", - "productId": "0x414B", - "menus": ["qmk_rgb_matrix"], - "matrix": { - "rows": 11, - "cols": 4 - }, - "layouts": { - "keymap": [ - [ - "0,1\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "c": "#aaaaaa" - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3" - ], - [ - "2,0", - "2,1", - "2,2", - { - "h": 2 - }, - "2,3" - ], - [ - "3,0", - "3,1", - "3,2" - ], - [ - "4,0", - "4,1", - "4,2", - { - "c": "#777777", - "h": 2 - }, - "4,3" - ], - [ - { - "c": "#cccccc", - "w": 2 - }, - "5,0", - "5,2" - ] - ] - } + "name": "Atlantis PS17", + "vendorId": "0x0015", + "productId": "0x414B", + "matrix": { + "rows": 11, + "cols": 4 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgb_matrix" + ], + "layouts": { + "keymap": [ + [ + "0,1\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3" + ], + [ + "2,0", + "2,1", + "2,2", + { + "h": 2 + }, + "2,3" + ], + [ + "3,0", + "3,1", + "3,2" + ], + [ + "4,0", + "4,1", + "4,2", + { + "c": "#777777", + "h": 2 + }, + "4,3" + ], + [ + { + "c": "#cccccc", + "w": 2 + }, + "5,0", + "5,2" + ] + ] + } } + From fa0d5fd9088c12c1a1d5c7e11e543a16aaf71e0c Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:12:38 +0200 Subject: [PATCH 18/40] Update v3/atlantis/ps17/ps17.json --- v3/atlantis/ps17/ps17.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/atlantis/ps17/ps17.json b/v3/atlantis/ps17/ps17.json index 322f6aef22..4ea2511346 100644 --- a/v3/atlantis/ps17/ps17.json +++ b/v3/atlantis/ps17/ps17.json @@ -3,7 +3,7 @@ "vendorId": "0x0015", "productId": "0x414B", "matrix": { - "rows": 11, + "rows": 6, "cols": 4 }, "keycodes": [ From ffaa4affe02ed9c4bb702977b19df297595d0363 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:20:27 +0200 Subject: [PATCH 19/40] Update v3/mechstudio/chapter1/chapter1.json --- v3/mechstudio/chapter1/chapter1.json | 1 + 1 file changed, 1 insertion(+) diff --git a/v3/mechstudio/chapter1/chapter1.json b/v3/mechstudio/chapter1/chapter1.json index 00d3e7159b..ea1255c853 100644 --- a/v3/mechstudio/chapter1/chapter1.json +++ b/v3/mechstudio/chapter1/chapter1.json @@ -232,3 +232,4 @@ ] } } + From 575221a9ab01cbef58deba18b9051a4aefb9663b Mon Sep 17 00:00:00 2001 From: archetype-made Date: Sun, 14 Apr 2024 16:56:01 -0700 Subject: [PATCH 20/40] Update file name Updated file name for .json file --- .../minervalx/{Minerva_LX_via_040424.json => minervalx.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename v3/archetype/minervalx/{Minerva_LX_via_040424.json => minervalx.json} (100%) diff --git a/v3/archetype/minervalx/Minerva_LX_via_040424.json b/v3/archetype/minervalx/minervalx.json similarity index 100% rename from v3/archetype/minervalx/Minerva_LX_via_040424.json rename to v3/archetype/minervalx/minervalx.json From 131166b2ed1141d522bc0e3f985e3f3ad86676f4 Mon Sep 17 00:00:00 2001 From: archetype-made Date: Sun, 14 Apr 2024 17:01:48 -0700 Subject: [PATCH 21/40] Layout error fixes updated layout errors and right shift label --- v3/archetype/minervalx/minervalx.json | 34 ++++++++++----------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/v3/archetype/minervalx/minervalx.json b/v3/archetype/minervalx/minervalx.json index acd6ce1382..0d7d5bd0e8 100644 --- a/v3/archetype/minervalx/minervalx.json +++ b/v3/archetype/minervalx/minervalx.json @@ -2,27 +2,20 @@ "name": "Minerva LX", "vendorId": "0x5453", "productId": "0x0100", - "matrix": { - "rows": 5, - "cols": 15 - }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_backlight" - ], + "keycodes": ["qmk_lighting"], + "menus": ["qmk_backlight"], + "matrix": { "rows": 5, "cols": 15 }, "layouts": { "labels": [ "Split Backspace", - "Split Left Shift", + "Split Right Shift", [ - "Bottom Row", - "Tsangan", - "Tsangan-Split", - "ANSI" + "Bottom Row", + "Tsangan", + "Tsangan-Split", + "ANSI" ] - ], + ], "keymap": [ [ { @@ -144,19 +137,19 @@ "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n1,0", - "3,13\n\n\n1,0", + "3,12\n\n\n1,1", + "3,13\n\n\n1,1", { "x": 0.25, "c": "#cccccc" }, "3,14", { - "x": 0.5, + "x": -4, "c": "#aaaaaa", "w": 2.75 }, - "3,12\n\n\n1,1" + "3,12\n\n\n1,0" ], [ { @@ -253,4 +246,3 @@ ] } } - From 6067e73cf06f256fbf2287d16ee4bafce77687d1 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:11:04 +0200 Subject: [PATCH 22/40] Update v3/archetype/minervalx/minervalx.json --- v3/archetype/minervalx/minervalx.json | 57 +++++++++++++++++++-------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/v3/archetype/minervalx/minervalx.json b/v3/archetype/minervalx/minervalx.json index 0d7d5bd0e8..21fcccd63b 100644 --- a/v3/archetype/minervalx/minervalx.json +++ b/v3/archetype/minervalx/minervalx.json @@ -2,20 +2,27 @@ "name": "Minerva LX", "vendorId": "0x5453", "productId": "0x0100", - "keycodes": ["qmk_lighting"], - "menus": ["qmk_backlight"], - "matrix": { "rows": 5, "cols": 15 }, + "matrix": { + "rows": 5, + "cols": 15 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_backlight" + ], "layouts": { "labels": [ "Split Backspace", "Split Right Shift", [ - "Bottom Row", - "Tsangan", - "Tsangan-Split", - "ANSI" + "Bottom Row", + "Tsangan", + "Tsangan-Split", + "ANSI" ] - ], + ], "keymap": [ [ { @@ -48,10 +55,12 @@ }, "0,14", { - "x": 0.5, - "c": "#aaaaaa" + "x": 0.5 }, "2,12\n\n\n0,1", + { + "c": "#aaaaaa" + }, "0,13\n\n\n0,1" ], [ @@ -138,21 +147,24 @@ "w": 1.75 }, "3,12\n\n\n1,1", + { + "x": -1.75, + "w": 2.75 + }, + "3,12\n\n\n1,0", + { + "x": -1 + }, "3,13\n\n\n1,1", { "x": 0.25, "c": "#cccccc" }, - "3,14", - { - "x": -4, - "c": "#aaaaaa", - "w": 2.75 - }, - "3,12\n\n\n1,0" + "3,14" ], [ { + "c": "#aaaaaa", "w": 1.5 }, "4,0\n\n\n2,0", @@ -162,10 +174,12 @@ }, "4,2\n\n\n2,0", { + "c": "#cccccc", "w": 7 }, "4,6\n\n\n2,0", { + "c": "#aaaaaa", "w": 1.5 }, "4,10\n\n\n2,0", @@ -191,15 +205,21 @@ }, "4,2\n\n\n2,1", { + "c": "#cccccc", "w": 3 }, "4,4\n\n\n2,1", + { + "c": "#aaaaaa" + }, "4,6\n\n\n2,1", { + "c": "#cccccc", "w": 3 }, "4,8\n\n\n2,1", { + "c": "#aaaaaa", "w": 1.5 }, "4,10\n\n\n2,1", @@ -223,10 +243,12 @@ }, "4,2\n\n\n2,2", { + "c": "#cccccc", "w": 6.25 }, "4,6\n\n\n2,2", { + "c": "#aaaaaa", "w": 1.25 }, "4,9\n\n\n2,2", @@ -246,3 +268,4 @@ ] } } + From 595895d45e65613f9f6481bce2f480500c749e22 Mon Sep 17 00:00:00 2001 From: suikagiken <115451678+suikagiken@users.noreply.github.com> Date: Thu, 18 Apr 2024 00:09:05 +0900 Subject: [PATCH 23/40] add keyboard suika85ergo --- v3/suikagiken/suika85ergo/suika85ergo.json | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 v3/suikagiken/suika85ergo/suika85ergo.json diff --git a/v3/suikagiken/suika85ergo/suika85ergo.json b/v3/suikagiken/suika85ergo/suika85ergo.json new file mode 100644 index 0000000000..09cac6e8ea --- /dev/null +++ b/v3/suikagiken/suika85ergo/suika85ergo.json @@ -0,0 +1,54 @@ +{ + "name": "suika85ergo", + "vendorId": "0x4B48", + "productId": "0x0002", + "matrix": {"rows": 6,"cols": 17}, + "layouts": { + "keymap": [ + [{"y":2,"x":8.75},"0,10"], + [{"y":3.75,"x":8.25,"c":"#777777"},"4,8"], + [{"x":8.25},"5,8"], + [{"rx":8.1,"ry":3.75,"y":-0.25,"x":0.15,"c":"#aaaaaa"},"1,8"], + [{"x":0.15,"c":"#cccccc"},"2,8"], + [{"rx":8.35,"ry":5.5,"y":2.25,"x":0.9,"c":"#777777"},"5,9"], + [{"rx":10.32,"ry":5,"y":0.5,"x":-2.57,"c":"#cccccc"},"3,7"], + [{"rx":10.34,"y":0.5,"x":-1.59},"3,9"], + [{"rx":10.35,"y":-3,"x":-3.6},"0,5","0,6",{"x":1},"0,11"], + [{"y":4.75,"x":-3.1,"c":"#777777"},"5,7"], + [{"r":15,"rx":8.77,"y":-2.75,"x":-8.52},"0,0"], + [{"y":-0.75,"x":-7.02,"c":"#cccccc"},"0,1","0,2","0,3","0,4"], + [{"y":0.25,"x":-8.52,"c":"#aaaaaa"},"1,0",{"x":3.25,"c":"#cccccc"},"1,4"], + [{"y":-0.75,"x":-5.27},"1,3",{"x":1},"1,5"], + [{"y":-0.75,"x":-7.27},"1,1","1,2",{"x":3},"1,6"], + [{"y":-0.5,"x":-4.27},"2,4"], + [{"y":-0.75,"x":-8.52,"c":"#aaaaaa"},"2,0",{"x":2.25,"c":"#cccccc"},"2,3",{"x":1},"2,5"], + [{"y":-0.75,"x":-7.27,"c":"#aaaaaa"},"2,1",{"c":"#cccccc"},"2,2",{"x":3},"2,6"], + [{"y":-0.5,"x":-4.27},"3,4"], + [{"y":-0.75,"x":-8.52,"c":"#aaaaaa"},"3,0",{"x":2.25,"c":"#cccccc"},"3,3",{"x":1},"3,5"], + [{"y":-0.75,"x":-7.27,"c":"#aaaaaa"},"3,1",{"c":"#cccccc"},"3,2",{"x":3},"3,6"], + [{"y":-0.5,"x":-4.27},"4,4"], + [{"y":-0.75,"x":-5.27},"4,3",{"x":1},"4,5"], + [{"y":-0.75,"x":-7.77,"c":"#aaaaaa","w":1.5},"4,1",{"c":"#cccccc"},"4,2",{"x":3},"4,6"], + [{"y":-0.5,"x":-4.27,"c":"#aaaaaa"},"5,4"], + [{"y":-0.75,"x":-5.27},"5,3",{"x":1},"5,5"], + [{"y":-0.75,"x":-6.77,"w":1.5},"5,2",{"x":3,"w":1.25},"5,6"], + [{"r":-15,"rx":8.79,"y":-2.75,"x":7.46},"0,16"], + [{"y":-0.75,"x":2.96,"c":"#cccccc"},"0,12","0,13","0,14","0,15"], + [{"y":0.25,"x":3.21},"1,12"], + [{"y":-0.75,"x":2.21},"1,11",{"x":1},"1,13",{"x":2.25,"c":"#aaaaaa"},"1,16"], + [{"y":-0.75,"x":1.21,"c":"#cccccc"},"1,10",{"x":3},"1,14","1,15"], + [{"y":-0.5,"x":3.21},"2,12"], + [{"y":-0.75,"x":2.21},"2,11",{"x":1},"2,13"], + [{"y":-0.75,"x":1.21},"2,10",{"x":3},"2,14","2,15"], + [{"y":-0.5,"x":3.21},"3,12",{"x":3.25,"c":"#777777"},"2,16"], + [{"y":-0.75,"x":2.21,"c":"#cccccc"},"3,11",{"x":1},"3,13"], + [{"y":-0.75,"x":1.21},"3,10",{"x":3},"3,14","3,15"], + [{"y":-0.5,"x":3.21},"4,12"], + [{"y":-0.75,"x":2.21},"4,11",{"x":1},"4,13"], + [{"y":-0.75,"x":1.21},"4,10",{"x":3},"4,14",{"c":"#aaaaaa","w":1.5},"4,15"], + [{"y":-0.5,"x":3.21},"5,12"], + [{"y":-0.75,"x":2.21},"5,11",{"x":1},"5,13"], + [{"y":-0.75,"x":0.96,"w":1.25},"5,10",{"x":3,"w":1.5},"5,14"] + ] + } +} \ No newline at end of file From 60851df555e892c06d9f7bad562ff4973d5a49b3 Mon Sep 17 00:00:00 2001 From: yiancar Date: Wed, 17 Apr 2024 22:06:12 +0100 Subject: [PATCH 24/40] Create keycult65.json --- v3/yiancardesigns/keycult65/keycult65.json | 158 +++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 v3/yiancardesigns/keycult65/keycult65.json diff --git a/v3/yiancardesigns/keycult65/keycult65.json b/v3/yiancardesigns/keycult65/keycult65.json new file mode 100644 index 0000000000..89a46dd005 --- /dev/null +++ b/v3/yiancardesigns/keycult65/keycult65.json @@ -0,0 +1,158 @@ +{ + "name": "Keycult 65", + "vendorId": "0x8968", + "productId": "0x6335", + "matrix": {"rows": 5, "cols": 15}, + "layouts": { + "labels": [ + "Split Backspace", + ["Bottom Row", "6.25U", "7U"] + ], + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "w": 2 + }, + "0,13\n\n\n0,0", + "0,14", + { + "x": 1.25 + }, + "1,13\n\n\n0,1", + "0,13\n\n\n0,1" + ], + [ + { + "w": 1.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "2,12", + "1,14" + ], + [ + { + "w": 1.75 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "w": 2.25 + }, + "2,13", + "2,14" + ], + [ + { + "w": 2.25 + }, + "3,0", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "w": 1.75 + }, + "3,12", + "3,13", + "3,14" + ], + [ + { + "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", + { + "w": 6.25 + }, + "4,6\n\n\n1,0", + { + "w": 1.25 + }, + "4,9\n\n\n1,0", + { + "w": 1.25 + }, + "4,11\n\n\n1,0", + { + "x": 0.5 + }, + "4,12", + "4,13", + "4,14" + ], + [ + { + "y": 0.5, + "w": 1.5 + }, + "4,0\n\n\n1,1", + "4,1\n\n\n1,1", + { + "w": 1.5 + }, + "4,2\n\n\n1,1", + { + "w": 7 + }, + "4,6\n\n\n1,1", + { + "w": 1.5 + }, + "4,11\n\n\n1,1" + ] + ] + } +} From d8472fe63f9a8bb0702f6cf77c13d38e4bb181bc Mon Sep 17 00:00:00 2001 From: yiancar Date: Wed, 17 Apr 2024 22:39:44 +0100 Subject: [PATCH 25/40] Create skelett_60.json --- v3/yiancardesigns/skelett_60/skelett_60.json | 227 +++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 v3/yiancardesigns/skelett_60/skelett_60.json diff --git a/v3/yiancardesigns/skelett_60/skelett_60.json b/v3/yiancardesigns/skelett_60/skelett_60.json new file mode 100644 index 0000000000..6375de580f --- /dev/null +++ b/v3/yiancardesigns/skelett_60/skelett_60.json @@ -0,0 +1,227 @@ +{ + "name": "Skelett 60", + "vendorId": "0x8968", + "productId": "0x7336", + "matrix": { + "rows": 5, + "cols": 14 + }, + "layouts": { + "labels": [ + "Split Backspace", + "Split Left Shift", + "Split Right Shift", + "ISO Enter", + [ + "Bottom Row", + "6.25U", + "7U" + ] + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "2,12\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,13\n\n\n3,0", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n3,1" + ], + [ + { + "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\n3,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,11\n\n\n3,1" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0\n\n\n1,0", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,12\n\n\n2,0", + { + "x": 0.25, + "w": 1.25 + }, + "3,0\n\n\n1,1", + { + "c": "#cccccc" + }, + "3,1\n\n\n1,1", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12\n\n\n2,1", + "3,13\n\n\n2,1" + ], + [ + { + "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, + "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" + ] + ] + } +} From e4677a3ca63b7db2480fb42b5863727d9170565a Mon Sep 17 00:00:00 2001 From: HereVoLand <65162585+Vem-596@users.noreply.github.com> Date: Thu, 18 Apr 2024 21:05:54 +0800 Subject: [PATCH 26/40] Add files via upload --- v3/herevoland/shadow80.json | 291 ++++++++++++++++++++++++++++++++++++ 1 file changed, 291 insertions(+) create mode 100644 v3/herevoland/shadow80.json diff --git a/v3/herevoland/shadow80.json b/v3/herevoland/shadow80.json new file mode 100644 index 0000000000..54de3713f7 --- /dev/null +++ b/v3/herevoland/shadow80.json @@ -0,0 +1,291 @@ +{ + "name": "SHADOW80", + "vendorId": "0x0011", + "productId": "0x0011", + "keycodes": ["qmk_lighting"], + "menus":[ "qmk_rgb_matrix"], + "customKeycodes": [ + { + "name": "Toggle WinKey Lock", + "title": "Toggle WinKey Lock", + "shortName": "WinLock" + }, + { + "name": "Toggle macOS Keymap", + "title": "Toggle macOS Keymap", + "shortName": "TogMacOS" + }, + { + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "Mission Control" + }, + { + "name": "Launch Pad", + "title": "Launch Pad in macOS", + "shortName": "Launch Pad" + } + ], + "matrix": { "rows": 6, "cols": 17 }, + "layouts": { + "labels": [ + ["Enter","ansi","iso"], + ["Space","7U","6.25U"], + ["Lshift","default","split"] , + ["Rshift","default","split"], + ["BS","default","split"] + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 0.25 + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25 + }, + "0,5", + "0,6", + "0,7", + "0,8", + { + "x": 0.25 + }, + "0,9", + "0,10", + "0,11", + "0,12", + { + "x": 0.25 + }, + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y":0.25 + }, + "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\n4,0", + "3,12\n\n\n4,1", + "1,13\n\n\n4,1", + { + "x": -1.75, + "c": "#cccccc" + }, + "1,14", + "1,15", + "1,16" + ], + [ + { + "w": 1.5 + }, + "2,0", + "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\n0,0", + { + "w":1.25, + "h":2, + "c":"#aaaaaa", + "w2":1.5, + "h2":1, + "x2":-0.25 + }, + "3,13\n\n\n0,1", + { + "x": -1, + "c": "#cccccc" + }, + "2,14", + "2,15", + "2,16" + ], + [ + { + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "w": 2.25, + "c": "#aaaaaa" + }, + "3,13\n\n\n0,0", + { + "x":-1 + }, + "2,13\n\n\n0,1" + + + ], + [ + { + "w": 2.25 + }, + "4,0\n\n\n2,0", + {"w":1.25}, + "4,0\n\n\n2,1", + "4,1\n\n\n2,1", + { + "x":-2.25, + "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\n3,0", + {"w":1.75}, + "4,12\n\n\n3,1", + "4,13\n\n\n3,1", + { + "x":-2.75 + }, + { + "x": 1.25, + "c": "#777777" + }, + "4,15" + ], + [ + { + "w": 1.5, + "c": "#aaaaaa" + }, + "5,0\n\n\n1,0", + "5,1\n\n\n1,0", + { + "w":1.5 + }, + "5,2\n\n\n1,0", + { + "w": 7 + }, + "5,6\n\n\n1,0", + { + "w":1.5 + }, + "5,11\n\n\n1,0", + "5,12\n\n\n1,0", + { + "w":1.5 + }, + "5,13\n\n\n1,0", + { + "w":1.25 + }, + "5,0\n\n\n1,1", + { + "w":1.25 + }, + "5,1\n\n\n1,1", + { + "w":1.25 + }, + "5,2\n\n\n1,1", + { + "w": 6.25 + }, + "5,6\n\n\n1,1", + { + "w":1.25 + }, + "5,10\n\n\n1,1", + { + "w":1.25 + }, + "5,11\n\n\n1,1", + { + "w":1.25 + }, + "5,12\n\n\n1,1", + { + "w":1.25 + }, + "5,13\n\n\n1,1", + + + + { + "x": -14.75, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16" + + ] + ] + + + + + } +} From 12a71f7ef99b92a3a540bbf6c2abbfb4cef0ffff Mon Sep 17 00:00:00 2001 From: era Date: Fri, 19 Apr 2024 04:57:54 +0900 Subject: [PATCH 27/40] Add Linx3 N86 Add Linx3 N86 --- v3/era/linx3/n86/n86.json | 213 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 v3/era/linx3/n86/n86.json diff --git a/v3/era/linx3/n86/n86.json b/v3/era/linx3/n86/n86.json new file mode 100644 index 0000000000..c1f24d7a4f --- /dev/null +++ b/v3/era/linx3/n86/n86.json @@ -0,0 +1,213 @@ +{ + "name": "N86", + "vendorId": "0x4552", + "productId": "0x0008", + "keycodes": ["qmk_lighting"], + "menus": [ "qmk_rgb_matrix" ], + "matrix": {"rows": 6, "cols": 17}, + "layouts": { + "labels": [ + "Split backspace", + "Split right shift" + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.5 + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5 + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,14", + "1,15", + "1,16", + { + "x": 1.25 + }, + "1,13\n\n\n0,1", + "1,14\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "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 + }, + "3,14", + "2,15", + "2,16" + ], + [ + { + "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" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,12\n\n\n1,0", + { + "x": 1.25, + "c": "#777777" + }, + "4,15", + { + "x": 1.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "4,12\n\n\n1,1", + "4,13\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "5,0", + "5,1", + { + "w": 1.5 + }, + "5,2", + { + "c": "#cccccc", + "w": 7 + }, + "5,7", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11", + "5,12", + { + "w": 1.5 + }, + "5,13", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16" + ] + ] + } +} \ No newline at end of file From 7a1dddc6c67b3daa76ac2e6dc6e725722d32194b Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:03:06 +0200 Subject: [PATCH 28/40] Update v3/suikagiken/suika85ergo/suika85ergo.json --- v3/suikagiken/suika85ergo/suika85ergo.json | 528 +++++++++++++++++++-- 1 file changed, 482 insertions(+), 46 deletions(-) diff --git a/v3/suikagiken/suika85ergo/suika85ergo.json b/v3/suikagiken/suika85ergo/suika85ergo.json index 09cac6e8ea..f96a2174ff 100644 --- a/v3/suikagiken/suika85ergo/suika85ergo.json +++ b/v3/suikagiken/suika85ergo/suika85ergo.json @@ -2,53 +2,489 @@ "name": "suika85ergo", "vendorId": "0x4B48", "productId": "0x0002", - "matrix": {"rows": 6,"cols": 17}, + "matrix": { + "rows": 6, + "cols": 17 + }, "layouts": { "keymap": [ - [{"y":2,"x":8.75},"0,10"], - [{"y":3.75,"x":8.25,"c":"#777777"},"4,8"], - [{"x":8.25},"5,8"], - [{"rx":8.1,"ry":3.75,"y":-0.25,"x":0.15,"c":"#aaaaaa"},"1,8"], - [{"x":0.15,"c":"#cccccc"},"2,8"], - [{"rx":8.35,"ry":5.5,"y":2.25,"x":0.9,"c":"#777777"},"5,9"], - [{"rx":10.32,"ry":5,"y":0.5,"x":-2.57,"c":"#cccccc"},"3,7"], - [{"rx":10.34,"y":0.5,"x":-1.59},"3,9"], - [{"rx":10.35,"y":-3,"x":-3.6},"0,5","0,6",{"x":1},"0,11"], - [{"y":4.75,"x":-3.1,"c":"#777777"},"5,7"], - [{"r":15,"rx":8.77,"y":-2.75,"x":-8.52},"0,0"], - [{"y":-0.75,"x":-7.02,"c":"#cccccc"},"0,1","0,2","0,3","0,4"], - [{"y":0.25,"x":-8.52,"c":"#aaaaaa"},"1,0",{"x":3.25,"c":"#cccccc"},"1,4"], - [{"y":-0.75,"x":-5.27},"1,3",{"x":1},"1,5"], - [{"y":-0.75,"x":-7.27},"1,1","1,2",{"x":3},"1,6"], - [{"y":-0.5,"x":-4.27},"2,4"], - [{"y":-0.75,"x":-8.52,"c":"#aaaaaa"},"2,0",{"x":2.25,"c":"#cccccc"},"2,3",{"x":1},"2,5"], - [{"y":-0.75,"x":-7.27,"c":"#aaaaaa"},"2,1",{"c":"#cccccc"},"2,2",{"x":3},"2,6"], - [{"y":-0.5,"x":-4.27},"3,4"], - [{"y":-0.75,"x":-8.52,"c":"#aaaaaa"},"3,0",{"x":2.25,"c":"#cccccc"},"3,3",{"x":1},"3,5"], - [{"y":-0.75,"x":-7.27,"c":"#aaaaaa"},"3,1",{"c":"#cccccc"},"3,2",{"x":3},"3,6"], - [{"y":-0.5,"x":-4.27},"4,4"], - [{"y":-0.75,"x":-5.27},"4,3",{"x":1},"4,5"], - [{"y":-0.75,"x":-7.77,"c":"#aaaaaa","w":1.5},"4,1",{"c":"#cccccc"},"4,2",{"x":3},"4,6"], - [{"y":-0.5,"x":-4.27,"c":"#aaaaaa"},"5,4"], - [{"y":-0.75,"x":-5.27},"5,3",{"x":1},"5,5"], - [{"y":-0.75,"x":-6.77,"w":1.5},"5,2",{"x":3,"w":1.25},"5,6"], - [{"r":-15,"rx":8.79,"y":-2.75,"x":7.46},"0,16"], - [{"y":-0.75,"x":2.96,"c":"#cccccc"},"0,12","0,13","0,14","0,15"], - [{"y":0.25,"x":3.21},"1,12"], - [{"y":-0.75,"x":2.21},"1,11",{"x":1},"1,13",{"x":2.25,"c":"#aaaaaa"},"1,16"], - [{"y":-0.75,"x":1.21,"c":"#cccccc"},"1,10",{"x":3},"1,14","1,15"], - [{"y":-0.5,"x":3.21},"2,12"], - [{"y":-0.75,"x":2.21},"2,11",{"x":1},"2,13"], - [{"y":-0.75,"x":1.21},"2,10",{"x":3},"2,14","2,15"], - [{"y":-0.5,"x":3.21},"3,12",{"x":3.25,"c":"#777777"},"2,16"], - [{"y":-0.75,"x":2.21,"c":"#cccccc"},"3,11",{"x":1},"3,13"], - [{"y":-0.75,"x":1.21},"3,10",{"x":3},"3,14","3,15"], - [{"y":-0.5,"x":3.21},"4,12"], - [{"y":-0.75,"x":2.21},"4,11",{"x":1},"4,13"], - [{"y":-0.75,"x":1.21},"4,10",{"x":3},"4,14",{"c":"#aaaaaa","w":1.5},"4,15"], - [{"y":-0.5,"x":3.21},"5,12"], - [{"y":-0.75,"x":2.21},"5,11",{"x":1},"5,13"], - [{"y":-0.75,"x":0.96,"w":1.25},"5,10",{"x":3,"w":1.5},"5,14"] + [ + { + "y": 2, + "x": 8.75 + }, + "0,10" + ], + [ + { + "y": 3.75, + "x": 8.25, + "c": "#777777" + }, + "4,8" + ], + [ + { + "x": 8.25 + }, + "5,8" + ], + [ + { + "rx": 8.1, + "ry": 3.75, + "y": -0.25, + "x": 0.15, + "c": "#aaaaaa" + }, + "1,8" + ], + [ + { + "x": 0.15, + "c": "#cccccc" + }, + "2,8" + ], + [ + { + "rx": 8.35, + "ry": 5.5, + "y": 2.25, + "x": 0.9, + "c": "#777777" + }, + "5,9" + ], + [ + { + "rx": 10.32, + "ry": 5, + "y": 0.5, + "x": -2.57, + "c": "#cccccc" + }, + "3,7" + ], + [ + { + "rx": 10.34, + "y": 0.5, + "x": -1.59 + }, + "3,9" + ], + [ + { + "rx": 10.35, + "y": -3, + "x": -3.6 + }, + "0,5", + "0,6", + { + "x": 1 + }, + "0,11" + ], + [ + { + "y": 4.75, + "x": -3.1, + "c": "#777777" + }, + "5,7" + ], + [ + { + "r": 15, + "rx": 8.77, + "y": -2.75, + "x": -8.52 + }, + "0,0" + ], + [ + { + "y": -0.75, + "x": -7.02, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4" + ], + [ + { + "y": 0.25, + "x": -8.52, + "c": "#aaaaaa" + }, + "1,0", + { + "x": 3.25, + "c": "#cccccc" + }, + "1,4" + ], + [ + { + "y": -0.75, + "x": -5.27 + }, + "1,3", + { + "x": 1 + }, + "1,5" + ], + [ + { + "y": -0.75, + "x": -7.27 + }, + "1,1", + "1,2", + { + "x": 3 + }, + "1,6" + ], + [ + { + "y": -0.5, + "x": -4.27 + }, + "2,4" + ], + [ + { + "y": -0.75, + "x": -8.52, + "c": "#aaaaaa" + }, + "2,0", + { + "x": 2.25, + "c": "#cccccc" + }, + "2,3", + { + "x": 1 + }, + "2,5" + ], + [ + { + "y": -0.75, + "x": -7.27, + "c": "#aaaaaa" + }, + "2,1", + { + "c": "#cccccc" + }, + "2,2", + { + "x": 3 + }, + "2,6" + ], + [ + { + "y": -0.5, + "x": -4.27 + }, + "3,4" + ], + [ + { + "y": -0.75, + "x": -8.52, + "c": "#aaaaaa" + }, + "3,0", + { + "x": 2.25, + "c": "#cccccc" + }, + "3,3", + { + "x": 1 + }, + "3,5" + ], + [ + { + "y": -0.75, + "x": -7.27, + "c": "#aaaaaa" + }, + "3,1", + { + "c": "#cccccc" + }, + "3,2", + { + "x": 3 + }, + "3,6" + ], + [ + { + "y": -0.5, + "x": -4.27 + }, + "4,4" + ], + [ + { + "y": -0.75, + "x": -5.27 + }, + "4,3", + { + "x": 1 + }, + "4,5" + ], + [ + { + "y": -0.75, + "x": -7.77, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,1", + { + "c": "#cccccc" + }, + "4,2", + { + "x": 3 + }, + "4,6" + ], + [ + { + "y": -0.5, + "x": -4.27, + "c": "#aaaaaa" + }, + "5,4" + ], + [ + { + "y": -0.75, + "x": -5.27 + }, + "5,3", + { + "x": 1 + }, + "5,5" + ], + [ + { + "y": -0.75, + "x": -6.77, + "w": 1.5 + }, + "5,2", + { + "x": 3, + "w": 1.25 + }, + "5,6" + ], + [ + { + "r": -15, + "rx": 8.79, + "y": -2.75, + "x": 7.46 + }, + "0,16" + ], + [ + { + "y": -0.75, + "x": 2.96, + "c": "#cccccc" + }, + "0,12", + "0,13", + "0,14", + "0,15" + ], + [ + { + "y": 0.25, + "x": 3.21 + }, + "1,12" + ], + [ + { + "y": -0.75, + "x": 2.21 + }, + "1,11", + { + "x": 1 + }, + "1,13", + { + "x": 2.25, + "c": "#aaaaaa" + }, + "1,16" + ], + [ + { + "y": -0.75, + "x": 1.21, + "c": "#cccccc" + }, + "1,10", + { + "x": 3 + }, + "1,14", + "1,15" + ], + [ + { + "y": -0.5, + "x": 3.21 + }, + "2,12" + ], + [ + { + "y": -0.75, + "x": 2.21 + }, + "2,11", + { + "x": 1 + }, + "2,13" + ], + [ + { + "y": -0.75, + "x": 1.21 + }, + "2,10", + { + "x": 3 + }, + "2,14", + "2,15" + ], + [ + { + "y": -0.5, + "x": 3.21 + }, + "3,12", + { + "x": 3.25, + "c": "#777777" + }, + "2,16" + ], + [ + { + "y": -0.75, + "x": 2.21, + "c": "#cccccc" + }, + "3,11", + { + "x": 1 + }, + "3,13" + ], + [ + { + "y": -0.75, + "x": 1.21 + }, + "3,10", + { + "x": 3 + }, + "3,14", + "3,15" + ], + [ + { + "y": -0.5, + "x": 3.21 + }, + "4,12" + ], + [ + { + "y": -0.75, + "x": 2.21 + }, + "4,11", + { + "x": 1 + }, + "4,13" + ], + [ + { + "y": -0.75, + "x": 1.21 + }, + "4,10", + { + "x": 3 + }, + "4,14", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,15" + ], + [ + { + "y": -0.5, + "x": 3.21 + }, + "5,12" + ], + [ + { + "y": -0.75, + "x": 2.21 + }, + "5,11", + { + "x": 1 + }, + "5,13" + ], + [ + { + "y": -0.75, + "x": 0.96, + "w": 1.25 + }, + "5,10", + { + "x": 3, + "w": 1.5 + }, + "5,14" + ] ] } -} \ No newline at end of file +} From 8eb7fafd22a85d9c746e1f24e8194bc76a4e80ae Mon Sep 17 00:00:00 2001 From: Alabahuy Date: Fri, 19 Apr 2024 13:50:40 +0700 Subject: [PATCH 29/40] add jaykeeb joker --- v3/jaykeeb/joker/joker.json | 270 ++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) create mode 100644 v3/jaykeeb/joker/joker.json diff --git a/v3/jaykeeb/joker/joker.json b/v3/jaykeeb/joker/joker.json new file mode 100644 index 0000000000..c1d9c2a994 --- /dev/null +++ b/v3/jaykeeb/joker/joker.json @@ -0,0 +1,270 @@ +{ + "name": "Joker", + "vendorId": "0x414C", + "productId": "0x0795", + "matrix": {"rows": 6, "cols": 19}, + "layouts": { + "labels": [ + "Split Backspace", + ["Bottom Row", "6.25U", "7U"] + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25 + }, + "0,5", + "0,6", + "0,7", + "0,8", + { + "x": 0.25 + }, + "0,9", + "0,10", + "0,11", + "0,12", + { + "x": 0.25 + }, + "0,13", + { + "x": 0.25 + }, + "0,14", + { + "x": 0.25 + }, + "0,15", + "0,16", + "0,17", + "0,18" + ], + [ + { + "y": 0.25 + }, + "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", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,14", + { + "x": 0.25 + }, + "1,15", + "1,16", + "1,17", + "1,18", + { + "x": 0.75 + }, + "1,13\n\n\n0,1", + "2,13\n\n\n0,1" + ], + [ + { + "w": 1.5 + }, + "2,0", + "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 + }, + "3,13", + { + "x": 0.25 + }, + "2,14", + { + "x": 0.25 + }, + "2,15", + "2,16", + "2,17", + { + "h": 2 + }, + "2,18" + ], + [ + { + "w": 1.75 + }, + "3,0", + "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,12", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,14", + { + "x": 0.25 + }, + "3,15", + "3,16", + "3,17" + ], + [ + { + "w": 2.25 + }, + "4,0", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "w": 1.75 + }, + "4,12", + { + "x": 2.5 + }, + "4,15", + "4,16", + "4,17", + { + "h": 2 + }, + "4,18" + ], + [ + { + "y": -0.75, + "x": 14.25 + }, + "4,13" + ], + [ + { + "y": -0.25, + "w": 1.25 + }, + "5,0\n\n\n1,0", + { + "w": 1.25 + }, + "5,1\n\n\n1,0", + { + "w": 1.25 + }, + "5,2\n\n\n1,0", + { + "w": 6.25 + }, + "5,6\n\n\n1,0", + { + "w": 1.5 + }, + "5,10\n\n\n1,0", + { + "w": 1.5 + }, + "5,11\n\n\n1,0", + { + "x": 3.5, + "w": 2 + }, + "5,15", + "5,17" + ], + [ + { + "y": -0.75, + "x": 13.25 + }, + "5,12", + "5,13", + "5,14" + ], + [ + { + "y": -0.25, + "w": 1.5 + }, + "5,0\n\n\n1,1", + { + "w": 1.5 + }, + "5,1\n\n\n1,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n1,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,10\n\n\n1,1", + { + "w": 1.5 + }, + "5,11\n\n\n1,1" + ] + ] + } +} \ No newline at end of file From a10c0c3a807758db5fbcb7512fd0ee920ad79859 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Fri, 19 Apr 2024 10:44:06 +0200 Subject: [PATCH 30/40] Update v3/jaykeeb/joker/joker.json --- v3/jaykeeb/joker/joker.json | 81 +++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 22 deletions(-) diff --git a/v3/jaykeeb/joker/joker.json b/v3/jaykeeb/joker/joker.json index c1d9c2a994..2267ac0bc9 100644 --- a/v3/jaykeeb/joker/joker.json +++ b/v3/jaykeeb/joker/joker.json @@ -2,11 +2,18 @@ "name": "Joker", "vendorId": "0x414C", "productId": "0x0795", - "matrix": {"rows": 6, "cols": 19}, + "matrix": { + "rows": 6, + "cols": 19 + }, "layouts": { "labels": [ "Split Backspace", - ["Bottom Row", "6.25U", "7U"] + [ + "Bottom Row", + "6.25U", + "7U" + ] ], "keymap": [ [ @@ -23,29 +30,34 @@ "0,3", "0,4", { - "x": 0.25 + "x": 0.25, + "c": "#aaaaaa" }, "0,5", "0,6", "0,7", "0,8", { - "x": 0.25 + "x": 0.25, + "c": "#cccccc" }, "0,9", "0,10", "0,11", "0,12", { - "x": 0.25 + "x": 0.25, + "c": "#aaaaaa" }, "0,13", { - "x": 0.25 + "x": 0.25, + "c": "#cccccc" }, "0,14", { - "x": 0.25 + "x": 0.25, + "c": "#aaaaaa" }, "0,15", "0,16", @@ -54,7 +66,8 @@ ], [ { - "y": 0.25 + "y": 0.25, + "c": "#cccccc" }, "1,0", "1,1", @@ -75,21 +88,26 @@ }, "1,13\n\n\n0,0", { - "x": 0.25, + "x": 0.25, "c": "#cccccc" }, "1,14", { - "x": 0.25 + "x": 0.25, + "c": "#aaaaaa" }, "1,15", "1,16", "1,17", "1,18", { - "x": 0.75 + "x": 0.25, + "c": "#cccccc" }, "1,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, "2,13\n\n\n0,1" ], [ @@ -97,6 +115,9 @@ "w": 1.5 }, "2,0", + { + "c": "#cccccc" + }, "2,1", "2,2", "2,3", @@ -124,6 +145,7 @@ "2,16", "2,17", { + "c": "#aaaaaa", "h": 2 }, "2,18" @@ -133,6 +155,9 @@ "w": 1.75 }, "3,0", + { + "c": "#cccccc" + }, "3,1", "3,2", "3,3", @@ -150,7 +175,7 @@ }, "3,12", { - "x": 0.25, + "x": 0.25, "c": "#cccccc" }, "3,14", @@ -163,9 +188,13 @@ ], [ { + "c": "#aaaaaa", "w": 2.25 }, "4,0", + { + "c": "#cccccc" + }, "4,2", "4,3", "4,4", @@ -177,30 +206,35 @@ "4,10", "4,11", { + "c": "#aaaaaa", "w": 1.75 }, "4,12", { - "x": 2.5 + "x": 2.5, + "c": "#cccccc" }, "4,15", "4,16", "4,17", { + "c": "#aaaaaa", "h": 2 }, "4,18" ], [ { - "y": -0.75, - "x": 14.25 - }, + "y": -0.75, + "x": 14.25, + "c": "#cccccc" + }, "4,13" ], [ { "y": -0.25, + "c": "#aaaaaa", "w": 1.25 }, "5,0\n\n\n1,0", @@ -213,10 +247,12 @@ }, "5,2\n\n\n1,0", { + "c": "#cccccc", "w": 6.25 }, "5,6\n\n\n1,0", { + "c": "#aaaaaa", "w": 1.5 }, "5,10\n\n\n1,0", @@ -225,7 +261,8 @@ }, "5,11\n\n\n1,0", { - "x": 3.5, + "x": 3.5, + "c": "#cccccc", "w": 2 }, "5,15", @@ -235,14 +272,14 @@ { "y": -0.75, "x": 13.25 - }, - "5,12", - "5,13", + }, + "5,12", + "5,13", "5,14" ], [ { - "y": -0.25, + "c": "#aaaaaa", "w": 1.5 }, "5,0\n\n\n1,1", @@ -267,4 +304,4 @@ ] ] } -} \ No newline at end of file +} From e5c2d099a5dd5f14eb1d6ad9bb423c621fd34197 Mon Sep 17 00:00:00 2001 From: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com> Date: Mon, 22 Apr 2024 22:15:26 +0700 Subject: [PATCH 31/40] Remove "rev.1" of De60fs --- v3/deemen17/de60fs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/deemen17/de60fs.json b/v3/deemen17/de60fs.json index 411663d23b..0ab5174f20 100644 --- a/v3/deemen17/de60fs.json +++ b/v3/deemen17/de60fs.json @@ -1,5 +1,5 @@ { - "name": "De60fs Rev.1", + "name": "De60fs", "vendorId": "0xDE17", "productId": "0x60F0", "menus": [ "qmk_rgblight" ], From ffafd46ef9675d7a507b028d8b434abc759b5896 Mon Sep 17 00:00:00 2001 From: HereVoLand <65162585+Vem-596@users.noreply.github.com> Date: Tue, 23 Apr 2024 03:16:42 +0800 Subject: [PATCH 32/40] Delete v3/herevoland directory --- v3/herevoland/shadow80.json | 291 ------------------------------------ 1 file changed, 291 deletions(-) delete mode 100644 v3/herevoland/shadow80.json diff --git a/v3/herevoland/shadow80.json b/v3/herevoland/shadow80.json deleted file mode 100644 index 54de3713f7..0000000000 --- a/v3/herevoland/shadow80.json +++ /dev/null @@ -1,291 +0,0 @@ -{ - "name": "SHADOW80", - "vendorId": "0x0011", - "productId": "0x0011", - "keycodes": ["qmk_lighting"], - "menus":[ "qmk_rgb_matrix"], - "customKeycodes": [ - { - "name": "Toggle WinKey Lock", - "title": "Toggle WinKey Lock", - "shortName": "WinLock" - }, - { - "name": "Toggle macOS Keymap", - "title": "Toggle macOS Keymap", - "shortName": "TogMacOS" - }, - { - "name": "Mission Control", - "title": "Mission Control in macOS", - "shortName": "Mission Control" - }, - { - "name": "Launch Pad", - "title": "Launch Pad in macOS", - "shortName": "Launch Pad" - } - ], - "matrix": { "rows": 6, "cols": 17 }, - "layouts": { - "labels": [ - ["Enter","ansi","iso"], - ["Space","7U","6.25U"], - ["Lshift","default","split"] , - ["Rshift","default","split"], - ["BS","default","split"] - ], - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0", - { - "x": 0.25 - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "x": 0.25 - }, - "0,5", - "0,6", - "0,7", - "0,8", - { - "x": 0.25 - }, - "0,9", - "0,10", - "0,11", - "0,12", - { - "x": 0.25 - }, - "0,13", - { - "x": 0.25 - }, - "0,14", - "0,15", - "0,16" - ], - [ - { - "y":0.25 - }, - "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\n4,0", - "3,12\n\n\n4,1", - "1,13\n\n\n4,1", - { - "x": -1.75, - "c": "#cccccc" - }, - "1,14", - "1,15", - "1,16" - ], - [ - { - "w": 1.5 - }, - "2,0", - "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\n0,0", - { - "w":1.25, - "h":2, - "c":"#aaaaaa", - "w2":1.5, - "h2":1, - "x2":-0.25 - }, - "3,13\n\n\n0,1", - { - "x": -1, - "c": "#cccccc" - }, - "2,14", - "2,15", - "2,16" - ], - [ - { - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "w": 2.25, - "c": "#aaaaaa" - }, - "3,13\n\n\n0,0", - { - "x":-1 - }, - "2,13\n\n\n0,1" - - - ], - [ - { - "w": 2.25 - }, - "4,0\n\n\n2,0", - {"w":1.25}, - "4,0\n\n\n2,1", - "4,1\n\n\n2,1", - { - "x":-2.25, - "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\n3,0", - {"w":1.75}, - "4,12\n\n\n3,1", - "4,13\n\n\n3,1", - { - "x":-2.75 - }, - { - "x": 1.25, - "c": "#777777" - }, - "4,15" - ], - [ - { - "w": 1.5, - "c": "#aaaaaa" - }, - "5,0\n\n\n1,0", - "5,1\n\n\n1,0", - { - "w":1.5 - }, - "5,2\n\n\n1,0", - { - "w": 7 - }, - "5,6\n\n\n1,0", - { - "w":1.5 - }, - "5,11\n\n\n1,0", - "5,12\n\n\n1,0", - { - "w":1.5 - }, - "5,13\n\n\n1,0", - { - "w":1.25 - }, - "5,0\n\n\n1,1", - { - "w":1.25 - }, - "5,1\n\n\n1,1", - { - "w":1.25 - }, - "5,2\n\n\n1,1", - { - "w": 6.25 - }, - "5,6\n\n\n1,1", - { - "w":1.25 - }, - "5,10\n\n\n1,1", - { - "w":1.25 - }, - "5,11\n\n\n1,1", - { - "w":1.25 - }, - "5,12\n\n\n1,1", - { - "w":1.25 - }, - "5,13\n\n\n1,1", - - - - { - "x": -14.75, - "c": "#777777" - }, - "5,14", - "5,15", - "5,16" - - ] - ] - - - - - } -} From 565ec50d499037867fc7b75b1dd8551ab5408d87 Mon Sep 17 00:00:00 2001 From: HereVoLand <65162585+Vem-596@users.noreply.github.com> Date: Tue, 23 Apr 2024 03:18:32 +0800 Subject: [PATCH 33/40] Add files via upload --- v3/pixelspace/shadow80/shadow80.json | 319 +++++++++++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 v3/pixelspace/shadow80/shadow80.json diff --git a/v3/pixelspace/shadow80/shadow80.json b/v3/pixelspace/shadow80/shadow80.json new file mode 100644 index 0000000000..35996e6b4a --- /dev/null +++ b/v3/pixelspace/shadow80/shadow80.json @@ -0,0 +1,319 @@ +{ + "name": "SHADOW80", + "vendorId": "0x0011", + "productId": "0x0011", + "keycodes": ["qmk_lighting"], + "menus":[ "qmk_rgb_matrix"], + "customKeycodes": [ + { + "name": "Toggle WinKey Lock", + "title": "Toggle WinKey Lock", + "shortName": "WinLock" + }, + { + "name": "Toggle macOS Keymap", + "title": "Toggle macOS Keymap", + "shortName": "TogMacOS" + }, + { + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "Mission Control" + }, + { + "name": "Launch Pad", + "title": "Launch Pad in macOS", + "shortName": "Launch Pad" + } + ], + "matrix": { "rows": 6, "cols": 17 }, + "layouts": { + "labels": [ + "ISO Enter", + ["Bottom Row","7U","6.25U"], + "Split Lshift" , + "Split Rshift", + "Split BackSpace" + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#777777" + }, + "0,0", + { + "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", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,13", + { + "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\n4,0", + { + "x": 0.5 + }, + "1,14", + "1,15", + "1,16", + { + "x": 1, + "c": "#cccccc" + }, + "3,12\n\n\n4,1", + "1,13\n\n\n4,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "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\n0,0", + + { + "x": 0.5, + "c": "#aaaaaa" + }, + "2,14", + "2,15", + "2,16", + { + "x": 1.75, + "w":1.25, + "h":2, + "c": "#777777", + "w2":1.5, + "h2":1, + "x2":-0.25 + }, + "3,13\n\n\n0,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", + { + "w": 2.25, + "c": "#777777" + }, + "3,13\n\n\n0,0", + { + "x": 4.25, + "c": "#cccccc" + }, + "2,13\n\n\n0,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":2.75 + }, + "4,12\n\n\n3,0", + { + "x": 1.25 + }, + "4,15", + { + "x": 1.25, + "w":1.75 + }, + "4,12\n\n\n3,1", + "4,13\n\n\n3,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "5,0\n\n\n1,0", + "5,1\n\n\n1,0", + { + "w":1.5 + }, + "5,2\n\n\n1,0", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n1,0", + { + "c": "#aaaaaa", + "w":1.5 + }, + "5,11\n\n\n1,0", + "5,12\n\n\n1,0", + { + "w":1.5 + }, + "5,13\n\n\n1,0", + { + "x": 0.25 + }, + "5,14", + "5,15", + "5,16" + ], + [ + { + "y": 0.25, + "x": 2.5, + "w": 1.25 + }, + "5,0\n\n\n1,1", + { + "w":1.25 + }, + "5,1\n\n\n1,1", + { + "w":1.25 + }, + "5,2\n\n\n1,1", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6\n\n\n1,1", + { + "c": "#aaaaaa", + "w":1.25 + }, + "5,10\n\n\n1,1", + { + "w":1.25 + }, + "5,11\n\n\n1,1", + { + "w":1.25 + }, + "5,12\n\n\n1,1", + { + "w":1.25 + }, + "5,13\n\n\n1,1" + ] + ] + + + + + } +} From 9a1369515c1c81812d974738c265c497c5c55c8c Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Tue, 23 Apr 2024 23:30:27 +0400 Subject: [PATCH 34/40] Create lisa.json --- v3/keyten/lisa/lisa.json | 223 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 v3/keyten/lisa/lisa.json diff --git a/v3/keyten/lisa/lisa.json b/v3/keyten/lisa/lisa.json new file mode 100644 index 0000000000..a6f4bd00a7 --- /dev/null +++ b/v3/keyten/lisa/lisa.json @@ -0,0 +1,223 @@ +{ + "name": "Lisa", + "vendorId": "0xEB69", + "productId": "0x4001", + "matrix": { + "rows": 4, + "cols": 13 + }, + "layouts": { + "labels": [ + ["Left Spacebar", "1.25u/2u", "2u/1.25"], + ["Right Spacebar", "2.25u/1.25u", "1.25u/2.25"] + ], + "keymap": [ + [ + { + "y": 0.38, + "x": 0.36, + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1" + ], + [ + { + "y": -0.99, + "x": 11.4 + }, + "0,10", + { + "c": "#aaaaaa" + }, + "0,11", + "0,12" + ], + [ + { + "x": 0.22, + "w": 1.25 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1" + ], + [ + { + "y": -0.99, + "x": 11.79 + }, + "1,10", + { + "c": "#777777", + "w": 1.75 + }, + "1,12" + ], + [ + { + "x": 0.07, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1" + ], + [ + { + "y": -0.99, + "x": 11.43 + }, + "2,10", + "2,11", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "2,12" + ], + [ + { + "x": 0.17, + "w": 1.25 + }, + "3,0", + { + "w": 1.25 + }, + "3,1" + ], + [ + { + "y": -0.99, + "x": 12.069, + "w": 1.25 + }, + "3,11", + { + "w": 1.25 + }, + "3,12" + ], + [ + { + "r": 8, + "y": -4.42, + "x": 2.5, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5" + ], + [ + { + "x": 2.75 + }, + "1,2", + "1,3", + "1,4", + "1,5" + ], + [ + { + "x": 3.25 + }, + "2,2", + "2,3", + "2,4", + "2,5" + ], + [ + { + "x": 4, + "c": "#aaaaaa", + "w": 1.25 + }, + "3,3\n\n\n0,0", + { + "c": "#cccccc", + "w": 2 + }, + "3,5\n\n\n0,0" + ], + [ + { + "y": 0.25, + "x": 4, + "w": 2 + }, + "3,3\n\n\n0,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,5\n\n\n0,1" + ], + [ + { + "r": -8, + "y": -3.33, + "x": 7.1, + "c": "#cccccc" + }, + "0,6", + "0,7", + "0,8", + "0,9" + ], + [ + { + "x": 7.35 + }, + "1,6", + "1,7", + "1,8", + "1,9" + ], + [ + { + "x": 6.85 + }, + "2,6", + "2,7", + "2,8", + "2,9" + ], + [ + { + "x": 6.85, + "w": 2.25 + }, + "3,6\n\n\n1,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,8\n\n\n1,0" + ], + [ + { + "y": 0.25, + "x": 6.85, + "w": 1.25 + }, + "3,6\n\n\n1,1", + { + "c": "#cccccc", + "w": 2.25 + }, + "3,8\n\n\n1,1" + ] + ] + } +} From c3fa22e0b2a79dd7d4d74ac15013486e62465ebe Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 25 Apr 2024 03:13:04 +0200 Subject: [PATCH 35/40] Removal of KB38 --- v3/doio/kb38/kb38-01.json | 122 -------------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 v3/doio/kb38/kb38-01.json diff --git a/v3/doio/kb38/kb38-01.json b/v3/doio/kb38/kb38-01.json deleted file mode 100644 index bfca92966d..0000000000 --- a/v3/doio/kb38/kb38-01.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "name": "DOIO KB38-01", - "vendorId": "0xD010", - "productId": "0x3801", - "matrix": { - "rows": 6, - "cols": 8 - }, - "keycodes": [ - "qmk_lighting" - ], - "menus": [ - "qmk_rgb_matrix" - ], - "layouts": { - "keymap": [ - [ - { - "c": "#cccccc" - }, - "0,0", - { - "x": 1.5 - }, - "0,1", - { - "x": 0.75 - }, - "0,2", - "0,3", - "0,4", - { - "x": 0.25 - }, - "0,5", - "0,6", - "0,7" - ], - [ - { - "c": "#cccccc" - }, - "1,0", - "1,1", - "1,2", - "1,3", - { - "x": 0.25 - }, - "1,4", - "1,5", - "1,6" - ], - [ - "2,0", - "2,1", - "2,2", - { - "h": 2 - }, - "2,3", - { - "x": 0.25 - }, - "2,4", - "2,5", - "2,6", - { - "x": 0.5 - }, - "5,5\n\n\n\n\n\n\n\n\ne0", - { - "x": 0.5 - }, - "5,6\n\n\n\n\n\n\n\n\ne1" - ], - [ - "3,0", - "3,1", - "3,2", - { - "x": 1.25 - }, - "3,3", - "3,4", - "3,5" - ], - [ - "4,0", - "4,1", - "4,2", - { - "h": 2 - }, - "4,3", - { - "x": 1.25 - }, - "4,5", - { - "x": 1.75, - "w": 2, - "h": 2 - }, - "5,7\n\n\n\n\n\n\n\n\ne2" - ], - [ - { - "w": 2 - }, - "5,0", - "5,1", - { - "x": 1.25 - }, - "5,2", - "5,3", - "5,4" - ] - ] - } -} From ed50593bec8dcd1f7918baad979b855bd07060a6 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:23:12 +0200 Subject: [PATCH 36/40] Update v3/era/linx3/n8x/n8x.json --- v3/era/linx3/n8x/n8x.json | 571 ++++++++++++++++++++++++-------------- 1 file changed, 362 insertions(+), 209 deletions(-) diff --git a/v3/era/linx3/n8x/n8x.json b/v3/era/linx3/n8x/n8x.json index fd6c7cbf88..aa22016735 100644 --- a/v3/era/linx3/n8x/n8x.json +++ b/v3/era/linx3/n8x/n8x.json @@ -1,212 +1,365 @@ { - "name": "N8X", - "vendorId": "0x4552", - "productId": "0x0007", - "keycodes": ["qmk_lighting"], - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "Backlight", - "content": [ - { - "label": "Backlight Brightness", - "type": "range", - "options": [0, 10], - "content": ["id_custom_backlight_brightness", 0, 0] - }, - { - "label": "Backlight Effect", - "type": "dropdown", - "content": ["id_custom_backlight_effect", 0, 1], - "options": [["None", 0], ["Breathing", 1], ["Blink-Out on Keypress", 2], ["Blink-In on Keypress", 3]] - }, - { - "showIf": "{id_custom_backlight_effect} == 1", - "label": "Breating Period", - "type": "range", - "options": [1, 10], - "content": ["id_custom_breathing_period", 0, 2] - }, - { - "showIf": "{id_custom_backlight_effect} == 2 || {id_custom_backlight_effect} == 3", - "label": "Blink Speed", - "type": "range", - "options": [1, 10], - "content": ["id_custom_blink_speed", 0, 3] - } - ] - } - ] + "name": "N8X", + "vendorId": "0x4552", + "productId": "0x0007", + "matrix": { + "rows": 6, + "cols": 17 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "label": "Backlight Brightness", + "type": "range", + "options": [ + 0, + 10 + ], + "content": [ + "id_custom_backlight_brightness", + 0, + 0 + ] + }, + { + "label": "Backlight Effect", + "type": "dropdown", + "content": [ + "id_custom_backlight_effect", + 0, + 1 + ], + "options": [ + [ + "None", + 0 + ], + [ + "Breathing", + 1 + ], + [ + "Blink-Out on Keypress", + 2 + ], + [ + "Blink-In on Keypress", + 3 + ] + ] + }, + { + "showIf": "{id_custom_backlight_effect} == 1", + "label": "Breating Period", + "type": "range", + "options": [ + 1, + 10 + ], + "content": [ + "id_custom_breathing_period", + 0, + 2 + ] + }, + { + "showIf": "{id_custom_backlight_effect} == 2 || {id_custom_backlight_effect} == 3", + "label": "Blink Speed", + "type": "range", + "options": [ + 1, + 10 + ], + "content": [ + "id_custom_blink_speed", + 0, + 3 + ] + } + ] } - ], - "matrix": {"rows": 6, "cols": 17}, - "layouts": { - "labels": [ - "Split backspace", - "ISO enter", - "Split left shift", - "Split right shift", - "7U bottom row" - ], - "keymap": [ - [ - {"x": 2.5, "c": "#777777"}, - "0,0", - {"x": 1, "c": "#cccccc"}, - "0,2", - "0,3", - "0,4", - "0,5", - {"x": 0.5}, - "0,6", - "0,7", - "0,8", - "0,9", - {"x": 0.5}, - "0,10", - "0,11", - "0,12", - "0,13", - {"x": 0.25}, - "0,14", - "0,15", - "0,16" - ], - [ - {"y": 0.5, "x": 2.5}, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - {"c": "#aaaaaa", "w": 2}, - "1,13\n\n\n0,0", - {"x": 0.25,"c": "#cccccc"}, - "2,14", - "1,15", - "1,16", - {"x": 1.25}, - "1,13\n\n\n0,1", - "1,14\n\n\n0,1" - ], - [ - {"x": 2.5, "c": "#aaaaaa", "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", - {"x": 0.25}, - "3,14", - "2,15", - "2,16", - {"x": 2, "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", - {"x": 4.25, "c": "#cccccc"}, - "3,12\n\n\n1,1" - ], - [ - {"c": "#aaaaaa", "w": 1.25}, - "4,0\n\n\n2,1", - "4,1\n\n\n2,1", - {"x": 0.25, "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": 2.75 - }, - "4,12\n\n\n3,0", - {"x": 1.25, "c": "#cccccc"}, - "4,15", - {"x": 1.5, "c": "#aaaaaa", "w": 1.75}, - "4,12\n\n\n3,1", - "4,13\n\n\n3,1" - ], - [ - {"x": 2.5, "w": 1.25}, - "5,0\n\n\n4,0", - {"w": 1.25}, - "5,1\n\n\n4,0", - {"w": 1.25}, - "5,2\n\n\n4,0", - {"c": "#cccccc", "w": 6.25 - }, - "5,6\n\n\n4,0", - {"c": "#aaaaaa", "w": 1.25}, - "5,9\n\n\n4,0", - {"w": 1.25}, - "5,10\n\n\n4,0", - {"w": 1.25}, - "5,11\n\n\n4,0", - {"w": 1.25}, - "5,13\n\n\n4,0", - {"x": 0.25, "c": "#cccccc"}, - "5,14", - "5,15", - "5,16" - ], - [ - {"y": 0.25, "x": 2.5, "c": "#aaaaaa", "w": 1.5}, - "5,0\n\n\n4,1", - "5,1\n\n\n4,1", - {"w": 1.5}, - "5,2\n\n\n4,1", - {"c": "#cccccc", "w": 7}, - "5,6\n\n\n4,1", - {"c": "#aaaaaa", "w": 1.5}, - "5,10\n\n\n4,1", - "5,11\n\n\n4,1", - {"w": 1.5}, - "5,13\n\n\n4,1" - ] - ] + ] } -} \ No newline at end of file + ], + "layouts": { + "labels": [ + "Split Backspace", + "ISO", + "Split Left Shift", + "Split Right Shift", + "7U" + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.5 + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5 + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.5, + "x": 2.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,14", + "1,15", + "1,16", + { + "x": 1.25 + }, + "1,13\n\n\n0,1", + "1,14\n\n\n0,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "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", + { + "x": 0.25 + }, + "3,14", + "2,15", + "2,16", + { + "x": 2, + "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", + { + "x": 4.25, + "c": "#cccccc" + }, + "3,12\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n2,1", + "4,1\n\n\n2,1", + { + "x": 0.25, + "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": 2.75 + }, + "4,12\n\n\n3,0", + { + "x": 1.25, + "c": "#cccccc" + }, + "4,15", + { + "x": 1.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "4,12\n\n\n3,1", + "4,13\n\n\n3,1" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "5,0\n\n\n4,0", + { + "w": 1.25 + }, + "5,1\n\n\n4,0", + { + "w": 1.25 + }, + "5,2\n\n\n4,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,9\n\n\n4,0", + { + "w": 1.25 + }, + "5,10\n\n\n4,0", + { + "w": 1.25 + }, + "5,11\n\n\n4,0", + { + "w": 1.25 + }, + "5,13\n\n\n4,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,14", + "5,15", + "5,16" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n4,1", + "5,1\n\n\n4,1", + { + "w": 1.5 + }, + "5,2\n\n\n4,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,10\n\n\n4,1", + "5,11\n\n\n4,1", + { + "w": 1.5 + }, + "5,13\n\n\n4,1" + ] + ] + } +} From 8f2aa55983a2a7c6ca43ee2fd3310628debb85dd Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:29:09 +0200 Subject: [PATCH 37/40] Update v3/pixelspace/shadow80/shadow80.json --- v3/pixelspace/shadow80/shadow80.json | 99 +++++++++++++++------------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/v3/pixelspace/shadow80/shadow80.json b/v3/pixelspace/shadow80/shadow80.json index 35996e6b4a..e0ff0ae4ed 100644 --- a/v3/pixelspace/shadow80/shadow80.json +++ b/v3/pixelspace/shadow80/shadow80.json @@ -2,36 +2,47 @@ "name": "SHADOW80", "vendorId": "0x0011", "productId": "0x0011", - "keycodes": ["qmk_lighting"], - "menus":[ "qmk_rgb_matrix"], + "matrix": { + "rows": 6, + "cols": 17 + }, "customKeycodes": [ { - "name": "Toggle WinKey Lock", - "title": "Toggle WinKey Lock", - "shortName": "WinLock" + "name": "Toggle WinKey Lock", + "title": "Toggle WinKey Lock", + "shortName": "WinLock" }, { - "name": "Toggle macOS Keymap", - "title": "Toggle macOS Keymap", - "shortName": "TogMacOS" + "name": "Toggle macOS Keymap", + "title": "Toggle macOS Keymap", + "shortName": "TogMacOS" }, { - "name": "Mission Control", - "title": "Mission Control in macOS", - "shortName": "Mission Control" + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "Mission Control" }, { - "name": "Launch Pad", - "title": "Launch Pad in macOS", - "shortName": "Launch Pad" + "name": "Launch Pad", + "title": "Launch Pad in macOS", + "shortName": "Launch Pad" } ], - "matrix": { "rows": 6, "cols": 17 }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgb_matrix" + ], "layouts": { "labels": [ "ISO Enter", - ["Bottom Row","7U","6.25U"], - "Split Lshift" , + [ + "Bottom Row", + "7U", + "6.25U" + ], + "Split Lshift", "Split Rshift", "Split BackSpace" ], @@ -80,7 +91,7 @@ ], [ { - "y":0.25, + "y": 0.25, "x": 2.5, "c": "#cccccc" }, @@ -141,7 +152,6 @@ "w": 1.5 }, "2,13\n\n\n0,0", - { "x": 0.5, "c": "#aaaaaa" @@ -151,12 +161,12 @@ "2,16", { "x": 1.75, - "w":1.25, - "h":2, "c": "#777777", - "w2":1.5, - "h2":1, - "x2":-0.25 + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 }, "3,13\n\n\n0,1" ], @@ -168,7 +178,7 @@ }, "3,0", { - "c": "#cccccc" + "c": "#cccccc" }, "3,1", "3,2", @@ -182,8 +192,8 @@ "3,10", "3,11", { - "w": 2.25, - "c": "#777777" + "c": "#777777", + "w": 2.25 }, "3,13\n\n\n0,0", { @@ -191,8 +201,6 @@ "c": "#cccccc" }, "2,13\n\n\n0,1" - - ], [ { @@ -225,7 +233,7 @@ "4,11", { "c": "#aaaaaa", - "w":2.75 + "w": 2.75 }, "4,12\n\n\n3,0", { @@ -233,8 +241,8 @@ }, "4,15", { - "x": 1.25, - "w":1.75 + "x": 1.5, + "w": 1.75 }, "4,12\n\n\n3,1", "4,13\n\n\n3,1" @@ -247,7 +255,7 @@ "5,0\n\n\n1,0", "5,1\n\n\n1,0", { - "w":1.5 + "w": 1.5 }, "5,2\n\n\n1,0", { @@ -257,14 +265,14 @@ "5,6\n\n\n1,0", { "c": "#aaaaaa", - "w":1.5 + "w": 1.5 }, "5,11\n\n\n1,0", "5,12\n\n\n1,0", { - "w":1.5 - }, - "5,13\n\n\n1,0", + "w": 1.5 + }, + "5,13\n\n\n1,0", { "x": 0.25 }, @@ -280,11 +288,11 @@ }, "5,0\n\n\n1,1", { - "w":1.25 + "w": 1.25 }, "5,1\n\n\n1,1", { - "w":1.25 + "w": 1.25 }, "5,2\n\n\n1,1", { @@ -294,26 +302,23 @@ "5,6\n\n\n1,1", { "c": "#aaaaaa", - "w":1.25 + "w": 1.25 }, "5,10\n\n\n1,1", { - "w":1.25 + "w": 1.25 }, "5,11\n\n\n1,1", { - "w":1.25 + "w": 1.25 }, "5,12\n\n\n1,1", { - "w":1.25 + "w": 1.25 }, "5,13\n\n\n1,1" ] ] - - - - } } + From 8124078ad7533f79cea9d7b656e2ba4b13a1e237 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:36:09 +0200 Subject: [PATCH 38/40] Update v3/era/linx3/n86/n86.json --- v3/era/linx3/n86/n86.json | 431 +++++++++++++++++++------------------- 1 file changed, 219 insertions(+), 212 deletions(-) diff --git a/v3/era/linx3/n86/n86.json b/v3/era/linx3/n86/n86.json index c1f24d7a4f..ad804e5c96 100644 --- a/v3/era/linx3/n86/n86.json +++ b/v3/era/linx3/n86/n86.json @@ -1,213 +1,220 @@ { - "name": "N86", - "vendorId": "0x4552", - "productId": "0x0008", - "keycodes": ["qmk_lighting"], - "menus": [ "qmk_rgb_matrix" ], - "matrix": {"rows": 6, "cols": 17}, - "layouts": { - "labels": [ - "Split backspace", - "Split right shift" - ], - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0", - { - "x": 1, - "c": "#cccccc" - }, - "0,2", - "0,3", - "0,4", - "0,5", - { - "x": 0.5 - }, - "0,6", - "0,7", - "0,8", - "0,9", - { - "x": 0.5 - }, - "0,10", - "0,11", - "0,12", - "0,13", - { - "x": 0.25 - }, - "0,14", - "0,15", - "0,16" - ], - [ - { - "y": 0.5 - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,13\n\n\n0,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,14", - "1,15", - "1,16", - { - "x": 1.25 - }, - "1,13\n\n\n0,1", - "1,14\n\n\n0,1" - ], - [ - { - "c": "#aaaaaa", - "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 - }, - "3,14", - "2,15", - "2,16" - ], - [ - { - "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" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "4,12\n\n\n1,0", - { - "x": 1.25, - "c": "#777777" - }, - "4,15", - { - "x": 1.5, - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12\n\n\n1,1", - "4,13\n\n\n1,1" - ], - [ - { - "w": 1.5 - }, - "5,0", - "5,1", - { - "w": 1.5 - }, - "5,2", - { - "c": "#cccccc", - "w": 7 - }, - "5,7", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,11", - "5,12", - { - "w": 1.5 - }, - "5,13", - { - "x": 0.25, - "c": "#777777" - }, - "5,14", - "5,15", - "5,16" - ] - ] - } -} \ No newline at end of file + "name": "N86", + "vendorId": "0x4552", + "productId": "0x0008", + "matrix": { + "rows": 6, + "cols": 17 + }, + "keycodes": [ + "qmk_lighting" + ], + "menus": [ + "qmk_rgb_matrix" + ], + "layouts": { + "labels": [ + "Split Backspace", + "Split Right Shift" + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.5 + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5 + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,14", + "1,15", + "1,16", + { + "x": 1.25 + }, + "1,13\n\n\n0,1", + "1,14\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "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 + }, + "3,14", + "2,15", + "2,16" + ], + [ + { + "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" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,12\n\n\n1,0", + { + "x": 1.25, + "c": "#777777" + }, + "4,15", + { + "x": 1.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "4,12\n\n\n1,1", + "4,13\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "5,0", + "5,1", + { + "w": 1.5 + }, + "5,2", + { + "c": "#cccccc", + "w": 7 + }, + "5,7", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,11", + "5,12", + { + "w": 1.5 + }, + "5,13", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16" + ] + ] + } +} From ca4c618df1e089fb5cb0849be38121ce41e95397 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:46:02 +0200 Subject: [PATCH 39/40] Update v3/keyten/lisa/lisa.json --- v3/keyten/lisa/lisa.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/v3/keyten/lisa/lisa.json b/v3/keyten/lisa/lisa.json index a6f4bd00a7..0c0fc06b12 100644 --- a/v3/keyten/lisa/lisa.json +++ b/v3/keyten/lisa/lisa.json @@ -8,8 +8,16 @@ }, "layouts": { "labels": [ - ["Left Spacebar", "1.25u/2u", "2u/1.25"], - ["Right Spacebar", "2.25u/1.25u", "1.25u/2.25"] + [ + "Left Spacebar", + "1.25U | 2U", + "2U | 1.25U" + ], + [ + "Right Spacebar", + "2.25U | 1.25U", + "1.25U | 2.25U" + ] ], "keymap": [ [ @@ -221,3 +229,4 @@ ] } } + From d29d240973227e76910a0b6df8ea63edc3077bfc Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:55:17 +0200 Subject: [PATCH 40/40] Update pull_request_template.md Update PR Checklist to add formatting --- .github/pull_request_template.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index cd53e56418..fc818d57b3 100755 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,7 +7,7 @@ -## QMK Pull Request +## QMK Pull Request @@ -25,6 +25,7 @@ - [ ] The VIA support for this keyboard is **MERGED** in QMK master already **(MANDATORY)** - [ ] The VIA definition follows the guide here: https://caniusevia.com/docs/layouts - [ ] I have a V3 JSON version for this keyboard definition.**(MANDATORY)** +- [ ] I have formatted the JSON file to have consistent formatting with the rest of the repository. - [ ] I have tested this keyboard definition using VIA's "Design" tab. - [ ] I have tested this keyboard definition with firmware on a device. - [ ] I have assigned alpha keys and modifier keys with the correct colors.