Fix joystick compile issues (qmk#9949)

zsa · Sep 30, 2020 · 356659b · 356659b
1 parent eb056ac
commit 356659b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/keyboards/handwired/onekey/keymaps/joystick/config.h b/keyboards/handwired/onekey/keymaps/joystick/config.h
@@ -1,3 +1,4 @@
 #pragma once
+
 #define JOYSTICK_AXES_COUNT 2
 #define JOYSTICK_BUTTON_COUNT 1
diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -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
+};
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
@@ -544,8 +544,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
 }