Merge branch 'qmk:master' into m4m5

.gitignore

@@ -64,6 +64,7 @@ build/
 cmake-build-debug
 CMakeLists.txt
 *.pdf
+*.zip
 
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace

keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h

@@ -19,5 +19,5 @@
 
 #include_next <mcuconf.h>
 
-#undef RP_SPI_USE_SPI1
-#define RP_SPI_USE_SPI1 TRUE
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE

keyboards/cloud_macro/keyboard.json

@@ -0,0 +1,33 @@
+{
+    "manufacturer": "Trey Wax",
+    "keyboard_name": "cloud_macro",
+    "maintainer": "TweyHugs",
+    "development_board": "kb2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "direct":[
+            ["GP2", "GP3", "GP4", "GP5", "GP6"]
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},  
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0}
+            ]
+        }
+    }
+}

keyboards/cloud_macro/keymaps/default/keymap.c

@@ -0,0 +1,8 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(KC_1,  KC_2,  KC_3, KC_4, KC_5)
+};

keyboards/cloud_macro/readme.md

@@ -0,0 +1,27 @@
+# cloud_macro
+
+![cloud_macro](https://i.imgur.com/n0PMttQ.jpeg)
+
+A 5 key macropad in the shape of a cloud
+
+* Keyboard Maintainer: [Trey Wax](https://github.com/TweyHugs)
+* Hardware Supported: Adafruit KB2040
+* Hardware Availability: *https://circuitrey.carrd.co/*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cloud_macro:default
+
+Flashing example for this keyboard:
+
+    make cloud_macro: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

keyboards/togkey/pad_pocket/keyboard.json

@@ -0,0 +1,49 @@
+{
+    "manufacturer": "TogKey",
+    "keyboard_name": "Pad Pocket",
+    "maintainer": "togkey86",
+    "development_board": "promicro_rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP22"],
+        "rows": ["GP26"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "hue_steps": 10,
+        "led_count": 2
+    },
+    "url": "https://togkey.com/products/togkey-pad-pocket",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x8688",
+        "vid": "0xFEED"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP21"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0}
+            ]
+        }
+    }
+}

keyboards/togkey/pad_pocket/keymaps/default/keymap.c

@@ -0,0 +1,29 @@
+// Copyright 2025 TogKey
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+//Tap Dances
+enum {
+    TD_VOLDOWN_MEDIAPREV,
+    TD_VOLUP_MEDIANEXT
+};
+
+tap_dance_action_t tap_dance_actions[] = {
+    [TD_VOLDOWN_MEDIAPREV] = ACTION_TAP_DANCE_DOUBLE(KC_AUDIO_VOL_DOWN, KC_MEDIA_PREV_TRACK),
+    [TD_VOLUP_MEDIANEXT] = ACTION_TAP_DANCE_DOUBLE(KC_AUDIO_VOL_UP, KC_MEDIA_NEXT_TRACK)
+};
+
+//Combos
+const uint16_t PROGMEM media_combo[] = {TD(TD_VOLDOWN_MEDIAPREV), TD(TD_VOLUP_MEDIANEXT), COMBO_END};
+
+combo_t key_combos[] = {
+    COMBO(media_combo, KC_MEDIA_PLAY_PAUSE)
+};
+
+//Keymap
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         TD(TD_VOLDOWN_MEDIAPREV),  TD(TD_VOLUP_MEDIANEXT)
+    )
+};

keyboards/togkey/pad_pocket/keymaps/default/rules.mk

@@ -0,0 +1,2 @@
+COMBO_ENABLE = yes
+TAP_DANCE_ENABLE = yes

keyboards/togkey/pad_pocket/readme.md

@@ -0,0 +1,27 @@
+# pad_pocket
+
+![pad_pocket](https://i.imgur.com/yCrqAe5.jpeg)
+
+A simple 2-Key Macropad Keychain based off an RP2040 Development Board and a custom PCB that is pre-programmed to control media.
+
+* Keyboard Maintainer: [Jon Henry](https://github.com/togkey86)
+* Hardware Supported: Togkey Pad Pocket/Duo PCB, RP2040 Pro Micro Development Board
+* Hardware Availability: (https://togkey.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+     make togkey/pad_pocket:default
+
+Flashing example for this keyboard:
+
+    make togkey/pad_pocket: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 (The left key closest to the USB Port) 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