Merge remote-tracking branch 'origin/master' into develop

qmk · Jul 3, 2021 · def12e2 · def12e2
2 parents b635ca4 + 2161496
commit def12e2
Show file tree

Hide file tree

Showing 19 changed files with 403 additions and 29 deletions.
diff --git a/keyboards/phase_studio/titan65/config.h → ...rds/phase_studio/titan65/hotswap/config.h b/keyboards/phase_studio/titan65/config.h → ...rds/phase_studio/titan65/hotswap/config.h
@@ -23,7 +23,7 @@
 #define PRODUCT_ID      0xBB91
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Phase Studio
-#define PRODUCT         Titan 65
+#define PRODUCT         Titan 65 (hotswap)
 
 /* key matrix size */
 #define MATRIX_ROWS 5

diff --git a/keyboards/phase_studio/titan65/titan65.c → ...ds/phase_studio/titan65/hotswap/hotswap.c b/keyboards/phase_studio/titan65/titan65.c → ...ds/phase_studio/titan65/hotswap/hotswap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "titan65.h"
+#include "hotswap.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {

diff --git a/keyboards/phase_studio/titan65/titan65.h → ...ds/phase_studio/titan65/hotswap/hotswap.h b/keyboards/phase_studio/titan65/titan65.h → ...ds/phase_studio/titan65/hotswap/hotswap.h
diff --git a/keyboards/phase_studio/titan65/info.json → ...ds/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/info.json → ...ds/phase_studio/titan65/hotswap/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Titan 65",
+    "keyboard_name": "Titan 65 (hotswap)",
     "url": "",
     "maintainer": "drashna",
     "width": 16,

diff --git a/...e_studio/titan65/keymaps/default/keymap.c → .../titan65/hotswap/keymaps/default/keymap.c b/...e_studio/titan65/keymaps/default/keymap.c → .../titan65/hotswap/keymaps/default/keymap.c
diff --git a/...phase_studio/titan65/keymaps/via/keymap.c → ...udio/titan65/hotswap/keymaps/via/keymap.c b/...phase_studio/titan65/keymaps/via/keymap.c → ...udio/titan65/hotswap/keymaps/via/keymap.c
diff --git a/...phase_studio/titan65/keymaps/via/rules.mk → ...udio/titan65/hotswap/keymaps/via/rules.mk b/...phase_studio/titan65/keymaps/via/rules.mk → ...udio/titan65/hotswap/keymaps/via/rules.mk
diff --git a/keyboards/phase_studio/titan65/readme.md → ...ds/phase_studio/titan65/hotswap/readme.md b/keyboards/phase_studio/titan65/readme.md → ...ds/phase_studio/titan65/hotswap/readme.md
diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+
+AUDIO_SUPPORTED = no
+RGBLIGHT_SUPPORTED = no
+RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/phase_studio/titan65/rules.mk b/keyboards/phase_studio/titan65/rules.mk
@@ -1,26 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes            # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-
-
-AUDIO_SUPPORTED = no
-RGBLIGHT_SUPPORTED = no
-RGB_MATRIX_SUPPORTED = yes
+DEFAULT_FOLDER = phase_studio/titan65/hotswap
diff --git a/keyboards/phase_studio/titan65/soldered/config.h b/keyboards/phase_studio/titan65/soldered/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <[email protected]>
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5054
+#define PRODUCT_ID      0xBB92
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Phase Studio
+#define PRODUCT         Titan 65 (soldered)
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "Titan 65 (soldered)",
+    "url": "",
+    "maintainer": "drashna",
+    "width": 16,
+    "height": 5,
+    "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/phase_studio/titan65/soldered/keymaps/default/keymap.c b/keyboards/phase_studio/titan65/soldered/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <[email protected]>
+ *
+ * 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 QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_PGUP,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT,     KC_PGDN,
+        KC_LSFT,  KC_NUHS,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,        KC_UP,   LT(1, KC_END),
+        KC_LCTL,   KC_LGUI, KC_LALT,                       KC_SPC,                             KC_LALT,    KC_LCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+        _______,     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
+        _______,       RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,
+        _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,       _______, _______,
+        _______,   _______, _______,                       _______,                             _______,    _______,         _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/phase_studio/titan65/soldered/keymaps/via/keymap.c b/keyboards/phase_studio/titan65/soldered/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <[email protected]>
+ *
+ * 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_PGUP,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT,     KC_PGDN,
+        KC_LSFT,  KC_NUHS,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,        KC_UP,   LT(1, KC_END),
+        KC_LCTL,   KC_LGUI, KC_LALT,                       KC_SPC,                             KC_LALT,    KC_LCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+        _______,     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
+        _______,       RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,
+        _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,       _______, _______,
+        _______,   _______, _______,                       _______,                             _______,    _______,         _______, _______, _______
+    ),
+
+
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,
+        _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,       _______, _______,
+        _______,   _______, _______,                       _______,                             _______,    _______,         _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,
+        _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,       _______, _______,
+        _______,   _______, _______,                       _______,                             _______,    _______,         _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/phase_studio/titan65/soldered/keymaps/via/rules.mk b/keyboards/phase_studio/titan65/soldered/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/phase_studio/titan65/soldered/readme.md b/keyboards/phase_studio/titan65/soldered/readme.md
@@ -0,0 +1,24 @@
+# Titan 65
+
+A 65% ANSI keyboard with per key RGB
+
+* Keyboard Maintainer: [Drashna Jaelre](https://github.com/drashna)
+* Hardware Supported: atmega32u4 based PCB
+* Hardware Availability: TBD
+
+Make example for this keyboard (after setting up your build environment):
+
+    make phase_studio/titan65:default
+
+Flashing example for this keyboard:
+
+    make phase_studio/titan65:default:flash
+
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+To enter the bootloader, hold down the top left most key when plugging in the USB cable. 
+
+Alternatively, the default keymap has a RESET key if yo hold down the "home" (right most, second from botton) key and hit the top right most key.
diff --git a/keyboards/phase_studio/titan65/soldered/rules.mk b/keyboards/phase_studio/titan65/soldered/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+
+AUDIO_SUPPORTED = no
+RGBLIGHT_SUPPORTED = no
+RGB_MATRIX_SUPPORTED = no
diff --git a/keyboards/phase_studio/titan65/soldered/soldered.c b/keyboards/phase_studio/titan65/soldered/soldered.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <[email protected]>
+ *
+ * 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"