diff options
Diffstat (limited to 'keyboards/handwired')
| -rw-r--r-- | keyboards/handwired/cyberstar/cyberstar.h | 34 | ||||
| -rw-r--r-- | keyboards/handwired/cyberstar/info.json | 90 | ||||
| -rw-r--r-- | keyboards/handwired/jtallbean/split_65/info.json | 165 | ||||
| -rw-r--r-- | keyboards/handwired/jtallbean/split_65/split_65.c | 2 | ||||
| -rw-r--r-- | keyboards/handwired/jtallbean/split_65/split_65.h | 47 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/bebol/bebol.h | 35 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/bebol/info.json | 76 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/bumblebee/bumblebee.c | 2 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/bumblebee/bumblebee.h | 39 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/bumblebee/info.json | 63 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/glacier/glacier.h | 43 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/glacier/info.json | 125 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/koalafications/info.json | 93 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/koalafications/koalafications.h | 37 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/the_galleon/info.json | 263 | ||||
| -rw-r--r-- | keyboards/handwired/swiftrax/the_galleon/the_galleon.h | 45 |
16 files changed, 673 insertions, 486 deletions
diff --git a/keyboards/handwired/cyberstar/cyberstar.h b/keyboards/handwired/cyberstar/cyberstar.h deleted file mode 100644 index 13b3117c97..0000000000 --- a/keyboards/handwired/cyberstar/cyberstar.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2022 Yiancar-Designs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#pragma once - -#define XXX KC_NO - -#include "quantum.h" - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ - K30, K31, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, \ - K43, K44, K46, K48, K4B, K4C, K4F, K4G, K4H \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, XXX, XXX, XXX }, \ - { K30, K31, XXX, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, K3G, XXX }, \ - { XXX, XXX, XXX, K43, K44, XXX, K46, XXX, K48, XXX, XXX, K4B, K4C, XXX, XXX, K4F, K4G, K4H } \ -} diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json index 6e3cb6de3f..66cd24e20b 100644 --- a/keyboards/handwired/cyberstar/info.json +++ b/keyboards/handwired/cyberstar/info.json @@ -21,7 +21,95 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1, "w":1.5}, {"x":16.5, "y":1}, {"x":17.5, "y":1}, {"x":18.5, "y":1}, {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3, "w":1.75}, {"x":15.25, "y":3}, {"x":17.5, "y":3}, {"x":3.25, "y":4}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"x":8, "y":4, "w":2.75}, {"x":10.75, "y":4, "w":1.5}, {"x":12.25, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}, {"x":18.5, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + {"matrix": [1, 14], "x": 15.25, "y": 0}, + + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "x": 12.75, "y": 1}, + {"matrix": [1, 13], "x": 13.75, "y": 1}, + {"matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [1, 16], "x": 17.5, "y": 1}, + {"matrix": [1, 17], "x": 18.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3}, + {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 15.25, "y": 3}, + + {"matrix": [3, 16], "x": 17.5, "y": 3}, + + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25}, + {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.75}, + {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4}, + + {"matrix": [4, 15], "x": 16.5, "y": 4}, + {"matrix": [4, 16], "x": 17.5, "y": 4}, + {"matrix": [4, 17], "x": 18.5, "y": 4} + ] } } } diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json index 5c48352c1f..593c8943a6 100644 --- a/keyboards/handwired/jtallbean/split_65/info.json +++ b/keyboards/handwired/jtallbean/split_65/info.json @@ -27,81 +27,96 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x":0, "y":0}, - {"label":"Esc", "x":1.25, "y":0}, - {"label":"!", "x":2.25, "y":0}, - {"label":"@", "x":3.25, "y":0}, - {"label":"#", "x":4.25, "y":0}, - {"label":"$", "x":5.25, "y":0}, - {"label":"%", "x":6.25, "y":0}, - {"label":"^", "x":7.25, "y":0}, - {"label":"&", "x":9.25, "y":0}, - {"label":"*", "x":10.25, "y":0}, - {"label":"(", "x":11.25, "y":0}, - {"label":")", "x":12.25, "y":0}, - {"label":"_", "x":13.25, "y":0}, - {"label":"+", "x":14.25, "y":0}, - {"label":"~", "x":15.25, "y":0}, - {"label":"Back", "x":16.25, "y":0}, - {"label":"Insert", "x":17.25, "y":0}, - {"label":"PgUp", "x":0, "y":1}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":3.75, "y":1}, - {"label":"E", "x":4.75, "y":1}, - {"label":"R", "x":5.75, "y":1}, - {"label":"T", "x":6.75, "y":1}, - {"label":"Y", "x":8.75, "y":1}, - {"label":"U", "x":9.75, "y":1}, - {"label":"I", "x":10.75, "y":1}, - {"label":"O", "x":11.75, "y":1}, - {"label":"P", "x":12.75, "y":1}, - {"label":"{", "x":13.75, "y":1}, - {"label":"}", "x":14.75, "y":1}, - {"label":"|", "x":15.75, "y":1, "w":1.5}, - {"label":"Delete", "x":17.25, "y":1}, - {"label":"PgDn", "x":0, "y":2}, - {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, - {"label":"A", "x":3, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":9, "y":2}, - {"label":"J", "x":10, "y":2}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2}, - {"label":":", "x":13, "y":2}, - {"label":"\"", "x":14, "y":2}, - {"label":"Enter", "x":15, "y":2, "w":2.25}, - {"label":"Home", "x":17.25, "y":2}, - {"label":"Fn", "x":0, "y":3}, - {"label":"Shift", "x":1.25, "y":3, "w":2.25}, - {"label":"Z", "x":3.5, "y":3}, - {"label":"X", "x":4.5, "y":3}, - {"label":"C", "x":5.5, "y":3}, - {"label":"V", "x":6.5, "y":3}, - {"label":"B", "x":7.5, "y":3}, - {"label":"N", "x":9.5, "y":3}, - {"label":"M", "x":10.5, "y":3}, - {"label":"<", "x":11.5, "y":3}, - {"label":">", "x":12.5, "y":3}, - {"label":"?", "x":13.5, "y":3}, - {"label":"Shift", "x":14.5, "y":3, "w":1.75}, - {"label":"\u2191", "x":16.25, "y":3}, - {"label":"End", "x":17.25, "y":3}, - {"label":"Code", "x":0, "y":4}, - {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, - {"label":"Win", "x":2.5, "y":4, "w":1.25}, - {"label":"Alt", "x":3.75, "y":4, "w":1.25}, - {"x":5, "y":4, "w":2.75}, - {"x":8.75, "y":4, "w":2.25}, - {"label":"Alt", "x":11, "y":4, "w":1.25}, - {"label":"Win", "x":12.25, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":4}, - {"label":"\u2193", "x":16.25, "y":4}, - {"label":"\u2192", "x":17.25, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + + {"matrix": [5, 0], "x": 9.25, "y": 0}, + {"matrix": [5, 1], "x": 10.25, "y": 0}, + {"matrix": [5, 2], "x": 11.25, "y": 0}, + {"matrix": [5, 3], "x": 12.25, "y": 0}, + {"matrix": [5, 4], "x": 13.25, "y": 0}, + {"matrix": [5, 5], "x": 14.25, "y": 0}, + {"matrix": [5, 6], "x": 15.25, "y": 0}, + {"matrix": [5, 7], "x": 16.25, "y": 0}, + {"matrix": [5, 8], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 2.75, "y": 1}, + {"matrix": [1, 4], "x": 3.75, "y": 1}, + {"matrix": [1, 5], "x": 4.75, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + + {"matrix": [6, 0], "x": 8.75, "y": 1}, + {"matrix": [6, 1], "x": 9.75, "y": 1}, + {"matrix": [6, 2], "x": 10.75, "y": 1}, + {"matrix": [6, 3], "x": 11.75, "y": 1}, + {"matrix": [6, 4], "x": 12.75, "y": 1}, + {"matrix": [6, 5], "x": 13.75, "y": 1}, + {"matrix": [6, 6], "x": 14.75, "y": 1}, + {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5}, + {"matrix": [6, 8], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 7], "x": 15, "y": 2, "w": 2.25}, + {"matrix": [7, 8], "x": 17.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + + {"matrix": [8, 0], "x": 9.5, "y": 3}, + {"matrix": [8, 1], "x": 10.5, "y": 3}, + {"matrix": [8, 2], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 4], "x": 13.5, "y": 3}, + {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 16.25, "y": 3}, + {"matrix": [8, 8], "x": 17.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.75}, + + {"matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 5], "x": 15.25, "y": 4}, + {"matrix": [9, 7], "x": 16.25, "y": 4}, + {"matrix": [9, 8], "x": 17.25, "y": 4} ] } } diff --git a/keyboards/handwired/jtallbean/split_65/split_65.c b/keyboards/handwired/jtallbean/split_65/split_65.c index 09a4086fbc..d408f5577b 100644 --- a/keyboards/handwired/jtallbean/split_65/split_65.c +++ b/keyboards/handwired/jtallbean/split_65/split_65.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "split_65.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/handwired/jtallbean/split_65/split_65.h b/keyboards/handwired/jtallbean/split_65/split_65.h deleted file mode 100644 index 8884c5cece..0000000000 --- a/keyboards/handwired/jtallbean/split_65/split_65.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 jtallbean - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - #define LAYOUT_all( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, R08, \ - L10, L11, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R27, R28, \ - L30, L31, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R37, R38, \ - L40, L41, L43, L44, L45, R40, R42, R43, R44, R45, R47, R48 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO}, \ - { L10, L11, KC_NO, L13, L14, L15, L16, L17, KC_NO}, \ - { L20, L21, KC_NO, L23, L24, L25, L26, L27, KC_NO}, \ - { L30, L31, KC_NO, L33, L34, L35, L36, L37, KC_NO}, \ - { L40, L41, KC_NO, L43, L44, L45, KC_NO, KC_NO, KC_NO}, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, KC_NO, R37, R38 }, \ - { R40, KC_NO, R42, R43, R44, R45, KC_NO, R47, R48 } \ - } diff --git a/keyboards/handwired/swiftrax/bebol/bebol.h b/keyboards/handwired/swiftrax/bebol/bebol.h deleted file mode 100644 index 4bd6974c23..0000000000 --- a/keyboards/handwired/swiftrax/bebol/bebol.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k2f, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, k3f, \ - k40, k41, k42, k46, k4a, k4b, k4c, k4d, k4e, k4f \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e, k3f }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f } \ -} diff --git a/keyboards/handwired/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/info.json index e1b1fcdc64..423c90f180 100644 --- a/keyboards/handwired/swiftrax/bebol/info.json +++ b/keyboards/handwired/swiftrax/bebol/info.json @@ -17,7 +17,81 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c index 9c3444955c..7660f93996 100644 --- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c +++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "bumblebee.h" +#include "quantum.h" // Initialize all RGB indicators to 'off' void keyboard_post_init_kb(void) { diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h deleted file mode 100644 index a451e1273a..0000000000 --- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#pragma once - -#define XXX KC_NO - -#include "quantum.h" - - #define LAYOUT_all( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \ - K60, K70, K62, K72, K63, K74, K65, K66, K76, K67 \ - ) \ - { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, XXX }, \ - { K60, XXX, K62, K63, XXX, K65, K66, K67 }, \ - { K70, XXX, K72, XXX, K74, XXX, K76, XXX } \ - } - diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json index c96702e68c..f5fe3747c4 100644 --- a/keyboards/handwired/swiftrax/bumblebee/info.json +++ b/keyboards/handwired/swiftrax/bumblebee/info.json @@ -25,7 +25,68 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0, "w":1.5}, {"label":"0,1", "x":2.5, "y":0}, {"label":"1,1", "x":3.5, "y":0}, {"label":"0,2", "x":4.5, "y":0}, {"label":"1,2", "x":5.5, "y":0}, {"label":"0,3", "x":6.5, "y":0}, {"label":"1,3", "x":7.5, "y":0}, {"label":"0,4", "x":8.5, "y":0}, {"label":"1,4", "x":9.5, "y":0}, {"label":"0,5", "x":10.5, "y":0}, {"label":"1,5", "x":11.5, "y":0}, {"label":"0,6", "x":12.5, "y":0}, {"label":"1,6", "x":13.5, "y":0}, {"label":"0,7", "x":14.5, "y":0, "w":1.5}, {"label":"1,7", "x":16, "y":0}, {"label":"2,0", "x":0, "y":1}, {"label":"3,0", "x":1, "y":1, "w":1.75}, {"label":"2,1", "x":2.75, "y":1}, {"label":"3,1", "x":3.75, "y":1}, {"label":"2,2", "x":4.75, "y":1}, {"label":"3,2", "x":5.75, "y":1}, {"label":"2,3", "x":6.75, "y":1}, {"label":"3,3", "x":7.75, "y":1}, {"label":"2,4", "x":8.75, "y":1}, {"label":"3,4", "x":9.75, "y":1}, {"label":"2,5", "x":10.75, "y":1}, {"label":"3,5", "x":11.75, "y":1}, {"label":"2,6", "x":12.75, "y":1}, {"label":"3,6", "x":13.75, "y":1, "w":2.25}, {"label":"2,7", "x":16, "y":1}, {"label":"4,0", "x":0, "y":2}, {"label":"5,0", "x":1, "y":2, "w":2.25}, {"label":"4,1", "x":3.25, "y":2}, {"label":"5,1", "x":4.25, "y":2}, {"label":"4,2", "x":5.25, "y":2}, {"label":"5,2", "x":6.25, "y":2}, {"label":"4,3", "x":7.25, "y":2}, {"label":"5,3", "x":8.25, "y":2}, {"label":"4,4", "x":9.25, "y":2}, {"label":"5,4", "x":10.25, "y":2}, {"label":"4,5", "x":11.25, "y":2}, {"label":"5,5", "x":12.25, "y":2}, {"label":"4,6", "x":13.25, "y":2, "w":1.75}, {"label":"5,6", "x":15, "y":2}, {"label":"4,7", "x":16, "y":2}, {"label":"6,0", "x":0, "y":3}, {"label":"7,0", "x":1, "y":3, "w":1.5}, {"label":"6,2", "x":3.88, "y":3, "w":1.5}, {"label":"7,2", "x":5.38, "y":3, "w":2.75}, {"label":"6,3", "x":8.13, "y":3}, {"label":"7,4", "x":9.13, "y":3, "w":2}, {"label":"6,5", "x":11.13, "y":3, "w":1.5}, {"label":"6,6", "x":14, "y":3}, {"label":"7,6", "x":15, "y":3}, {"label":"6,7", "x":16, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [1, 1], "x": 3.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + {"matrix": [0, 5], "x": 10.5, "y": 0}, + {"matrix": [1, 5], "x": 11.5, "y": 0}, + {"matrix": [0, 6], "x": 12.5, "y": 0}, + {"matrix": [1, 6], "x": 13.5, "y": 0}, + {"matrix": [0, 7], "x": 14.5, "y": 0, "w": 1.5}, + {"matrix": [1, 7], "x": 16, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1, "w": 1.75}, + {"matrix": [2, 1], "x": 2.75, "y": 1}, + {"matrix": [3, 1], "x": 3.75, "y": 1}, + {"matrix": [2, 2], "x": 4.75, "y": 1}, + {"matrix": [3, 2], "x": 5.75, "y": 1}, + {"matrix": [2, 3], "x": 6.75, "y": 1}, + {"matrix": [3, 3], "x": 7.75, "y": 1}, + {"matrix": [2, 4], "x": 8.75, "y": 1}, + {"matrix": [3, 4], "x": 9.75, "y": 1}, + {"matrix": [2, 5], "x": 10.75, "y": 1}, + {"matrix": [3, 5], "x": 11.75, "y": 1}, + {"matrix": [2, 6], "x": 12.75, "y": 1}, + {"matrix": [3, 6], "x": 13.75, "y": 1, "w": 2.25}, + {"matrix": [2, 7], "x": 16, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2, "w": 2.25}, + {"matrix": [4, 1], "x": 3.25, "y": 2}, + {"matrix": [5, 1], "x": 4.25, "y": 2}, + {"matrix": [4, 2], "x": 5.25, "y": 2}, + {"matrix": [5, 2], "x": 6.25, "y": 2}, + {"matrix": [4, 3], "x": 7.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 6], "x": 13.25, "y": 2, "w": 1.75}, + {"matrix": [5, 6], "x": 15, "y": 2}, + {"matrix": [4, 7], "x": 16, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3, "w": 1.5}, + {"matrix": [6, 2], "x": 3.88, "y": 3, "w": 1.5}, + {"matrix": [7, 2], "x": 5.38, "y": 3, "w": 2.75}, + {"matrix": [6, 3], "x": 8.13, "y": 3}, + {"matrix": [7, 4], "x": 9.13, "y": 3, "w": 2}, + {"matrix": [6, 5], "x": 11.13, "y": 3, "w": 1.5}, + + {"matrix": [6, 6], "x": 14, "y": 3}, + {"matrix": [7, 6], "x": 15, "y": 3}, + {"matrix": [6, 7], "x": 16, "y": 3} + ] } } }
\ No newline at end of file diff --git a/keyboards/handwired/swiftrax/glacier/glacier.h b/keyboards/handwired/swiftrax/glacier/glacier.h deleted file mode 100644 index 1a731ea072..0000000000 --- a/keyboards/handwired/swiftrax/glacier/glacier.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#pragma once - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT_all( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, K09, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K78, K27, K37, K28, K38, K29, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, K58, K49, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, K68, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K87, K97, K88, \ - KA0, KB0, KA1, KB3, KA4, KB4, KA5, KB5, KA6, KB6, KA7 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ < |