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

keyboards/mechboards/sofle/pro/config.h

@@ -0,0 +1,6 @@
+// Copyright 2025 Dasky (@daskygit)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "keyboards/mechboards/common/rgb_effects.h"

keyboards/mechboards/sofle/pro/keyboard.json

@@ -0,0 +1,203 @@
+{
+    "manufacturer": "Mechboards",
+    "keyboard_name": "Sofle Pro",
+    "maintainer": "dasky",
+    "build": {
+        "lto": true
+    },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "oled": true,
+        "os_detection": true,
+        "rgb_matrix": true,
+        "wpm": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "cycle_left_right": true
+        },
+        "default": {
+            "animation": "cycle_left_right"
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [4, 0], "x": 32, "y": 57, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 36, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 24, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 12, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 12, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 24, "flags": 4},
+            {"matrix": [2, 1], "x": 16, "y": 36, "flags": 4},
+            {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
+            {"matrix": [4, 1], "x": 48, "y": 55, "flags": 4},
+            {"matrix": [4, 2], "x": 64, "y": 57, "flags": 4},
+            {"matrix": [3, 2], "x": 32, "y": 45, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 33, "flags": 4},
+            {"matrix": [1, 2], "x": 32, "y": 21, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 9, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 7, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 19, "flags": 4},
+            {"matrix": [2, 3], "x": 48, "y": 31, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 43, "flags": 4},
+            {"matrix": [4, 3], "x": 80, "y": 59, "flags": 4},
+            {"matrix": [4, 4], "x": 96, "y": 64, "flags": 4},
+            {"matrix": [3, 4], "x": 64, "y": 45, "flags": 4},
+            {"matrix": [2, 4], "x": 64, "y": 33, "flags": 4},
+            {"matrix": [1, 4], "x": 64, "y": 21, "flags": 4},
+            {"matrix": [0, 4], "x": 64, "y": 9, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 10, "flags": 4},
+            {"matrix": [1, 5], "x": 80, "y": 22, "flags": 4},
+            {"matrix": [2, 5], "x": 80, "y": 34, "flags": 4},
+            {"matrix": [3, 5], "x": 80, "y": 47, "flags": 4},
+            {"x": 84, "y": 45, "flags": 2},
+            {"x": 68, "y": 7, "flags": 2},
+            {"x": 20, "y": 14, "flags": 2},
+            {"x": 28, "y": 49, "flags": 2},
+            {"x": 62, "y": 57, "flags": 2},
+            {"matrix": [9, 0], "x": 192, "y": 57, "flags": 4},
+            {"matrix": [8, 0], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [7, 0], "x": 224, "y": 36, "flags": 4},
+            {"matrix": [6, 0], "x": 224, "y": 24, "flags": 4},
+            {"matrix": [5, 0], "x": 224, "y": 12, "flags": 4},
+            {"matrix": [5, 1], "x": 208, "y": 12, "flags": 4},
+            {"matrix": [6, 1], "x": 208, "y": 24, "flags": 4},
+            {"matrix": [7, 1], "x": 208, "y": 36, "flags": 4},
+            {"matrix": [8, 1], "x": 208, "y": 48, "flags": 4},
+            {"matrix": [9, 1], "x": 176, "y": 55, "flags": 4},
+            {"matrix": [9, 2], "x": 160, "y": 57, "flags": 4},
+            {"matrix": [8, 2], "x": 192, "y": 45, "flags": 4},
+            {"matrix": [7, 2], "x": 192, "y": 33, "flags": 4},
+            {"matrix": [6, 2], "x": 192, "y": 21, "flags": 4},
+            {"matrix": [5, 2], "x": 192, "y": 9, "flags": 4},
+            {"matrix": [5, 3], "x": 176, "y": 7, "flags": 4},
+            {"matrix": [6, 3], "x": 176, "y": 19, "flags": 4},
+            {"matrix": [7, 3], "x": 176, "y": 31, "flags": 4},
+            {"matrix": [8, 3], "x": 176, "y": 43, "flags": 4},
+            {"matrix": [9, 3], "x": 144, "y": 59, "flags": 4},
+            {"matrix": [9, 4], "x": 128, "y": 64, "flags": 4},
+            {"matrix": [8, 4], "x": 160, "y": 45, "flags": 4},
+            {"matrix": [7, 4], "x": 160, "y": 33, "flags": 4},
+            {"matrix": [6, 4], "x": 160, "y": 21, "flags": 4},
+            {"matrix": [5, 4], "x": 160, "y": 9, "flags": 4},
+            {"matrix": [5, 5], "x": 144, "y": 10, "flags": 4},
+            {"matrix": [6, 5], "x": 144, "y": 22, "flags": 4},
+            {"matrix": [7, 5], "x": 144, "y": 34, "flags": 4},
+            {"matrix": [8, 5], "x": 144, "y": 47, "flags": 4}
+            {"x": 140, "y": 45, "flags": 2},
+            {"x": 156, "y": 7, "flags": 2},
+            {"x": 204, "y": 14, "flags": 2},
+            {"x": 196, "y": 49, "flags": 2},
+            {"x": 162, "y": 57, "flags": 2}
+        ],
+        "max_brightness": 120,
+        "split_count": [34, 34]
+    },
+    "rgblight": {
+        "led_count": 68,
+        "max_brightness": 120,
+        "split_count": [34, 34]
+    },
+    "split": {
+        "enabled": true,
+        "serial": {
+            "pin": "D2"
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true,
+                "oled": true,
+                "wpm": true
+            }
+        }
+    },
+    "url": "mechboards.co.uk",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x7171"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [5, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 12.5, "y": 0},
+                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6, "y": 2.75},
+                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 1], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 3], "x": 11, "y": 4.25},
+                {"matrix": [9, 2], "x": 12, "y": 4.15},
+                {"matrix": [9, 1], "x": 13, "y": 4.125},
+                {"matrix": [9, 0], "x": 14, "y": 4.375}
+            ]
+        }
+    }
+}

