diff options
Diffstat (limited to 'keyboards/murcielago')
| -rw-r--r-- | keyboards/murcielago/info.json | 27 | ||||
| -rw-r--r-- | keyboards/murcielago/murcielago.c | 17 | ||||
| -rw-r--r-- | keyboards/murcielago/rev1/config.h | 18 |
3 files changed, 19 insertions, 43 deletions
diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json index b54258280b..1c9eaef3a1 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,6 +26,12 @@ {"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", @@ -31,50 +42,50 @@ {"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,3", "x":3, "y":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,2", "x":11, "y":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,3", "x":3, "y":1}, {"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,2", "x":11, "y":1}, {"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,3", "x":3, "y":2}, {"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,2", "x":11, "y":2}, {"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,3", "x":3, "y":3}, {"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,2", "x":11, "y":3}, {"label":"9,3", "x":12, "y":3.125}, {"label":"9,4", "x":13, "y":3.25}, {"label":"9,5", "x":14, "y":3.425}, 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/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 */ |