Merge remote-tracking branch 'qmk/master' into merge-2024-06-23

keyboards/geekboards/macropad_v2/config.h

@@ -19,7 +19,5 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
-
-#define WAIT_FOR_USB
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3

keyboards/geekboards/macropad_v2/keyboard.json

@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x0483",
     "pid": "0xA372",
-    "device_version": "0.0.2"
+    "device_version": "0.0.2",
+    "wait_for_enumeration": true
   },
   "qmk": {
     "tap_keycode_delay": 10
@@ -55,6 +56,15 @@
   },
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgb_matrix": true
+  },
   "matrix_pins": {
     "direct": [
       ["B13", "B15", "B3", "B5"],

keyboards/geekboards/macropad_v2/keymaps/default/readme.md

@@ -1 +0,0 @@
-# The default keymap for Geekboards Macropad v2

keyboards/geekboards/macropad_v2/keymaps/via/readme.md

@@ -1,3 +0,0 @@
-# Geekboards Macropad v2 - VIA layout
-
-Flash with this layout to use [VIA](https://caniusevia.com/) for customising layout.

keyboards/geekboards/macropad_v2/rules.mk

@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-

keyboards/geekboards/tester/config.h

@@ -1,6 +1,3 @@
 #pragma once
 
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-
-#define LOCKING_SUPPORT_ENABL
-#define LOCKING_RESYNC_ENABLE

keyboards/geekboards/tester/keyboard.json

@@ -52,6 +52,21 @@
         },
         "driver": "is31fl3731"
     },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F7", "F6", "D2", "D3"],
         "rows": ["B0", "D4"]

keyboards/geekboards/tester/rules.mk

@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix