diff options
Diffstat (limited to 'keyboards/mokey')
23 files changed, 709 insertions, 1128 deletions
diff --git a/keyboards/mokey/ginkgo65/ginkgo65.c b/keyboards/mokey/ginkgo65/ginkgo65.c deleted file mode 100644 index 4ab3aae51f..0000000000 --- a/keyboards/mokey/ginkgo65/ginkgo65.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Ocean - * 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/>. - */ -#include "ginkgo65.h" - diff --git a/keyboards/mokey/ginkgo65/ginkgo65.h b/keyboards/mokey/ginkgo65/ginkgo65.h index 1594e5c793..5aa3d3aa61 100644 --- a/keyboards/mokey/ginkgo65/ginkgo65.h +++ b/keyboards/mokey/ginkgo65/ginkgo65.h @@ -212,5 +212,5 @@ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \ - { k40, k41, k42, K43, k44, XXX, K46, XXX, XXX, XXX, k4A, XXX, k4C, k4D, k4E, XXX }, \ + { k40, k41, k42, K43, k44, XXX, K46, XXX, XXX, K49, k4A, XXX, k4C, k4D, k4E, XXX }, \ } diff --git a/keyboards/mokey/ginkgo65hot/config.h b/keyboards/mokey/ginkgo65hot/config.h deleted file mode 100644 index c3f836fd12..0000000000 --- a/keyboards/mokey/ginkgo65hot/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2021 Kyle McCreery -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 MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/ginkgo65hot/ginkgo65hot.c b/keyboards/mokey/ginkgo65hot/ginkgo65hot.c deleted file mode 100644 index 1db0f9c22d..0000000000 --- a/keyboards/mokey/ginkgo65hot/ginkgo65hot.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Ocean - * 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/>. - */ -#include "ginkgo65hot.h" - diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json index 31427c7cb3..347d4f840d 100644 --- a/keyboards/mokey/ginkgo65hot/info.json +++ b/keyboards/mokey/ginkgo65hot/info.json @@ -8,6 +8,11 @@ "pid": "0x3366", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 6, diff --git a/keyboards/mokey/ibis80/config.h b/keyboards/mokey/ibis80/config.h deleted file mode 100644 index 51dbcc0bf7..0000000000 --- a/keyboards/mokey/ibis80/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Kyle McCreery -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 MATRIX_ROW_PINS { B0, B1, B2, E6, F0, F1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/ibis80/ibis80.c b/keyboards/mokey/ibis80/ibis80.c deleted file mode 100644 index faddc99eb5..0000000000 --- a/keyboards/mokey/ibis80/ibis80.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Ocean - * 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/>. - */ - -#include "ibis80.h"
\ No newline at end of file diff --git a/keyboards/mokey/ibis80/ibis80.h b/keyboards/mokey/ibis80/ibis80.h deleted file mode 100644 index 0f2c60a533..0000000000 --- a/keyboards/mokey/ibis80/ibis80.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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 - -/* - * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ - * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │0E │0F │0G │ - * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ │1E │1F │1G │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ┌─────┐ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │2E │2F │2G │ │3D │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐ │ ISO Enter - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │ │2D │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ └───┴────┘ - * │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D │ │4F │ - * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ - * │50 │51 │52 │56 │5A │5B │5D │ │5E │5F │5G │ - * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘ - * ┌─────┐ ┌─────┬───────────────────────────┬─────┐ ┌─────┐ - * │50 │ │52 │56 │5A │ │5D │ - * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ - */ - -#define LAYOUT_tkl_f13_ansi_tsangan(\ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4d, k4f, \ - k50, k51, k52, k56, k5a, k5b, k5d, k5e, k5f, k5g \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, XXX, XXX, k4d, XXX, k4f, XXX }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g } \ -} - -#define LAYOUT_tkl_f13_ansi_wkl(\ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4d, k4f, \ - k50, k52, k56, k5a, k5d, k5e, k5f, k5g \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, XXX, XXX, k4d, XXX, k4f, XXX }, \ - { k50, XXX, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, k5e, k5f, k5g } \ -} diff --git a/keyboards/mokey/ibis80/info.json b/keyboards/mokey/ibis80/info.json index df1771d5e8..5324930df8 100644 --- a/keyboards/mokey/ibis80/info.json +++ b/keyboards/mokey/ibis80/info.json @@ -8,6 +8,11 @@ "pid": "0x3380", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], + "rows": ["B0", "B1", "B2", "E6", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { @@ -16,202 +21,210 @@ "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1.25, "y": 0}, - {"label": "k02", "x": 2.25, "y": 0}, - {"label": "k03", "x": 3.25, "y": 0}, - {"label": "k04", "x": 4.25, "y": 0}, - {"label": "k05", "x": 5.5, "y": 0}, - {"label": "k06", "x": 6.5, "y": 0}, - {"label": "k07", "x": 7.5, "y": 0}, - {"label": "k08", "x": 8.5, "y": 0}, - {"label": "k09", "x": 9.75, "y": 0}, - {"label": "k0A", "x": 10.75, "y": 0}, - {"label": "k0B", "x": 11.75, "y": 0}, - {"label": "k0C", "x": 12.75, "y": 0}, - {"label": "k0D", "x": 14, "y": 0}, - - {"label": "k0E", "x": 15.25, "y": 0}, - {"label": "k0F", "x": 16.25, "y": 0}, - {"label": "k0G", "x": 17.25, "y": 0}, - - {"label": "k10", "x": 0, "y": 1.5}, - {"label": "k11", "x": 1, "y": 1.5}, - {"label": "k12", "x": 2, "y": 1.5}, - {"label": "k13", "x": 3, "y": 1.5}, - {"label": "k14", "x": 4, "y": 1.5}, - {"label": "k15", "x": 5, "y": 1.5}, - {"label": "k16", "x": 6, "y": 1.5}, - {"label": "k17", "x": 7, "y": 1.5}, - {"label": "k18", "x": 8, "y": 1.5}, - {"label": "k19", "x": 9, "y": 1.5}, - {"label": "k1A", "x": 10, "y": 1.5}, - {"label": "k1B", "x": 11, "y": 1.5}, - {"label": "k1C", "x": 12, "y": 1.5}, - {"label": "k1D", "x": 13, "y": 1.5, "w": 2}, - - {"label": "k1E", "x": 15.25, "y": 1.5}, - {"label": "k1F", "x": 16.25, "y": 1.5}, - {"label": "k1G", "x": 17.25, "y": 1.5}, - - {"label": "k20", "x": 0, "y": 2.5, "w": 1.5}, - {"label": "k21", "x": 1.5, "y": 2.5}, - {"label": "k22", "x": 2.5, "y": 2.5}, - {"label": "k23", "x": 3.5, "y": 2.5}, - {"label": "k24", "x": 4.5, "y": 2.5}, - {"label": "k25", "x": 5.5, "y": 2.5}, - {"label": "k26", "x": 6.5, "y": 2.5}, - {"label": "k27", "x": 7.5, "y": 2.5}, - {"label": "k28", "x": 8.5, "y": 2.5}, - {"label": "k29", "x": 9.5, "y": 2.5}, - {"label": "k2A", "x": 10.5, "y": 2.5}, - {"label": "k2B", "x": 11.5, "y": 2.5}, - {"label": "k2C", "x": 12.5, "y": 2.5}, - {"label": "k2D", "x": 13.5, "y": 2.5}, - - {"label": "k2E", "x": 15.25, "y": 2.5}, - {"label": "k2F", "x": 16.25, "y": 2.5}, - {"label": "k2G", "x": 17.25, "y": 2.5}, - - {"label": "k30", "x": 0, "y": 3.5, "w": 1.75}, - {"label": "k31", "x": 1.75, "y": 3.5}, - {"label": "k32", "x": 2.75, "y": 3.5}, - {"label": "k33", "x": 3.75, "y": 3.5}, - {"label": "k34", "x": 4.75, "y": 3.5}, - {"label": "k35", "x": 5.75, "y": 3.5}, - {"label": "k36", "x": 6.75, "y": 3.5}, - {"label": "k37", "x": 7.75, "y": 3.5}, - {"label": "k38", "x": 8.75, "y": 3.5}, - {"label": "k39", "x": 9.75, "y": 3.5}, - {"label": "k3A", "x": 10.75, "y": 3.5}, - {"label": "k3B", "x": 11.75, "y": 3.5}, - {"label": "k3D", "x": 12.75, "y": 3.5, "w": 2.25}, - - {"label": "k40", "x": 0, "y": 4.5, "w": 2.25}, - {"label": "k41", "x": 2.25, "y": 4.5}, - {"label": "k42", "x": 3.25, "y": 4.5}, - {"label": "k43", "x": 4.25, "y": 4.5}, - {"label": "k44", "x": 5.25, "y": 4.5}, - {"label": "k45", "x": 6.25, "y": 4.5}, - {"label": "k46", "x": 7.25, "y": 4.5}, - {"label": "k47", "x": 8.25, "y": 4.5}, - {"label": "k48", "x": 9.25, "y": 4.5}, - {"label": "k49", "x": 10.25, "y": 4.5}, - {"label": "k4A", "x": 11.25, "y": 4.5}, - {"label": "k4D", "x": 12.25, "y": 4.5, "w": 2.75}, - - {"label": "k4F", "x": 16.25, "y": 4.5}, - - {"label": "k50", "x": 0, "y": 5.5, "w": 1.5}, - {"label": "k51", "x": 1.5, "y": 5.5}, - {"label": "k52", "x": 2.5, "y": 5.5, "w": 1.5}, - {"label": "k56", "x": 4, "y": 5.5, "w": 7}, - {"label": "k5A", "x": 11, "y": 5.5, "w": 1.5}, - {"label": "k5B", "x": 12.5, "y": 5.5}, - {"label": "k5D", "x": 13.5, "y": 5.5, "w": 1.5}, - - {"label": "k5E", "x": 15.25, "y": 5.5}, - {"label": "k5F", "x": 16.25, "y": 5.5}, - {"label": "k5G", "x": 17.25, "y": 5.5} + {"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.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] }, "LAYOUT_tkl_f13_ansi_wkl": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1.25, "y": 0}, - {"label": "k02", "x": 2.25, "y": 0}, - {"label": "k03", "x": 3.25, "y": 0}, - {"label": "k04", "x": 4.25, "y": 0}, - {"label": "k05", "x": 5.5, "y": 0}, - {"label": "k06", "x": 6.5, "y": 0}, - {"label": "k07", "x": 7.5, "y": 0}, - {"label": "k08", "x": 8.5, "y": 0}, - {"label": "k09", "x": 9.75, "y": 0}, - {"label": "k0A", "x": 10.75, "y": 0}, - {"label": "k0B", "x": 11.75, "y": 0}, - {"label": "k0C", "x": 12.75, "y": 0}, - {"label": "k0D", "x": 14, "y": 0}, - - {"label": "k0E", "x": 15.25, "y": 0}, - {"label": "k0F", "x": 16.25, "y": 0}, - {"label": "k0G", "x": 17.25, "y": 0}, - - {"label": "k10", "x": 0, "y": 1.5}, - {"label": "k11", "x": 1, "y": 1.5}, - {"label": "k12", "x": 2, "y": 1.5}, - {"label": "k13", "x": 3, "y": 1.5}, - {"label": "k14", "x": 4, "y": 1.5}, - {"label": "k15", "x": 5, "y": 1.5}, - {"label": "k16", "x": 6, "y": 1.5}, - {"label": "k17", "x": 7, "y": 1.5}, - {"label": "k18", "x": 8, "y": 1.5}, - {"label": "k19", "x": 9, "y": 1.5}, - {"label": "k1A", "x": 10, "y": 1.5}, - {"label": "k1B", "x": 11, "y": 1.5}, - {"label": "k1C", "x": 12, "y": 1.5}, - {"label": "k1D", "x": 13, "y": 1.5, "w": 2}, - - {"label": "k1E", "x": 15.25, "y": 1.5}, - {"label": "k1F", "x": 16.25, "y": 1.5}, - {"label": "k1G", "x": 17.25, "y": 1.5}, - - {"label": "k20", "x": 0, "y": 2.5, "w": 1.5}, - {"label": "k21", "x": 1.5, "y": 2.5}, - {"label": "k22", "x": 2.5, "y": 2.5}, - {"label": "k23", "x": 3.5, "y": 2.5}, - {"label": "k24", "x": 4.5, "y": 2.5}, - {"label": "k25", "x": 5.5, "y": 2.5}, - {"label": "k26", "x": 6.5, "y": 2.5}, - {"label": "k27", "x": 7.5, "y": 2.5}, - {"label": "k28", "x": 8.5, "y": 2.5}, - {"label": "k29", "x": 9.5, "y": 2.5}, - {"label": "k2A", "x": 10.5, "y": 2.5}, - {"label": "k2B", "x": 11.5, "y": 2.5}, - {"label": "k2C", "x": 12.5, "y": 2.5}, - {"label": "k2D", "x": 13.5, "y": 2.5}, - - {"label": "k2E", "x": 15.25, "y": 2.5}, - {"label": "k2F", "x": 16.25, "y": 2.5}, - {"label": "k2G", "x": 17.25, "y": 2.5}, - - {"label": "k30", "x": 0, "y": 3.5, "w": 1.75}, - {"label": "k31", "x": 1.75, "y": 3.5}, - {"label": "k32", "x": 2.75, "y": 3.5}, - {"label": "k33", "x": 3.75, "y": 3.5}, - {"label": "k34", "x": 4.75, "y": 3.5}, - {"label": "k35", "x": 5.75, "y": 3.5}, - {"label": "k36", "x": 6.75, "y": 3.5}, - {"label": "k37", "x": 7.75, "y": 3.5}, - {"label": "k38", "x": 8.75, "y": 3.5}, - {"label": "k39", "x": 9.75, "y": 3.5}, - {"label": "k3A", "x": 10.75, "y": 3.5}, - {"label": "k3B", "x": 11.75, "y": 3.5}, - {"label": "k3D", "x": 12.75, "y": 3.5, "w": 2.25}, - - {"label": "k40", "x": 0, "y": 4.5, "w": 2.25}, - {"label": "k41", "x": 2.25, "y": 4.5}, - {"label": "k42", "x": 3.25, "y": 4.5}, - {"label": "k43", "x": 4.25, "y": 4.5}, - {"label": "k44", "x": 5.25, "y": 4.5}, - {"label": "k45", "x": 6.25, "y": 4.5}, - {"label": "k46", "x": 7.25, "y": 4.5}, - {"label": "k47", "x": 8.25, "y": 4.5}, - {"label": "k48", "x": 9.25, "y": 4.5}, - {"label": "k49", "x": 10.25, "y": 4.5}, - {"label": "k4A", "x": 11.25, "y": 4.5}, - {"label": "k4D", "x": 12.25, "y": 4.5, "w": 2.75}, - - {"label": "k4F", "x": 16.25, "y": 4.5}, - - {"label": "k50", "x": 0, "y": 5.5, "w": 1.5}, - {"label": "k52", "x": 2.5, "y": 5.5, "w": 1.5}, - {"label": "k56", "x": 4, "y": 5.5, "w": 7}, - {"label": "k5A", "x": 11, "y": 5.5, "w": 1.5}, - {"label": "k5D", "x": 13.5, "y": 5.5, "w": 1.5}, - - {"label": "k5E", "x": 15.25, "y": 5.5}, - {"label": "k5F", "x": 16.25, "y": 5.5}, - {"label": "k5G", "x": 17.25, "y": 5.5} + {"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.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/mokey/mokey63/config.h b/keyboards/mokey/mokey63/config.h deleted file mode 100644 index 4347c233c3..0000000000 --- a/keyboards/mokey/mokey63/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Kyle McCreery -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 MATRIX_ROW_PINS { B5, B6, B2, B3, B1 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/mokey63/info.json b/keyboards/mokey/mokey63/info.json index 0a29380114..6da3bc3133 100644 --- a/keyboards/mokey/mokey63/info.json +++ b/keyboards/mokey/mokey63/info.json @@ -8,6 +8,11 @@ "pid": "0x063A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B5", "B6", "B2", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mokey/mokey63/mokey63.c b/keyboards/mokey/mokey63/mokey63.c deleted file mode 100644 index ea30335a84..0000000000 --- a/keyboards/mokey/mokey63/mokey63.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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/>. - */ -#include "mokey63.h" diff --git a/keyboards/mokey/mokey64/config.h b/keyboards/mokey/mokey64/config.h deleted file mode 100644 index 4946ac2a9b..0000000000 --- a/keyboards/mokey/mokey64/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Kyle McCreery -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 MATRIX_ROW_PINS { B1, B2, B3, B4, B5 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D2, D1, D3, D5, D4, D6, D7, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/mokey64/info.json b/keyboards/mokey/mokey64/info.json index b31ef95cfd..36126d9243 100644 --- a/keyboards/mokey/mokey64/info.json +++ b/keyboards/mokey/mokey64/info.json @@ -8,6 +8,11 @@ "pid": "0x001A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D2", "D1", "D3", "D5", "D4", "D6", "D7", "B6"], + "rows": ["B1", "B2", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mokey/mokey64/mokey64.c b/keyboards/mokey/mokey64/mokey64.c deleted file mode 100644 index 5ba764b6b2..0000000000 --- a/keyboards/mokey/mokey64/mokey64.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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/>. - */ - -#include "mokey64.h"
\ No newline at end of file diff --git a/keyboards/mokey/xox70/config.h b/keyboards/mokey/xox70/config.h deleted file mode 100644 index 12780d9be9..0000000000 --- a/keyboards/mokey/xox70/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2021 Kyle McCreery -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 MATRIX_ROW_PINS { F7, B7, F5, F1, B0 } -#define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json index f2dc99719a..9d3216ab15 100644 --- a/keyboards/mokey/xox70/info.json +++ b/keyboards/mokey/xox70/info.json @@ -8,432 +8,437 @@ "pid": "0x3370", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "C7", "F4", "F5", "F1", "B6", "D0", "D2", "D3", "D1", "D7", "D4", "D5", "D6", "B4", "B5", "C6", "B7"], + "rows": ["F7", "B7", "F5", "F1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"], "layouts": { "LAYOUT_all": { "layout": [ - {"label":"k00", "x": 0, "y": 0}, - {"label":"k01", "x": 1, "y": 0}, - {"label":"k02", "x": 2, "y": 0}, - {"label":"k03", "x": 3, "y": 0}, - {"label":"k04", "x": 4, "y": 0}, - {"label":"k05", "x": 5, "y": 0}, - {"label":"k06", "x": 6, "y": 0}, - {"label":"k07", "x": 7, "y": 0}, - {"label":"k08", "x": 8, "y": 0}, - {"label":"k09", "x": 9, "y": 0}, - {"label":"k0A", "x": 10, "y": 0}, - {"label":"k0B", "x": 11, "y": 0}, - {"label":"k0C", "x": 12, "y": 0}, - {"label":"k0D", "x": 13, "y": 0}, - {"label":"k0E", "x": 14, "y": 0}, - - {"label":"k0F", "x": 15.25, "y": 0}, - {"label":"k0G", "x": 16.25, "y": 0}, - {"label":"k0H", "x": 17.25, "y": 0}, - - {"label":"k10", "x": 0, "y": 1, "w": 1.5}, - {"label":"k12", "x": 1.5, "y": 1}, - {"label":"k13", "x": 2.5, "y": 1}, - {"label":"k14", "x": 3.5, "y": 1}, - {"label":"k15", "x": 4.5, "y": 1}, - {"label":"k16", "x": 5.5, "y": 1}, - {"label":"k17", "x": 6.5, "y": 1}, - {"label":"k18", "x": 7.5, "y": 1}, - {"label":"k19", "x": 8.5, "y": 1}, - {"label":"k1A", "x": 9.5, "y": 1}, - {"label":"k1B", "x": 10.5, "y": 1}, - {"label":"k1C", "x": 11.5, "y": 1}, - {"label":"k1D", "x": 12.5, "y": 1}, - {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5}, - - {"label":"k1F", "x": 15.25, "y": 1}, - {"label":"k1G", "x": 16.25, "y": 1}, - {"label":"k1H", "x": 17.25, "y": 1}, - - {"label":"k20", "x": 0, "y": 2, "w": 1.75}, - {"label":"k22", "x": 1.75, "y": 2}, - {"label":"k23", "x": 2.75, "y": 2}, - {"label":"k24", "x": 3.75, "y": 2}, - {"label":"k25", "x": 4.75, "y": 2}, - {"label":"k26", "x": 5.75, "y": 2}, - {"label":"k27", "x": 6.75, "y": 2}, - {"label":"k28", "x": 7.75, "y": 2}, - {"label":"k29", "x": 8.75, "y": 2}, - {"label":"k2A", "x": 9.75, "y": 2}, - {"label":"k2B", "x": 10.75, "y": 2}, - {"label":"k2C", "x": 11.75, "y": 2}, - {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25}, - - {"label":"k30", "x": 0, "y": 3, "w": 1.25}, - {"label":"k31", "x": 1.25, "y": 3}, - {"label":"k32", "x": 2.25, "y": 3}, - {"label":"k33", "x": 3.25, "y": 3}, - {"label":"k34", "x": 4.25, "y": 3}, - {"label":"k35", "x": 5.25, "y": 3}, - {"label":"k36", "x": 6.25, "y": 3}, - {"label":"k37", "x": 7.25, "y": 3}, - {"label":"k38", "x": 8.25, "y": 3}, - {"label":"k39", "x": 9.25, "y": 3}, - {"label":"k3A", "x": 10.25, "y": 3}, - {"label":"k3B", "x": 11.25, "y": 3}, - {"label":"k3D", "x": 12.25, "y": 3, "w": 1.75}, - {"label":"k3E", "x": 14, "y": 3}, - - {"label":"k3G", "x": 16.25, "y": 3}, - - {"label":"k40", "x": 0, "y": 4, "w": 1.5}, - {"label":"k41", "x": 1.5, "y": 4}, - {"label":"k43", "x": 2.5, "y": 4, "w": 1.5}, - {"label":"k44", "x": 4, "y": 4, "w": 2.5}, - {"label":"k46", "x": 6.5, "y": 4}, - {"label":"k48", "x": 7.5, "y": 4, "w": 2.5}, - {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, - {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, - {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, - {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, - - {"label":"k4F", "x": 15.25, "y": 4}, - {"label":"k4G", "x": 16.25, "y": 4}, - {"label":"k4H", "x": 17.25, "y": 4} + {"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.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"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, 16], "x": 16.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.5}, + {"matrix": [4, 6], "x": 6.5, "y": 4}, + {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 2.5}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 15.25, "y": 4}, + {"matrix": [4, 16], "x": 16.25, "y": 4}, + {"matrix": [4, 17], "x": 17.25, "y": 4} ] }, "LAYOUT_tkl_nofrow_ansi": { "layout": [ - {"label":"k00", "x": 0, "y": 0}, - {"label":"k01", "x": 1, "y": 0}, - {"label":"k02", "x": 2, "y": 0}, - {"label":"k03", "x": 3, "y": 0}, - {"label":"k04", "x": 4, "y": 0}, - {"label":"k05", "x": 5, "y": 0}, - {"label":"k06", "x": 6, "y": 0}, - {"label":"k07", "x": 7, "y": 0}, - {"label":"k08", "x": 8, "y": 0}, - {"label":"k09", "x": 9, "y": 0}, - {"label":"k0A", "x": 10, "y": 0}, - {"label":"k0B", "x": 11, "y": 0}, - {"label":"k0C", "x": 12, "y": 0}, - {"label":"k0E", "x": 13, "y": 0, "w": 2}, - - {"label":"k0F", "x": 15.25, "y": 0}, - {"label":"k0G", "x": 16.25, "y": 0}, - {"label":"k0H", "x": 17.25, "y": 0}, - - {"label":"k10", "x": 0, "y": 1, "w": 1.5}, - {"label":"k12", "x": 1.5, "y": 1}, - {"label":"k13", "x": 2.5, "y": 1}, - {"label":"k14", "x": 3.5, "y": 1}, - {"label":"k15", "x": 4.5, "y": 1}, - {"label":"k16", "x": 5.5, "y": 1}, - {"label":"k17", "x": 6.5, "y": 1}, - {"label":"k18", "x": 7.5, "y": 1}, - {"label":"k19", "x": 8.5, "y": 1}, - {"label":"k1A", "x": 9.5, "y": 1}, - {"label":"k1B", "x": 10.5, "y": 1}, - {"label":"k1C", "x": 11.5, "y": 1}, - {"label":"k1D", "x": 12.5, "y": 1}, - {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5}, - - {"label":"k1F", "x": 15.25, "y": 1}, - {"label":"k1G", "x": 16.25, "y": 1}, - {"label":"k1H", "x": 17.25, "y": 1}, - - {"label":"k20", "x": 0, "y": 2, "w": 1.75}, - {"label":"k22", "x": 1.75, "y": 2}, - {"label":"k23", "x": 2.75, "y": 2}, - {"label":"k24", "x": 3.75, "y": 2}, - {"label":"k25", "x": 4.75, "y": 2}, - {"label":"k26", "x": 5.75, "y": 2}, - {"label":"k27", "x": 6.75, "y": 2}, - {"label":"k28", "x": 7.75, "y": 2}, - {"label":"k29", "x": 8.75, "y": 2}, - {"label":"k2A", "x": 9.75, "y": 2}, - {"label":"k2B", "x": 10.75, "y": 2}, - {"label":"k2C", "x": 11.75, "y": 2}, - {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25}, - - {"label":"k30", "x": 0, "y": 3, "w": 2.25}, - {"label":"k32", "x": 2.25, "y": 3}, - {"label":"k33", "x": 3.25, "y": 3}, - {"label":"k34", "x": 4.25, "y": 3}, - {"label":"k35", "x": 5.25, "y": 3}, - {"label":"k36", "x": 6.25, "y": 3}, - {"label":"k37", "x": 7.25, "y": 3}, - {"label":"k38", "x": 8.25, "y": 3}, - {"label":"k39", "x": 9.25, "y": 3}, - {"label":"k3A", "x": 10.25, "y": 3}, - {"label":"k3B", "x": 11.25, "y": 3}, - {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75}, - - {"label":"k3G", "x": 16.25, "y": 3}, - - {"label":"k40", "x": 0, "y": 4, "w": 1.25}, - {"label":"k41", "x": 1.25, "y": 4, "w": 1.25}, - {"label":"k43", "x": 2.5, "y": 4, "w": 1.25}, - {"label":"k46", "x": 3.75, "y": 4, "w": 6.25}, - {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, - {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, - {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, - {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, - - {"label":"k4F", "x": 15.25, "y": 4}, - {"label":"k4G", "x": 16.25, "y": 4}, - {"label":"k4H", "x": 17.25, "y": 4} + {"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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"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": 2.75}, + + {"matrix": [3, 16], "x": 16.25, "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, 3], "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, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 15.25, "y": 4}, + {"matrix": [4, 16], "x": 16.25, "y": 4}, + {"matrix": [4, 17], "x": 17.25, "y": 4} ] }, "LAYOUT_tkl_nofrow_iso": { "layout": [ - {"label":"k00", "x": 0, "y": 0}, - {"label":"k01", "x": 1, "y": 0}, - {"label":"k02", "x": 2, "y": 0}, - {"label":"k03", "x": 3, "y": 0}, - {"label":"k04", "x": 4, "y": 0}, - {"label":"k05", "x": 5, "y": 0}, - {"label":"k06", "x": 6, "y": 0}, - {"label":"k07", "x": 7, "y": 0}, - {"label":"k08", "x": 8, "y": 0}, - {"label":"k09", "x": 9, "y": 0}, - {"label":"k0A", "x": 10, "y": 0}, - {"label":"k0B", "x": 11, "y": 0}, - {"label":"k0C", "x": 12, "y": 0}, - {"label":"k0E", "x": 13, "y": 0, "w": 2}, - - {"label":"k0F", "x": 15.25, "y": 0}, - {"label":"k0G", "x": 16.25, "y": 0}, - {"label":"k0H", "x": 17.25, "y": 0}, - - {"label":"k10", "x": 0, "y": 1, "w": 1.5}, - {"label":"k12", "x": 1.5, "y": 1}, - {"label":"k13", "x": 2.5, "y": 1}, - {"label":"k14", "x": 3.5, "y": 1}, - {"label":"k15", "x": 4.5, "y": 1}, - {"label":"k16", "x": 5.5, "y": 1}, - {"label":"k17", "x": 6.5, "y": 1}, - {"label":"k18", "x": 7.5, "y": 1}, - {"label":"k19", "x": 8.5, "y": 1}, - {"label":"k1A", "x": 9.5, "y": 1}, - {"label":"k1B", "x": 10.5, "y": 1}, - {"label":"k1C", "x": 11.5, "y": 1}, - {"label":"k1D", "x": 12.5, "y": 1}, - - {"label":"k1F", "x": 15.25, "y": 1}, - {"label":"k1G", "x": 16.25, "y": 1}, - {"label":"k1H", "x": 17.25, "y": 1}, - - {"label":"k20", "x": 0, "y": 2, "w": 1.75}, - {"label":"k22", "x": 1.75, "y": 2}, - {"label":"k23", "x": 2.75, "y": 2}, - {"label":"k24", "x": 3.75, "y": 2}, - {"label":"k25", "x": 4.75, "y": 2}, - {"label":"k26", "x": 5.75, "y": 2}, - {"label":"k27", "x": 6.75, "y": 2}, - {"label":"k28", "x": 7.75, "y": 2}, - {"label":"k29", "x": 8.75, "y": 2}, - {"label":"k2A", "x": 9.75, "y": 2}, - {"label":"k2B", "x": 10.75, "y": 2}, - {"label":"k2C", "x": 11.75, "y": 2}, - {"label":"k1E", "x": 12.75, "y": 2}, - {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - - {"label":"k30", "x": 0, "y": 3, "w": 1.25}, - {"label":"k31", "x": 1.25, "y": 3}, - {"label":"k32", "x": 2.25, "y": 3}, - {"label":"k33", "x": 3.25, "y": 3}, - {"label":"k34", "x": 4.25, "y": 3}, - {"label":"k35", "x": 5.25, "y": 3}, - {"label":"k36", "x": 6.25, "y": 3}, - {"label":"k37", "x": 7.25, "y": 3}, - {"label":"k38", "x": 8.25, "y": 3}, - {"label":"k39", "x": 9.25, "y": 3}, - {"label":"k3A", "x": 10.25, "y": 3}, - {"label":"k3B", "x": 11.25, "y": 3}, - {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75}, - - {"label":"k3G", "x": 16.25, "y": 3}, - - {"label":"k40", "x": 0, "y": 4, "w": 1.25}, - {"label":"k41", "x": 1.25, "y": 4, "w": 1.25}, - {"label":"k43", "x": 2.5, "y": 4, "w": 1.25}, - {"label":"k46", "x": 3.75, "y": 4, "w": 6.25}, - {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, - {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, - {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, - {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, - - {"label":"k4F", "x": 15.25, "y": 4}, - {"label":"k4G", "x": 16.25, "y": 4}, - {"label":"k4H", "x": 17.25, "y": 4} + {"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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"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": 2.75}, + + {"matrix": [3, 16], "x": 16.25, "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, 3], "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, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 15.25, "y": 4}, + {"matrix": [4, 16], "x": 16.25, "y": 4}, + {"matrix": [4, 17], "x": 17.25, "y": 4} ] }, "LAYOUT_tkl_nofrow_ansi_split_bs": { "layout": [ - {"label":"k00", "x": 0, "y": 0}, - {"label":"k01", "x": 1, "y": 0}, - {"label":"k02", "x": 2, "y": 0}, - {"label":"k03", "x": 3, "y": 0}, - {"label":"k04", "x": 4, "y": 0}, - {"label":"k05", "x": 5, "y": 0}, - {"label":"k06", "x": 6, "y": 0}, - {"label":"k07", "x": 7, "y": 0}, - {"label":"k08", "x": 8, "y": 0}, - {"label":"k09", "x": 9, "y": 0}, - {"label":"k0A", "x": 10, "y": 0}, - {"label":"k0B", "x": 11, "y": 0}, - {"label":"k0C", "x": 12, "y": 0}, - {"label":"k0D", "x": 13, "y": 0}, - {"label":"k0E", "x": 14, "y": 0}, - - {"label":"k0F", "x": 15.25, "y": 0}, - {"label":"k0G", "x": 16.25, "y": 0}, - {"label":"k0H", "x": 17.25, "y": 0}, - - {"label":"k10", "x": 0, "y": 1, "w": 1.5}, - {"label":"k12", "x": 1.5, "y": 1}, - {"label":"k13", "x": 2.5, "y": 1}, - {"label":"k14", "x": 3.5, "y": 1}, - {"label":"k15", "x": 4.5, "y": 1}, - {"label":"k16", "x": 5.5, "y": 1}, - {"label":"k17", "x": 6.5, "y": 1}, - {"label":"k18", "x": 7.5, "y": 1}, - {"label":"k19", "x": 8.5, "y": 1}, - {"label":"k1A", "x": 9.5, "y": 1}, - {"label":"k1B", "x": 10.5, "y": 1}, - {"label":"k1C", "x": 11.5, "y": 1}, - {"label":"k1D", "x": 12.5, "y": 1}, - {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5}, - - {"label":"k1F", "x": 15.25, "y": 1}, - {"label":"k1G", "x": 16.25, "y": 1}, - {"label":"k1H", "x": 17.25, "y": 1}, - - {"label":"k20", "x": 0, "y": 2, "w": 1.75}, - {"label":"k22", "x": 1.75, "y": 2}, - {"label":"k23", "x": 2.75, "y": 2}, - {"label":"k24", "x": 3.75, "y": 2}, - {"label":"k25", "x": 4.75, "y": 2}, - {"label":"k26", "x": 5.75, "y": 2}, - {"label":"k27", "x": 6.75, "y": 2}, - {"label":"k28", "x": 7.75, "y": 2}, - {"label":"k29", "x": 8.75, "y": 2}, - {"label":"k2A", "x": 9.75, "y": 2}, - {"label":"k2B", "x": 10.75, "y": 2}, - {"label":"k2C", "x": 11.75, "y": 2}, - {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25}, - - {"label":"k30", "x": 0, "y": 3, "w": 2.25}, - {"label":"k32", "x": 2.25, "y": 3}, - {"label":"k33", "x": 3.25, "y": 3}, - {"label":"k34", "x": 4.25, "y": 3}, - {"label":"k35", "x": 5.25, "y": 3}, - {"label":"k36", "x": 6.25, "y": 3}, - {"label":"k37", "x": 7.25, "y": 3}, - {"label":"k38", "x": 8.25, "y": 3}, - {"label":"k39", "x": 9.25, "y": 3}, - {"label":"k3A", "x": 10.25, "y": 3}, - {"label":"k3B", "x": 11.25, "y": 3}, - {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75}, - - {"label":"k3G", "x": 16.25, "y": 3}, - - {"label":"k40", "x": 0, "y": 4, "w": 1.25}, - {"label":"k41", "x": 1.25, "y": 4, "w": 1.25}, - {"label":"k43", "x": 2.5, "y": 4, "w": 1.25}, - {"label":"k46", "x": 3.75, "y": 4, "w": 6.25}, - {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, - {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, - {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, - {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, - - {"label":"k4F", "x": 15.25, "y": 4}, - {"label":"k4G", "x": 16.25, "y": 4}, - {"label":"k4H", "x": 17.25, "y": 4} + {"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.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"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": 2.75}, + + {"matrix": [3, 16], "x": 16.25, "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, 3], "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, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 15.25, "y": 4}, + {"matrix": [4, 16], "x": 16.25, "y": 4}, + {"matrix": [4, 17], "x": 17.25, "y": 4} ] }, "LAYOUT_tkl_nofrow_iso_split_bs": { "layout": [ - {"label":"k00", "x": 0, "y": 0}, - {"label":"k01", "x": 1, "y": 0}, - {"label":"k02", "x": 2, "y": 0}, - {"label":"k03", "x": 3, "y": 0}, - {"label":"k04", "x": 4, "y": 0}, - {"label":"k05", "x": 5, "y": 0}, - {"label":"k06", "x": 6, "y": 0}, - {"label":"k07", "x": 7, "y": 0}, - {"label":"k08", "x": 8, "y": 0}, - {"label":"k09", "x": 9, "y": 0}, - {"label":"k0A", "x": 10, "y": 0}, - {"label":"k0B", "x": 11, "y": 0}, - {"label":"k0C", "x": 12, "y": 0}, - {"label":"k0D", "x": 13, "y": 0}, - {"label":"k0E", "x": 14, "y": 0}, - - {"label":"k0F", "x": 15.25, "y": 0}, - {"label":"k0G", "x": 16.25, "y": 0}, - {"label":"k0H", "x": 17.25, "y": 0}, - - {"label":"k10", "x": 0, "y": 1, "w": 1.5}, - {"label":"k12", "x": 1.5, "y": 1}, - {"label":"k13", "x": 2.5, "y": 1}, - {"label":"k14", "x": 3.5, "y": 1}, - {"label":"k15", "x": 4.5, "y": 1}, - {"label":"k16", "x": 5.5, "y": 1}, - {"label":"k17", "x": 6.5, "y": 1}, - {"label":"k18", "x": 7.5, "y": 1}, - {"label":"k19", "x": 8.5, "y": 1}, - {"label":"k1A", "x": 9.5, "y": 1}, - {"label":"k1B", "x": 10.5, "y": 1}, - {"label":"k1C", "x": 11.5, "y": 1}, - {"label":"k1D", "x": 12.5, "y": 1}, - - {"label":"k1F", "x": 15.25, "y": 1}, - {"label":"k1G", "x": 16.25, "y": 1}, - {"label":"k1H", "x": 17.25, "y": 1}, - - {"label":"k20", "x": 0, "y": 2, "w": 1.75}, - {"label":"k22", "x": 1.75, "y": 2}, - {"label":"k23", "x": 2.75, "y": 2}, - {"label":"k24", "x": 3.75, "y": 2}, - {"label":"k25", "x": 4.75, "y": 2}, - {"label":"k26", "x": 5.75, "y": 2}, - {"label":"k27", "x": 6.75, "y": 2}, - {"label":"k28", "x": 7.75, "y": 2}, - {"label":"k29", "x": 8.75, "y": 2}, - {"label":"k2A", "x": 9.75, "y": 2}, - {"label":"k2B", "x": 10.75, "y": 2}, - {"label":"k2C", "x": 11.75, "y": 2}, - {"label":"k1E", "x": 12.75, "y": 2}, - {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - - {"label":"k30", "x": 0, "y": 3, "w": 1.25}, - {"label":"k31", "x": 1.25, "y": 3}, - {"label":"k32", "x": 2.25, "y": 3}, - {"label":"k33", "x": 3.25, "y": 3}, - {"label":"k34", "x": 4.25, "y": 3}, - {"label":"k35", "x": 5.25, "y": 3}, - {"label":"k36", "x": 6.25, "y": 3}, - {"label":"k37", "x": 7.25, "y": 3}, - {"label":"k38", "x": 8.25, "y": 3}, - {"label":"k39", "x": 9.25, "y": 3}, - {"label":"k3A", "x": 10.25, "y": 3}, - {"label":"k3B", "x": 11.25, "y": 3}, - {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75}, - - {"label":"k3G", "x": 16.25, "y": 3}, - - {"label":"k40", "x": 0, "y": 4, "w": 1.25}, - {"label":"k41", "x": 1.25, "y": 4, "w": 1.25}, - {"label":"k43", "x": 2.5, "y": 4, "w": 1.25}, - {"label":"k46", "x": 3.75, "y": 4, "w": 6.25}, - {"label":"k4A", "x": 10, "y": 4, "w": 1.25}, - {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25}, - {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25}, - {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25}, - - {"label":"k4F", "x": 15.25, "y": 4}, - {"label":"k4G", "x": 16.25, "y": 4}, - {"label":"k4H", "x": 17.25, "y": 4} + {"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.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"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": 2.75}, + + {"matrix": [3, 16], "x": 16.25, "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, 3], "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, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 15.25, "y": 4}, + {"matrix": [4, 16], "x": 16.25, "y": 4}, + {"matrix": [4, 17], "x": 17.25, "y": 4} ] } } diff --git a/keyboards/mokey/xox70/xox70.c b/keyboards/mokey/xox70/xox70.c deleted file mode 100644 index 7c46b6a54a..0000000000 --- a/keyboards/mokey/xox70/xox70.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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/>. - */ -#include "xox70.h"
\ No newline at end of file diff --git a/keyboards/mokey/xox70/xox70.h b/keyboards/mokey/xox70/xox70.h deleted file mode 100644 index 3c0f15d2f7..0000000000 --- a/keyboards/mokey/xox70/xox70.h +++ /dev/null @@ -1,114 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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 - -/* - * ┌───────┐ - * │0E │ 2u Backspace - * └───────┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0F │0G │0H │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ┌─────┐ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │1F │1G │1H │ │2D │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐ │ ISO Enter - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │1E │ │ - * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ├───┴────┴─┐ - * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │ │3G │ │3D │ - * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └──────────┘ - * │40 │41 │43 │46 │4A │4B │4D │4E │ │4F │4G │4H │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ - * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ - * │40 │41 │43 │46 │4B │4D │4E │ - * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ - * ┌─────┐ ┌─────┬───────────┬───┬───────────┬─────┐ ┌─────┐ - * │40 │ │43 │44 │46 │48 │4B │ │4E │ - * └─────┘ └─────┴───────────┴───┴───────────┴─────┘ └─────┘ - */ - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3G, \ - k40, k41, k43, k44, k46, k48, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, XXX, k3G, XXX }, \ - { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ -} - -#define LAYOUT_tkl_nofrow_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, k0H, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, \ - k40, k41, k43, k46, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \ - { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ -} - -#define LAYOUT_tkl_nofrow_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, k0H, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, \ - k40, k41, k43, k46, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \ - { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ -} - -#define LAYOUT_tkl_nofrow_ansi_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, \ - k40, k41, k43, k46, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \ - { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ -} - -#define LAYOUT_tkl_nofrow_iso_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, \ - k40, k41, k43, k46, k4A, k4B, k4D, k4E, k4F, k4G, k4H \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \ - { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \ -} diff --git a/keyboards/mokey/xox70hot/config.h b/keyboards/mokey/xox70hot/config.h deleted file mode 100644 index 12780d9be9..0000000000 --- a/keyboards/mokey/xox70hot/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2021 Kyle McCreery -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 MATRIX_ROW_PINS { F7, B7, F5, F1, B0 } -#define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json index 132ade0c9d..590684d79f 100644 --- a/keyboards/mokey/xox70hot/info.json +++ b/keyboards/mokey/xox70hot/info.json @@ -8,6 +8,11 @@ "pid": "0x3371", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "C7", "F4", "F5", "F1", "B6", "D0", "D2", "D3", "D1", "D7", "D4", "D5", "D6", "B4", "B5", "C6", "B7"], + "rows": ["F7", "B7", "F5", "F1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { @@ -16,80 +21,84 @@ "layouts": { "LAYOUT_tkl_nofrow_ansi_tsangan": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":0}, - {"label":"k0c", "x":12, "y":0}, - {"label":"k0e", "x":13, "y":0, "w":2}, - {"label":"k0f", "x":15.25, "y":0}, - {"label":"k0g", "x":16.25, "y":0}, - {"label":"k0h", "x":17.25, "y":0}, + {"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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label":"k10", "x":0, "y":1, "w":1.5}, - {"label":"k12", "x":1.5, "y":1}, - {"label":"k13", "x":2.5, "y":1}, - {"label":"k14", "x":3.5, "y":1}, - {"label":"k15", "x":4.5, "y":1}, - {"label":"k16", "x":5.5, "y":1}, - {"label":"k17", "x":6.5, "y":1}, - {"label":"k18", "x":7.5, "y":1}, - {"label":"k19", "x":8.5, "y":1}, - {"label":"k1a", "x":9.5, "y":1}, - {"label":"k1b", "x":10.5, "y":1}, - {"label":"k1c", "x":11.5, "y":1}, - {"label":"k1d", "x":12.5, "y":1}, - {"label":"k1e", "x":13.5, "y":1, "w":1.5}, - {"label":"k1f", "x":15.25, "y":1}, - {"label":"k1g", "x":16.25, "y":1}, - {"label":"k1h", "x":17.25, "y":1}, + {"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": 2.75}, - {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k22", "x":1.75, "y":2}, - {"label":"k23", "x":2.75, "y":2}, - {"label":"k24", "x":3.75, "y":2}, - {"label":"k25", "x":4.75, "y":2}, - {"label":"k26", "x":5.75, "y":2}, - {"label":"k27", "x":6.75, "y":2}, - {"label":"k28", "x":7.75, "y":2}, - {"label":"k29", "x":8.75, "y":2}, - {"label":"k2a", "x":9.75, "y":2}, - {"label":"k2b", "x":10.75, "y":2}, - {"label":"k2c", "x":11.75, "y":2}, - {"label":"k2d", "x":12.75, "y":2, "w":2.25}, + {"matrix": [3, 16], "x": 16.25, "y": 3}, - {"label":"k30", "x":0, "y":3, "w":2.25}, - {"label":"k32", "x":2.25, "y":3}, - {"label":"k33", "x":3.25, "y":3}, - {"label":"k34", "x":4.25, "y":3}, - {"label":"k35", "x":5.25, "y":3}, - {"label":"k36", "x":6.25, "y":3}, - {"label":"k37", "x":7.25, "y":3}, - {"label":"k38", "x":8.25, "y":3}, - {"label":"k39", "x":9.25, "y":3}, - {"label":"k3a", "x":10.25, "y":3}, - {"label":"k3b", "x":11.25, "y":3}, - {"label":"k3d", "x":12.25, "y":3, "w":2.75}, - {"label":"k3g", "x":16.25, "y":3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}, - {"label":"k40", "x":0, "y":4, "w":1.5}, - {"label":"k41", "x":1.5, "y":4}, - {"label":"k43", "x":2.5, "y":4, "w":1.5}, - {"label":"k46", "x":4, "y":4, "w":7}, - {"label":"k4a", "x":11, "y":4, "w":1.5}, - {"label":"k4b", "x":12.5, "y":4}, - {"label":"k4e", "x":13.5, "y":4, "w":1.5}, - {"label":"k4f", "x":15.25, "y":4}, - {"label":"k4g", "x":16.25, "y":4}, - {"label":"k4h", "x":17.25, "y":4} + {"matrix": [4, 15], "x": 15.25, "y": 4}, + {"matrix": [4, 16], "x": 16.25, "y": 4}, + {"matrix": [4, 17], "x": 17.25, "y": 4} ] } } diff --git a/keyboards/mokey/xox70hot/xox70hot.c b/keyboards/mokey/xox70hot/xox70hot.c deleted file mode 100644 index 728b5e4e39..0000000000 --- a/keyboards/mokey/xox70hot/xox70hot.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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/>. - */ -#include "xox70hot.h"
\ No newline at end of file diff --git a/keyboards/mokey/xox70hot/xox70hot.h b/keyboards/mokey/xox70hot/xox70hot.h deleted file mode 100644 index 5e6f9665c8..0000000000 --- a/keyboards/mokey/xox70hot/xox70hot.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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_tkl_nofrow_ansi_tsangan(\ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, k0h, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3g, \ - k40, k41, k43, k46, k4a, k4b, k4e, k4f, k4g, k4h \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e, k0f, k0g, k0h }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO, KC_NO, KC_NO,KC_NO }, \ - { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, KC_NO, KC_NO, k3g, KC_NO }, \ - { k40, k41, KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a, k4b, KC_NO, KC_NO,k4e, k4f, k4g, k4h } \ -} - |