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

2023-01-15 23:30:12 +00:00 · 2023-01-15 23:30:12 +00:00 · df2a4556b6
commit df2a4556b6
parent 14a138f48e 955829bfd0
1 changed files with 1 additions and 1 deletions
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@ -91,7 +91,7 @@ union {
    report_digitizer_t digitizer;
 #endif
 #ifdef JOYSTICK_ENABLE
-    joystick_report_t joystick;
+    report_joystick_t joystick;
 #endif
 } universal_report_blank = {0};