From 90b15735b2c6a0dedba856f401b28c3325f5c4a5 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:54:34 +0200 Subject: [PATCH 1/2] 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. From 8d71f3080e4aa12d4b176f329439b286ae8ed48c Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:00:16 +0200 Subject: [PATCH 2/2] Addition of Chroma and formatting --- v3/archetype/minervalx/minervalx.json | 1 - v3/atlantis/ps17/ps17.json | 1 - v3/cipulot/chroma/chroma.json | 225 +++++++++++++++++++++ v3/keyten/lisa/lisa.json | 1 - v3/mechstudio/chapter1/chapter1.json | 1 - v3/pixelspace/shadow80/shadow80.json | 1 - v3/yiancardesigns/keycult65/keycult65.json | 11 +- 7 files changed, 234 insertions(+), 7 deletions(-) create mode 100644 v3/cipulot/chroma/chroma.json diff --git a/v3/archetype/minervalx/minervalx.json b/v3/archetype/minervalx/minervalx.json index 21fcccd63b..52b1568a16 100644 --- a/v3/archetype/minervalx/minervalx.json +++ b/v3/archetype/minervalx/minervalx.json @@ -268,4 +268,3 @@ ] } } - diff --git a/v3/atlantis/ps17/ps17.json b/v3/atlantis/ps17/ps17.json index 4ea2511346..f2fc1d8b44 100644 --- a/v3/atlantis/ps17/ps17.json +++ b/v3/atlantis/ps17/ps17.json @@ -64,4 +64,3 @@ ] } } - diff --git a/v3/cipulot/chroma/chroma.json b/v3/cipulot/chroma/chroma.json new file mode 100644 index 0000000000..c20546e592 --- /dev/null +++ b/v3/cipulot/chroma/chroma.json @@ -0,0 +1,225 @@ +{ + "name": "Chroma", + "vendorId": "0x6369", + "productId": "0x6BBF", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "labels": [ + "Split Backspace", + "Split Left Shift", + "Split Right Shift", + "ISO", + [ + "Bottom Row", + "7U WK", + "7U WKL" + ] + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#aaaaaa" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,14\n\n\n0,0", + { + "x": 1.5, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "0,14\n\n\n0,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13\n\n\n3,0", + { + "x": 2.25, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n3,1" + ], + [ + { + "x": 2.5, + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "2,13\n\n\n3,0", + { + "x": 1.25, + "c": "#cccccc" + }, + "2,12\n\n\n3,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n1,1", + "3,1\n\n\n1,1", + { + "x": 0.25, + "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.75, + "w": 1.75 + }, + "3,12\n\n\n2,1", + "3,13\n\n\n2,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "4,0\n\n\n4,0", + "4,1\n\n\n4,0", + { + "w": 1.5 + }, + "4,2\n\n\n4,0", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n4,0", + "4,12\n\n\n4,0", + { + "w": 1.5 + }, + "4,13\n\n\n4,0" + ], + [ + { + "y": 0.25, + "x": 2.5, + "w": 1.5 + }, + "4,0\n\n\n4,1", + { + "d": true + }, + "4,1\n\n\n4,1", + { + "w": 1.5 + }, + "4,2\n\n\n4,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n4,1", + { + "d": true + }, + "4,12\n\n\n4,1", + { + "w": 1.5 + }, + "4,13\n\n\n4,1" + ] + ] + } +} diff --git a/v3/keyten/lisa/lisa.json b/v3/keyten/lisa/lisa.json index 0c0fc06b12..df2bca453a 100644 --- a/v3/keyten/lisa/lisa.json +++ b/v3/keyten/lisa/lisa.json @@ -229,4 +229,3 @@ ] } } - diff --git a/v3/mechstudio/chapter1/chapter1.json b/v3/mechstudio/chapter1/chapter1.json index ea1255c853..00d3e7159b 100644 --- a/v3/mechstudio/chapter1/chapter1.json +++ b/v3/mechstudio/chapter1/chapter1.json @@ -232,4 +232,3 @@ ] } } - diff --git a/v3/pixelspace/shadow80/shadow80.json b/v3/pixelspace/shadow80/shadow80.json index e0ff0ae4ed..0e4b21a797 100644 --- a/v3/pixelspace/shadow80/shadow80.json +++ b/v3/pixelspace/shadow80/shadow80.json @@ -321,4 +321,3 @@ ] } } - diff --git a/v3/yiancardesigns/keycult65/keycult65.json b/v3/yiancardesigns/keycult65/keycult65.json index 89a46dd005..33ccd8c058 100644 --- a/v3/yiancardesigns/keycult65/keycult65.json +++ b/v3/yiancardesigns/keycult65/keycult65.json @@ -2,11 +2,18 @@ "name": "Keycult 65", "vendorId": "0x8968", "productId": "0x6335", - "matrix": {"rows": 5, "cols": 15}, + "matrix": { + "rows": 5, + "cols": 15 + }, "layouts": { "labels": [ "Split Backspace", - ["Bottom Row", "6.25U", "7U"] + [ + "Bottom Row", + "6.25U", + "7U" + ] ], "keymap": [ [