Merge branch 'master' into meteor

1 files changed, 13 insertions, 0 deletions

diff --git a/quantum/joystick.c b/quantum/joystick.c
new file mode 100644
index 0000000000..7b87201aef
--- /dev/null
+++ b/quantum/joystick.c
@@ -0,0 +1,13 @@
+#include "joystick.h"
+
+joystick_t joystick_status = {.buttons = {0},
+                              .axes =
+                                  {
+#if JOYSTICK_AXES_COUNT > 0
+                                      0
+#endif
+                                  },
+                              .status = 0};
+
+// array defining the reading of analog values for each axis
+__attribute__((weak)) joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {};