Merge upstream master

1 files changed, 30 insertions, 0 deletions

diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
new file mode 100644
index 0000000000..f450769b43
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2022 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                                    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
+    )
+};
+
+#if defined(JOYSTICK_ENABLE) && defined(ENCODER_ENABLE)
+
+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_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);
+
+    return true;
+}
+
+#endif