keyboards/mechboards/sofle/pro/keymaps/default/keymap.c

@@ -0,0 +1,47 @@
+// Copyright 2025 Dasky (@daskygit)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_GRV,
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                             KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_BSPC,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                             KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MUTE,        KC_MPLY, KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+                      KC_LGUI, KC_LALT, KC_LCTL, MO(1),   KC_ENT,         KC_SPC,  MO(2),   KC_RCTL, KC_RALT, KC_RGUI
+  ),
+  [1] = LAYOUT(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                            KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_F12,
+    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
+    _______, KC_EQL,  KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,        _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
+                      _______, _______, _______, _______, _______,        _______, MO(3),   _______, _______, _______
+  ),
+  [2] = LAYOUT(
+    _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______ ,_______,
+    _______, KC_INS,  KC_PSCR, KC_APP,  XXXXXXX, XXXXXXX,                          KC_PGUP, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, KC_BSPC,
+    _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS,                          KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  XXXXXXX,
+    _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), XXXXXXX, _______,        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+                      _______, _______, _______, MO(3),   _______,        _______, _______, _______, _______, _______
+  ),
+    [3] = LAYOUT(
+    XXXXXXX, XXXXXXX, XXXXXXX ,XXXXXXX, XXXXXXX, XXXXXXX,                          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    RM_TOGG, RM_HUEU, RM_SATU, RM_VALU, XXXXXXX, XXXXXXX,                          XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
+    RM_NEXT, RM_HUED, RM_SATD, RM_VALD, XXXXXXX, XXXXXXX, XXXXXXX,        XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
+                      _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______
+  )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT)},
+[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+[3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}
+};
+#endif
+// clang-format on

keyboards/mechboards/sofle/pro/keymaps/default/rules.mk

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

keyboards/mechboards/sofle/pro/post_rules.mk

@@ -0,0 +1 @@
+include keyboards/mechboards/common/post_rules.mk

