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

keyboards/keebio/foldkb/rev2_1/config.h

@@ -0,0 +1,17 @@
+// Copyright 2025 Keebio (@keebio)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Defines for the split keyboard setup */
+#define SERIAL_USART_TX_PIN A9
+#define SERIAL_USART_RX_PIN A10
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_PIN_SWAP
+
+#define USB_VBUS_PIN A7
+
+/* Defines for the RGB matrix */
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM3_UP

keyboards/keebio/foldkb/rev2_1/halconf.h

@@ -0,0 +1,10 @@
+// Copyright 2025 Keebio (@keebio)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>

keyboards/keebio/foldkb/rev2_1/keyboard.json

@@ -0,0 +1,279 @@
+{
+    "keyboard_name": "FoldKB Rev. 2.1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A4", "pin_b": "A3"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A15", "B3", "B4", "B5", "B6", "B7", "F0"],
+        "rows": ["A5", "A0", "A1", "A2", "F1"]
+    },
+    "processor": "STM32G431",
+    "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, 1], "x": 17, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 31, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 72, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 86, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 100, "y": 0, "flags": 4},
+            {"matrix": [1, 7], "x": 100, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 86, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 72, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 45, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 28, "y": 16, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 45, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 59, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 72, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 86, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 100, "y": 32, "flags": 4},
+            {"matrix": [3, 7], "x": 100, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 86, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 72, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 59, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 22, "y": 48, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 4},
+            {"matrix": [4, 3], "x": 40, "y": 64, "flags": 4},
+            {"matrix": [4, 4], "x": 57, "y": 64, "flags": 4},
+            {"matrix": [4, 5], "x": 72, "y": 64, "flags": 4},
+            {"matrix": [4, 6], "x": 86, "y": 64, "flags": 4},
+            {"matrix": [4, 7], "x": 100, "y": 64, "flags": 4},
+            {"x": 93, "y": 48, "flags": 2},
+            {"x": 65, "y": 64, "flags": 2},
+            {"x": 31, "y": 64, "flags": 2},
+            {"x": 10, "y": 64, "flags": 2},
+            {"x": 0, "y": 24, "flags": 2},
+            {"x": 24, "y": 0, "flags": 2},
+            {"x": 65, "y": 0, "flags": 2},
+            {"x": 90, "y": 8, "flags": 2},
+            {"matrix": [5, 7], "x": 221, "y": 0, "flags": 4},
+            {"matrix": [5, 6], "x": 207, "y": 0, "flags": 4},
+            {"matrix": [5, 5], "x": 193, "y": 0, "flags": 4},
+            {"matrix": [5, 4], "x": 179, "y": 0, "flags": 4},
+            {"matrix": [5, 3], "x": 165, "y": 0, "flags": 4},
+            {"matrix": [5, 2], "x": 152, "y": 0, "flags": 4},
+            {"matrix": [5, 1], "x": 138, "y": 0, "flags": 4},
+            {"matrix": [5, 0], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [6, 0], "x": 124, "y": 16, "flags": 4},
+            {"matrix": [6, 1], "x": 138, "y": 16, "flags": 4},
+            {"matrix": [6, 2], "x": 152, "y": 16, "flags": 4},
+            {"matrix": [6, 3], "x": 165, "y": 16, "flags": 4},
+            {"matrix": [6, 4], "x": 179, "y": 16, "flags": 4},
+            {"matrix": [6, 5], "x": 193, "y": 16, "flags": 4},
+            {"matrix": [6, 6], "x": 207, "y": 16, "flags": 4},
+            {"matrix": [6, 7], "x": 224, "y": 16, "flags": 4},
+            {"matrix": [7, 7], "x": 215, "y": 32, "flags": 4},
+            {"matrix": [7, 5], "x": 193, "y": 32, "flags": 4},
+            {"matrix": [7, 4], "x": 179, "y": 32, "flags": 4},
+            {"matrix": [7, 3], "x": 165, "y": 32, "flags": 4},
+            {"matrix": [7, 2], "x": 152, "y": 32, "flags": 4},
+            {"matrix": [7, 1], "x": 138, "y": 32, "flags": 4},
+            {"matrix": [7, 0], "x": 124, "y": 32, "flags": 4},
+            {"matrix": [8, 0], "x": 124, "y": 48, "flags": 4},
+            {"matrix": [8, 1], "x": 138, "y": 48, "flags": 4},
+            {"matrix": [8, 2], "x": 152, "y": 48, "flags": 4},
+            {"matrix": [8, 3], "x": 165, "y": 48, "flags": 4},
+            {"matrix": [8, 4], "x": 179, "y": 48, "flags": 4},
+            {"matrix": [8, 5], "x": 198, "y": 48, "flags": 4},
+            {"matrix": [8, 7], "x": 217, "y": 48, "flags": 4},
+            {"matrix": [9, 7], "x": 215, "y": 64, "flags": 4},
+            {"matrix": [9, 5], "x": 198, "y": 64, "flags": 4},
+            {"matrix": [9, 4], "x": 181, "y": 64, "flags": 4},
+            {"matrix": [9, 3], "x": 164, "y": 64, "flags": 4},
+            {"matrix": [9, 1], "x": 145, "y": 64, "flags": 4},
+            {"matrix": [9, 0], "x": 136, "y": 64, "flags": 4},
+            {"matrix": [9, 0], "x": 126, "y": 64, "flags": 4},
+            {"x": 121, "y": 56, "flags": 2},
+            {"x": 152, "y": 64, "flags": 2},
+            {"x": 207, "y": 64, "flags": 2},
+            {"x": 224, "y": 52, "flags": 2},
+            {"x": 224, "y": 12, "flags": 2},
+            {"x": 196, "y": 0, "flags": 2},
+            {"x": 159, "y": 0, "flags": 2},
+            {"x": 124, "y": 8, "flags": 2}
+        ],
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [44, 45]
+    },
+    "split": {
+        "bootmagic": {
+            "matrix": [5, 7]
+        },
+        "enabled": true,
+        "handedness": {
+            "pin": "A8"
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["A6", "A5", "A4", "A3", "A2", "B5", "B6", "B7"],
+                "rows": ["A15", "B3", "B4", "A0", "A1"]
+            }
+        },
+        "serial": {
+            "driver": "usart"
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x2358"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+                {"matrix": [5, 7], "x": 16, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [6, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [7, 5], "x": 14, "y": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 2], "x": 1, "y": 3, "w": 2.25},
+                {"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": [8, 0], "x": 9, "y": 3},
+                {"matrix": [8, 1], "x": 10, "y": 3},
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+                {"matrix": [8, 4], "x": 13, "y": 3},
+                {"matrix": [8, 5], "x": 14, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15.75, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [9, 0], "x": 9, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}

keyboards/keebio/foldkb/rev2_1/keymaps/default/keymap.c

@@ -0,0 +1,21 @@
+// Copyright 2025 Keebio (@keebio)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_MUTE, KC_ESC,  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_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_END,           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_PGUP,          KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+    KC_PGDN,          KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC,  KC_RALT, KC_RGUI, KC_MENU, KC_RCTL
+  ),
+  [1] = LAYOUT(
+    KC_MUTE, QK_BOOT, KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, KC_DEL,
+    RM_TOGG,          _______, RM_SATD, RM_SATU, _______, _______, _______,     _______, KC_7,    KC_8,    KC_9,    _______, _______, _______, _______,
+    RM_NEXT,          _______, RM_VALD, RM_VALU, _______, _______, _______,     _______, KC_4,    KC_5,    KC_6,    _______, _______,          _______,
+    KC_VOLU,          _______, RM_HUED, RM_HUEU, _______, _______, _______,     _______, KC_1,    KC_2,    KC_3,    _______, _______, _______,
+    KC_VOLD,          _______, RM_SPDD, RM_SPDU, _______, _______, _______,     _______, KC_0,    _______, _______, _______, _______
+  ),
+};

keyboards/keebio/foldkb/rev2_1/mcuconf.h

@@ -0,0 +1,14 @@
+// Copyright 2025 Keebio (@keebio)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+/* enable USART1, used for split comms */
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+/* enable TIM3, used for RGB LED PWM driver */
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE

keyboards/keebio/foldkb/rev2_1/rev2_1.c

@@ -0,0 +1,29 @@
+// Copyright 2025 Keebio (@keebio)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+void keyboard_pre_init_kb(void) {
+    // Disable the PD peripheral in pre-init because its pins are being used in the matrix:
+    PWR->CR3 |= PWR_CR3_UCPD_DBDIS;
+    // Call the corresponding _user() function (see https://docs.qmk.fm/#/custom_quantum_functions)
+    keyboard_pre_init_user();
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}