|
|
|
@ -903,7 +903,8 @@ static void send_extra(uint8_t report_id, uint16_t data) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
report_extra_t report = {.report_id = report_id, .usage = data}; |
|
|
|
|
static report_extra_t report; |
|
|
|
|
report = (report_extra_t){.report_id = report_id, .usage = data}; |
|
|
|
|
|
|
|
|
|
usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)&report, sizeof(report_extra_t)); |
|
|
|
|
osalSysUnlock(); |
|
|
|
@ -1051,45 +1052,44 @@ void virtser_task(void) { |
|
|
|
|
#ifdef JOYSTICK_ENABLE |
|
|
|
|
|
|
|
|
|
void send_joystick_packet(joystick_t *joystick) { |
|
|
|
|
joystick_report_t rep = { |
|
|
|
|
static joystick_report_t rep; |
|
|
|
|
rep = (joystick_report_t) { |
|
|
|
|
# if JOYSTICK_AXES_COUNT > 0 |
|
|
|
|
.axes = |
|
|
|
|
{ |
|
|
|
|
joystick->axes[0], |
|
|
|
|
{ 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
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|