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

2023-09-17 17:36:04 +00:00 · 2023-09-17 17:36:04 +00:00 · 6e98c80eaa
parent f457f0a26d 652c5a9410
commit 6e98c80eaa
2 changed files with 4 additions and 1 deletions
--- a/keyboards/geistmaschine/macropod/config.h
+++ b/keyboards/geistmaschine/macropod/config.h
@ -19,3 +19,6 @@
   IO expander setup would allow up to 1x16 + 1 from the MCU */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 17
+
+/* Fix for Apple Silicon Macs struggling to detect board after suspend/sleep */
+#define USB_SUSPEND_WAKEUP_DELAY 200
--- a/keyboards/geistmaschine/macropod/info.json
+++ b/keyboards/geistmaschine/macropod/info.json
@ -15,7 +15,7 @@
        "command": false,
        "console": false,
        "extrakey": true,
-        "mousekey": false,
+        "mousekey": true,
        "nkro": false,
        "encoder": true
    },