From 996a19ee7ba3308e17fd347afde0b135852835cc Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Tue, 29 Jun 2021 15:36:35 -0700 Subject: Revert "Audio system overhaul (#11820)" due to freezing issues This reverts commit c80e5f9f8868ccaa8cb990be6f4da3f1011c2b78. --- quantum/backlight/backlight_avr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'quantum/backlight/backlight_avr.c') diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c index e47192de34..2ecdd4f2c4 100644 --- a/quantum/backlight/backlight_avr.c +++ b/quantum/backlight/backlight_avr.c @@ -126,7 +126,7 @@ # define COMxx1 COM1B1 # define OCRxx OCR1B # endif -#elif (AUDIO_PIN != B5) && (AUDIO_PIN != B6) && (AUDIO_PIN != B7) && (AUDIO_PIN_ALT != B5) && (AUDIO_PIN_ALT != B6) && (AUDIO_PIN_ALT != B7) +#elif !defined(B5_AUDIO) && !defined(B6_AUDIO) && !defined(B7_AUDIO) // Timer 1 is not in use by Audio feature, Backlight can use it # pragma message "Using hardware timer 1 with software PWM" # define HARDWARE_PWM @@ -145,7 +145,7 @@ # define OCIExA OCIE1A # define OCRxx OCR1A -#elif (AUDIO_PIN != C4) && (AUDIO_PIN != C5) && (AUDIO_PIN != C6) +#elif !defined(C6_AUDIO) && !defined(C5_AUDIO) && !defined(C4_AUDIO) # pragma message "Using hardware timer 3 with software PWM" // Timer 3 is not in use by Audio feature, Backlight can use it # define HARDWARE_PWM -- cgit v1.2.3