Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-07-30 00:32:42 +00:00
commit 0c487cbeba

View File

@ -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