Skip to content

Commit

Permalink
Fix joystick compile issues (#9949)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark authored and noroadsleft committed Aug 27, 2020
1 parent db1713d commit f376858
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
1 change: 1 addition & 0 deletions keyboards/handwired/onekey/keymaps/joystick/config.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#pragma once

#define JOYSTICK_AXES_COUNT 2
#define JOYSTICK_BUTTON_COUNT 1
21 changes: 11 additions & 10 deletions keyboards/handwired/onekey/keymaps/joystick/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,20 @@
#endif

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( JS_BUTTON0 )
LAYOUT_ortho_1x1(JS_BUTTON0)
};

void matrix_scan_user() {
int16_t val = (((uint32_t)timer_read()%5000 - 2500) * 255) / 5000;
if (val != joystick_status.axes[1]) {
joystick_status.axes[1] = val;
joystick_status.status |= JS_UPDATED;
}
int16_t val = (((uint32_t)timer_read() % 5000 - 2500) * 255) / 5000;

if (val != joystick_status.axes[1]) {
joystick_status.axes[1] = val;
joystick_status.status |= JS_UPDATED;
}
}

//joystick config
// Joystick config
joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
[0] = JOYSTICK_AXIS_IN(ADC_PIN, 0, 512, 1023)
, [1] = JOYSTICK_AXIS_VIRTUAL
};
[0] = JOYSTICK_AXIS_IN(ADC_PIN, 0, 512, 1023),
[1] = JOYSTICK_AXIS_VIRTUAL
};
4 changes: 3 additions & 1 deletion tmk_core/protocol/lufa/lufa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, CDC_EPSIZE, 1);
#endif

#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
}

Expand Down

0 comments on commit f376858

Please sign in to comment.