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

This commit is contained in:
QMK Bot 2023-09-17 17:36:04 +00:00
commit 6e98c80eaa
2 changed files with 4 additions and 1 deletions

View file

@ -19,3 +19,6 @@
IO expander setup would allow up to 1x16 + 1 from the MCU */ IO expander setup would allow up to 1x16 + 1 from the MCU */
#define MATRIX_ROWS 1 #define MATRIX_ROWS 1
#define MATRIX_COLS 17 #define MATRIX_COLS 17
/* Fix for Apple Silicon Macs struggling to detect board after suspend/sleep */
#define USB_SUSPEND_WAKEUP_DELAY 200

View file

@ -15,7 +15,7 @@
"command": false, "command": false,
"console": false, "console": false,
"extrakey": true, "extrakey": true,
"mousekey": false, "mousekey": true,
"nkro": false, "nkro": false,
"encoder": true "encoder": true
}, },