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

keyboards/jubakuba/aftermarket_keycult_tkl/keyboard.json

@@ -0,0 +1,276 @@
+{
+    "manufacturer": "Mike Tihonovich",
+    "keyboard_name": "aftermarket_keycult_tkl",
+    "maintainer": "Jubakuba",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP19", "pin_b": "GP20"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "dynamic_macro": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP24", "GP0", "GP1", "GP3", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18", "GP21", "GP22"],
+        "rows": ["GP7", "GP6", "GP5", "GP4", "GP2", "GP23"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "flower_blooming": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "riverflow": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "starlight": true,
+            "starlight_dual_hue": true,
+            "starlight_dual_sat": true,
+            "starlight_smooth": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 5},
+            {"matrix": [0, 1], "x": 28, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 42, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 56, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 70, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 98, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 126, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 140, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 196, "y": 0, "flags": 5},
+            {"matrix": [0, 15], "x": 210, "y": 0, "flags": 5},
+            {"matrix": [0, 16], "x": 224, "y": 0, "flags": 5},
+            {"matrix": [1, 16], "x": 224, "y": 13, "flags": 5},
+            {"matrix": [1, 15], "x": 210, "y": 13, "flags": 5},
+            {"matrix": [1, 14], "x": 196, "y": 13, "flags": 5},
+            {"matrix": [1, 13], "x": 182, "y": 13, "flags": 5},
+            {"matrix": [1, 12], "x": 168, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 154, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 140, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 126, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 112, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 98, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 84, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 70, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 56, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 42, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 28, "y": 13, "flags": 4},
+            {"matrix": [1, 1], "x": 14, "y": 13, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 26, "flags": 5},
+            {"matrix": [2, 1], "x": 14, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 28, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 56, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 70, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 84, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 98, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 112, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 126, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 168, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 182, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 196, "y": 26, "flags": 5},
+            {"matrix": [2, 15], "x": 210, "y": 26, "flags": 5},
+            {"matrix": [2, 16], "x": 224, "y": 26, "flags": 5},
+            {"matrix": [3, 13], "x": 168, "y": 38, "flags": 5},
+            {"matrix": [3, 12], "x": 154, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 140, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 126, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 112, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 98, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 42, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 28, "y": 38, "flags": 4},
+            {"matrix": [3, 1], "x": 14, "y": 38, "flags": 4},
+            {"matrix": [3, 0], "x": 12, "y": 38, "flags": 5},
+            {"matrix": [3, 0], "x": 0, "y": 38, "flags": 5},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 5},
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 5},
+            {"matrix": [5, 1], "x": 14, "y": 64, "flags": 5},
+            {"matrix": [5, 2], "x": 28, "y": 64, "flags": 5},
+            {"matrix": [5, 3], "x": 42, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 28, "y": 51, "flags": 4},
+            {"matrix": [4, 2], "x": 42, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 56, "y": 51, "flags": 4},
+            {"matrix": [4, 4], "x": 70, "y": 51, "flags": 4},
+            {"matrix": [4, 5], "x": 84, "y": 51, "flags": 4},
+            {"matrix": [4, 6], "x": 98, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 112, "y": 51, "flags": 4},
+            {"matrix": [4, 8], "x": 126, "y": 51, "flags": 4},
+            {"matrix": [4, 9], "x": 140, "y": 51, "flags": 4},
+            {"matrix": [4, 10], "x": 154, "y": 51, "flags": 4},
+            {"matrix": [4, 13], "x": 168, "y": 51, "flags": 5},
+            {"matrix": [4, 15], "x": 210, "y": 51, "flags": 5},
+            {"matrix": [5, 16], "x": 224, "y": 64, "flags": 5},
+            {"matrix": [5, 15], "x": 210, "y": 64, "flags": 5},
+            {"matrix": [5, 14], "x": 196, "y": 64, "flags": 5},
+            {"matrix": [5, 13], "x": 182, "y": 64, "flags": 5},
+            {"matrix": [5, 12], "x": 168, "y": 64, "flags": 5},
+            {"matrix": [5, 10], "x": 154, "y": 64, "flags": 5},
+            {"matrix": [5, 7], "x": 140, "y": 64, "flags": 5},
+            {"matrix": [5, 3], "x": 110, "y": 64, "flags": 4},
+            {"matrix": [5, 3], "x": 86, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 29
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0008",
+        "vid": "0x4A4B"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP25"
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "Print", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+                {"label": "Tilda", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "Minus", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "Equals", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "PageUp", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "Bracket", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "CloseBracket", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "Backslash", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "Insert", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "PageDn", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"label": "Capslock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "SemiColon", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "Apostrophe", "matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "LShift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": "Comma", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": "Period", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "Slash", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "RShift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"label": "Up", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"label": "LCtrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "LAlt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "RAlt", "matrix": [5, 7], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "RGUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "FN", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "RCtrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"label": "Left", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}

keyboards/jubakuba/aftermarket_keycult_tkl/keymaps/default/keymap.c

@@ -0,0 +1,42 @@
+/* Copyright 2026 Jubakuba
+ *
+ * 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_tkl_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  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_INS,  KC_HOME, KC_PGUP,
+        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_DEL,  KC_END,  KC_PGDN,
+        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_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+
+    ),
+    [1] = LAYOUT_tkl_ansi(
+        DM_RSTP,          DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, DM_PLY1, DM_PLY2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        RM_TOGG, RM_NEXT, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RM_PREV, RM_HUED, RM_SATD, RM_VALD, RM_SPDD, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+    )
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [1] = {ENCODER_CCW_CW(MS_WHLU, MS_WHLD)},
+};

keyboards/jubakuba/aftermarket_keycult_tkl/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/jubakuba/aftermarket_keycult_tkl/readme.md

@@ -0,0 +1,27 @@
+# aftermarket_keycult_tkl
+
+![aftermarket_keycult_tkl](https://i.imgur.com/Y1jk63E.png)
+
+*This code is specifically for the aftermarket QMK PCB maintained by Jubakuba that enables QMK with Per-Key-RGB for the Keycult TKL.  This firmware should NOT be flashed on the stock PCB.  The PCB needs to be ordered using a PCB provider using the hardware link below.  This PCB will fit in the Keycult TKL keyboard and work as expected.*
+
+* Keyboard Maintainer: [Mike Tihonovich](https://github.com/Jubakuba)
+* Hardware Supported: [Custom PCB](https://github.com/Jubakuba/Keycult-TKL-Kicad)
+* Hardware Availability: https://github.com/Jubakuba/Keycult-TKL-Kicad
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jubakuba/aftermarket_keycult_tkl:default
+
+Flashing example for this keyboard:
+
+    make jubakuba/aftermarket_keycult_tkl: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
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available