summaryrefslogtreecommitdiff
path: root/keyboards/phase_studio/titan65/soldered
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/phase_studio/titan65/soldered')
-rw-r--r--keyboards/phase_studio/titan65/soldered/config.h33
-rw-r--r--keyboards/phase_studio/titan65/soldered/info.json438
-rw-r--r--keyboards/phase_studio/titan65/soldered/soldered.c17
-rw-r--r--keyboards/phase_studio/titan65/soldered/soldered.h91
4 files changed, 368 insertions, 211 deletions
diff --git a/keyboards/phase_studio/titan65/soldered/config.h b/keyboards/phase_studio/titan65/soldered/config.h
deleted file mode 100644
index a53a1ea4ce..0000000000
--- a/keyboards/phase_studio/titan65/soldered/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- *
- * 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
-
-
-/*
- * 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 { B6, C6, C7, F7, E6 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, F6, F5, F4, F1, F0, B0, B1, B2, B3 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/phase_studio/titan65/soldered/info.json b/keyboards/phase_studio/titan65/soldered/info.json
index ba7d9f9354..d8e547ca5f 100644
--- a/keyboards/phase_studio/titan65/soldered/info.json
+++ b/keyboards/phase_studio/titan65/soldered/info.json
@@ -8,81 +8,379 @@
"pid": "0xBB92",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"],
+ "rows": ["B6", "C6", "C7", "F7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B4,B0)", "x":0, "y":0},
- {"label":"K01 (B4,B1)", "x":1, "y":0},
- {"label":"K02 (B4,B2)", "x":2, "y":0},
- {"label":"K03 (B4,B3)", "x":3, "y":0},
- {"label":"K04 (B4,B7)", "x":4, "y":0},
- {"label":"K05 (B4,D0)", "x":5, "y":0},
- {"label":"K06 (B4,D1)", "x":6, "y":0},
- {"label":"K07 (B4,D2)", "x":7, "y":0},
- {"label":"K08 (B4,D3)", "x":8, "y":0},
- {"label":"K09 (B4,D5)", "x":9, "y":0},
- {"label":"K0A (B4,F0)", "x":10, "y":0},
- {"label":"K0B (B4,F1)", "x":11, "y":0},
- {"label":"K0C (B4,C7)", "x":12, "y":0},
- {"label":"K0E (B4,F5)", "x":13, "y":0},
- {"label":"K0E (B4,F5)", "x":13, "y":0},
- {"label":"K0E (B4,F5)", "x":14, "y":0},
- {"label":"K0F (B4,F6)", "x":15, "y":0},
- {"label":"K10 (B5,B0)", "x":0, "y":1, "w":1.5},
- {"label":"K12 (B5,B2)", "x":1.5, "y":1},
- {"label":"K13 (B5,B3)", "x":2.5, "y":1},
- {"label":"K14 (B5,B7)", "x":3.5, "y":1},
- {"label":"K15 (B5,D0)", "x":4.5, "y":1},
- {"label":"K16 (B5,D1)", "x":5.5, "y":1},
- {"label":"K17 (B5,D2)", "x":6.5, "y":1},
- {"label":"K18 (B5,D3)", "x":7.5, "y":1},
- {"label":"K19 (B5,D5)", "x":8.5, "y":1},
- {"label":"K1A (B5,F0)", "x":9.5, "y":1},
- {"label":"K1B (B5,F1)", "x":10.5, "y":1},
- {"label":"K1C (B5,C7)", "x":11.5, "y":1},
- {"label":"K1D (B5,F4)", "x":12.5, "y":1},
- {"label":"K1E (B5,F5)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1F (B5,F6)", "x":15, "y":1},
- {"label":"K20 (B6,B0)", "x":0, "y":2, "w":1.75},
- {"label":"K22 (B6,B2)", "x":1.75, "y":2},
- {"label":"K23 (B6,B3)", "x":2.75, "y":2},
- {"label":"K24 (B6,B7)", "x":3.75, "y":2},
- {"label":"K25 (B6,D0)", "x":4.75, "y":2},
- {"label":"K26 (B6,D1)", "x":5.75, "y":2},
- {"label":"K27 (B6,D2)", "x":6.75, "y":2},
- {"label":"K28 (B6,D3)", "x":7.75, "y":2},
- {"label":"K29 (B6,D5)", "x":8.75, "y":2},
- {"label":"K2A (B6,F0)", "x":9.75, "y":2},
- {"label":"K2B (B6,F1)", "x":10.75, "y":2},
- {"label":"K2C (B6,C7)", "x":11.75, "y":2},
- {"label":"K2D (B6,F4)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2F (B6,F6)", "x":15, "y":2},
- {"label":"K30 (C6,B1)", "x":0, "y":3, "w":1.25},
- {"label":"K30 (C6,B1)", "x":1.25, "y":3},
- {"label":"K32 (C6,B2)", "x":2.25, "y":3},
- {"label":"K33 (C6,B3)", "x":3.25, "y":3},
- {"label":"K34 (C6,B7)", "x":4.25, "y":3},
- {"label":"K35 (C6,D0)", "x":5.25, "y":3},
- {"label":"K36 (C6,D1)", "x":6.25, "y":3},
- {"label":"K37 (C6,D2)", "x":7.25, "y":3},
- {"label":"K38 (C6,D3)", "x":8.25, "y":3},
- {"label":"K39 (C6,D5)", "x":9.25, "y":3},
- {"label":"K3A (C6,F0)", "x":10.25, "y":3},
- {"label":"K3B (C6,F1)", "x":11.25, "y":3},
- {"label":"K3D (C6,F4)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3E (C6,F5)", "x":14, "y":3},
- {"label":"K3F (C6,F6)", "x":15, "y":3},
- {"label":"K40 (F7,B0)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,B1)", "x":1.25, "y":4},
- {"label":"K42 (F7,B2)", "x":2.25, "y":4, "w":1.25},
- {"label":"K46 (F7,D1)", "x":3.5, "y":4, "w":6.25},
- {"label":"K4A (F7,F0)", "x":9.75, "y":4, "w":1.25},
- {"label":"K4B (F7,F1)", "x":11, "y":4, "w":1.25},
- {"label":"K4D (F7,F4)", "x":13, "y":4},
- {"label":"K4E (F7,F5)", "x":14, "y":4},
- {"label":"K4F (F7,F6)", "x":15, "y":4}
+ {"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": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0},
+ {"matrix": [0, 15], "x": 14, "y": 0},
+ {"matrix": [1, 0], "x": 15, "y": 0},
+
+ {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 1},
+ {"matrix": [1, 4], "x": 2.5, "y": 1},
+ {"matrix": [1, 5], "x": 3.5, "y": 1},
+ {"matrix": [1, 6], "x": 4.5, "y": 1},
+ {"matrix": [1, 7], "x": 5.5, "y": 1},
+ {"matrix": [1, 8], "x": 6.5, "y": 1},
+ {"matrix": [1, 9], "x": 7.5, "y": 1},
+ {"matrix": [1, 10], "x": 8.5, "y": 1},
+ {"matrix": [1, 11], "x": 9.5, "y": 1},
+ {"matrix": [1, 12], "x": 10.5, "y": 1},
+ {"matrix": [1, 13], "x": 11.5, "y": 1},
+ {"matrix": [1, 14], "x": 12.5, "y": 1},
+ {"matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [2, 0], "x": 15, "y": 1},
+
+ {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 1.75, "y": 2},
+ {"matrix": [2, 4], "x": 2.75, "y": 2},
+ {"matrix": [2, 5], "x": 3.75, "y": 2},
+ {"matrix": [2, 6], "x": 4.75, "y": 2},
+ {"matrix": [2, 7], "x": 5.75, "y": 2},
+ {"matrix": [2, 8], "x": 6.75, "y": 2},
+ {"matrix": [2, 9], "x": 7.75, "y": 2},
+ {"matrix": [2, 10], "x": 8.75, "y": 2},
+ {"matrix": [2, 11], "x": 9.75, "y": 2},
+ {"matrix": [2, 12], "x": 10.75, "y": 2},
+ {"matrix": [2, 13], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 1.25, "y": 3},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 4], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3},
+ {"matrix": [3, 6], "x": 5.25, "y": 3},
+ {"matrix": [3, 7], "x": 6.25, "y": 3},
+ {"matrix": [3, 8], "x": 7.25, "y": 3},
+ {"matrix": [3, 9], "x": 8.25, "y": 3},
+ {"matrix": [3, 10], "x": 9.25, "y": 3},
+ {"matrix": [3, 11], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 1.25, "y": 4},
+ {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"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": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 15], "x": 14, "y": 0},
+ {"matrix": [1, 0], "x": 15, "y": 0},
+ {"matrix": [1, 2], "x": 16, "y": 0},
+ {"matrix": [1, 3], "x": 17, "y": 0},
+ {"matrix": [1, 4], "x": 18, "y": 0},
+ {"matrix": [1, 5], "x": 19, "y": 0},
+ {"matrix": [1, 6], "x": 20, "y": 0},
+ {"matrix": [1, 7], "x": 21, "y": 0},
+ {"matrix": [1, 8], "x": 22, "y": 0},
+ {"matrix": [1, 9], "x": 23, "y": 0},
+ {"matrix": [1, 10], "x": 24, "y": 0},
+ {"matrix": [1, 11], "x": 25, "y": 0},
+ {"matrix": [1, 12], "x": 26, "y": 0},
+ {"matrix": [1, 13], "x": 27, "y": 0},
+ {"matrix": [1, 14], "x": 28, "y": 0},
+ {"matrix": [1, 15], "x": 29, "y": 0},
+ {"matrix": [2, 0], "x": 30, "y": 0},
+ {"matrix": [2, 2], "x": 31, "y": 0},
+ {"matrix": [2, 3], "x": 32, "y": 0},
+ {"matrix": [2, 4], "x": 33, "y": 0},
+ {"matrix": [2, 5], "x": 34, "y": 0},
+ {"matrix": [2, 6], "x": 35, "y": 0},
+ {"matrix": [2, 7], "x": 36, "y": 0},
+ {"matrix": [2, 8], "x": 37, "y": 0},
+ {"matrix": [2, 9], "x": 38, "y": 0},
+ {"matrix": [2, 10], "x": 39, "y": 0},
+ {"matrix": [2, 11], "x": 40, "y": 0},
+ {"matrix": [2, 12], "x": 41, "y": 0},
+ {"matrix": [2, 14], "x": 42, "y": 0},
+ {"matrix": [2, 15], "x": 43, "y": 0},
+ {"matrix": [3, 0], "x": 44, "y": 0},
+ {"matrix": [3, 3], "x": 45, "y": 0},
+ {"matrix": [3, 4], "x": 46, "y": 0},
+ {"matrix": [3, 5], "x": 47, "y": 0},
+ {"matrix": [3, 6], "x": 48, "y": 0},
+ {"matrix": [3, 7], "x": 49, "y": 0},
+ {"matrix": [3, 8], "x": 50, "y": 0},
+ {"matrix": [3, 9], "x": 51, "y": 0},
+ {"matrix": [3, 10], "x": 52, "y": 0},
+ {"matrix": [3, 11], "x": 53, "y": 0},
+ {"matrix": [3, 12], "x": 54, "y": 0},
+ {"matrix": [3, 13], "x": 55, "y": 0},
+ {"matrix": [3, 14], "x": 56, "y": 0},
+ {"matrix": [3, 15], "x": 57, "y": 0},
+ {"matrix": [4, 0], "x": 58, "y": 0},
+ {"matrix": [4, 2], "x": 59, "y": 0},
+ {"matrix": [4, 3], "x": 60, "y": 0},
+ {"matrix": [4, 7], "x": 61, "y": 0},
+ {"matrix": [4, 11], "x": 62, "y": 0},
+ {"matrix": [4, 12], "x": 63, "y": 0},
+ {"matrix": [4, 13], "x": 64, "y": 0},
+ {"matrix": [4, 14], "x": 65, "y": 0},
+ {"matrix": [4, 15], "x": 66, "y": 0}
+ ]
+ },
+ "LAYOUT_ansi_split_bspc": {
+ "layout": [
+ {"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": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 16, "y": 0},
+ {"matrix": [1, 2], "x": 17, "y": 0},
+ {"matrix": [1, 3], "x": 18, "y": 0},
+ {"matrix": [1, 4], "x": 19, "y": 0},
+ {"matrix": [1, 5], "x": 20, "y": 0},
+ {"matrix": [1, 6], "x": 21, "y": 0},
+ {"matrix": [1, 7], "x": 22, "y": 0},
+ {"matrix": [1, 8], "x": 23, "y": 0},
+ {"matrix": [1, 9], "x": 24, "y": 0},
+ {"matrix": [1, 10], "x": 25, "y": 0},
+ {"matrix": [1, 11], "x": 26, "y": 0},
+ {"matrix": [1, 12], "x": 27, "y": 0},
+ {"matrix": [1, 13], "x": 28, "y": 0},
+ {"matrix": [1, 14], "x": 29, "y": 0},
+ {"matrix": [1, 15], "x": 30, "y": 0},
+ {"matrix": [2, 0], "x": 31, "y": 0},
+ {"matrix": [2, 2], "x": 32, "y": 0},
+ {"matrix": [2, 3], "x": 33, "y": 0},
+ {"matrix": [2, 4], "x": 34, "y": 0},
+ {"matrix": [2, 5], "x": 35, "y": 0},
+ {"matrix": [2, 6], "x": 36, "y": 0},
+ {"matrix": [2, 7], "x": 37, "y": 0},
+ {"matrix": [2, 8], "x": 38, "y": 0},
+ {"matrix": [2, 9], "x": 39, "y": 0},
+ {"matrix": [2, 10], "x": 40, "y": 0},
+ {"matrix": [2, 11], "x": 41, "y": 0},
+ {"matrix": [2, 12], "x": 42, "y": 0},
+ {"matrix": [2, 14], "x": 43, "y": 0},
+ {"matrix": [2, 15], "x": 44, "y": 0},
+ {"matrix": [3, 0], "x": 45, "y": 0},
+ {"matrix": [3, 3], "x": 46, "y": 0},
+ {"matrix": [3, 4], "x": 47, "y": 0},
+ {"matrix": [3, 5], "x": 48, "y": 0},
+ {"matrix": [3, 6], "x": 49, "y": 0},
+ {"matrix": [3, 7], "x": 50, "y": 0},
+ {"matrix": [3, 8], "x": 51, "y": 0},
+ {"matrix": [3, 9], "x": 52, "y": 0},
+ {"matrix": [3, 10], "x": 53, "y": 0},
+ {"matrix": [3, 11], "x": 54, "y": 0},
+ {"matrix": [3, 12], "x": 55, "y": 0},
+ {"matrix": [3, 13], "x": 56, "y": 0},
+ {"matrix": [3, 14], "x": 57, "y": 0},
+ {"matrix": [3, 15], "x": 58, "y": 0},
+ {"matrix": [4, 0], "x": 59, "y": 0},
+ {"matrix": [4, 2], "x": 60, "y": 0},
+ {"matrix": [4, 3], "x": 61, "y": 0},
+ {"matrix": [4, 7], "x": 62, "y": 0},
+ {"matrix": [4, 11], "x": 63, "y": 0},
+ {"matrix": [4, 12], "x": 64, "y": 0},
+ {"matrix": [4, 13], "x": 65, "y": 0},
+ {"matrix": [4, 14], "x": 66, "y": 0},
+ {"matrix": [4, 15], "x": 67, "y": 0}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"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": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 15], "x": 14, "y": 0},
+ {"matrix": [1, 0], "x": 15, "y": 0},
+ {"matrix": [1, 2], "x": 16, "y": 0},
+ {"matrix": [1, 3], "x": 17, "y": 0},
+ {"matrix": [1, 4], "x": 18, "y": 0},
+ {"matrix": [1, 5], "x": 19, "y": 0},
+ {"matrix": [1, 6], "x": 20, "y": 0},
+ {"matrix": [1, 7], "x": 21, "y": 0},
+ {"matrix": [1, 8], "x": 22, "y": 0},
+ {"matrix": [1, 9], "x": 23, "y": 0},
+ {"matrix": [1, 10], "x": 24, "y": 0},
+ {"matrix": [1, 11], "x": 25, "y": 0},
+ {"matrix": [1, 12], "x": 26, "y": 0},
+ {"matrix": [1, 13], "x": 27, "y": 0},
+ {"matrix": [1, 15], "x": 28, "y": 0},
+ {"matrix": [2, 0], "x": 29, "y": 0},
+ {"matrix": [2, 2], "x": 30, "y": 0},
+ {"matrix": [2, 3], "x": 31, "y": 0},
+ {"matrix": [2, 4], "x": 32, "y": 0},
+ {"matrix": [2, 5], "x": 33, "y": 0},
+ {"matrix": [2, 6], "x": 34, "y": 0},
+ {"matrix": [2, 7], "x": 35, "y": 0},
+ {"matrix": [2, 8], "x": 36, "y": 0},
+ {"matrix": [2, 9], "x": 37, "y": 0},
+ {"matrix": [2, 10], "x": 38, "y": 0},
+ {"matrix": [2, 11], "x": 39, "y": 0},
+ {"matrix": [2, 12], "x": 40, "y": 0},
+ {"matrix": [2, 13], "x": 41, "y": 0},
+ {"matrix": [2, 14], "x": 42, "y": 0},
+ {"matrix": [2, 15], "x": 43, "y": 0},
+ {"matrix": [3, 0], "x": 44, "y": 0},
+ {"matrix": [3, 2], "x": 45, "y": 0},
+ {"matrix": [3, 3], "x": 46, "y": 0},
+ {"matrix": [3, 4], "x": 47, "y": 0},
+ {"matrix": [3, 5], "x": 48, "y": 0},
+ {"matrix": [3, 6], "x": 49, "y": 0},
+ {"matrix": [3, 7], "x": 50, "y": 0},
+ {"matrix": [3, 8], "x": 51, "y": 0},
+ {"matrix": [3, 9], "x": 52, "y": 0},
+ {"matrix": [3, 10], "x": 53, "y": 0},
+ {"matrix": [3, 11], "x": 54, "y": 0},
+ {"matrix": [3, 12], "x": 55, "y": 0},
+ {"matrix": [3, 13], "x": 56, "y": 0},
+ {"matrix": [3, 14], "x": 57, "y": 0},
+ {"matrix": [3, 15], "x": 58, "y": 0},
+ {"matrix": [4, 0], "x": 59, "y": 0},
+ {"matrix": [4, 2], "x": 60, "y": 0},
+ {"matrix": [4, 3], "x": 61, "y": 0},
+ {"matrix": [4, 7], "x": 62, "y": 0},
+ {"matrix": [4, 11], "x": 63, "y": 0},
+ {"matrix": [4, 12], "x": 64, "y": 0},
+ {"matrix": [4, 13], "x": 65, "y": 0},
+ {"matrix": [4, 14], "x": 66, "y": 0},
+ {"matrix": [4, 15], "x": 67, "y": 0}
+ ]
+ },
+ "LAYOUT_iso_split_bspc": {
+ "layout": [
+ {"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": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 16, "y": 0},
+ {"matrix": [1, 2], "x": 17, "y": 0},
+ {"matrix": [1, 3], "x": 18, "y": 0},
+ {"matrix": [1, 4], "x": 19, "y": 0},
+ {"matrix": [1, 5], "x": 20, "y": 0},
+ {"matrix": [1, 6], "x": 21, "y": 0},
+ {"matrix": [1, 7], "x": 22, "y": 0},
+ {"matrix": [1, 8], "x": 23, "y": 0},
+ {"matrix": [1, 9], "x": 24, "y": 0},
+ {"matrix": [1, 10], "x": 25, "y": 0},
+ {"matrix": [1, 11], "x": 26, "y": 0},
+ {"matrix": [1, 12], "x": 27, "y": 0},
+ {"matrix": [1, 13], "x": 28, "y": 0},
+ {"matrix": [1, 15], "x": 29, "y": 0},
+ {"matrix": [2, 0], "x": 30, "y": 0},
+ {"matrix": [2, 2], "x": 31, "y": 0},
+ {"matrix": [2, 3], "x": 32, "y": 0},
+ {"matrix": [2, 4], "x": 33, "y": 0},
+ {"matrix": [2, 5], "x": 34, "y": 0},
+ {"matrix": [2, 6], "x": 35, "y": 0},
+ {"matrix": [2, 7], "x": 36, "y": 0},
+ {"matrix": [2, 8], "x": 37, "y": 0},
+ {"matrix": [2, 9], "x": 38, "y": 0},
+ {"matrix": [2, 10], "x": 39, "y": 0},
+ {"matrix": [2, 11], "x": 40, "y": 0},
+ {"matrix": [2, 12], "x": 41, "y": 0},
+ {"matrix": [2, 13], "x": 42, "y": 0},
+ {"matrix": [2, 14], "x": 43, "y": 0},
+ {"matrix": [2, 15], "x": 44, "y": 0},
+ {"matrix": [3, 0], "x": 45, "y": 0},
+ {"matrix": [3, 2], "x": 46, "y": 0},
+ {"matrix": [3, 3], "x": 47, "y": 0},
+ {"matrix": [3, 4], "x": 48, "y": 0},
+ {"matrix": [3, 5], "x": 49, "y": 0},
+ {"matrix": [3, 6], "x": 50, "y": 0},
+ {"matrix": [3, 7], "x": 51, "y": 0},
+ {"matrix": [3, 8], "x": 52, "y": 0},
+ {"matrix": [3, 9], "x": 53, "y": 0},
+ {"matrix": [3, 10], "x": 54, "y": 0},
+ {"matrix": [3, 11], "x": 55, "y": 0},
+ {"matrix": [3, 12], "x": 56, "y": 0},
+ {"matrix": [3, 13], "x": 57, "y": 0},
+ {"matrix": [3, 14], "x": 58, "y": 0},
+ {"matrix": [3, 15], "x": 59, "y": 0},
+ {"matrix": [4, 0], "x": 60, "y": 0},
+ {"matrix": [4, 2], "x": 61, "y": 0},
+ {"matrix": [4, 3], "x": 62, "y": 0},
+ {"matrix": [4, 7], "x": 63, "y": 0},
+ {"matrix": [4, 11], "x": 64, "y": 0},
+ {"matrix": [4, 12], "x": 65, "y": 0},
+ {"matrix": [4, 13], "x": 66, "y": 0},
+ {"matrix": [4, 14], "x": 67, "y": 0},
+ {"matrix": [4, 15], "x": 68, "y": 0}
]
}
}
diff --git a/keyboards/phase_studio/titan65/soldered/soldered.c b/keyboards/phase_studio/titan65/soldered/soldered.c
deleted file mode 100644
index 65aee33f6b..0000000000
--- a/keyboards/phase_studio/titan65/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- *
- * 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 "soldered.h"
diff --git a/keyboards/phase_studio/titan65/soldered/soldered.h b/keyboards/phase_studio/titan65/soldered/soldered.h
deleted file mode 100644
index f312337970..0000000000
--- a/keyboards/phase_studio/titan65/soldered/soldered.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- *
- * 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"
-
-#define ___ KC_NO
-
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k42, k43, k47, k4b, k4c, k4d, k4e, k4f \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
- { k10, ___, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
- { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f }, \
- { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, k4e, k4f } \
-}
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, \
- k30, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k42, k43, k47, k4b, k4c, k4d, k4e, k4f \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, ___, k0f }, \
- { k10, ___, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
- { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e, k2f }, \
- { k30, ___, ___, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, k4e, k4f } \
-}
-
-#define LAYOUT_ansi_split_bspc( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, \
- k30, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k42, k43, k47, k4b, k4c, k4d, k4e, k4f \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
- { k10, ___, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
- { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e, k2f }, \
- { k30, ___, ___, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, k4e, k4f } \
-}
-
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k42, k43, k47, k4b, k4c, k4d, k4e, k4f \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, ___, k0f }, \
- { k10, ___, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___, k1f }, \
- { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f }, \
- { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, k4e, k4f } \
-}
-
-#define LAYOUT_iso_split_bspc( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k42, k43, k47, k4b, k4c, k4d, k4e, k4f \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
- { k10, ___, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___, k1f }, \
- { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f }, \
- { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, k4e, k4f } \
-}