diff options
Diffstat (limited to 'keyboards/qpockets')
25 files changed, 414 insertions, 720 deletions
diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h deleted file mode 100644 index eac213400a..0000000000 --- a/keyboards/qpockets/eggman/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Alan Lehners - * - * 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 { C4, C5, C2, D0, B5, B6, D6 } -#define MATRIX_COL_PINS { B7, B4, B3, B2, D3, D2, D1 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/qpockets/eggman/eggman.c b/keyboards/qpockets/eggman/eggman.c deleted file mode 100644 index 2287b9e278..0000000000 --- a/keyboards/qpockets/eggman/eggman.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Alan Lehners - * - * 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 "eggman.h" diff --git a/keyboards/qpockets/eggman/eggman.h b/keyboards/qpockets/eggman/eggman.h deleted file mode 100644 index 4d4c4a1241..0000000000 --- a/keyboards/qpockets/eggman/eggman.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Alan Lehners - * - * 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_default( \ - K02, K04, \ - K10, K00, K11, K01, K12, K13, K14, K05, K15, K06, K16, \ - K30, K20, K31, K21, K32, K33, K34, K25, K35, K26, K36, \ - K50, K40, K51, K41, K52, K53, K54, K45, K55, K46, K56, \ - K61, K62, K64, K65 \ -) \ -{ \ -{ K00, K01, K02, XXX, K04, K05, K06 }, \ -{ K10, K11, K12, K13, K14, K15, K16 }, \ -{ K20, K21, XXX, XXX, XXX, K25, K26 }, \ -{ K30, K31, K32, K33, K34, K35, K36 }, \ -{ K40, K41, XXX, XXX, XXX, K45, K46 }, \ -{ K50, K51, K52, K53, K54, K55, K56 }, \ -{ XXX, K61, K62, XXX, K64, K65, XXX }, \ -} - diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json index 989402411d..16b0ebe42a 100644 --- a/keyboards/qpockets/eggman/info.json +++ b/keyboards/qpockets/eggman/info.json @@ -1,63 +1,74 @@ { - "keyboard_name": "eggman", + "keyboard_name": "eggman", "manufacturer": "qpockets", - "url": "", - "maintainer": "qpockets", + "url": "", + "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x656D", - "device_version": "10.0.0" + "vid": "0x7170", + "pid": "0x656D", + "device_version": "10.0.0" }, + "matrix_pins": { + "cols": ["B7", "B4", "B3", "B2", "D3", "D2", "D1"], + "rows": ["C4", "C5", "C2", "D0", "B5", "B6", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "C6", "pin_b": "C7"}, - {"pin_a": "D4", "pin_b": "D5"} - ] + "rotary": [ + {"pin_a": "C6", "pin_b": "C7"}, + {"pin_a": "D4", "pin_b": "D5"} + ] }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ - {"label":"RE", "x":4.25, "y":0}, - {"label":"RE", "x":6.25, "y":0}, - {"label":"Q", "x":0, "y":0.75}, - {"label":"W", "x":1, "y":0.5}, - {"label":"E", "x":2, "y":0.25}, - {"label":"R", "x":3, "y":0.75}, - {"label":"T", "x":4, "y":1}, - {"label":"Delete", "x":5, "y":1, "w":1.5}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":0.75}, - {"label":"I", "x":8.5, "y":0.25}, - {"label":"O", "x":9.5, "y":0.5}, - {"label":"P", "x":10.5, "y":0.75}, - {"label":"A", "x":0, "y":1.75}, - {"label":"S", "x":1, "y":1.5}, - {"label":"D", "x":2, "y":1.25}, - {"label":"F", "x":3, "y":1.75}, - {"label":"G", "x":4, "y":2}, - {"label":"Tab", "x":5, "y":2, "w":1.5}, - {"label":"H", "x":6.5, "y":2}, - {"label":"J", "x":7.5, "y":1.75}, - {"label":"K", "x":8.5, "y":1.25}, - {"label":"L", "x":9.5, "y":1.5}, - {"label":"\"", "x":10.5, "y":1.75}, - {"label":"Z", "x":0, "y":2.75}, - {"label":"X", "x":1, "y":2.5}, - {"label":"C", "x":2, "y":2.25}, - {"label":"V", "x":3, "y":2.75}, - {"label":"B", "x":4, "y":3}, - {"label":"Shift", "x":5, "y":3, "w":1.5}, - {"label":"N", "x":6.5, "y":3}, - {"label":"M", "x":7.5, "y":2.75}, - {"label":"<", "x":8.5, "y":2.25}, - {"label":">", "x":9.5, "y":2.5}, - {"label":"?", "x":10.5, "y":2.75}, - {"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, - {"label":"Backspace", "x":3.75, "y":4, "w":2}, - {"label":"Space", "x":5.75, "y":4, "w":2}, - {"label":"Alt", "x":7.75, "y":4, "w":1.25}] + {"matrix": [0, 2], "x": 4.25, "y": 0}, + + {"matrix": [0, 4], "x": 6.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 0], "x": 1, "y": 0.5}, + {"matrix": [1, 1], "x": 2, "y": 0.25}, + {"matrix": [0, 1], "x": 3, "y": 0.75}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1, "w": 1.5}, + {"matrix": [1, 4], "x": 6.5, "y": 1}, + {"matrix": [0, 5], "x": 7.5, "y": 0.75}, + {"matrix": [1, 5], "x": 8.5, "y": 0.25}, + {"matrix": [0, 6], "x": 9.5, "y": 0.5}, + {"matrix": [1, 6], "x": 10.5, "y": 0.75}, + + {"matrix": [3, 0], "x": 0, "y": 1.75}, + {"matrix": [2, 0], "x": 1, "y": 1.5}, + {"matrix": [3, 1], "x": 2, "y": 1.25}, + {"matrix": [2, 1], "x": 3, "y": 1.75}, + {"matrix": [3, 2], "x": 4, "y": 2}, + {"matrix": [3, 3], "x": 5, "y": 2, "w": 1.5}, + {"matrix": [3, 4], "x": 6.5, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "y": 1.75}, + {"matrix": [3, 5], "x": 8.5, "y": 1.25}, + {"matrix": [2, 6], "x": 9.5, "y": 1.5}, + {"matrix": [3, 6], "x": 10.5, "y": 1.75}, + + {"matrix": [5, 0], "x": 0, "y": 2.75}, + {"matrix": [4, 0], "x": 1, "y": 2.5}, + {"matrix": [5, 1], "x": 2, "y": 2.25}, + {"matrix": [4, 1], "x": 3, "y": 2.75}, + {"matrix": [5, 2], "x": 4, "y": 3}, + {"matrix": [5, 3], "x": 5, "y": 3, "w": 1.5}, + {"matrix": [5, 4], "x": 6.5, "y": 3}, + {"matrix": [4, 5], "x": 7.5, "y": 2.75}, + {"matrix": [5, 5], "x": 8.5, "y": 2.25}, + {"matrix": [4, 6], "x": 9.5, "y": 2.5}, + {"matrix": [5, 6], "x": 10.5, "y": 2.75}, + + {"matrix": [6, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [6, 2], "x": 3.75, "y": 4, "w": 2}, + {"matrix": [6, 4], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [6, 5], "x": 7.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/qpockets/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h index dd1d9753fd..90d12ee7da 100644 --- a/keyboards/qpockets/eggman/keymaps/default/config.h +++ b/keyboards/qpockets/eggman/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 175 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h index 22c2bc73de..3caf7fdbcb 100644 --- a/keyboards/qpockets/space_space/rev1/config.h +++ b/keyboards/qpockets/space_space/rev1/config.h @@ -16,14 +16,4 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { F1, F4, F5, C7 } -#define MATRIX_COL_PINS \ - { D4, B4, B5, B6, C6, F7, F6, F0, B0, E6, B1 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json index cd9dcb56a8..f54e5e8e3a 100644 --- a/keyboards/qpockets/space_space/rev1/info.json +++ b/keyboards/qpockets/space_space/rev1/info.json @@ -4,101 +4,112 @@ "url": "", "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x7373", - "device_version": "30.0.0" + "vid": "0x7170", + "pid": "0x7373", + "device_version": "30.0.0" }, + "matrix_pins": { + "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"], + "rows": ["F1", "F4", "F5", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "B3", "pin_b": "B2", "resolution": 3}, - {"pin_a": "D6", "pin_b": "D7"} - ] + "rotary": [ + {"pin_a": "B3", "pin_b": "B2", "resolution": 3}, + {"pin_a": "D6", "pin_b": "D7"} + ] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 7, "layouts": { "LAYOUT_default": { - "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Delete", "x":5, "y":0, "w":1.5}, - {"label":"Y", "x":6.5, "y":0}, - {"label":"U", "x":7.5, "y":0}, - {"label":"I", "x":8.5, "y":0}, - {"label":"O", "x":9.5, "y":0}, - {"label":"P", "x":10.5, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"Tab", "x":5, "y":1, "w":1.5}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"\"", "x":10.5, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"Shift", "x":5, "y":2, "w":1.5}, - {"label":"N", "x":6.5, "y":2}, - {"label":"M", "x":7.5, "y":2}, - {"label":"<", "x":8.5, "y":2}, - {"label":">", "x":9.5, "y":2}, - {"label":"?", "x":10.5, "y":2}, - {"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, - {"label":"Fn", "x":2.5, "y":3.35}, - {"label":"Backspace", "x":3.5, "y":3.35, "w":2}, - {"label":"Space", "x":5.5, "y":3.35, "w":2.25}, - {"label":"Gui", "x":7.75, "y":3.35}, - {"label":"Alt", "x":8.75, "y":3.35, "w":1.25} + "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, "w": 1.5}, + {"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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + + {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25}, + {"matrix": [3, 3], "x": 2.5, "y": 3.35}, + {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2}, + {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.35}, + {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25} ] }, - "LAYOUT_big_space": { + "LAYOUT_big_space": { "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Delete", "x":5, "y":0, "w":1.5}, - {"label":"Y", "x":6.5, "y":0}, - {"label":"U", "x":7.5, "y":0}, - {"label":"I", "x":8.5, "y":0}, - {"label":"O", "x":9.5, "y":0}, - {"label":"P", "x":10.5, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"Tab", "x":5, "y":1, "w":1.5}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"\"", "x":10.5, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"Shift", "x":5, "y":2, "w":1.5}, - {"label":"N", "x":6.5, "y":2}, - {"label":"M", "x":7.5, "y":2}, - {"label":"<", "x":8.5, "y":2}, - {"label":">", "x":9.5, "y":2}, - {"label":"?", "x":10.5, "y":2}, - {"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, - {"label":"Space", "x":2.5, "y":3.35, "w":6.25}, - {"label":"Alt", "x":8.75, "y":3.35, "w":1.25} + {"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, "w": 1.5}, + {"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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + + {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25}, + {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25} ] } } diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h index ffc2124e1b..fd24168f47 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h +++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 175 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h index ffc2124e1b..fd24168f47 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h +++ b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 175 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/rev1.c b/keyboards/qpockets/space_space/rev1/rev1.c deleted file mode 100644 index e639552cfb..0000000000 --- a/keyboards/qpockets/space_space/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ - -/* Copyright 2020 qpockets - * - * 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 "rev1.h" diff --git a/keyboards/qpockets/space_space/rev1/rev1.h b/keyboards/qpockets/space_space/rev1/rev1.h deleted file mode 100644 index e56068ec42..0000000000 --- a/keyboards/qpockets/space_space/rev1/rev1.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2020 qpockets - * - * 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_default( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \ - K32, K33, K34, K36, K37, K38 \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \ - {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \ -} - -#define LAYOUT_big_space( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \ - K32, K35, K38 \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \ - {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \ -} diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h index 26b85360c4..6603c0e153 100644 --- a/keyboards/qpockets/space_space/rev2/config.h +++ b/keyboards/qpockets/space_space/rev2/config.h @@ -16,19 +16,8 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B1, B0, D5, B6 } -#define MATRIX_COL_PINS \ - { C6, F6, F1, F4, F5, E6, D6, B2, B5, D3, D2 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE -#define RGB_DI_PIN F0 #define RGBLED_NUM 4 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json index 580ab0a4d5..635c66db99 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/info.json @@ -4,100 +4,114 @@ "url": "", "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x7373", - "device_version": "30.0.2" + "vid": "0x7170", + "pid": "0x7373", + "device_version": "30.0.2" }, + "matrix_pins": { + "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"], + "rows": ["B1", "B0", "D5", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "B4", "pin_b": "D7", "resolution": 3}, - {"pin_a": "C7", "pin_b": "F7", "resolution": 3} - ] + "rotary": [ + {"pin_a": "B4", "pin_b": "D7", "resolution": 3}, + {"pin_a": "C7", "pin_b": "F7", "resolution": 3} + ] + }, + "ws2812": { + "pin": "F0" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { - "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Delete", "x":5, "y":0, "w":1.5}, - {"label":"Y", "x":6.5, "y":0}, - {"label":"U", "x":7.5, "y":0}, - {"label":"I", "x":8.5, "y":0}, - {"label":"O", "x":9.5, "y":0}, - {"label":"P", "x":10.5, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"Tab", "x":5, "y":1, "w":1.5}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"\"", "x":10.5, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"Shift", "x":5, "y":2, "w":1.5}, - {"label":"N", "x":6.5, "y":2}, - {"label":"M", "x":7.5, "y":2}, - {"label":"<", "x":8.5, "y":2}, - {"label":">", "x":9.5, "y":2}, - {"label":"?", "x":10.5, "y":2}, - {"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, - {"label":"Fn", "x":2.5, "y":3.35}, - {"label":"Backspace", "x":3.5, "y":3.35, "w":2}, - {"label":"Space", "x":5.5, "y":3.35, "w":2.25}, - {"label":"Gui", "x":7.75, "y":3.35}, - {"label":"Alt", "x":8.75, "y":3.35, "w":1.25} + "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, "w": 1.5}, + {"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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + + {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25}, + {"matrix": [3, 3], "x": 2.5, "y": 3.35}, + {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2}, + {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.35}, + {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25} ] }, - "LAYOUT_big_space": { + "LAYOUT_big_space": { "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Delete", "x":5, "y":0, "w":1.5}, - {"label":"Y", "x":6.5, "y":0}, - {"label":"U", "x":7.5, "y":0}, - {"label":"I", "x":8.5, "y":0}, - {"label":"O", "x":9.5, "y":0}, - {"label":"P", "x":10.5, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"Tab", "x":5, "y":1, "w":1.5}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"\"", "x":10.5, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"Shift", "x":5, "y":2, "w":1.5}, - {"label":"N", "x":6.5, "y":2}, - {"label":"M", "x":7.5, "y":2}, - {"label":"<", "x":8.5, "y":2}, - {"label":">", "x":9.5, "y":2}, - {"label":"?", "x":10.5, "y":2}, - {"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, - {"label":"Space", "x":2.5, "y":3.35, "w":6.25}, - {"label":"Alt", "x":8.75, "y":3.35, "w":1.25} + {"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, "w": 1.5}, + {"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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + + {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25}, + {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25} ] } } diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h index ffc2124e1b..fd24168f47 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 175 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h index 0b0e89fa1f..7fdb8504a6 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 165 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h index bf8c47eb3e..31291ecc8f 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 145 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev2/rev2.c b/keyboards/qpockets/space_space/rev2/rev2.c index 07b93b36aa..e6053afb75 100644 --- a/keyboards/qpockets/space_space/rev2/rev2.c +++ b/keyboards/qpockets/space_space/rev2/rev2.c @@ -14,7 +14,7 @@ * 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 "rev2.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } diff --git a/keyboards/qpockets/space_space/rev2/rev2.h b/keyboards/qpockets/space_space/rev2/rev2.h deleted file mode 100644 index 99362b900f..0000000000 --- a/keyboards/qpockets/space_space/rev2/rev2.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 qpockets - * - * 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_default( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \ - K32, K33, K34, K36, K37, K38 \ -) \ -{ \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \ - {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \ -} \ - -#define LAYOUT_big_space( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \ - K32, K35, K38 \ -) \ -{ \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \ - {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \ -} - - diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h deleted file mode 100644 index a811be9a74..0000000000 --- a/keyboards/qpockets/wanten/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2021 qpockets - -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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, F7, B3, D5 } -#define MATRIX_COL_PINS { F4, F1, B5, B6, C6, C7, D4, E6, D2, B1, B2, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json index e35237a358..df1798db24 100644 --- a/keyboards/qpockets/wanten/info.json +++ b/keyboards/qpockets/wanten/info.json @@ -1,18 +1,23 @@ { - "keyboard_name": "wanten", + "keyboard_name": "wanten", "manufacturer": "qpockets", - "url": "", - "maintainer": "qpockets", + "url": "", + "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x7774", - "device_version": "0.0.1" + "vid": "0x7170", + "pid": "0x7774", + "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F1", "B5", "B6", "C6", "C7", "D4", "E6", "D2", "B1", "B2", "D3"], + "rows": ["F0", "F7", "B3", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "F5", "pin_b": "F6"}, - {"pin_a": "D6", "pin_b": "D7"} - ] + "rotary": [ + {"pin_a": "F5", "pin_b": "F6"}, + {"pin_a": "D6", "pin_b": "D7"} + ] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", @@ -20,148 +25,155 @@ "layouts": { "LAYOUT_default": { "layout": [ - {"label":"Play", "x":0, "y":0}, - {"label":"q", "x":1, "y":0}, - {"label":"w", "x":2, "y":0}, - {"label":"e", "x":3, "y":0}, - {"label":"r", "x":4, "y":0}, - {"label":"t", "x":5, "y":0}, - {"label":"Del", "x":6, "y":0, "w":1.75}, - {"label":"y", "x":7.75, "y":0}, - {"label":"u", "x":8.75, "y":0}, - {"label":"i", "x":9.75, "y":0}, - {"label":"o", "x":10.75, "y":0}, - {"label":"p", "x":11.75, "y":0}, - {"label":"Next", "x":0, "y":1}, - {"label":"a", "x":1, "y":1}, - {"label":"s", "x":2, "y":1}, - {"label":"d", "x":3, "y":1}, - {"label":"f", "x":4, "y":1}, - {"label":"g", "x":5, "y":1}, - {"label":"Tab", "x":6, "y":1, "w":1.75}, - {"label":"h", "x":7.75, "y":1}, - {"label":"j", "x":8.75, "y":1}, - {"label":"k", "x":9.75, "y":1}, - {"label":"l", "x":10.75, "y":1}, - {"label":"\"", "x":11.75, "y":1}, - {"label":"Prev", "x":0, "y":2}, - {"label":"z", "x":1, "y":2}, - {"label":"x", "x":2, "y":2}, - {"label":"c", "x":3, "y":2}, - {"label":"v", "x":4, "y":2}, - {"label":"b", "x":5, "y":2}, - {"label":"Shift", "x":6, "y":2, "w":1.75}, - {"label":"n", "x":7.75, "y":2}, - {"label":"m", "x":8.75, "y":2}, - {"label":"<", "x":9.75, "y":2}, - {"label":">", "x":10.75, "y":2}, - {"label":"?", "x":11.75, "y":2}, - {"label":"LCtrl", "x":0, "y":3, "w":1.25}, - {"label":"LGui", "x":1.25, "y":3, "w":1.25}, - {"label":"LAlt", "x":2.5, "y":3, "w":1.25}, - {"label":"Back", "x":3.75, "y":3, "w":3}, - {"label":"Space", "x":6.75, "y":3, "w":3}, - {"label":"RCtrl", "x":9.75, "y":3}, - {"label":"RGui", "x":10.75, "y":3}, - {"label":"RAlt", "x":11.75, "y":3} - ] + {"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, "w": 1.75}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1, "w": 1.75}, + {"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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"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, "w": 1.75}, + {"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": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} + ] }, - - "LAYOUT_2u_bars": { + "LAYOUT_2u_bars": { "layout": [ - {"label":"Play", "x":0, "y":0}, - {"label":"q", "x":1, "y":0}, - {"label":"w", "x":2, "y":0}, - {"label":"e", "x":3, "y":0}, - {"label":"r", "x":4, "y":0}, - {"label":"t", "x":5, "y":0}, - {"label":"Del", "x":6, "y":0, "w":1.75}, - {"label":"y", "x":7.75, "y":0}, - {"label":"u", "x":8.75, "y":0}, - {"label":"i", "x":9.75, "y":0}, - {"label":"o", "x":10.75, "y":0}, - {"label":"p", "x":11.75, "y":0}, - {"label":"Next", "x":0, "y":1}, - {"label":"a", "x":1, "y":1}, - {"label":"s", "x":2, "y":1}, - {"label":"d", "x":3, "y":1}, - {"label":"f", "x":4, "y":1}, - {"label":"g", "x":5, "y":1}, - {"label":"Tab", "x":6, "y":1, "w":1.75}, - {"label":"h", "x":7.75, "y":1}, - {"label":"j", "x":8.75, "y":1}, - {"label":"k", "x":9.75, "y":1}, - {"label":"l", "x":10.75, "y":1}, - {"label":"\"", "x":11.75, "y":1}, - {"label":"Prev", "x":0, "y":2}, - {"label":"z", "x":1, "y":2}, - {"label":"x", "x":2, "y":2}, - {"label":"c", "x":3, "y":2}, - {"label":"v", "x":4, "y":2}, - {"label":"b", "x":5, "y":2}, - {"label":"Shift", "x":6, "y":2, "w":1.75}, - {"label":"n", "x":7.75, "y":2}, - {"label":"m", "x":8.75, "y":2}, - {"label":"<", "x":9.75, "y":2}, - {"label":">", "x":10.75, "y":2}, - {"label":"?", "x":11.75, "y":2}, - {"label":"PSCR", "x":0, "y":3, "w":1.25}, - {"label":"LAlt", "x":1.25, "y":3, "w":1.25}, - {"label":"LGui", "x":2.5, "y":3, "w":1.25}, - {"label":"LCtl", "x":3.75, "y":3}, - {"label":"Back", "x":4.75, "y":3, "w":2}, - {"label":"Space", "x":6.75, "y":3, "w":2.25}, - {"label":"RCtrl", "x":9, "y":3}, - {"label":"RGui", "x":10, "y":3, "w":1.25}, - {"label":"RAlt", "x":11.25, "y":3, "w":1.5} - ] + {"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, "w": 1.75}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1, "w": 1.75}, + {"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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"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, "w": 1.75}, + {"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": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.25}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5} + ] }, - "LAYOUT_625_bar": { "layout": [ - {"label":"Play", "x":0, "y":0}, - {"label":"q", "x":1, "y":0}, - {"label":"w", "x":2, "y":0}, - {"label":"e", "x":3, "y":0}, - {"label":"r", "x":4, "y":0}, - {"label":"t", "x":5, "y":0}, - {"label":"Del", "x":6, "y":0, "w":1.75}, - {"label":"y", "x":7.75, "y":0}, - {"label":"u", "x":8.75, "y":0}, - {"label":"i", "x":9.75, "y":0}, - {"label":"o", "x":10.75, "y":0}, - {"label":"p", "x":11.75, "y":0}, - {"label":"Next", "x":0, "y":1}, - {"label":"a", "x":1, "y":1}, - {"label":"s", "x":2, "y":1}, - {"label":"d", "x":3, "y":1}, - {"label":"f", "x":4, "y":1}, - {"label":"g", "x":5, "y":1}, - {"label":"Tab", "x":6, "y":1, "w":1.75}, - {"label":"h", "x":7.75, "y":1}, - {"label":"j", "x":8.75, "y":1}, - {"label":"k", "x":9.75, "y":1}, - {"label":"l", "x":10.75, "y":1}, - {"label":"\"", "x":11.75, "y":1}, - {"label":"Prev", "x":0, "y":2}, - {"label":"z", "x":1, "y":2}, - {"label":"x", "x":2, "y":2}, - {"label":"c", "x":3, "y":2}, - {"label":"v", "x":4, "y":2}, - {"label":"b", "x":5, "y":2}, - {"label":"Shift", "x":6, "y":2, "w":1.75}, - {"label":"n", "x":7.75, "y":2}, - {"label":"m", "x":8.75, "y":2}, - {"label":"<", "x":9.75, "y":2}, - {"label":">", "x":10.75, "y":2}, - {"label":"?", "x":11.75, "y":2}, - {"label":"LAlt", "x":0, "y":3, "w":1.25}, - {"label":"LGui", "x":1.25, "y":3, "w":1.25}, - {"label":"LCtrl", "x":2.5, "y":3, "w":1.25}, - {"label":"Space", "x":3.75, "y":3, "w":6.25}, - {"label":"RAlt", "x":10, "y":3, "w":1.25}, - {"label":"RCtrl", "x":11.25, "y":3, "w":1.5} - ] + {"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, "w": 1.75}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1, "w": 1.75}, + {"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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"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, "w": 1.75}, + {"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": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 3.75, "y": 3, "w": 6.25}, + {"matrix": [3, 9], "x": 10, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5} + ] } } -}
\ No newline at end of file +} diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h index 51e54382af..072519ff6c 100644 --- a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h +++ b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 145 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h index 51e54382af..072519ff6c 100644 --- a/keyboards/qpockets/wanten/keymaps/625_bar/config.h +++ b/keyboards/qpockets/wanten/keymaps/625_bar/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 145 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h index 51e54382af..072519ff6c 100644 --- a/keyboards/qpockets/wanten/keymaps/default/config.h +++ b/keyboards/qpockets/wanten/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 145 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/wanten/wanten.c b/keyboards/qpockets/wanten/wanten.c deleted file mode 100644 index 15f3e64cb8..0000000000 --- a/keyboards/qpockets/wanten/wanten.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 qpockets - * - * 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 "wanten.h" diff --git a/keyboards/qpockets/wanten/wanten.h b/keyboards/qpockets/wanten/wanten.h deleted file mode 100644 index e6db44fea6..0000000000 --- a/keyboards/qpockets/wanten/wanten.h +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright 2021 qpockets - * - * 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 - -/* 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_default( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \ - k30, k31, k32, k35, k37, k39, k80, k81 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \ - { k30, k31, k32, XXX, XXX, k35, XXX, k37, XXX, k39, k80, k81, } \ -} - -#define LAYOUT_625_bar( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \ - k30, k31, k32, k36, k39, k81 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \ - { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, XXX, k81, } \ -} - -#define LAYOUT_2u_bars( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \ - k30, k31, k32, k34, k35, k37, k38, k39, k81 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \ - { k30, k31, k32, XXX, k34, k35, XXX, k37, k38, k39, XXX, k81, } \ -} |