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

2025-07-19 14:12:01 +00:00 · 2025-06-07 00:31:45 +00:00 · 2025-06-07 00:31:45 +00:00 · 8455dd093d
commit 8455dd093d
parent e182e1a387 b4cabc3cf7
29 changed files with 44 additions and 54 deletions
--- a/keyboards/handwired/wwa/soyuz/keyboard.json
+++ b/keyboards/handwired/wwa/soyuz/keyboard.json
@ -8,7 +8,8 @@
        "bootmagic": true,
        "extrakey": true,
        "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "encoder" : true
    },
    "matrix_pins": {
        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6"],
@ -20,6 +21,13 @@
        "pid": "0x0004",
        "vid": "0x5757"
    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP16", "pin_b": "GP17"},
+            {"pin_a": "GP18", "pin_b": "GP19"},
+            {"pin_a": "GP20", "pin_b": "GP21"}
+        ]
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
+++ b/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
@ -3,11 +3,17 @@

 #include QMK_KEYBOARD_H

-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
        KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,     KC_F10,
        KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,   KC_F16,    KC_F17,
        KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,   KC_F23,    KC_F24 
    )
-};
+};
+
+
+#if defined(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_VOLD, KC_VOLU),  ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
--- a/keyboards/handwired/wwa/soyuz/keymaps/default/rules.mk
+++ b/keyboards/handwired/wwa/soyuz/keymaps/default/rules.mk
@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/handwired/wwa/soyuz/readme.md
+++ b/keyboards/handwired/wwa/soyuz/readme.md
@ -2,7 +2,7 @@

 ![soyuz](https://i.imgur.com/KwwORGSh.jpeg)

-21 Key and 3 MIDI Potentiometers Macro Keyboard
+21 Key, 3 Encoder

 * Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
 * Hardware Supported: RP2040 Handwired
--- a/keyboards/nacly/sodium42/keyboard.json
+++ b/keyboards/nacly/sodium42/keyboard.json
@ -35,8 +35,7 @@
            "pin": "D3"
        }
    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/nacly/sodium50/keyboard.json
+++ b/keyboards/nacly/sodium50/keyboard.json
@ -35,8 +35,7 @@
            "pin": "D3"
        }
    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/nacly/sodium62/keyboard.json
+++ b/keyboards/nacly/sodium62/keyboard.json
@ -36,8 +36,7 @@
            "pin": "D3"
        }
    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/nacly/splitreus62/keyboard.json
+++ b/keyboards/nacly/splitreus62/keyboard.json
@ -42,8 +42,7 @@
    "ws2812": {
      "pin": "B1"
    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
      "LAYOUT": {
        "layout": [
--- a/keyboards/nacly/ua62/keyboard.json
+++ b/keyboards/nacly/ua62/keyboard.json
@ -26,8 +26,7 @@
        "rows": ["D3", "D2", "D1", "D0", "D4"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
      "LAYOUT": {
        "layout": [
--- a/keyboards/newgame40/keyboard.json
+++ b/keyboards/newgame40/keyboard.json
@ -39,8 +39,7 @@
  "ws2812": {
    "pin": "F6"
  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
+  "development_board": "promicro",
  "community_layouts": ["ortho_4x10"],
  "layouts": {
    "LAYOUT_ortho_4x10": {
--- a/keyboards/nightly_boards/n9/keyboard.json
+++ b/keyboards/nightly_boards/n9/keyboard.json
@ -46,8 +46,7 @@
    "ws2812": {
        "pin": "F5"
    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/nightly_boards/ph_arisu/keyboard.json
+++ b/keyboards/nightly_boards/ph_arisu/keyboard.json
@ -25,8 +25,7 @@
        "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
    },
    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/np12/keyboard.json
+++ b/keyboards/np12/keyboard.json
@ -25,8 +25,7 @@
      {"pin_a": "F4", "pin_b": "F5"}
    ]
  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
+  "development_board": "promicro",
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/numatreus/keyboard.json
+++ b/keyboards/numatreus/keyboard.json
@ -33,8 +33,7 @@
    "led_count": 6,
    "max_brightness": 200
  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
+  "development_board": "promicro",
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/obosob/arch_36/keyboard.json
+++ b/keyboards/obosob/arch_36/keyboard.json
@ -34,8 +34,7 @@
    "ws2812": {
        "pin": "D3"
    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "community_layouts": ["split_3x5_3"],
    "layouts": {
        "LAYOUT_split_3x5_3": {
--- a/keyboards/obosob/steal_this_keyboard/keyboard.json
+++ b/keyboards/obosob/steal_this_keyboard/keyboard.json
@ -8,8 +8,7 @@
        "pid": "0x50AD",
        "device_version": "0.0.1"
    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "features": {
        "bootmagic": false,
        "extrakey": true,
--- a/keyboards/ocean/addon/keyboard.json
+++ b/keyboards/ocean/addon/keyboard.json
@ -19,8 +19,7 @@
        "rows": ["C6", "D7", "E6", "B4", "B5"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/ocean/gin_v2/keyboard.json
+++ b/keyboards/ocean/gin_v2/keyboard.json
@ -18,8 +18,7 @@
        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/ocean/slamz/keyboard.json
+++ b/keyboards/ocean/slamz/keyboard.json
@ -18,8 +18,7 @@
        "rows": ["D2", "D1", "D0", "D4"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/ocean/stealth/keyboard.json
+++ b/keyboards/ocean/stealth/keyboard.json
@ -18,8 +18,7 @@
        "rows": ["D1"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/ocean/sus/keyboard.json
+++ b/keyboards/ocean/sus/keyboard.json
@ -19,8 +19,7 @@
      "rows": ["B5", "B4", "E6", "D7"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT_ortho_4x3": {
          "layout": [
--- a/keyboards/ocean/wang_ergo/keyboard.json
+++ b/keyboards/ocean/wang_ergo/keyboard.json
@ -18,8 +18,7 @@
        "rows": ["F4", "F5", "F6", "F7"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layout_aliases": {
        "LAYOUT": "LAYOUT_all"
    },
--- a/keyboards/ocean/wang_v2/keyboard.json
+++ b/keyboards/ocean/wang_v2/keyboard.json
@ -18,8 +18,7 @@
        "rows": ["F4", "F5", "F6", "F7"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/ocean/yuri/keyboard.json
+++ b/keyboards/ocean/yuri/keyboard.json
@ -19,8 +19,7 @@
        "rows": ["F4", "F5", "F6", "F7"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/om60/keyboard.json
+++ b/keyboards/om60/keyboard.json
@ -49,8 +49,7 @@
  "ws2812": {
    "pin": "D3"
  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
+  "development_board": "promicro",
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/omkbd/ergodash/info.json
+++ b/keyboards/omkbd/ergodash/info.json
@ -1,6 +1,5 @@
 {
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "split": {
        "enabled": true
    }
--- a/keyboards/omkbd/runner3680/info.json
+++ b/keyboards/omkbd/runner3680/info.json
@ -1,6 +1,5 @@
 {
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
    "features": {
        "bootmagic": false,
        "extrakey": false,
--- a/keyboards/orthodox/rev1/keyboard.json
+++ b/keyboards/orthodox/rev1/keyboard.json
@ -17,8 +17,7 @@
      "pin": "D0"
    }
  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
+  "development_board": "promicro",
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/orthodox/rev3/keyboard.json
+++ b/keyboards/orthodox/rev3/keyboard.json
@ -17,8 +17,7 @@
      "pin": "D0"
    }
  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
+  "development_board": "promicro",
  "layouts": {
    "LAYOUT": {
      "layout": [