keyboards/mechboards/sofle/pro/pro.c

@@ -0,0 +1,15 @@
+// Copyright 2025 Dasky (@daskygit)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+void render_logo(void) {
+    static const char PROGMEM pro_logo[] = {
+        252, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 31,  31,  31,  31,  31,  255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 0,   0,   0,   240, 248, 24,  24,  24,  24,  24,  24,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   240, 248, 24,  24,  24,  24,  16,  0,   0,   248, 248, 0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,   0,   0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,   0,   0,   0,  0,  0,  0,  0,  0,   255, 255, 255, 255, 255, 7,   7,  7,  7,  7,  255, 7,   7,   7,   7,   7,   255, 7, 7, 7, 7, 7, 255, 7,  7,  7,  7,  7,  255, 7,  7,  7,  7,  7,  255, 255, 255, 4,  4,  4,  4, 4, 255,
+        7,   7,   7,   7,   7,   255, 7,   7,   7,   7,   7,   255, 255, 255, 255, 255, 0,   0,   0,   3,   7,   6,   6,   6,   6,   254, 252, 0,   0,   254, 255, 3,   3,   3,   3,   255, 254, 0,   0,   3,   255, 255, 3,   3,   3,   0,   0,   0,   0,   255, 255, 0,   0,   0,   0,   254, 255, 51,  51,  51,  51,  63,  30,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   255, 255, 255, 255, 255, 65,  65,  65,  65,  65,  255, 255, 255, 255, 255, 255, 255, 65, 65, 65, 65, 65, 255, 255, 255, 255, 255, 255, 255, 65, 65, 65, 65, 65, 255, 255, 255, 65, 65, 65, 65, 65, 255, 127, 127, 127, 127, 127, 255, 65, 65, 65, 65, 65,  255, 255, 255, 255, 255, 0,   0, 0, 3, 3, 3, 3,   3,  3,  3,  1,  0,  0,   1,  3,  3,  3,  3,  3,   3,   1,   0,  0,  0,  3, 3, 0,
+        0,   0,   0,   0,   0,   0,   1,   3,   3,   3,   0,   0,   1,   3,   3,   3,   3,   3,   3,   1,   0,   0,   224, 240, 48,  176, 176, 112, 240, 48,  176, 176, 112, 240, 112, 176, 176, 112, 240, 224, 0,   0,   63,  127, 255, 255, 255, 240, 240, 240, 240, 240, 255, 255, 255, 255, 255, 255, 255, 240, 240, 240, 240, 240, 255, 255, 255, 255, 255, 255, 255, 240, 240, 240, 240, 240, 255, 255, 255, 240, 240, 240, 240, 240, 255, 240, 240, 240, 240, 240, 255, 240, 240, 240, 240, 240, 255, 255, 255, 127, 63,  0,   0,  0,  0,  0,  0,  0,   0,   0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,   0,   0,   0,  0,  0,  0,  0,  0,   0,   0,   0,   0,   0,   0,   0,  0,  0,  0,  0,   0,   0,   0,   0,   0,   0,   0, 0, 0, 0, 0, 31,  63, 48, 61, 61, 62, 63,  48, 61, 61, 50, 63, 56,  55,  55,  56, 63, 31, 0, 0,
+    };
+    oled_write_raw_P(pro_logo, sizeof(pro_logo));
+}
+#endif

keyboards/mechboards/sofle/pro/readme.md

@@ -0,0 +1,25 @@
+# Sofle Pro
+
+A refreshed PCB with per key RGB, battery, power switch support.
+
+* Keyboard Maintainer: [dasky](https://github.com/daskygit)
+* Hardware Supported: Controllers using promicro footprint.
+* Hardware Availability: https://mechboards.co.uk
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb mechboards/sofle/pro -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb mechboards/sofle/pro -km default
+
+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 top left key or the top right key depending on which side you're connecting to USB.
+* **Physical reset button**: Double press the button below the TRRS socket.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available