From c447c4ffd5301793c91ac717d3f6318f7a17d8cf Mon Sep 17 00:00:00 2001 From: a-chol <a-chol@users.noreply.github.com> Date: Mon, 30 Mar 2020 11:17:14 +0200 Subject: [PATCH] Update tmk_core/protocol/chibios/usb_main.c Co-Authored-By: Ryan <fauxpark@gmail.com> --- tmk_core/protocol/chibios/usb_main.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index ea25ce0a8c..cd34fd2891 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c @@ -891,45 +891,37 @@ void virtser_task(void) { void send_joystick_packet(joystick_t *joystick) { joystick_report_t rep = { # if JOYSTICK_AXES_COUNT > 0 - .axes = {joystick->axes[0] + .axes = {joystick->axes[0], # if JOYSTICK_AXES_COUNT >= 2 - , - joystick->axes[1] + joystick->axes[1], # endif # if JOYSTICK_AXES_COUNT >= 3 - , - joystick->axes[2] + joystick->axes[2], # endif # if JOYSTICK_AXES_COUNT >= 4 - , - joystick->axes[3] + joystick->axes[3], # endif # if JOYSTICK_AXES_COUNT >= 5 - , - joystick->axes[4] + joystick->axes[4], # endif # if JOYSTICK_AXES_COUNT >= 6 - , - joystick->axes[5] + joystick->axes[5], # endif }, # endif // JOYSTICK_AXES_COUNT>0 # if JOYSTICK_BUTTON_COUNT > 0 - .buttons = {joystick->buttons[0] + .buttons = {joystick->buttons[0], # if JOYSTICK_BUTTON_COUNT > 8 - , - joystick->buttons[1] + joystick->buttons[1], # endif # if JOYSTICK_BUTTON_COUNT > 16 - , - joystick->buttons[2] + joystick->buttons[2], # endif # if JOYSTICK_BUTTON_COUNT > 24 - , - joystick->buttons[3] + joystick->buttons[3], # endif } # endif // JOYSTICK_BUTTON_COUNT>0