From cf5e9d172d38e9a9b65cb568631259bf1e2bfec6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 13 Mar 2023 23:02:03 +1100 Subject: Fix layout macro keys with no matrix position (#20033) --- keyboards/nixkeyboards/day_off/day_off.c | 16 ---- keyboards/nixkeyboards/day_off/day_off.h | 32 ------- keyboards/nixkeyboards/day_off/info.json | 140 +++++++++++++++---------------- 3 files changed, 70 insertions(+), 118 deletions(-) delete mode 100644 keyboards/nixkeyboards/day_off/day_off.c delete mode 100644 keyboards/nixkeyboards/day_off/day_off.h (limited to 'keyboards/nixkeyboards/day_off') diff --git a/keyboards/nixkeyboards/day_off/day_off.c b/keyboards/nixkeyboards/day_off/day_off.c deleted file mode 100644 index 2694682f09..0000000000 --- a/keyboards/nixkeyboards/day_off/day_off.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Nix Keyboards - * - * 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 . - */ -#include "day_off.h" diff --git a/keyboards/nixkeyboards/day_off/day_off.h b/keyboards/nixkeyboards/day_off/day_off.h deleted file mode 100644 index f890b837e6..0000000000 --- a/keyboards/nixkeyboards/day_off/day_off.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2021 Nix Keyboards - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT_all(K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,\ - K011, K012, K013, K014, K101, K102, K103, K104, K105, K106, \ - K107, K108, K109, K110, K111, K112, K113, K114, K200, K201, \ - K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K212, K213, K214, K300, K301, K302, K303, K304, K305, K306, \ - K307, K308, K309, K310, K311, K312, K313, K314, K400, K401, \ - K402, K403, K405, K407, K408, K410, K411, K412, K413, K414) \ - { {KC_NO, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \ - {KC_NO, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114}, \ - {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214}, \ - {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314}, \ - {K400, K401, K402, K403, KC_NO, K405, KC_NO, K407, K408, KC_NO, K410, K411, K412, K413, KC_NO} \ - } diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json index 989033c6b4..3bb6933b4c 100644 --- a/keyboards/nixkeyboards/day_off/info.json +++ b/keyboards/nixkeyboards/day_off/info.json @@ -26,76 +26,76 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"~", "x":1.5, "y":0}, - {"label":"!", "x":2.5, "y":0}, - {"label":"@", "x":3.5, "y":0}, - {"label":"#", "x":4.5, "y":0}, - {"label":"$", "x":5.5, "y":0}, - {"label":"%", "x":6.5, "y":0}, - {"label":"^", "x":7.5, "y":0}, - {"label":"&", "x":8.5, "y":0}, - {"label":"*", "x":9.5, "y":0}, - {"label":"(", "x":10.5, "y":0}, - {"label":")", "x":11.5, "y":0}, - {"label":"_", "x":12.5, "y":0}, - {"label":"+", "x":13.5, "y":0}, - {"label":"Bksp", "x":14.5, "y":0}, - {"label":"Del", "x":15.5, "y":0}, - {"label":"Tab", "x":1.5, "y":1, "w":1.5}, - {"label":"Q", "x":3, "y":1}, - {"label":"W", "x":4, "y":1}, - {"label":"E", "x":5, "y":1}, - {"label":"R", "x":6, "y":1}, - {"label":"T", "x":7, "y":1}, - {"label":"Y", "x":8, "y":1}, - {"label":"U", "x":9, "y":1}, - {"label":"I", "x":10, "y":1}, - {"label":"O", "x":11, "y":1}, - {"label":"P", "x":12, "y":1}, - {"label":"{", "x":13, "y":1}, - {"label":"}", "x":14, "y":1}, - {"label":"|", "x":15, "y":1, "w":1.5}, - {"label":"M1", "x":0, "y":2}, - {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, - {"label":"A", "x":3.25, "y":2}, - {"label":"S", "x":4.25, "y":2}, - {"label":"D", "x":5.25, "y":2}, - {"label":"F", "x":6.25, "y":2}, - {"label":"G", "x":7.25, "y":2}, - {"label":"H", "x":8.25, "y":2}, - {"label":"J", "x":9.25, "y":2}, - {"label":"K", "x":10.25, "y":2}, - {"label":"L", "x":11.25, "y":2}, - {"label":":", "x":12.25, "y":2}, - {"label":"\"", "x":13.25, "y":2}, - {"label":"Enter", "x":14.25, "y":2, "w":2.25}, - {"label":"M2", "x":0, "y":3}, - {"label":"", "x":1.5, "y":3, "w":1.25}, - {"label":"Shift", "x":2.75, "y":3}, - {"label":"Z", "x":3.75, "y":3}, - {"label":"X", "x":4.75, "y":3}, - {"label":"C", "x":5.75, "y":3}, - {"label":"V", "x":6.75, "y":3}, - {"label":"B", "x":7.75, "y":3}, - {"label":"N", "x":8.75, "y":3}, - {"label":"M", "x":9.75, "y":3}, - {"label":"<", "x":10.75, "y":3}, - {"label":">", "x":11.75, "y":3}, - {"label":"?", "x":12.75, "y":3}, - {"label":"Shift", "x":13.75, "y":3, "w":1.75}, - {"label":"", "x":15.5, "y":3}, - {"label":"M3", "x":0, "y":4}, - {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, - {"label":"Win", "x":2.75, "y":4, "w":1.25}, - {"label":"Alt", "x":4, "y":4, "w":1.25}, - {"label":"Space", "x":5.25, "y":4, "w":6.25}, - {"label":"Space", "x":5.25, "y":4, "w":2.25}, - {"label":"Mod", "x":7.5, "y":4, "w":1.25}, - {"label":"Space", "x":8.75, "y":4, "w":2.25}, - {"label":"Alt", "x":11.5, "y":4, "w":1.25}, - {"label":"Win", "x":12.75, "y":4, "w":1.25}, - {"label":"Menu", "x":14, "y":4, "w":1.25}, - {"label":"Ctrl", "x":15.25, "y":4, "w":1.25} + {"label":"~", "x":1.5, "y":0, "matrix":[0, 1]}, + {"label":"!", "x":2.5, "y":0, "matrix":[0, 2]}, + {"label":"@", "x":3.5, "y":0, "matrix":[0, 3]}, + {"label":"#", "x":4.5, "y":0, "matrix":[0, 4]}, + {"label":"$", "x":5.5, "y":0, "matrix":[0, 5]}, + {"label":"%", "x":6.5, "y":0, "matrix":[0, 6]}, + {"label":"^", "x":7.5, "y":0, "matrix":[0, 7]}, + {"label":"&", "x":8.5, "y":0, "matrix":[0, 8]}, + {"label":"*", "x":9.5, "y":0, "matrix":[0, 9]}, + {"label":"(", "x":10.5, "y":0, "matrix":[0, 10]}, + {"label":")", "x":11.5, "y":0, "matrix":[0, 11]}, + {"label":"_", "x":12.5, "y":0, "matrix":[0, 12]}, + {"label":"+", "x":13.5, "y":0, "matrix":[0, 13]}, + {"label":"Bksp", "x":14.5, "y":0, "matrix":[0, 14]}, + {"label":"Del", "x":15.5, "y":0, "matrix":[1, 1]}, + {"label":"Tab", "x":1.5, "y":1, "w":1.5, "matrix":[1, 2]}, + {"label":"Q", "x":3, "y":1, "matrix":[1, 3]}, + {"label":"W", "x":4, "y":1, "matrix":[1, 4]}, + {"label":"E", "x":5, "y":1, "matrix":[1, 5]}, + {"label":"R", "x":6, "y":1, "matrix":[1, 6]}, + {"label":"T", "x":7, "y":1, "matrix":[1, 7]}, + {"label":"Y", "x":8, "y":1, "matrix":[1, 8]}, + {"label":"U", "x":9, "y":1, "matrix":[1, 9]}, + {"label":"I", "x":10, "y":1, "matrix":[1, 10]}, + {"label":"O", "x":11, "y":1, "matrix":[1, 11]}, + {"label":"P", "x":12, "y":1, "matrix":[1, 12]}, + {"label":"{", "x":13, "y":1, "matrix":[1, 13]}, + {"label":"}", "x":14, "y":1, "matrix":[1, 14]}, + {"label":"|", "x":15, "y":1, "w":1.5, "matrix":[2, 0]}, + {"label":"M1", "x":0, "y":2, "matrix":[2, 1]}, + {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75, "matrix":[2, 2]}, + {"label":"A", "x":3.25, "y":2, "matrix":[2, 3]}, + {"label":"S", "x":4.25, "y":2, "matrix":[2, 4]}, + {"label":"D", "x":5.25, "y":2, "matrix":[2, 5]}, + {"label":"F", "x":6.25, "y":2, "matrix":[2, 6]}, + {"label":"G", "x":7.25, "y":2, "matrix":[2, 7]}, + {"label":"H", "x":8.25, "y":2, "matrix":[2, 8]}, + {"label":"J", "x":9.25, "y":2, "matrix":[2, 9]}, + {"label":"K", "x":10.25, "y":2, "matrix":[2, 10]}, + {"label":"L", "x":11.25, "y":2, "matrix":[2, 11]}, + {"label":":", "x":12.25, "y":2, "matrix":[2, 12]}, + {"label":"\"", "x":13.25, "y":2, "matrix":[2, 13]}, + {"label":"Enter", "x":14.25, "y":2, "w":2.25, "matrix":[2, 14]}, + {"label":"M2", "x":0, "y":3, "matrix":[3, 0]}, + {"label":"", "x":1.5, "y":3, "w":1.25, "matrix":[3, 1]}, + {"label":"Shift", "x":2.75, "y":3, "matrix":[3, 2]}, + {"label":"Z", "x":3.75, "y":3, "matrix":[3, 3]}, + {"label":"X", "x":4.75, "y":3, "matrix":[3, 4]}, + {"label":"C", "x":5.75, "y":3, "matrix":[3, 5]}, + {"label":"V", "x":6.75, "y":3, "matrix":[3, 6]}, + {"label":"B", "x":7.75, "y":3, "matrix":[3, 7]}, + {"label":"N", "x":8.75, "y":3, "matrix":[3, 8]}, + {"label":"M", "x":9.75, "y":3, "matrix":[3, 9]}, + {"label":"<", "x":10.75, "y":3, "matrix":[3, 10]}, + {"label":">", "x":11.75, "y":3, "matrix":[3, 11]}, + {"label":"?", "x":12.75, "y":3, "matrix":[3, 12]}, + {"label":"Shift", "x":13.75, "y":3, "w":1.75, "matrix":[3, 13]}, + {"label":"", "x":15.5, "y":3, "matrix":[3, 14]}, + {"label":"M3", "x":0, "y":4, "matrix":[4, 0]}, + {"label":"Ctrl", "x":1.5, "y":4, "w":1.25, "matrix":[4, 1]}, + {"label":"Win", "x":2.75, "y":4, "w":1.25, "matrix":[4, 2]}, + {"label":"Alt", "x":4, "y":4, "w":1.25, "matrix":[4, 3]}, + {"label":"Space", "x":5.25, "y":4, "w":6.25, "matrix":[4, 5]}, + {"label":"Space", "x":5.25, "y":4, "w":2.25, "matrix":[4, 7]}, + {"label":"Mod", "x":7.5, "y":4, "w":1.25, "matrix":[4, 8]}, + {"label":"Space", "x":8.75, "y":4, "w":2.25, "matrix":[4, 10]}, + {"label":"Alt", "x":11.5, "y":4, "w":1.25, "matrix":[4, 11]}, + {"label":"Win", "x":12.75, "y":4, "w":1.25, "matrix":[4, 12]}, + {"label":"Menu", "x":14, "y":4, "w":1.25, "matrix":[4, 13]}, + {"label":"Ctrl", "x":15.25, "y":4, "w":1.25, "matrix":[4, 14]} ] } } -- cgit v1.2.3