aboutsummaryrefslogtreecommitdiff
path: root/quantum
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 /quantum
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 'quantum')
-rw-r--r--quantum/joystick.c13
-rw-r--r--quantum/joystick.h54
-rw-r--r--quantum/process_keycode/process_joystick.c168
-rw-r--r--quantum/process_keycode/process_joystick.h11
-rw-r--r--quantum/quantum.c3
-rw-r--r--quantum/quantum.h4
-rw-r--r--quantum/quantum_keycodes.h35
7 files changed, 288 insertions, 0 deletions
diff --git a/quantum/joystick.c b/quantum/joystick.c
new file mode 100644
index 000000000..7b87201ae
--- /dev/null
+++ b/quantum/joystick.c
@@ -0,0 +1,13 @@
1#include "joystick.h"
2
3joystick_t joystick_status = {.buttons = {0},
4 .axes =
5 {
6#if JOYSTICK_AXES_COUNT > 0
7 0
8#endif
9 },
10 .status = 0};
11
12// array defining the reading of analog values for each axis
13__attribute__((weak)) joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {};
diff --git a/quantum/joystick.h b/quantum/joystick.h
new file mode 100644
index 000000000..a95472b9f
--- /dev/null
+++ b/quantum/joystick.h
@@ -0,0 +1,54 @@
1#pragma once
2
3#ifndef JOYSTICK_BUTTON_COUNT
4# define JOYSTICK_BUTTON_COUNT 8
5#endif
6
7#ifndef JOYSTICK_AXES_COUNT
8# define JOYSTICK_AXES_COUNT 4
9#endif
10
11#include "quantum.h"
12
13#include <stdint.h>
14
15// configure on input_pin of the joystick_axes array entry to JS_VIRTUAL_AXIS
16// to prevent it from being read from the ADC. This allows outputing forged axis value.
17//
18#define JS_VIRTUAL_AXIS 0xFF
19
20#define JOYSTICK_AXIS_VIRTUAL \
21 { JS_VIRTUAL_AXIS, JS_VIRTUAL_AXIS, JS_VIRTUAL_AXIS, 0, 1023 }
22#define JOYSTICK_AXIS_IN(INPUT_PIN, LOW, REST, HIGH) \
23 { JS_VIRTUAL_AXIS, INPUT_PIN, JS_VIRTUAL_AXIS, LOW, REST, HIGH }
24#define JOYSTICK_AXIS_IN_OUT(INPUT_PIN, OUTPUT_PIN, LOW, REST, HIGH) \
25 { OUTPUT_PIN, INPUT_PIN, JS_VIRTUAL_AXIS, LOW, REST, HIGH }
26#define JOYSTICK_AXIS_IN_OUT_GROUND(INPUT_PIN, OUTPUT_PIN, GROUND_PIN, LOW, REST, HIGH) \
27 { OUTPUT_PIN, INPUT_PIN, GROUND_PIN, LOW, REST, HIGH }
28
29typedef struct {
30 pin_t output_pin;
31 pin_t input_pin;
32 pin_t ground_pin;
33
34 // the AVR ADC offers 10 bit precision, with significant bits on the higher part
35 uint16_t min_digit;
36 uint16_t mid_digit;
37 uint16_t max_digit;
38} joystick_config_t;
39
40extern joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT];
41
42enum joystick_status { JS_INITIALIZED = 1, JS_UPDATED = 2 };
43
44typedef struct {
45 uint8_t buttons[JOYSTICK_BUTTON_COUNT / 8 + 1];
46
47 int16_t axes[JOYSTICK_AXES_COUNT];
48 uint8_t status : 2;
49} joystick_t;
50
51extern joystick_t joystick_status;
52
53// to be implemented in the hid protocol library
54void send_joystick_packet(joystick_t *joystick);
diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
new file mode 100644
index 000000000..c12f75685
--- /dev/null
+++ b/quantum/process_keycode/process_joystick.c
@@ -0,0 +1,168 @@
1#include "joystick.h"
2#include "process_joystick.h"
3
4#include "analog.h"
5
6#include <string.h>
7#include <math.h>
8
9bool process_joystick_buttons(uint16_t keycode, keyrecord_t *record);
10
11bool process_joystick(uint16_t keycode, keyrecord_t *record) {
12 if (process_joystick_buttons(keycode, record) && (joystick_status.status & JS_UPDATED) > 0) {
13 send_joystick_packet(&joystick_status);
14 joystick_status.status &= ~JS_UPDATED;
15 }
16
17 return true;
18}
19
20__attribute__((weak))
21void joystick_task(void) {
22 if (process_joystick_analogread() && (joystick_status.status & JS_UPDATED)) {
23 send_joystick_packet(&joystick_status);
24 joystick_status.status &= ~JS_UPDATED;
25 }
26}
27
28bool process_joystick_buttons(uint16_t keycode, keyrecord_t *record) {
29 if (keycode < JS_BUTTON0 || keycode > JS_BUTTON_MAX) {
30 return true;
31 } else {
32 if (record->event.pressed) {
33 joystick_status.buttons[(keycode - JS_BUTTON0) / 8] |= 1 << (keycode % 8);
34 } else {
35 joystick_status.buttons[(keycode - JS_BUTTON0) / 8] &= ~(1 << (keycode % 8));
36 }
37
38 joystick_status.status |= JS_UPDATED;
39 }
40
41 return true;
42}
43
44uint16_t savePinState(pin_t pin) {
45#ifdef __AVR__
46 uint8_t pinNumber = pin & 0xF;
47 return ((PORTx_ADDRESS(pin) >> pinNumber) & 0x1) << 1 | ((DDRx_ADDRESS(pin) >> pinNumber) & 0x1);
48#elif defined(PROTOCOL_CHIBIOS)
49 /*
50 The pin configuration is backed up in the following format :
51 bit 15 9 8 7 6 5 4 3 2 1 0
52 |unused|ODR|IDR|PUPDR|OSPEEDR|OTYPER|MODER|
53 */
54 return (( PAL_PORT(pin)->MODER >> (2*PAL_PAD(pin))) & 0x3)
55 | (((PAL_PORT(pin)->OTYPER >> (1*PAL_PAD(pin))) & 0x1) << 2)
56 | (((PAL_PORT(pin)->OSPEEDR >> (2*PAL_PAD(pin))) & 0x3) << 3)
57 | (((PAL_PORT(pin)->PUPDR >> (2*PAL_PAD(pin))) & 0x3) << 5)
58 | (((PAL_PORT(pin)->IDR >> (1*PAL_PAD(pin))) & 0x1) << 7)
59 | (((PAL_PORT(pin)->ODR >> (1*PAL_PAD(pin))) & 0x1) << 8);
60#else
61 return 0;
62#endif
63}
64
65void restorePinState(pin_t pin, uint16_t restoreState) {
66#if defined(PROTOCOL_LUFA)
67 uint8_t pinNumber = pin & 0xF;
68 PORTx_ADDRESS(pin) = (PORTx_ADDRESS(pin) & ~_BV(pinNumber)) | (((restoreState >> 1) & 0x1) << pinNumber);
69 DDRx_ADDRESS(pin) = (DDRx_ADDRESS(pin) & ~_BV(pinNumber)) | ((restoreState & 0x1) << pinNumber);
70#elif defined(PROTOCOL_CHIBIOS)
71 PAL_PORT(pin)->MODER = (PAL_PORT(pin)->MODER & ~(0x3<< (2*PAL_PAD(pin)))) | (restoreState & 0x3) << (2*PAL_PAD(pin));
72 PAL_PORT(pin)->OTYPER = (PAL_PORT(pin)->OTYPER & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>2) & 0x1) << (1*PAL_PAD(pin));
73 PAL_PORT(pin)->OSPEEDR= (PAL_PORT(pin)->OSPEEDR & ~(0x3<< (2*PAL_PAD(pin)))) | ((restoreState>>3) & 0x3) << (2*PAL_PAD(pin));
74 PAL_PORT(pin)->PUPDR = (PAL_PORT(pin)->PUPDR & ~(0x3<< (2*PAL_PAD(pin)))) | ((restoreState>>5) & 0x3) << (2*PAL_PAD(pin));
75 PAL_PORT(pin)->IDR = (PAL_PORT(pin)->IDR & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>7) & 0x1) << (1*PAL_PAD(pin));
76 PAL_PORT(pin)->ODR = (PAL_PORT(pin)->ODR & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>8) & 0x1) << (1*PAL_PAD(pin));
77#else
78 return;
79#endif
80}
81
82__attribute__((weak)) bool process_joystick_analogread() { return process_joystick_analogread_quantum(); }
83
84bool process_joystick_analogread_quantum() {
85#if JOYSTICK_AXES_COUNT > 0
86 for (int axis_index = 0; axis_index < JOYSTICK_AXES_COUNT; ++axis_index) {
87 if (joystick_axes[axis_index].input_pin == JS_VIRTUAL_AXIS) {
88 continue;
89 }
90
91 // save previous input pin status as well
92 uint16_t inputSavedState = savePinState(joystick_axes[axis_index].input_pin);
93
94 // disable pull-up resistor
95 writePinLow(joystick_axes[axis_index].input_pin);
96
97 // if pin was a pull-up input, we need to uncharge it by turning it low
98 // before making it a low input
99 setPinOutput(joystick_axes[axis_index].input_pin);
100
101 wait_us(10);
102
103 // save and apply output pin status
104 uint16_t outputSavedState = 0;
105 if (joystick_axes[axis_index].output_pin != JS_VIRTUAL_AXIS) {
106 // save previous output pin status
107 outputSavedState = savePinState(joystick_axes[axis_index].output_pin);
108
109 setPinOutput(joystick_axes[axis_index].output_pin);
110 writePinHigh(joystick_axes[axis_index].output_pin);
111 }
112
113 uint16_t groundSavedState = 0;
114 if (joystick_axes[axis_index].ground_pin != JS_VIRTUAL_AXIS) {
115 // save previous output pin status
116 groundSavedState = savePinState(joystick_axes[axis_index].ground_pin);
117
118 setPinOutput(joystick_axes[axis_index].ground_pin);
119 writePinLow(joystick_axes[axis_index].ground_pin);
120 }
121
122 wait_us(10);
123
124 setPinInput(joystick_axes[axis_index].input_pin);
125
126 wait_us(10);
127
128# if defined(__AVR__) || defined(PROTOCOL_CHIBIOS)
129 int16_t axis_val = analogReadPin(joystick_axes[axis_index].input_pin);
130# else
131 // default to resting position
132 int16_t axis_val = joystick_axes[axis_index].mid_digit;
133# endif
134
135 //test the converted value against the lower range
136 int32_t ref = joystick_axes[axis_index].mid_digit;
137 int32_t range = joystick_axes[axis_index].min_digit;
138 int32_t ranged_val = ((axis_val - ref) * -127) / (range - ref) ;
139
140 if (ranged_val > 0) {
141 //the value is in the higher range
142 range = joystick_axes[axis_index].max_digit;
143 ranged_val = ((axis_val - ref) * 127) / (range - ref);
144 }
145
146 //clamp the result in the valid range
147 ranged_val = ranged_val < -127 ? -127 : ranged_val;
148 ranged_val = ranged_val > 127 ? 127 : ranged_val;
149
150 if (ranged_val != joystick_status.axes[axis_index]) {
151 joystick_status.axes[axis_index] = ranged_val;
152 joystick_status.status |= JS_UPDATED;
153 }
154
155 // restore output, ground and input status
156 if (joystick_axes[axis_index].output_pin != JS_VIRTUAL_AXIS) {
157 restorePinState(joystick_axes[axis_index].output_pin, outputSavedState);
158 }
159 if (joystick_axes[axis_index].ground_pin != JS_VIRTUAL_AXIS) {
160 restorePinState(joystick_axes[axis_index].ground_pin, groundSavedState);
161 }
162
163 restorePinState(joystick_axes[axis_index].input_pin, inputSavedState);
164 }
165
166#endif
167 return true;
168}
diff --git a/quantum/process_keycode/process_joystick.h b/quantum/process_keycode/process_joystick.h
new file mode 100644
index 000000000..7a8b82913
--- /dev/null
+++ b/quantum/process_keycode/process_joystick.h
@@ -0,0 +1,11 @@
1#pragma once
2
3#include <stdint.h>
4#include "quantum.h"
5
6bool process_joystick(uint16_t keycode, keyrecord_t *record);
7
8void joystick_task(void);
9
10bool process_joystick_analogread(void);
11bool process_joystick_analogread_quantum(void);
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 9d63f4de2..dab6c9172 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -277,6 +277,9 @@ bool process_record_quantum(keyrecord_t *record) {
277#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) 277#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
278 process_rgb(keycode, record) && 278 process_rgb(keycode, record) &&
279#endif 279#endif
280#ifdef JOYSTICK_ENABLE
281 process_joystick(keycode, record) &&
282#endif
280 true)) { 283 true)) {
281 return false; 284 return false;
282 } 285 }
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 51deac0cd..a2c0ec9a2 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -142,6 +142,10 @@ extern layer_state_t layer_state;
142# include "process_magic.h" 142# include "process_magic.h"
143#endif 143#endif
144 144
145#ifdef JOYSTICK_ENABLE
146# include "process_joystick.h"
147#endif
148
145#ifdef GRAVE_ESC_ENABLE 149#ifdef GRAVE_ESC_ENABLE
146# include "process_grave_esc.h" 150# include "process_grave_esc.h"
147#endif 151#endif
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 437921aeb..5e7c9ad33 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -512,6 +512,41 @@ enum quantum_keycodes {
512 DYN_MACRO_PLAY1, 512 DYN_MACRO_PLAY1,
513 DYN_MACRO_PLAY2, 513 DYN_MACRO_PLAY2,
514 514
515 JS_BUTTON0,
516 JS_BUTTON_MIN = JS_BUTTON0,
517 JS_BUTTON1,
518 JS_BUTTON2,
519 JS_BUTTON3,
520 JS_BUTTON4,
521 JS_BUTTON5,
522 JS_BUTTON6,
523 JS_BUTTON7,
524 JS_BUTTON8,
525 JS_BUTTON9,
526 JS_BUTTON10,
527 JS_BUTTON11,
528 JS_BUTTON12,
529 JS_BUTTON13,
530 JS_BUTTON14,
531 JS_BUTTON15,
532 JS_BUTTON16,
533 JS_BUTTON17,
534 JS_BUTTON18,
535 JS_BUTTON19,
536 JS_BUTTON20,
537 JS_BUTTON21,
538 JS_BUTTON22,
539 JS_BUTTON23,
540 JS_BUTTON24,
541 JS_BUTTON25,
542 JS_BUTTON26,
543 JS_BUTTON27,
544 JS_BUTTON28,
545 JS_BUTTON29,
546 JS_BUTTON30,
547 JS_BUTTON31,
548 JS_BUTTON_MAX = JS_BUTTON31,
549
515 // always leave at the end 550 // always leave at the end
516 SAFE_RANGE 551 SAFE_RANGE
517}; 552};