poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix joystick compile issues (#9949)

Browse source
This commit is contained in:
Ryan 2020-08-08 10:24:29 +10:00 committed by James Young
parent e34eca361f
commit 12333b7c5e
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
keyboards/handwired/onekey/keymaps/joystick/config.h
View file

@ -1,3 +1,4 @@
#pragma once #pragma once
#define JOYSTICK_AXES_COUNT 2 #define JOYSTICK_AXES_COUNT 2
#define JOYSTICK_BUTTON_COUNT 1 #define JOYSTICK_BUTTON_COUNT 1

9
keyboards/handwired/onekey/keymaps/joystick/keymap.c
View file

@ -7,19 +7,20 @@
#endif #endif
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( JS_BUTTON0 ) LAYOUT_ortho_1x1(JS_BUTTON0)
}; };
void matrix_scan_user() { void matrix_scan_user() {
int16_t val = (((uint32_t)timer_read() % 5000 - 2500) * 255) / 5000; int16_t val = (((uint32_t)timer_read() % 5000 - 2500) * 255) / 5000;
if (val != joystick_status.axes[1]) { if (val != joystick_status.axes[1]) {
joystick_status.axes[1] = val; joystick_status.axes[1] = val;
joystick_status.status |= JS_UPDATED; joystick_status.status |= JS_UPDATED;
} }
} }
//joystick config // Joystick config
joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = { joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
[0] = JOYSTICK_AXIS_IN(ADC_PIN, 0, 512, 1023) [0] = JOYSTICK_AXIS_IN(ADC_PIN, 0, 512, 1023),
, [1] = JOYSTICK_AXIS_VIRTUAL [1] = JOYSTICK_AXIS_VIRTUAL
}; };

4
tmk_core/protocol/lufa/lufa.c
View file

@ -475,8 +475,10 @@ void EVENT_USB_Device_ConfigurationChanged(void) {
ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_OUT_EPNUM | ENDPOINT_DIR_OUT), EP_TYPE_BULK, CDC_EPSIZE, 1); ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_OUT_EPNUM | ENDPOINT_DIR_OUT), EP_TYPE_BULK, CDC_EPSIZE, 1);
ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, CDC_EPSIZE, 1); ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, CDC_EPSIZE, 1);
#endif #endif
#ifdef JOYSTICK_ENABLE #ifdef JOYSTICK_ENABLE
ConfigSuccess &= ENDPOINT_CONFIG(JOYSTICK_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN, JOYSTICK_EPSIZE, ENDPOINT_BANK_SINGLE); /* Setup joystick endpoint */
ConfigSuccess &= Endpoint_ConfigureEndpoint((JOYSTICK_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_INTERRUPT, JOYSTICK_EPSIZE, 1);
#endif #endif
} }