diff --git a/keyboards/handwired/onekey/keymaps/joystick/config.h b/keyboards/handwired/onekey/keymaps/joystick/config.h
index c43f204802..5701d80c84 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/config.h
+++ b/keyboards/handwired/onekey/keymaps/joystick/config.h
@@ -1,3 +1,3 @@
 #pragma once
-#define JOYSTICK_AXES_COUNT 1
+#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 353d31e283..60802f464a 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -2,10 +2,24 @@
 
 #include "joystick.h"
 
+#ifndef ADC_PIN
+#    define ADC_PIN F6
+#endif
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT( 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;
+  }
+}
+
 //joystick config
 joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
-  [0] = JOYSTICK_AXIS_IN(A0, 0, 512, 1024)
+    [0] = JOYSTICK_AXIS_IN(ADC_PIN, 0, 512, 1023)
+  , [1] = JOYSTICK_AXIS_VIRTUAL
 };
\ No newline at end of file
diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h
index fbcd630d79..c82cf9b78f 100644
--- a/keyboards/handwired/onekey/promicro/config.h
+++ b/keyboards/handwired/onekey/promicro/config.h
@@ -21,3 +21,5 @@
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
 #define UNUSED_PINS
+
+#define ADC_PIN F6
diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h
index fe34f94add..0836fb4677 100644
--- a/keyboards/handwired/onekey/proton_c/config.h
+++ b/keyboards/handwired/onekey/proton_c/config.h
@@ -28,3 +28,5 @@
 #define BACKLIGHT_PAL_MODE      2
 
 #define RGB_DI_PIN A1
+
+#define ADC_PIN A0
diff --git a/quantum/joystick.h b/quantum/joystick.h
index 100e22b0e8..5a6995f5f6 100644
--- a/quantum/joystick.h
+++ b/quantum/joystick.h
@@ -8,6 +8,8 @@
 #    define JOYSTICK_AXES_COUNT 4
 #endif
 
+#include "quantum.h"
+
 #include <stdint.h>
 
 // configure on input_pin of the joystick_axes array entry to JS_VIRTUAL_AXIS