summaryrefslogtreecommitdiff
path: root/keyboards/handwired/onekey
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-08-08 10:24:29 +1000
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-08-29 14:30:02 -0700
commit12333b7c5e47f935c8e11276caebae464331df8a (patch)
treeaf761775935559ec01e64a7eb31151519d1ccbff /keyboards/handwired/onekey
parente34eca361fdd9ff61b8827fec545202da179648c (diff)
Fix joystick compile issues (#9949)
Diffstat (limited to 'keyboards/handwired/onekey')
-rw-r--r--keyboards/handwired/onekey/keymaps/joystick/config.h1
-rw-r--r--keyboards/handwired/onekey/keymaps/joystick/keymap.c21
2 files changed, 12 insertions, 10 deletions
diff --git a/keyboards/handwired/onekey/keymaps/joystick/config.h b/keyboards/handwired/onekey/keymaps/joystick/config.h
index 5701d80c84..ac09aa7cfb 100644
--- 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
index 60802f464a..f427b9d77d 100644
--- 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
-}; \ No newline at end of file
+ [0] = JOYSTICK_AXIS_IN(ADC_PIN, 0, 512, 1023),
+ [1] = JOYSTICK_AXIS_VIRTUAL
+};