aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/lufa/lufa.c
diff options
context:
space:
mode:
authora-chol <a-chol@users.noreply.github.com>2020-07-25 14:01:15 +0200
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-08-29 14:30:02 -0700
commitd4be07dad368c57669c88ead6c093c9e23086855 (patch)
tree91d2e4e4dec57c978e92dfd71056aadb0dfdaaeb /tmk_core/protocol/lufa/lufa.c
parent9d3b26a47543d9898a2af2cee5f6ef53b4995e9f (diff)
downloadqmk_firmware-d4be07dad368c57669c88ead6c093c9e23086855.tar.gz
qmk_firmware-d4be07dad368c57669c88ead6c093c9e23086855.zip
Hid joystick interface (#4226)
* add support for hid gamepad interface add documentation for HID joystick Add joystick_task to read analog axes values even when no key is pressed or release. update doc Update docs/feature_joystick.md Manage pin setup and read to maintain matrix scan after analog read * Incorporates patches and changes to HID reporting There are some patches provided by @a-chol incorporated on this commit, and also some changes I made to the HID Report structure. The most interesting is the one dealing with number of buttons: Linux doesn't seem to care, but Windows requires the HID structure to be byte aligned (that's in the spec). So if one declares 8/16/32... buttons they should not have any issues, but this is what happens when you have 9 buttons: ``` bits |0|1|2|3|4|5|6|7| |*|*|*|*|*|*|*|*| axis 0 (report size 8) |*|*|*|*|*|*|*|*| ... |*|*|*|*|*|*|*|*| |*|*|*|*|*|*|*|*| |*|*|*|*|*|*|*|*| |*|*|*|*|*|*|*|*| |*|*|*|*|*|*|*|*| axis 6 |*|*|*|*|*|*|*|*| first 8 buttons (report size 1) |*| | | | | | | | last of 9 buttons, not aligned ``` So for that I added a conditonal that will add a number of reports with size 1 to make sure it aligns to the next multiple of 8. Those reports send dummy inputs that don't do anything aside from aligning the data. Tested on Linux, Windows 10 and Street Fighter (where the joystick is recognized as direct-input) * Add save and restore of each pin used in reading joystick (AVR). Allow output pin to be JS_VIRTUAL_AXIS if the axis is connected to Vcc instead of an output pin from the MCU. Fix joystick report id Fix broken v-usb hid joystick interface. Make it more resilient to unusual settings (none multiple of eight button count, 0 buttons or 0 axes) Correct adc reading for multiple axes. Piecewise range conversion for uncentered raw value range. Input, output and ground pin configuration per axis. Documentation fixes * Fix port addressing for joystick analog read * The other required set of changes As per the PR, the changes still holding it up. Add onekey for testing. Fix ARM builds. Fix device descriptor when either axes or buttons is zero. Add compile-time check for at least one axis or button. Move definition to try to fix conflict. PR review comments. qmk cformat * avoid float functions to compute range mapping for axis adc reading * Remove V-USB support for now. Updated docs accordingly. * Update tmk_core/protocol/lufa/lufa.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Update tmk_core/protocol/usb_descriptor.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Update tmk_core/protocol/usb_descriptor.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Update tmk_core/protocol/usb_descriptor.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Add support for joystick adc reading for stm32 MCUs. Fix joystick hid report sending for chibios * Fix HID joystick report sending for ChibiOS. Add one analog axis to the onekey:joystick keymap. Fix pin state save and restore during joystick analog read for STM32 MCUs. * Update tmk_core/protocol/chibios/usb_main.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Update tmk_core/protocol/lufa/lufa.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Add missing mcuconf.h and halconf.h to onekey:joystick keymap. Add suggested fixes from PR. * Switch saveState and restoreState signature to use pin_t type. onekey:joystick : add a second axis, virtual and programmatically animated. * Update docs/feature_joystick.md Co-Authored-By: Ryan <fauxpark@gmail.com> * Update docs/feature_joystick.md Co-Authored-By: Ryan <fauxpark@gmail.com> * Add PR corrections * Remove halconf.h and mcuconf.h from onekey keymaps * Change ADC_PIN to A0 Co-authored-by: achol <allecooll@hotmail.com> Co-authored-by: José Júnior <jose.junior@gmail.com> Co-authored-by: a-chol <achol@notamail.com> Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
-rw-r--r--tmk_core/protocol/lufa/lufa.c67
1 files changed, 67 insertions, 0 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 6776a964e..85603646d 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -85,6 +85,10 @@ extern keymap_config_t keymap_config;
85# include "raw_hid.h" 85# include "raw_hid.h"
86#endif 86#endif
87 87
88#ifdef JOYSTICK_ENABLE
89# include "joystick.h"
90#endif
91
88uint8_t keyboard_idle = 0; 92uint8_t keyboard_idle = 0;
89/* 0: Boot Protocol, 1: Report Protocol(default) */ 93/* 0: Boot Protocol, 1: Report Protocol(default) */
90uint8_t keyboard_protocol = 1; 94uint8_t keyboard_protocol = 1;
@@ -264,6 +268,66 @@ static void Console_Task(void) {
264#endif 268#endif
265 269
266/******************************************************************************* 270/*******************************************************************************
271 * Joystick
272 ******************************************************************************/
273#ifdef JOYSTICK_ENABLE
274void send_joystick_packet(joystick_t *joystick) {
275 uint8_t timeout = 255;
276
277 joystick_report_t r = {
278# if JOYSTICK_AXES_COUNT > 0
279 .axes = {joystick->axes[0],
280
281# if JOYSTICK_AXES_COUNT >= 2
282 joystick->axes[1],
283# endif
284# if JOYSTICK_AXES_COUNT >= 3
285 joystick->axes[2],
286# endif
287# if JOYSTICK_AXES_COUNT >= 4
288 joystick->axes[3],
289# endif
290# if JOYSTICK_AXES_COUNT >= 5
291 joystick->axes[4],
292# endif
293# if JOYSTICK_AXES_COUNT >= 6
294 joystick->axes[5],
295# endif
296 },
297# endif // JOYSTICK_AXES_COUNT>0
298
299# if JOYSTICK_BUTTON_COUNT > 0
300 .buttons = {joystick->buttons[0],
301
302# if JOYSTICK_BUTTON_COUNT > 8
303 joystick->buttons[1],
304# endif
305# if JOYSTICK_BUTTON_COUNT > 16
306 joystick->buttons[2],
307# endif
308# if JOYSTICK_BUTTON_COUNT > 24
309 joystick->buttons[3],
310# endif
311 }
312# endif // JOYSTICK_BUTTON_COUNT>0
313 };
314
315 /* Select the Joystick Report Endpoint */
316 Endpoint_SelectEndpoint(JOYSTICK_IN_EPNUM);
317
318 /* Check if write ready for a polling interval around 10ms */
319 while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
320 if (!Endpoint_IsReadWriteAllowed()) return;
321
322 /* Write Joystick Report Data */
323 Endpoint_Write_Stream_LE(&r, sizeof(joystick_report_t), NULL);
324
325 /* Finalize the stream transfer to send the last packet */
326 Endpoint_ClearIN();
327}
328#endif
329
330/*******************************************************************************
267 * USB Events 331 * USB Events
268 ******************************************************************************/ 332 ******************************************************************************/
269/* 333/*
@@ -411,6 +475,9 @@ void EVENT_USB_Device_ConfigurationChanged(void) {
411 ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_OUT_EPNUM | ENDPOINT_DIR_OUT), EP_TYPE_BULK, CDC_EPSIZE, 1); 475 ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_OUT_EPNUM | ENDPOINT_DIR_OUT), EP_TYPE_BULK, CDC_EPSIZE, 1);
412 ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, CDC_EPSIZE, 1); 476 ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, CDC_EPSIZE, 1);
413#endif 477#endif
478#ifdef JOYSTICK_ENABLE
479 ConfigSuccess &= ENDPOINT_CONFIG(JOYSTICK_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN, JOYSTICK_EPSIZE, ENDPOINT_BANK_SINGLE);
480#endif
414} 481}
415 482
416/* FIXME: Expose this table in the docs somehow 483/* FIXME: Expose this table in the docs somehow