summaryrefslogtreecommitdiff
path: root/keyboards/pisces
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/pisces')
-rw-r--r--keyboards/pisces/config.h16
-rw-r--r--keyboards/pisces/info.json51
-rw-r--r--keyboards/pisces/keymaps/default/config.h1
-rw-r--r--keyboards/pisces/keymaps/via/config.h1
-rw-r--r--keyboards/pisces/pisces.c2
-rw-r--r--keyboards/pisces/pisces.h41
6 files changed, 49 insertions, 63 deletions
diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h
index 01210f2a0f..4cb5aaf54e 100644
--- a/keyboards/pisces/config.h
+++ b/keyboards/pisces/config.h
@@ -21,22 +21,6 @@
#define MATRIX_MASKED
#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 { C4, B0, C7 }
-#define MATRIX_COL_PINS { B1, B2, B3, B4, B5, B6, B7 }
-
-/* 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/pisces/info.json b/keyboards/pisces/info.json
index e7243bfc8d..e3dfef5ab7 100644
--- a/keyboards/pisces/info.json
+++ b/keyboards/pisces/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"],
+ "rows": ["C4", "B0", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
@@ -16,9 +21,49 @@
"layouts": {
"LAYOUT_split_3x6_1": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0},
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [3, 5], "x": 9, "y": 0},
+ {"matrix": [3, 4], "x": 10, "y": 0},
+ {"matrix": [3, 3], "x": 11, "y": 0},
+ {"matrix": [3, 2], "x": 12, "y": 0},
+ {"matrix": [3, 1], "x": 13, "y": 0},
+ {"matrix": [3, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [4, 5], "x": 9, "y": 1},
+ {"matrix": [4, 4], "x": 10, "y": 1},
+ {"matrix": [4, 3], "x": 11, "y": 1},
+ {"matrix": [4, 2], "x": 12, "y": 1},
+ {"matrix": [4, 1], "x": 13, "y": 1},
+ {"matrix": [4, 0], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [5, 6], "x": 8, "y": 2},
+ {"matrix": [5, 5], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [5, 3], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 1], "x": 13, "y": 2},
+ {"matrix": [5, 0], "x": 14, "y": 2}
]
}
}
diff --git a/keyboards/pisces/keymaps/default/config.h b/keyboards/pisces/keymaps/default/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/pisces/keymaps/default/config.h
+++ b/keyboards/pisces/keymaps/default/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/pisces/keymaps/via/config.h b/keyboards/pisces/keymaps/via/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/pisces/keymaps/via/config.h
+++ b/keyboards/pisces/keymaps/via/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/pisces/pisces.c b/keyboards/pisces/pisces.c
index 18814c4744..ca2016280d 100644
--- a/keyboards/pisces/pisces.c
+++ b/keyboards/pisces/pisces.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pisces.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[MATRIX_ROWS] = {
// 87654321
diff --git a/keyboards/pisces/pisces.h b/keyboards/pisces/pisces.h
deleted file mode 100644
index b2d61c17c3..0000000000
--- a/keyboards/pisces/pisces.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * 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_split_3x6_1( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25 \
-) { \
- { L00, L01, L02, L03, L04, L05, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { R05, R04, R03, R02, R01, R00, KC_NO }, \
- { R15, R14, R13, R12, R11, R10, KC_NO }, \
- { R25, R24, R23, R22, R21, R20, R26 } \
-}