diff options
| author | QMK Bot <hello@qmk.fm> | 2022-07-30 00:32:42 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-07-30 00:32:42 +0000 |
| commit | 0c487cbebae73d08e74c19194f1cf4c085a2c7a0 (patch) | |
| tree | e11e72ef68c34b99ed23400da7b847721e9252f8 /quantum | |
| parent | 21603c5142c1bd7d0e766bd78b4cc31408c3649d (diff) | |
| parent | d93dfbff3cdec41d9a6a226bcddeec0270b20aca (diff) | |
| download | qmk_firmware-0c487cbebae73d08e74c19194f1cf4c085a2c7a0.tar.gz qmk_firmware-0c487cbebae73d08e74c19194f1cf4c085a2c7a0.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/process_keycode/process_joystick.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c index 8c3e71616f..e867606074 100644 --- a/quantum/process_keycode/process_joystick.c +++ b/quantum/process_keycode/process_joystick.c @@ -106,7 +106,7 @@ bool process_joystick_analogread_quantum() { wait_us(10); -# if defined(__AVR__) || defined(PROTOCOL_CHIBIOS) +# if defined(ANALOG_JOYSTICK_ENABLE) && (defined(__AVR__) || defined(PROTOCOL_CHIBIOS)) int16_t axis_val = analogReadPin(joystick_axes[axis_index].input_pin); # else // default to resting position |