From 33db2f87e78825f9e192e56fe2c8c5e19cce3b5d Mon Sep 17 00:00:00 2001 From: Feags <41646528+Feags@users.noreply.github.com> Date: Thu, 6 Apr 2023 21:21:23 -0500 Subject: [PATCH 1/4] Krado Industries keyboards added --- v3/kradoindustries/kousa/kousa.json | 456 ++++++++++++++++++++ v3/kradoindustries/krado66/krado66.json | 315 ++++++++++++++ v3/kradoindustries/promenade/promenade.json | 217 ++++++++++ 3 files changed, 988 insertions(+) create mode 100644 v3/kradoindustries/kousa/kousa.json create mode 100644 v3/kradoindustries/krado66/krado66.json create mode 100644 v3/kradoindustries/promenade/promenade.json diff --git a/v3/kradoindustries/kousa/kousa.json b/v3/kradoindustries/kousa/kousa.json new file mode 100644 index 0000000000..cd81021930 --- /dev/null +++ b/v3/kradoindustries/kousa/kousa.json @@ -0,0 +1,456 @@ +{ + "name": "Kousa-TKL", + "vendorId": "0x12D0", + "productId": "0x4B4F", + "matrix": { + "rows": 6, + "cols": 17 + }, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "layouts": { + "labels": [ + "F13 <> F12", + "F13 Encoder", + "1u Inner Mods", + "1.5u Left Mod", + ["Spacebar", "Center 2u Only", "3u 1u 3u", "7u", "Two 3u", "6u", "Triple 2u", "Two 2u"], + "1.5u Right Mod" + ], + + "keymap": [ + [ + { + "x": 1.25, + "w": 0.75, + "d": true + }, + "\n\n\n0,1", + "0,1\n\n\n0,1", + "0,2\n\n\n0,1", + "0,3\n\n\n0,1", + "0,4\n\n\n0,1", + { + "c": "#aaaaaa", + "w": 0.5, + "d": true + }, + "0,5\n\n\n0,1", + "0,6\n\n\n0,1", + "0,7\n\n\n0,1", + "0,8\n\n\n0,1", + "0,9\n\n\n0,1", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,10\n\n\n0,1", + "0,11\n\n\n0,1", + "0,12\n\n\n0,1", + { + "c": "#777777" + }, + "0,13\n\n\n1,1\n\n\n\n\n\ne0" + ], + [ + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1\n\n\n0,0", + "0,2\n\n\n0,0", + "0,3\n\n\n0,0", + "0,4\n\n\n0,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,5\n\n\n0,0", + "0,6\n\n\n0,0", + "0,7\n\n\n0,0", + "0,8\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,9\n\n\n0,0", + "0,10\n\n\n0,0", + "0,11\n\n\n0,0", + "0,12\n\n\n0,0", + { + "x": 0.25, + "c": "#777777" + }, + "0,13\n\n\n1,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.25, + "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", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16" + ], + [ + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + { + "c": "#aaaaaa", + "h": 1.5 + }, + "2,6\n\n\n2,0", + { + "h": 1.5 + }, + "2,7\n\n\n2,0", + { + "c": "#cccccc" + }, + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,13", + { + "x": 0.25 + }, + "2,14", + "2,15", + "2,16", + { + "x": 0.25 + }, + "2,6\n\n\n2,1", + "2,7\n\n\n2,1" + ], + [ + { + "w": 1.5 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + { + "n": true + }, + "3,4", + "3,5", + { + "x": 2 + }, + "3,8", + { + "n": true + }, + "3,9", + "3,10", + "3,11", + "3,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "3,13", + { + "x": 3.5 + }, + "3,6\n\n\n2,1", + "3,7\n\n\n2,1" + ], + [ + { + "y": -0.5, + "x": 6.5, + "h": 1.5 + }, + "4,6\n\n\n2,0", + { + "h": 1.5 + }, + "4,7\n\n\n2,0" + ], + [ + { + "y": -0.5, + "w": 1.5 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + { + "x": 2 + }, + "4,8", + "4,9", + "4,10", + "4,11", + "4,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,13", + { + "x": 1.25, + "c": "#777777" + }, + "4,15", + { + "x": 1.25, + "c": "#aaaaaa" + }, + "4,6\n\n\n2,1", + "4,7\n\n\n2,1" + ], + [ + { + "w": 1.5 + }, + "5,0", + "5,1", + "5,2\n\n\n3,0", + "5,3\n\n\n3,0", + { + "x": -0.5, + "w": 0.5, + "d": true + }, + "\n\n\n4,0", + "5,4\n\n\n4,0", + "5,5\n\n\n4,0", + { + "c": "#cccccc", + "w": 2 + }, + "5,6\n\n\n4,0", + { + "c": "#aaaaaa" + }, + "5,8\n\n\n4,0", + "5,9\n\n\n4,0", + "5,10\n\n\n5,0", + { + "x": -1, + "w": 0.5, + "d": true + }, + "\n\n\n4,0", + { + "x": 0.5 + }, + "5,11\n\n\n5,0", + "5,12", + { + "w": 1.5 + }, + "5,13", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,2\n\n\n3,1", + { + "w": 0.5, + "d": true + }, + "5,3\n\n\n3,1", + { + "x": 6, + "w": 0.5, + "d": true + }, + "5,10\n\n\n5,1", + { + "w": 1.5 + }, + "5,11\n\n\n5,1" + ], + [ + { + "x": 4, + "c": "#cccccc", + "w": 3 + }, + "5,4\n\n\n4,1", + "5,6\n\n\n4,1", + { + "w": 3 + }, + "5,9\n\n\n4,1" + ], + [ + { + "x": 4, + "w": 7 + }, + "5,6\n\n\n4,2" + ], + [ + { + "x": 4, + "c": "#aaaaaa", + "w": 0.5, + "d": true + }, + "\n\n\n4,3", + { + "c": "#cccccc", + "w": 3 + }, + "5,5\n\n\n4,3", + { + "w": 3 + }, + "5,8\n\n\n4,3", + { + "c": "#aaaaaa", + "w": 0.5, + "d": true + }, + "\n\n\n4,3" + ], + [ + { + "x": 4, + "w": 0.5, + "d": true + }, + "\n\n\n4,4", + { + "c": "#cccccc", + "w": 6 + }, + "5,6\n\n\n4,4", + { + "c": "#aaaaaa", + "w": 0.5, + "d": true + }, + "\n\n\n4,4" + ], + [ + { + "x": 4, + "w": 0.5, + "d": true + }, + "\n\n\n4,5", + { + "c": "#cccccc", + "w": 2 + }, + "5,4\n\n\n4,5", + { + "w": 2 + }, + "5,6\n\n\n4,5", + { + "w": 2 + }, + "5,9\n\n\n4,5", + { + "c": "#aaaaaa", + "w": 0.5, + "d": true + }, + "\n\n\n4,5" + ], + [ + { + "x": 4, + "w": 0.5, + "d": true + }, + "\n\n\n4,6", + "5,4\n\n\n4,6", + { + "c": "#cccccc", + "w": 2 + }, + "5,5\n\n\n4,6", + { + "w": 2 + }, + "5,8\n\n\n4,6", + { + "c": "#aaaaaa" + }, + "5,4\n\n\n4,6", + { + "w": 0.5, + "d": true + }, + "\n\n\n4,6" + ] + ] + } +} \ No newline at end of file diff --git a/v3/kradoindustries/krado66/krado66.json b/v3/kradoindustries/krado66/krado66.json new file mode 100644 index 0000000000..f6c0370cef --- /dev/null +++ b/v3/kradoindustries/krado66/krado66.json @@ -0,0 +1,315 @@ +{ + "name": "Krado66 v2", + "vendorId": "0x12D0", + "productId": "0x1166", + "matrix": { + "rows": 10, + "cols": 8 +}, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "layouts": { + "labels": [ + "Top Left Encoder", + "Unsplit Backspace Left", + "Split Backspace Right", + "Pipe/Bslash Swap", + "Enter Swap", + "2.75u Right Shift ", + "Right Side Encoder", + "Lower Left Encoder", + ["Spacebar", "6.25u", "1.25u-2.25u-2.75u", "2.75u-1.25u-2.25u", "2.75u-Encoder-2.25u"], + ["Right Modifiers", "Three 1u", "Two 1.25u", "1.25u - 1u", "Two 1u and Encoder"] + ], + + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0\n\n\n0,1\n\n\n\n\n\ne0", + { + "x": 0.25 + }, + "0,0\n\n\n0,0", + { + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "0,1", + "1,1", + "0,2", + "1,2", + "0,3", + "1,3", + "0,4", + "1,4", + "0,5", + "1,5", + "0,6\n\n\n1,0", + "1,6\n\n\n1,0", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,7\n\n\n2,0", + { + "x": 0.25, + "w": 2 + }, + "0,6\n\n\n1,1", + { + "c": "#cccccc" + }, + "0,7\n\n\n2,1", + "1,7\n\n\n2,1" + ], + [ + { + "x": 1.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "3,0", + { + "c": "#cccccc" + }, + "2,1", + "3,1", + "2,2", + "3,2", + "2,3", + "3,3", + "2,4", + "3,4", + "2,5", + "3,5", + "2,6\n\n\n3,0", + "3,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,7\n\n\n3,0", + { + "x": 0.75, + "w": 1.5 + }, + "2,6\n\n\n3,1", + { + "c": "#cccccc" + }, + "3,6\n\n\n3,1", + "2,7\n\n\n3,1" + ], + [ + { + "x": 1.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "5,0", + { + "c": "#cccccc" + }, + "4,1", + "5,1", + "4,2", + "5,2", + "4,3", + "5,3", + "4,4", + "5,4", + "4,5", + "5,5", + "4,6\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "5,6\n\n\n4,0", + { + "x": 1, + "w": 2.25 + }, + "4,6\n\n\n4,1", + { + "c": "#cccccc" + }, + "5,6\n\n\n4,1" + ], + [ + { + "x": 1, + "c": "#aaaaaa", + "w": 2.25 + }, + "7,0", + { + "c": "#cccccc" + }, + "6,1", + "7,1", + "6,2", + "7,2", + "6,3", + "7,3", + "6,4", + "7,4", + "6,5", + "7,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "6,6\n\n\n5,0", + { + "c": "#777777" + }, + "6,7\n\n\n5,0", + { + "c": "#aaaaaa" + }, + "7,7\n\n\n6,0", + { + "x": 0.5, + "w": 2.75 + }, + "6,6\n\n\n5,1", + { + "c": "#777777" + }, + "7,7\n\n\n6,1\n\n\n\n\n\ne1" + ], + [ + { + "x": 1, + "c": "#aaaaaa", + "w": 1.25 + }, + "8,0\n\n\n7,0", + { + "w": 1.25 + }, + "9,0", + { + "w": 1.25 + }, + "8,1", + { + "c": "#cccccc", + "w": 6.25 + }, + "8,3\n\n\n8,0", + { + "c": "#aaaaaa" + }, + "8,5\n\n\n9,0", + "9,5\n\n\n9,0", + "8,6\n\n\n9,0", + { + "c": "#777777" + }, + "9,6", + "8,7", + "9,7" + ], + [ + { + "x": 1, + "w": 1.25 + }, + "8,0\n\n\n7,1\n\n\n\n\n\ne2", + { + "x": 2.5, + "c": "#cccccc", + "w": 1.25 + }, + "9,2\n\n\n8,1", + { + "w": 2.25 + }, + "8,3\n\n\n8,1", + { + "w": 2.75 + }, + "9,4\n\n\n8,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "8,5\n\n\n9,1", + { + "w": 1.25 + }, + "9,5\n\n\n9,1", + { + "c": "#cccccc", + "w": 0.5, + "d": true + }, + "\n\n\n9,1" + ], + [ + { + "x": 4.75, + "w": 2.75 + }, + "9,2\n\n\n8,2", + { + "w": 1.25 + }, + "8,3\n\n\n8,2", + { + "w": 2.25 + }, + "9,4\n\n\n8,2", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "8,5\n\n\n9,2", + { + "c": "#cccccc", + "w": 0.75, + "d": true + }, + "\n\n\n9,2", + { + "c": "#aaaaaa" + }, + "8,6\n\n\n9,2" + ], + [ + { + "x": 4.75, + "c": "#cccccc", + "w": 2.75 + }, + "9,2\n\n\n8,3", + { + "c": "#777777", + "w": 1.25 + }, + "8,3\n\n\n8,3\n\n\n\n\n\ne2", + { + "c": "#cccccc", + "w": 2.25 + }, + "9,4\n\n\n8,3", + { + "c": "#aaaaaa" + }, + "8,5\n\n\n9,3", + "9,5\n\n\n9,3", + { + "c": "#777777" + }, + "8,6\n\n\n9,3\n\n\n\n\n\ne1" + ] + ] + } +} \ No newline at end of file diff --git a/v3/kradoindustries/promenade/promenade.json b/v3/kradoindustries/promenade/promenade.json new file mode 100644 index 0000000000..15f16748d3 --- /dev/null +++ b/v3/kradoindustries/promenade/promenade.json @@ -0,0 +1,217 @@ +{ + "name": "Promenade", + "vendorId": "0x12D0", + "productId": "0x706D", + "matrix": { + "rows": 5, + "cols": 14 + }, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "layouts": { + "labels": [ + ["Bottom Row", "Two 3u", "6u", "Two 2u", "7u"] + ], + "keymap": [ + [ + { + "c": "#777777", + "w": 1.5 + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#777777", + "w": 1.5 + }, + "0,13" + ], + [ + { + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + { + "h": 1.5 + }, + "1,6", + { + "h": 1.5 + }, + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#777777", + "w": 1.5 + }, + "1,13" + ], + [ + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + { + "x": 2 + }, + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#777777", + "w": 1.5 + }, + "2,13" + ], + [ + { + "y": -0.5, + "x": 6.5, + "c": "#cccccc", + "h": 1.5 + }, + "3,6", + { + "h": 1.5 + }, + "3,7" + ], + [ + { + "y": -0.5, + "c": "#777777", + "w": 1.5 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + { + "x": 2 + }, + "3,8", + "3,9", + "3,10", + "3,11", + "3,12", + { + "c": "#777777", + "w": 1.5 + }, + "3,13" + ], + [ + { + "w": 1.5 + }, + "4,0", + "4,1", + "4,2\n\n\n0,0", + "4,3\n\n\n0,0", + { + "w": 3 + }, + "4,5\n\n\n0,0", + { + "w": 3 + }, + "4,8\n\n\n0,0", + "4,10\n\n\n0,0", + "4,11\n\n\n0,0", + "4,12", + { + "w": 1.5 + }, + "4,13" + ], + [ + { + "x": 2.5 + }, + "4,2\n\n\n0,1", + "4,3\n\n\n0,1", + { + "w": 6 + }, + "4,6\n\n\n0,1", + "4,10\n\n\n0,1", + "4,11\n\n\n0,1" + ], + [ + { + "x": 2.5 + }, + "4,2\n\n\n0,2", + "4,3\n\n\n0,2", + "4,4\n\n\n0,2", + { + "w": 2 + }, + "4,5\n\n\n0,2", + { + "w": 2 + }, + "4,8\n\n\n0,2", + "4,9\n\n\n0,2", + "4,10\n\n\n0,2", + "4,11\n\n\n0,2" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "4,2\n\n\n0,3", + { + "w": 7 + }, + "4,6\n\n\n0,3", + { + "w": 1.5 + }, + "4,11\n\n\n0,3" + ] + ] + } +} \ No newline at end of file From 8ecffa4acdf12b198fca17e048849365fa88083b Mon Sep 17 00:00:00 2001 From: Feags <41646528+Feags@users.noreply.github.com> Date: Sat, 8 Apr 2023 21:16:34 -0500 Subject: [PATCH 2/4] Changing Vendor ID Initial VID was already used, so it has been changed. --- v3/kradoindustries/kousa/kousa.json | 2 +- v3/kradoindustries/krado66/krado66.json | 6 +++--- v3/kradoindustries/promenade/promenade.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/v3/kradoindustries/kousa/kousa.json b/v3/kradoindustries/kousa/kousa.json index cd81021930..9ed76a00ed 100644 --- a/v3/kradoindustries/kousa/kousa.json +++ b/v3/kradoindustries/kousa/kousa.json @@ -1,6 +1,6 @@ { "name": "Kousa-TKL", - "vendorId": "0x12D0", + "vendorId": "0x4B72", "productId": "0x4B4F", "matrix": { "rows": 6, diff --git a/v3/kradoindustries/krado66/krado66.json b/v3/kradoindustries/krado66/krado66.json index f6c0370cef..0e169cb8d0 100644 --- a/v3/kradoindustries/krado66/krado66.json +++ b/v3/kradoindustries/krado66/krado66.json @@ -1,7 +1,7 @@ { - "name": "Krado66 v2", - "vendorId": "0x12D0", - "productId": "0x1166", + "name": "Krado66", + "vendorId": "0x4B72", + "productId": "0x6664", "matrix": { "rows": 10, "cols": 8 diff --git a/v3/kradoindustries/promenade/promenade.json b/v3/kradoindustries/promenade/promenade.json index 15f16748d3..faa8a2c741 100644 --- a/v3/kradoindustries/promenade/promenade.json +++ b/v3/kradoindustries/promenade/promenade.json @@ -1,6 +1,6 @@ { "name": "Promenade", - "vendorId": "0x12D0", + "vendorId": "0x4B72", "productId": "0x706D", "matrix": { "rows": 5, From 4a5c654b5701143e8c2b3564a1b38d64edbd5abe Mon Sep 17 00:00:00 2001 From: Feags <41646528+Feags@users.noreply.github.com> Date: Tue, 4 Jul 2023 13:47:43 -0500 Subject: [PATCH 3/4] Changed 1.25u spacekeys to mod color --- v3/kradoindustries/krado66/krado66.json | 320 ++++++++++++++++++++++++ 1 file changed, 320 insertions(+) diff --git a/v3/kradoindustries/krado66/krado66.json b/v3/kradoindustries/krado66/krado66.json index 0e169cb8d0..f6fec0c713 100644 --- a/v3/kradoindustries/krado66/krado66.json +++ b/v3/kradoindustries/krado66/krado66.json @@ -1,3 +1,4 @@ +<<<<<<< HEAD { "name": "Krado66", "vendorId": "0x4B72", @@ -312,4 +313,323 @@ ] ] } +======= +{ + "name": "Krado66", + "vendorId": "0x4B72", + "productId": "0x6664", + "matrix": { + "rows": 10, + "cols": 8 +}, + "keycodes": ["qmk_lighting"], + "menus": ["qmk_rgblight"], + "layouts": { + "labels": [ + "Top Left Encoder", + "Unsplit Backspace Left", + "Split Backspace Right", + "Pipe/Bslash Swap", + "Enter Swap", + "2.75u Right Shift ", + "Right Side Encoder", + "Lower Left Encoder", + ["Spacebar", "6.25u", "1.25u-2.25u-2.75u", "2.75u-1.25u-2.25u", "2.75u-Encoder-2.25u"], + ["Right Modifiers", "Three 1u", "Two 1.25u", "1.25u - 1u", "Two 1u and Encoder"] + ], + + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0\n\n\n0,1\n\n\n\n\n\ne0", + { + "x": 0.25 + }, + "0,0\n\n\n0,0", + { + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "0,1", + "1,1", + "0,2", + "1,2", + "0,3", + "1,3", + "0,4", + "1,4", + "0,5", + "1,5", + "0,6\n\n\n1,0", + "1,6\n\n\n1,0", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,7\n\n\n2,0", + { + "x": 0.25, + "w": 2 + }, + "0,6\n\n\n1,1", + { + "c": "#cccccc" + }, + "0,7\n\n\n2,1", + "1,7\n\n\n2,1" + ], + [ + { + "x": 1.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "3,0", + { + "c": "#cccccc" + }, + "2,1", + "3,1", + "2,2", + "3,2", + "2,3", + "3,3", + "2,4", + "3,4", + "2,5", + "3,5", + "2,6\n\n\n3,0", + "3,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,7\n\n\n3,0", + { + "x": 0.75, + "w": 1.5 + }, + "2,6\n\n\n3,1", + { + "c": "#cccccc" + }, + "3,6\n\n\n3,1", + "2,7\n\n\n3,1" + ], + [ + { + "x": 1.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "5,0", + { + "c": "#cccccc" + }, + "4,1", + "5,1", + "4,2", + "5,2", + "4,3", + "5,3", + "4,4", + "5,4", + "4,5", + "5,5", + "4,6\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "5,6\n\n\n4,0", + { + "x": 1, + "w": 2.25 + }, + "4,6\n\n\n4,1", + { + "c": "#cccccc" + }, + "5,6\n\n\n4,1" + ], + [ + { + "x": 1, + "c": "#aaaaaa", + "w": 2.25 + }, + "7,0", + { + "c": "#cccccc" + }, + "6,1", + "7,1", + "6,2", + "7,2", + "6,3", + "7,3", + "6,4", + "7,4", + "6,5", + "7,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "6,6\n\n\n5,0", + { + "c": "#777777" + }, + "6,7\n\n\n5,0", + { + "c": "#aaaaaa" + }, + "7,7\n\n\n6,0", + { + "x": 0.5, + "w": 2.75 + }, + "6,6\n\n\n5,1", + { + "c": "#777777" + }, + "7,7\n\n\n6,1\n\n\n\n\n\ne1" + ], + [ + { + "x": 1, + "c": "#aaaaaa", + "w": 1.25 + }, + "8,0\n\n\n7,0", + { + "w": 1.25 + }, + "9,0", + { + "w": 1.25 + }, + "8,1", + { + "c": "#cccccc", + "w": 6.25 + }, + "8,3\n\n\n8,0", + { + "c": "#aaaaaa" + }, + "8,5\n\n\n9,0", + "9,5\n\n\n9,0", + "8,6\n\n\n9,0", + { + "c": "#777777" + }, + "9,6", + "8,7", + "9,7" + ], + [ + { + "x": 1, + "w": 1.25 + }, + "8,0\n\n\n7,1\n\n\n\n\n\ne2", + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "9,2\n\n\n8,1", + { + "c": "#cccccc", + "w": 2.25 + }, + "8,3\n\n\n8,1", + { + "w": 2.75 + }, + "9,4\n\n\n8,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "8,5\n\n\n9,1", + { + "w": 1.25 + }, + "9,5\n\n\n9,1", + { + "c": "#cccccc", + "w": 0.5, + "d": true + }, + "\n\n\n9,1" + ], + [ + { + "x": 4.75, + "w": 2.75 + }, + "9,2\n\n\n8,2", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "8,3\n\n\n8,2", + { + "c": "#cccccc", + "w": 2.25 + }, + "9,4\n\n\n8,2", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "8,5\n\n\n9,2", + { + "c": "#cccccc", + "w": 0.75, + "d": true + }, + "\n\n\n9,2", + { + "c": "#aaaaaa" + }, + "8,6\n\n\n9,2" + ], + [ + { + "x": 4.75, + "c": "#cccccc", + "w": 2.75 + }, + "9,2\n\n\n8,3", + { + "c": "#777777", + "w": 1.25 + }, + "8,3\n\n\n8,3\n\n\n\n\n\ne2", + { + "c": "#cccccc", + "w": 2.25 + }, + "9,4\n\n\n8,3", + { + "c": "#aaaaaa" + }, + "8,5\n\n\n9,3", + "9,5\n\n\n9,3", + { + "c": "#777777" + }, + "8,6\n\n\n9,3\n\n\n\n\n\ne1" + ] + ] + } +>>>>>>> 4cc9b3ac (Changed 1.25u spacekeys to mod color) } \ No newline at end of file From 1ffc9a8be23d276f8521c7dd44f4ef7fa81b67e5 Mon Sep 17 00:00:00 2001 From: Feags <41646528+Feags@users.noreply.github.com> Date: Sat, 8 Jul 2023 16:07:13 -0500 Subject: [PATCH 4/4] Fixing krado66 and promenade after rebase --- v3/kradoindustries/krado66/krado66.json | 319 +------------------- v3/kradoindustries/promenade/promenade.json | 30 +- 2 files changed, 24 insertions(+), 325 deletions(-) diff --git a/v3/kradoindustries/krado66/krado66.json b/v3/kradoindustries/krado66/krado66.json index f6fec0c713..1990b51d61 100644 --- a/v3/kradoindustries/krado66/krado66.json +++ b/v3/kradoindustries/krado66/krado66.json @@ -1,319 +1,3 @@ -<<<<<<< HEAD -{ - "name": "Krado66", - "vendorId": "0x4B72", - "productId": "0x6664", - "matrix": { - "rows": 10, - "cols": 8 -}, - "keycodes": ["qmk_lighting"], - "menus": ["qmk_rgblight"], - "layouts": { - "labels": [ - "Top Left Encoder", - "Unsplit Backspace Left", - "Split Backspace Right", - "Pipe/Bslash Swap", - "Enter Swap", - "2.75u Right Shift ", - "Right Side Encoder", - "Lower Left Encoder", - ["Spacebar", "6.25u", "1.25u-2.25u-2.75u", "2.75u-1.25u-2.25u", "2.75u-Encoder-2.25u"], - ["Right Modifiers", "Three 1u", "Two 1.25u", "1.25u - 1u", "Two 1u and Encoder"] - ], - - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0\n\n\n0,1\n\n\n\n\n\ne0", - { - "x": 0.25 - }, - "0,0\n\n\n0,0", - { - "c": "#aaaaaa" - }, - "1,0", - { - "c": "#cccccc" - }, - "0,1", - "1,1", - "0,2", - "1,2", - "0,3", - "1,3", - "0,4", - "1,4", - "0,5", - "1,5", - "0,6\n\n\n1,0", - "1,6\n\n\n1,0", - { - "c": "#aaaaaa", - "w": 2 - }, - "0,7\n\n\n2,0", - { - "x": 0.25, - "w": 2 - }, - "0,6\n\n\n1,1", - { - "c": "#cccccc" - }, - "0,7\n\n\n2,1", - "1,7\n\n\n2,1" - ], - [ - { - "x": 1.75, - "c": "#aaaaaa", - "w": 1.5 - }, - "3,0", - { - "c": "#cccccc" - }, - "2,1", - "3,1", - "2,2", - "3,2", - "2,3", - "3,3", - "2,4", - "3,4", - "2,5", - "3,5", - "2,6\n\n\n3,0", - "3,6\n\n\n3,0", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,7\n\n\n3,0", - { - "x": 0.75, - "w": 1.5 - }, - "2,6\n\n\n3,1", - { - "c": "#cccccc" - }, - "3,6\n\n\n3,1", - "2,7\n\n\n3,1" - ], - [ - { - "x": 1.5, - "c": "#aaaaaa", - "w": 1.75 - }, - "5,0", - { - "c": "#cccccc" - }, - "4,1", - "5,1", - "4,2", - "5,2", - "4,3", - "5,3", - "4,4", - "5,4", - "4,5", - "5,5", - "4,6\n\n\n4,0", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "5,6\n\n\n4,0", - { - "x": 1, - "w": 2.25 - }, - "4,6\n\n\n4,1", - { - "c": "#cccccc" - }, - "5,6\n\n\n4,1" - ], - [ - { - "x": 1, - "c": "#aaaaaa", - "w": 2.25 - }, - "7,0", - { - "c": "#cccccc" - }, - "6,1", - "7,1", - "6,2", - "7,2", - "6,3", - "7,3", - "6,4", - "7,4", - "6,5", - "7,5", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "6,6\n\n\n5,0", - { - "c": "#777777" - }, - "6,7\n\n\n5,0", - { - "c": "#aaaaaa" - }, - "7,7\n\n\n6,0", - { - "x": 0.5, - "w": 2.75 - }, - "6,6\n\n\n5,1", - { - "c": "#777777" - }, - "7,7\n\n\n6,1\n\n\n\n\n\ne1" - ], - [ - { - "x": 1, - "c": "#aaaaaa", - "w": 1.25 - }, - "8,0\n\n\n7,0", - { - "w": 1.25 - }, - "9,0", - { - "w": 1.25 - }, - "8,1", - { - "c": "#cccccc", - "w": 6.25 - }, - "8,3\n\n\n8,0", - { - "c": "#aaaaaa" - }, - "8,5\n\n\n9,0", - "9,5\n\n\n9,0", - "8,6\n\n\n9,0", - { - "c": "#777777" - }, - "9,6", - "8,7", - "9,7" - ], - [ - { - "x": 1, - "w": 1.25 - }, - "8,0\n\n\n7,1\n\n\n\n\n\ne2", - { - "x": 2.5, - "c": "#cccccc", - "w": 1.25 - }, - "9,2\n\n\n8,1", - { - "w": 2.25 - }, - "8,3\n\n\n8,1", - { - "w": 2.75 - }, - "9,4\n\n\n8,1", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "8,5\n\n\n9,1", - { - "w": 1.25 - }, - "9,5\n\n\n9,1", - { - "c": "#cccccc", - "w": 0.5, - "d": true - }, - "\n\n\n9,1" - ], - [ - { - "x": 4.75, - "w": 2.75 - }, - "9,2\n\n\n8,2", - { - "w": 1.25 - }, - "8,3\n\n\n8,2", - { - "w": 2.25 - }, - "9,4\n\n\n8,2", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "8,5\n\n\n9,2", - { - "c": "#cccccc", - "w": 0.75, - "d": true - }, - "\n\n\n9,2", - { - "c": "#aaaaaa" - }, - "8,6\n\n\n9,2" - ], - [ - { - "x": 4.75, - "c": "#cccccc", - "w": 2.75 - }, - "9,2\n\n\n8,3", - { - "c": "#777777", - "w": 1.25 - }, - "8,3\n\n\n8,3\n\n\n\n\n\ne2", - { - "c": "#cccccc", - "w": 2.25 - }, - "9,4\n\n\n8,3", - { - "c": "#aaaaaa" - }, - "8,5\n\n\n9,3", - "9,5\n\n\n9,3", - { - "c": "#777777" - }, - "8,6\n\n\n9,3\n\n\n\n\n\ne1" - ] - ] - } -======= { "name": "Krado66", "vendorId": "0x4B72", @@ -631,5 +315,4 @@ ] ] } ->>>>>>> 4cc9b3ac (Changed 1.25u spacekeys to mod color) -} \ No newline at end of file +} diff --git a/v3/kradoindustries/promenade/promenade.json b/v3/kradoindustries/promenade/promenade.json index faa8a2c741..05a15907e0 100644 --- a/v3/kradoindustries/promenade/promenade.json +++ b/v3/kradoindustries/promenade/promenade.json @@ -15,7 +15,7 @@ "keymap": [ [ { - "c": "#777777", + "c": "#aaaaaa", "w": 1.5 }, "0,0", @@ -35,7 +35,7 @@ "0,11", "0,12", { - "c": "#777777", + "c": "#aaaaaa", "w": 1.5 }, "0,13" @@ -54,6 +54,7 @@ "1,4", "1,5", { + "c": "#aaaaaa", "h": 1.5 }, "1,6", @@ -61,13 +62,16 @@ "h": 1.5 }, "1,7", + { + "c": "#cccccc" + }, "1,8", "1,9", "1,10", "1,11", "1,12", { - "c": "#777777", + "c": "#aaaaaa", "w": 1.5 }, "1,13" @@ -94,7 +98,7 @@ "2,11", "2,12", { - "c": "#777777", + "c": "#aaaaaa", "w": 1.5 }, "2,13" @@ -103,7 +107,6 @@ { "y": -0.5, "x": 6.5, - "c": "#cccccc", "h": 1.5 }, "3,6", @@ -115,7 +118,6 @@ [ { "y": -0.5, - "c": "#777777", "w": 1.5 }, "3,0", @@ -136,7 +138,7 @@ "3,11", "3,12", { - "c": "#777777", + "c": "#aaaaaa", "w": 1.5 }, "3,13" @@ -150,6 +152,7 @@ "4,2\n\n\n0,0", "4,3\n\n\n0,0", { + "c": "#cccccc", "w": 3 }, "4,5\n\n\n0,0", @@ -157,6 +160,9 @@ "w": 3 }, "4,8\n\n\n0,0", + { + "c": "#aaaaaa" + }, "4,10\n\n\n0,0", "4,11\n\n\n0,0", "4,12", @@ -172,9 +178,13 @@ "4,2\n\n\n0,1", "4,3\n\n\n0,1", { + "c": "#cccccc", "w": 6 }, "4,6\n\n\n0,1", + { + "c": "#aaaaaa" + }, "4,10\n\n\n0,1", "4,11\n\n\n0,1" ], @@ -186,6 +196,7 @@ "4,3\n\n\n0,2", "4,4\n\n\n0,2", { + "c": "#cccccc", "w": 2 }, "4,5\n\n\n0,2", @@ -193,6 +204,9 @@ "w": 2 }, "4,8\n\n\n0,2", + { + "c": "#aaaaaa" + }, "4,9\n\n\n0,2", "4,10\n\n\n0,2", "4,11\n\n\n0,2" @@ -204,10 +218,12 @@ }, "4,2\n\n\n0,3", { + "c": "#cccccc", "w": 7 }, "4,6\n\n\n0,3", { + "c": "#aaaaaa", "w": 1.5 }, "4,11\n\n\n0,3"