diff options
Diffstat (limited to 'keyboards/labyrinth75')
-rw-r--r-- | keyboards/labyrinth75/config.h | 18 | ||||
-rw-r--r-- | keyboards/labyrinth75/info.json | 101 | ||||
-rw-r--r-- | keyboards/labyrinth75/labyrinth75.c | 17 | ||||
-rw-r--r-- | keyboards/labyrinth75/labyrinth75.h | 47 |
4 files changed, 100 insertions, 83 deletions
diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h index 226ef4a530..ce01f7a3ea 100644 --- a/keyboards/labyrinth75/config.h +++ b/keyboards/labyrinth75/config.h @@ -17,24 +17,6 @@ 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 { B4, E6, D7, C6, D4, D0, D1, D2, D3 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B0 //D5 could also be the other pin maybe #define RGBLED_NUM 6 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json index 67ad33b84e..3288c87ee5 100644 --- a/keyboards/labyrinth75/info.json +++ b/keyboards/labyrinth75/info.json @@ -8,14 +8,113 @@ "pid": "0x464B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], + "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 2] }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":5.75, "y":0}, {"label":"F6", "x":6.75, "y":0}, {"label":"F7", "x":7.75, "y":0}, {"label":"F8", "x":8.75, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Delete", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}] + "layout": [ + {"matrix": [0, 2], "x": 0, "y": 0}, + + {"matrix": [1, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [1, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + + {"matrix": [1, 4], "x": 5.75, "y": 0}, + {"matrix": [0, 5], "x": 6.75, "y": 0}, + {"matrix": [1, 5], "x": 7.75, "y": 0}, + {"matrix": [0, 6], "x": 8.75, "y": 0}, + + {"matrix": [1, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [0, 8], "x": 13, "y": 0}, + + {"matrix": [1, 8], "x": 15, "y": 0}, + + {"matrix": [3, 1], "x": 0, "y": 1.25}, + {"matrix": [2, 2], "x": 1, "y": 1.25}, + {"matrix": [3, 2], "x": 2, "y": 1.25}, + {"matrix": [2, 3], "x": 3, "y": 1.25}, + {"matrix": [3, 3], "x": 4, "y": 1.25}, + {"matrix": [2, 4], "x": 5, "y": 1.25}, + {"matrix": [3, 4], "x": 6, "y": 1.25}, + {"matrix": [2, 5], "x": 7, "y": 1.25}, + {"matrix": [3, 5], "x": 8, "y": 1.25}, + {"matrix": [2, 6], "x": 9, "y": 1.25}, + {"matrix": [3, 6], "x": 10, "y": 1.25}, + {"matrix": [2, 7], "x": 11, "y": 1.25}, + {"matrix": [3, 7], "x": 12, "y": 1.25}, + {"matrix": [2, 8], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [3, 8], "x": 15, "y": 1.25}, + + {"matrix": [5, 1], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 2.25}, + {"matrix": [5, 2], "x": 2.5, "y": 2.25}, + {"matrix": [4, 3], "x": 3.5, "y": 2.25}, + {"matrix": [5, 3], "x": 4.5, "y": 2.25}, + {"matrix": [4, 4], "x": 5.5, "y": 2.25}, + {"matrix": [5, 4], "x": 6.5, "y": 2.25}, + {"matrix": [4, 5], "x": 7.5, "y": 2.25}, + {"matrix": [5, 5], "x": 8.5, "y": 2.25}, + {"matrix": [4, 6], "x": 9.5, "y": 2.25}, + {"matrix": [5, 6], "x": 10.5, "y": 2.25}, + {"matrix": [4, 7], "x": 11.5, "y": 2.25}, + {"matrix": [5, 7], "x": 12.5, "y": 2.25}, + {"matrix": [4, 8], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [5, 8], "x": 15, "y": 2.25}, + + {"matrix": [6, 2], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 2], "x": 1.75, "y": 3.25}, + {"matrix": [6, 3], "x": 2.75, "y": 3.25}, + {"matrix": [7, 3], "x": 3.75, "y": 3.25}, + {"matrix": [6, 4], "x": 4.75, "y": 3.25}, + {"matrix": [7, 4], "x": 5.75, "y": 3.25}, + {"matrix": [6, 5], "x": 6.75, "y": 3.25}, + {"matrix": [7, 5], "x": 7.75, "y": 3.25}, + {"matrix": [6, 6], "x": 8.75, "y": 3.25}, + {"matrix": [7, 6], "x": 9.75, "y": 3.25}, + {"matrix": [6, 7], "x": 10.75, "y": 3.25}, + {"matrix": [7, 7], "x": 11.75, "y": 3.25}, + {"matrix": [6, 8], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [7, 8], "x": 15, "y": 3.25}, + + {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [1, 1], "x": 2.25, "y": 4.25}, + {"matrix": [2, 1], "x": 3.25, "y": 4.25}, + {"matrix": [4, 1], "x": 4.25, "y": 4.25}, + {"matrix": [6, 1], "x": 5.25, "y": 4.25}, + {"matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"matrix": [8, 1], "x": 7.25, "y": 4.25}, + {"matrix": [8, 2], "x": 8.25, "y": 4.25}, + {"matrix": [8, 3], "x": 9.25, "y": 4.25}, + {"matrix": [8, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [8, 7], "x": 14, "y": 4.25}, + {"matrix": [8, 8], "x": 15, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [3, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [0, 0], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [1, 0], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [2, 0], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [4, 0], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [6, 0], "x": 13, "y": 5.25}, + {"matrix": [7, 0], "x": 14, "y": 5.25}, + {"matrix": [8, 0], "x": 15, "y": 5.25} + ] } } } diff --git a/keyboards/labyrinth75/labyrinth75.c b/keyboards/labyrinth75/labyrinth75.c deleted file mode 100644 index 1bfe209587..0000000000 --- a/keyboards/labyrinth75/labyrinth75.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Livi - * - * 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 "labyrinth75.h" diff --git a/keyboards/labyrinth75/labyrinth75.h b/keyboards/labyrinth75/labyrinth75.h deleted file mode 100644 index 8955a6a87a..0000000000 --- a/keyboards/labyrinth75/labyrinth75.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 Livi - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - k02,k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, \ - k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \ - k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \ - k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, k78, \ - k01, k11, k21, k41, k61, k71, k81, k82, k83, k84, k85, k86, k87, k88, \ - k50, k30, k00, k10, k20, k40, k60, k70, k80 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88 } \ -} |