diff options
author | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
commit | 5024370dd0b441e86ace3089193e84c5b050d892 (patch) | |
tree | b661d5b154be987f9c3dba3a526b70e0b63f9fef /keyboards/biacco42/meishi2 | |
parent | 16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff) | |
parent | 8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff) |
Merge branch 'develop'
Diffstat (limited to 'keyboards/biacco42/meishi2')
-rw-r--r-- | keyboards/biacco42/meishi2/config.h | 17 | ||||
-rw-r--r-- | keyboards/biacco42/meishi2/info.json | 13 | ||||
-rw-r--r-- | keyboards/biacco42/meishi2/meishi2.c | 16 | ||||
-rw-r--r-- | keyboards/biacco42/meishi2/meishi2.h | 34 |
4 files changed, 9 insertions, 71 deletions
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h index c7614c0dbd..df5455b3c2 100644 --- a/keyboards/biacco42/meishi2/config.h +++ b/keyboards/biacco42/meishi2/config.h @@ -17,23 +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 { D7, E6 } -#define MATRIX_COL_PINS { F5, F6 } - -/* 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 */ diff --git a/keyboards/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json index ebdfc39028..fb88356968 100644 --- a/keyboards/biacco42/meishi2/info.json +++ b/keyboards/biacco42/meishi2/info.json @@ -8,15 +8,20 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6"], + "rows": ["D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0} ] } } diff --git a/keyboards/biacco42/meishi2/meishi2.c b/keyboards/biacco42/meishi2/meishi2.c deleted file mode 100644 index 14525ae175..0000000000 --- a/keyboards/biacco42/meishi2/meishi2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Biacco42 - * - * 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 "meishi2.h" diff --git a/keyboards/biacco42/meishi2/meishi2.h b/keyboards/biacco42/meishi2/meishi2.h deleted file mode 100644 index 776e0b0e1d..0000000000 --- a/keyboards/biacco42/meishi2/meishi2.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Biacco42 - * - * 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 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( \ - k00, k01, k02, k03 \ -) \ -{ \ - { k00, k01 }, \ - { k02, k03 } \ -} |