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

[Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (#20433 )
2025-07-22 15:42:04 +00:00 · 2023-04-13 04:44:03 +00:00 · 2023-04-12 21:43:27 -07:00 · 2023-04-13 04:05:26 +00:00 · 2023-04-13 04:04:42 +00:00 · 2023-04-12 22:04:02 -06:00
7 changed files with 9 additions and 5 deletions
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@ -829,9 +829,9 @@ endif
 ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
    PS2_ENABLE := yes
    MOUSE_ENABLE := yes
    SRC += ps2_mouse.c
    OPT_DEFS += -DPS2_MOUSE_ENABLE
    OPT_DEFS += -DMOUSE_ENABLE
 endif
 VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor
--- a/drivers/ps2/ps2_interrupt.c
+++ b/drivers/ps2/ps2_interrupt.c
@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 // chibiOS headers
 #    include "ch.h"
 #    include "hal.h"
 #    include "gpio.h"
 #endif
 #include "ps2.h"
--- a/keyboards/momokai/tap_duo/readme.md
+++ b/keyboards/momokai/tap_duo/readme.md
@ -2,7 +2,8 @@
 * Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
-
+* Hardware Supported: Tap Duo
 * Hardware Availability: [Momokai](https://www.momokai.com/)
 Make example for this keyboard (after setting up your build environment):
--- a/keyboards/momokai/tap_trio/readme.md
+++ b/keyboards/momokai/tap_trio/readme.md
@ -2,7 +2,8 @@
 * Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
-
+* Hardware Supported: Tap Trio
 * Hardware Availability: [Momokai](https://www.momokai.com/)
 Make example for this keyboard (after setting up your build environment):
--- a/keyboards/ymdk/id75/config.h
+++ b/keyboards/ymdk/id75/config.h
@ -16,7 +16,6 @@
 #pragma once
 #define RGB_DI_PIN B9
 #define RGB_MATRIX_LED_COUNT 89
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
--- a/keyboards/ymdk/id75/info.json
+++ b/keyboards/ymdk/id75/info.json
@ -18,7 +18,8 @@
    },
    "processor": "STM32F103",
    "ws2812": {
-        "driver": "pwm"
+        "driver": "pwm",
        "pin": "B9"
    },
    "rgb_matrix": {
        "animations": {
--- a/platforms/chibios/drivers/ps2/ps2_io.c
+++ b/platforms/chibios/drivers/ps2/ps2_io.c
@ -4,6 +4,7 @@
 // chibiOS headers
 #include "ch.h"
 #include "hal.h"
 #include "gpio.h"
 /* Check port settings for clock and data line */
 #if !(defined(PS2_CLOCK_PIN))
Author	SHA1	Message	Date
QMK Bot	cd2fe7704d	Merge remote-tracking branch 'origin/develop' into xap	2023-04-13 04:44:03 +00:00
Drashna Jaelre	cf5626e024	[Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (#20433 )	2023-04-12 21:43:27 -07:00
QMK Bot	8a31483309	Merge remote-tracking branch 'origin/develop' into xap	2023-04-13 04:05:26 +00:00
QMK Bot	572f86349e	Merge remote-tracking branch 'origin/master' into develop	2023-04-13 04:04:42 +00:00
Albert Y	6d965d486c	Add hardware information momokai keyboards (#20434 )	2023-04-12 22:04:02 -06:00
QMK Bot	766b600f64	Merge remote-tracking branch 'origin/develop' into xap	2023-04-13 01:00:14 +00:00
Drashna Jaelre	d11c37925b	[Keyboard] Update ymdk/id75 config (#20432 )	2023-04-12 17:59:07 -07:00