aboutsummaryrefslogtreecommitdiff
path: root/docs/features
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-08-31 03:44:35 +0000
committerQMK Bot <[email protected]>2024-08-31 03:44:35 +0000
commit81109100a90e0dbc19c797558d984add4fc8e75b (patch)
treefd100cb1a51e8423e17429a9969c8e5fe5d5bb80 /docs/features
parentdae5e9ee06b23f8eac06933baff0b8eaf44deff3 (diff)
parentd7e1eb3e48115d65b1f405172f16cf483c3a5d4e (diff)
downloadqmk_firmware-81109100a90e0dbc19c797558d984add4fc8e75b.tar.gz
qmk_firmware-81109100a90e0dbc19c797558d984add4fc8e75b.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs/features')
-rw-r--r--docs/features/joystick.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/features/joystick.md b/docs/features/joystick.md
index f3fd209d5a..69db4655d5 100644
--- a/docs/features/joystick.md
+++ b/docs/features/joystick.md
@@ -18,6 +18,8 @@ By default the joystick driver is `analog`, but you can change this with:
JOYSTICK_DRIVER = digital
```
+When using `analog` with ARM, [you must use 3.3v with your Joystick](../drivers/adc). Although ARM boards such as the [Helios](https://keeb.supply/products/0xcb-helios) have 5v pin output, the ADC driver does not support it.
+
## Configuration {#configuration}
By default, two axes and eight buttons are defined, with a reported resolution of 8 bits (-127 to +127). This can be changed in your `config.h`: