summaryrefslogtreecommitdiff
path: root/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/synthlabs/solo/keymaps/gamepad/keymap.c')
-rw-r--r--keyboards/synthlabs/solo/keymaps/gamepad/keymap.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
index 3e55f346f1..f450769b43 100644
--- a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
@@ -3,13 +3,11 @@
#include QMK_KEYBOARD_H
-#include "joystick.h"
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
- JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6,
- KC_NO, JS_BUTTON7, KC_NO,
- JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6
+ JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6,
+ KC_NO, JS_7, KC_NO,
+ JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6
)
};
@@ -18,17 +16,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
int16_t joystick_position = 0;
int16_t pulses_per_revolution = 24; // Depends on encoder model. Usually 18ppr or 24ppr for Bourns EC11s.
int16_t full_joystick_value = 32767; // Equivalent to max value of int16. +full_joystick_value is +1.0 axis output. -full_joystick_value is -1.0 axis output.
-joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
[0] = JOYSTICK_AXIS_VIRTUAL
};
bool encoder_update_kb(uint8_t index, bool clockwise) {
joystick_position += (clockwise ? 2 : -2) * (full_joystick_value / pulses_per_revolution); // +2 and -2 are used, since +1.0 and -1.0 axis output refers to positions at half of a full rotation
+ joystick_set_axis(0, joystick_position);
- if (joystick_position != joystick_status.axes[0]) {
- joystick_status.axes[0] = joystick_position;
- joystick_status.status |= JS_UPDATED;
- }
return true;
}