diff options
Diffstat (limited to 'keyboards/murcielago')
| -rw-r--r-- | keyboards/murcielago/info.json | 142 | ||||
| -rw-r--r-- | keyboards/murcielago/murcielago.c | 17 | ||||
| -rw-r--r-- | keyboards/murcielago/murcielago.h | 49 | ||||
| -rw-r--r-- | keyboards/murcielago/rev1/config.h | 18 |
4 files changed, 81 insertions, 145 deletions
diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json index b54258280b..78c991fdee 100644 --- a/keyboards/murcielago/info.json +++ b/keyboards/murcielago/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "D7", "D6", "D4"], + "rows": ["B4", "D5", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F0", "pin_b": "F1"} @@ -21,73 +26,88 @@ {"pin_a": "F6", "pin_b": "F7"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["D6", "D7", "D3", "B2", "B1", "B0"], + "rows": ["B3", "B7", "D4", "B6", "C6", "C7"] + } } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [ - {"label":"0,0", "x":0, "y":0.425}, - {"label":"0,1", "x":1, "y":0.25}, - {"label":"0,2", "x":2, "y":0.125}, - {"label":"0,3", "x":3, "y":0.0}, - {"label":"0,4", "x":4, "y":0.125}, - {"label":"0,5", "x":5, "y":0.25}, - {"label":"6,0", "x":9, "y":0.25}, - {"label":"6,1", "x":10, "y":0.125}, - {"label":"6,2", "x":11, "y":0.0}, - {"label":"6,3", "x":12, "y":0.125}, - {"label":"6,4", "x":13, "y":0.25}, - {"label":"6,5", "x":14, "y":0.425}, - {"label":"1,0", "x":0, "y":1.425}, - {"label":"1,1", "x":1, "y":1.25}, - {"label":"1,2", "x":2, "y":1.125}, - {"label":"1,3", "x":3, "y":1.0}, - {"label":"1,4", "x":4, "y":1.125}, - {"label":"1,5", "x":5, "y":1.25}, - {"label":"7,0", "x":9, "y":1.25}, - {"label":"7,1", "x":10, "y":1.125}, - {"label":"7,2", "x":11, "y":1.0}, - {"label":"7,3", "x":12, "y":1.125}, - {"label":"7,4", "x":13, "y":1.25}, - {"label":"7,5", "x":14, "y":1.425}, - {"label":"2,0", "x":0, "y":2.425}, - {"label":"2,1", "x":1, "y":2.25}, - {"label":"2,2", "x":2, "y":2.125}, - {"label":"2,3", "x":3, "y":2.0}, - {"label":"2,4", "x":4, "y":2.125}, - {"label":"2,5", "x":5, "y":2.25}, - {"label":"8,0", "x":9, "y":2.25}, - {"label":"8,1", "x":10, "y":2.125}, - {"label":"8,2", "x":11, "y":2.0}, - {"label":"8,3", "x":12, "y":2.125}, - {"label":"8,4", "x":13, "y":2.25}, - {"label":"8,5", "x":14, "y":2.425}, - {"label":"3,0", "x":0, "y":3.425}, - {"label":"3,1", "x":1, "y":3.25}, - {"label":"3,2", "x":2, "y":3.125}, - {"label":"3,3", "x":3, "y":3.0}, - {"label":"3,4", "x":4, "y":3.125}, - {"label":"3,5", "x":5, "y":3.25}, - {"label":"5,5", "x":6, "y":3.25}, - {"label":"11,0", "x":8, "y":3.25}, - {"label":"9,0", "x":9, "y":3.25}, - {"label":"9,1", "x":10, "y":3.125}, - {"label":"9,2", "x":11, "y":3.0}, - {"label":"9,3", "x":12, "y":3.125}, - {"label":"9,4", "x":13, "y":3.25}, - {"label":"9,5", "x":14, "y":3.425}, - {"label":"4,1", "x":1.7, "y":4.25}, - {"label":"4,2", "x":2.7, "y":4.05}, - {"label":"4,3", "x":3.7, "y":4.15}, - {"label":"4,4", "x":4.7, "y":4.35}, - {"label":"4,5", "x":5.8, "y":4.25, "h":1.5}, - {"label":"10,0", "x":8.2, "y":4.25, "h":1.5}, - {"label":"10,1", "x":9.3, "y":4.35}, - {"label":"10,2", "x":10.3, "y":4.15}, - {"label":"10,3", "x":11.3, "y":4.05}, - {"label":"10,4", "x":12.3, "y":4.25} + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.425}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [6, 0], "x": 9, "y": 0.25}, + {"matrix": [6, 1], "x": 10, "y": 0.125}, + {"matrix": [6, 2], "x": 11, "y": 0}, + {"matrix": [6, 3], "x": 12, "y": 0.125}, + {"matrix": [6, 4], "x": 13, "y": 0.25}, + {"matrix": [6, 5], "x": 14, "y": 0.425}, + + {"matrix": [1, 0], "x": 0, "y": 1.425}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [7, 0], "x": 9, "y": 1.25}, + {"matrix": [7, 1], "x": 10, "y": 1.125}, + {"matrix": [7, 2], "x": 11, "y": 1}, + {"matrix": [7, 3], "x": 12, "y": 1.125}, + {"matrix": [7, 4], "x": 13, "y": 1.25}, + {"matrix": [7, 5], "x": 14, "y": 1.425}, + + {"matrix": [2, 0], "x": 0, "y": 2.425}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [8, 0], "x": 9, "y": 2.25}, + {"matrix": [8, 1], "x": 10, "y": 2.125}, + {"matrix": [8, 2], "x": 11, "y": 2}, + {"matrix": [8, 3], "x": 12, "y": 2.125}, + {"matrix": [8, 4], "x": 13, "y": 2.25}, + {"matrix": [8, 5], "x": 14, "y": 2.425}, + + {"matrix": [3, 0], "x": 0, "y": 3.425}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [5, 5], "x": 6, "y": 3.25}, + + {"matrix": [11, 0], "x": 8, "y": 3.25}, + {"matrix": [9, 0], "x": 9, "y": 3.25}, + {"matrix": [9, 1], "x": 10, "y": 3.125}, + {"matrix": [9, 2], "x": 11, "y": 3}, + {"matrix": [9, 3], "x": 12, "y": 3.125}, + {"matrix": [9, 4], "x": 13, "y": 3.25}, + {"matrix": [9, 5], "x": 14, "y": 3.425}, + + {"matrix": [4, 1], "x": 1.7, "y": 4.25}, + {"matrix": [4, 2], "x": 2.7, "y": 4.05}, + {"matrix": [4, 3], "x": 3.7, "y": 4.15}, + {"matrix": [4, 4], "x": 4.7, "y": 4.35}, + {"matrix": [4, 5], "x": 5.8, "y": 4.25, "h": 1.5}, + + {"matrix": [10, 0], "x": 8.2, "y": 4.25, "h": 1.5}, + {"matrix": [10, 1], "x": 9.3, "y": 4.35}, + {"matrix": [10, 2], "x": 10.3, "y": 4.15}, + {"matrix": [10, 3], "x": 11.3, "y": 4.05}, + {"matrix": [10, 4], "x": 12.3, "y": 4.25} ] } } diff --git a/keyboards/murcielago/murcielago.c b/keyboards/murcielago/murcielago.c deleted file mode 100644 index 30215c69cd..0000000000 --- a/keyboards/murcielago/murcielago.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 elagil - * - * 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 "murcielago.h"
\ No newline at end of file diff --git a/keyboards/murcielago/murcielago.h b/keyboards/murcielago/murcielago.h deleted file mode 100644 index 458df972f7..0000000000 --- a/keyboards/murcielago/murcielago.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2020 elagil - * - * 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.k - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L41, L42, L43, L44, L45, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05 },\ - { L10, L11, L12, L13, L14, L15 },\ - { L20, L21, L22, L23, L24, L25 },\ - { L30, L31, L32, L33, L34, L35 },\ - { KC_NO, L41, L42, L43, L44, L45 },\ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L36 },\ - { R01, R02, R03, R04, R05, R06 },\ - { R11, R12, R13, R14, R15, R16 },\ - { R21, R22, R23, R24, R25, R26 },\ - { R31, R32, R33, R34, R35, R36 },\ - { R41, R42, R43, R44, R45, KC_NO },\ - { R30, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h index f334ebc63f..156f708632 100644 --- a/keyboards/murcielago/rev1/config.h +++ b/keyboards/murcielago/rev1/config.h @@ -21,24 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS #define SPLIT_USB_DETECT -/* - * 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, D5, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { C6, B6, B5, D7, D6, D4 } -#define MATRIX_ROW_PINS_RIGHT { B3, B7, D4, B6, C6, C7 } -#define MATRIX_COL_PINS_RIGHT { D6, D7, D3, B2, B1, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ |