gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to timer_read for limiting audio pin wait times

Browse Source
This commit is contained in:
David Hoelscher 2024-10-19 02:49:07 -05:00
parent fb8351b325
commit 9b8d4803dc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platforms/chibios/drivers/audio_pwm_hardware.c
View File

@ -13,6 +13,7 @@
#include "audio.h" #include "audio.h"
#include "gpio.h" #include "gpio.h"
#include "timer.h"
#if !defined(AUDIO_PIN) #if !defined(AUDIO_PIN)
# error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings" # error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings"
@ -37,9 +38,9 @@ void channel_1_stop(void);
void channel_1_start(void); void channel_1_start(void);
void audio_wait_for_pin(pin_t pin, uint8_t target_state) { void audio_wait_for_pin(pin_t pin, uint8_t target_state) {
rtcnt_t start = chSysGetRealtimeCounterX(); uint16_t wait_limiter_timer;
rtcnt_t end = start + 5000; wait_limiter_timer = timer_read();
while (chSysIsCounterWithinX(chSysGetRealtimeCounterX(), start, end)) { while (timer_elapsed(wait_limiter_timer) < 2) {
if (gpio_read_pin(pin) == target_state) { if (gpio_read_pin(pin) == target_state) {
break; break;
} }
@ -99,8 +100,11 @@ void channel_1_stop(void) {
audio_wait_for_pin(AUDIO_PIN,0); audio_wait_for_pin(AUDIO_PIN,0);
pwmStop(&AUDIO_PWM_DRIVER); pwmStop(&AUDIO_PWM_DRIVER);
// if it isn't actively low, it was stopped a little too late, so keep trying (should only need one more attempt) uint16_t wait_limiter_timer;
while (gpio_read_pin(AUDIO_PIN) == 1) { wait_limiter_timer = timer_read();
// if it isn't actively low, it may have been stopped a little too late, so keep trying
// it should not require very many attempts, so limit to 2ms maximum wait time as a failsafe
while ((gpio_read_pin(AUDIO_PIN) == 1) && (timer_elapsed(wait_limiter_timer) < 2)) {
pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG); pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
audio_wait_for_pin(AUDIO_PIN,0); audio_wait_for_pin(AUDIO_PIN,0);
pwmStop(&AUDIO_PWM_DRIVER); pwmStop(&AUDIO_PWM_DRIVER);