Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Joystick 16-bit support #10439

Merged
merged 8 commits into from
Oct 3, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions docs/feature_joystick.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
```

### Axis Resolution

For use-cases where a higher joystick-precision is desired, it is possible to increase axis precision to a maximum of 16-bit.
To use higher axis values, in this example 12-bit, i.e. from -2047 to 2047, add the following line to your config.h:

```
// Max 16
#define JOYSTICK_AXES_RESOLUTION 12
```


This setting works for virtual axes as well as analog axis reading using
`JOYSTICK_AXIS_IN(...)`, `JOYSTICK_AXIS_IN_OUT(...)` or `JOYSTICK_AXIS_IN_OUT_GROUND(...)`.
seb-pau marked this conversation as resolved.
Show resolved Hide resolved
### Triggering Joystick Buttons

Joystick buttons are normal Quantum keycodes, defined as `JS_BUTTON0` to `JS_BUTTON31`, depending on the number of buttons you have configured.
Expand Down
17 changes: 15 additions & 2 deletions quantum/joystick.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#pragma once

#include "quantum.h"

#include <stdint.h>

#ifndef JOYSTICK_BUTTON_COUNT
# define JOYSTICK_BUTTON_COUNT 8
#endif
Expand All @@ -8,9 +12,18 @@
# define JOYSTICK_AXES_COUNT 4
#endif

#include "quantum.h"
#ifndef JOYSTICK_AXES_RESOLUTION
# define JOYSTICK_AXES_RESOLUTION 8
#elif JOYSTICK_AXES_RESOLUTION < 8 || JOYSTICK_AXES_RESOLUTION > 16
# error JOYSTICK_AXES_RESOLUTION must be between 8 and 16
#endif

#if JOYSTICK_AXES_RESOLUTION == 16
# define JOYSTICK_RESOLUTION 32767
#else
# define JOYSTICK_RESOLUTION (1 << (JOYSTICK_AXES_RESOLUTION - 1)) - 1
#endif
fauxpark marked this conversation as resolved.
Show resolved Hide resolved

#include <stdint.h>

// configure on input_pin of the joystick_axes array entry to JS_VIRTUAL_AXIS
// to prevent it from being read from the ADC. This allows outputing forged axis value.
Expand Down
10 changes: 6 additions & 4 deletions quantum/process_keycode/process_joystick.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,20 +126,22 @@ bool process_joystick_analogread_quantum() {
int16_t axis_val = joystick_axes[axis_index].mid_digit;
# endif



fauxpark marked this conversation as resolved.
Show resolved Hide resolved
// test the converted value against the lower range
int32_t ref = joystick_axes[axis_index].mid_digit;
int32_t range = joystick_axes[axis_index].min_digit;
int32_t ranged_val = ((axis_val - ref) * -127) / (range - ref);
int32_t ranged_val = ((axis_val - ref) * -JOYSTICK_RESOLUTION) / (range - ref);

if (ranged_val > 0) {
// the value is in the higher range
range = joystick_axes[axis_index].max_digit;
ranged_val = ((axis_val - ref) * 127) / (range - ref);
ranged_val = ((axis_val - ref) * JOYSTICK_RESOLUTION) / (range - ref);
}

// clamp the result in the valid range
ranged_val = ranged_val < -127 ? -127 : ranged_val;
ranged_val = ranged_val > 127 ? 127 : ranged_val;
ranged_val = ranged_val < -JOYSTICK_RESOLUTION ? -JOYSTICK_RESOLUTION : ranged_val;
ranged_val = ranged_val > JOYSTICK_RESOLUTION ? JOYSTICK_RESOLUTION : ranged_val;

if (ranged_val != joystick_status.axes[axis_index]) {
joystick_status.axes[axis_index] = ranged_val;
Expand Down
6 changes: 5 additions & 1 deletion tmk_core/common/report.h
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,11 @@ typedef struct {

typedef struct {
#if JOYSTICK_AXES_COUNT > 0
int8_t axes[JOYSTICK_AXES_COUNT];
# if JOYSTICK_AXES_RESOLUTION > 8
int16_t axes[JOYSTICK_AXES_COUNT];
# else
int8_t axes[JOYSTICK_AXES_COUNT];
# endif
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
#endif

#if JOYSTICK_BUTTON_COUNT > 0
Expand Down
15 changes: 13 additions & 2 deletions tmk_core/protocol/usb_descriptor.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
#include "usb_descriptor.h"
#include "usb_descriptor_common.h"

#ifdef JOYSTICK_ENABLE
#include "joystick.h"
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
#endif

// clang-format off

/*
Expand Down Expand Up @@ -308,10 +312,17 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = {
HID_RI_USAGE(8, 0x35), // Rz
# endif
# if JOYSTICK_AXES_COUNT >= 1
HID_RI_LOGICAL_MINIMUM(8, -127),
HID_RI_LOGICAL_MAXIMUM(8, 127),
# if JOYSTICK_AXES_RESOLUTION == 8
HID_RI_LOGICAL_MINIMUM(8, -JOYSTICK_RESOLUTION),
HID_RI_LOGICAL_MAXIMUM(8, JOYSTICK_RESOLUTION),
HID_RI_REPORT_COUNT(8, JOYSTICK_AXES_COUNT),
HID_RI_REPORT_SIZE(8, 0x08),
# else
HID_RI_LOGICAL_MINIMUM(16, -JOYSTICK_RESOLUTION),
HID_RI_LOGICAL_MAXIMUM(16, JOYSTICK_RESOLUTION),
HID_RI_REPORT_COUNT(8, JOYSTICK_AXES_COUNT),
HID_RI_REPORT_SIZE(8, 0x10),
# endif
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
# endif

Expand Down
2 changes: 2 additions & 0 deletions tmk_core/protocol/usb_descriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,5 @@ enum usb_endpoints {

uint16_t get_usb_descriptor(const uint16_t wValue, const uint16_t wIndex, const void** const DescriptorAddress);
#endif


seb-pau marked this conversation as resolved.
Show resolved Hide resolved