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

keyboards/riot_pad/config.h

@@ -0,0 +1,8 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 0
+#define WS2812_SPI_SCK_PAL_MODE 0
+#define WS2812_SPI_SCK_PIN A5

keyboards/riot_pad/halconf.h

@@ -0,0 +1,7 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>

keyboards/riot_pad/info.json

@@ -0,0 +1,56 @@
+{
+    "manufacturer": "ShandonCodes",
+    "keyboard_name": "RiotPad",
+    "maintainer": "ShandonCodes",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "A8", "A9"],
+        "rows": ["B13", "B15"]
+    },
+    "processor": "STM32F072",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 12
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1000",
+        "vid": "0x7877"
+    },
+    "ws2812": {
+        "driver": "spi",
+        "pin": "A7"
+    },
+    "community_layouts": ["ortho_2x3"],
+    "layouts": {
+        "LAYOUT_ortho_2x3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
+}

keyboards/riot_pad/keymaps/default/keymap.c

@@ -0,0 +1,22 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬────┐
+     * │ A │ B │ C  │
+     * ├───┼───┼────┤
+     * │ D │ E │ Fn │
+     * └───┴───┴────┘
+     */
+    [0] = LAYOUT_ortho_2x3(
+        KC_A,    KC_B,    KC_C,
+        KC_D,    KC_E,    MO(1)
+    ),
+    [1] = LAYOUT_ortho_2x3(
+        RGB_MOD,    RGB_RMOD,    RGB_TOG,
+        RGB_VAI,    RGB_VAD,    KC_TRNS
+    )
+};

keyboards/riot_pad/keymaps/via/keymap.c

@@ -0,0 +1,22 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬────┐
+     * │ A │ B │ C  │
+     * ├───┼───┼────┤
+     * │ D │ E │ Fn │
+     * └───┴───┴────┘
+     */
+    [0] = LAYOUT_ortho_2x3(
+        KC_A,    KC_B,    KC_C,
+        KC_D,    KC_E,    MO(1)
+    ),
+    [1] = LAYOUT_ortho_2x3(
+        RGB_MOD,    RGB_RMOD,    RGB_TOG,
+        RGB_VAI,    RGB_VAD,    KC_TRNS
+    )
+};

keyboards/riot_pad/keymaps/via/rules.mk

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

keyboards/riot_pad/mcuconf.h

@@ -0,0 +1,8 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE

keyboards/riot_pad/readme.md

@@ -0,0 +1,25 @@
+# riot_pad
+
+![riot_pad](https://i.imgur.com/zH6H3pSh.png)
+
+A RGB lovin', 6 key macropad.
+
+* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
+* Hardware Supported: RiotPad PCB
+* Hardware Availability: [Limited Groupbuy](https://store.shandon.codes/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make riot_pad:default
+
+Flashing example for this keyboard:
+
+    make riot_pad: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 (top left key) and plug in the keyboard

keyboards/riot_pad/rules.mk

@@ -0,0 +1 @@
+# This file intentionally left blank