diff options
Diffstat (limited to 'keyboards/phase_studio/titan65')
| -rw-r--r-- | keyboards/phase_studio/titan65/hotswap/config.h | 17 | ||||
| -rw-r--r-- | keyboards/phase_studio/titan65/hotswap/hotswap.c | 2 | ||||
| -rw-r--r-- | keyboards/phase_studio/titan65/hotswap/hotswap.h | 35 | ||||
| -rw-r--r-- | keyboards/phase_studio/titan65/hotswap/info.json | 150 | ||||
| -rw-r--r-- | keyboards/phase_studio/titan65/hotswap/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/phase_studio/titan65/soldered/config.h | 33 | ||||
| -rw-r--r-- | keyboards/phase_studio/titan65/soldered/info.json | 5 | ||||
| -rw-r--r-- | keyboards/phase_studio/titan65/soldered/soldered.c | 17 |
8 files changed, 89 insertions, 172 deletions
diff --git a/keyboards/phase_studio/titan65/hotswap/config.h b/keyboards/phase_studio/titan65/hotswap/config.h index cf2ab2ffcb..8724fc556d 100644 --- a/keyboards/phase_studio/titan65/hotswap/config.h +++ b/keyboards/phase_studio/titan65/hotswap/config.h @@ -16,23 +16,6 @@ #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 { B4, B5, B6, C6, F7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, D5, F0, F1, C7, F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E6 #define RGB_MATRIX_LED_COUNT 67 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/phase_studio/titan65/hotswap/hotswap.c b/keyboards/phase_studio/titan65/hotswap/hotswap.c index 9c6538abf9..6df8319a83 100644 --- a/keyboards/phase_studio/titan65/hotswap/hotswap.c +++ b/keyboards/phase_studio/titan65/hotswap/hotswap.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "hotswap.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/phase_studio/titan65/hotswap/hotswap.h b/keyboards/phase_studio/titan65/hotswap/hotswap.h deleted file mode 100644 index 36ea0e7e19..0000000000 --- a/keyboards/phase_studio/titan65/hotswap/hotswap.h +++ /dev/null @@ -1,35 +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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, 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, K2F, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ - K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, 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, ___, K2F }, \ - { ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \ - { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \ -} diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json index d1e2b0e58b..380c0c271a 100644 --- a/keyboards/phase_studio/titan65/hotswap/info.json +++ b/keyboards/phase_studio/titan65/hotswap/info.json @@ -8,78 +8,94 @@ "pid": "0xBB91", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"], + "rows": ["B4", "B5", "B6", "C6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "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, "w":2}, - {"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":"K31 (C6,B1)", "x":0, "y":3, "w":2.25}, - {"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, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "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, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "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} ] } } diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk index 4f7d24eafc..a3b3ae4eaa 100644 --- a/keyboards/phase_studio/titan65/hotswap/rules.mk +++ b/keyboards/phase_studio/titan65/hotswap/rules.mk @@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 - AUDIO_SUPPORTED = no RGBLIGHT_SUPPORTED = no 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..0973cfba05 100644 --- a/keyboards/phase_studio/titan65/soldered/info.json +++ b/keyboards/phase_studio/titan65/soldered/info.json @@ -8,6 +8,11 @@ "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": { 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" |