gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-22 03:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge f664d766e4 into 36b5559b99

Browse Source
This commit is contained in:
David Hoelscher 2024-11-20 23:06:06 -08:00 committed by GitHub
commit 75c62803e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,18 +41,19 @@ static float channel_1_frequency = 0.0f;
void channel_1_set_frequency(float freq) { void channel_1_set_frequency(float freq) {
channel_1_frequency = freq; channel_1_frequency = freq;
pwmcnt_t period;
pwmcnt_t width;
if (freq <= 0.0) { if (freq <= 0.0) {
// a pause/rest has freq=0 period = 2;
return; width = 0;
} else {
period = (pwmCFG.frequency / freq);
width = (pwmcnt_t)(((period) * (pwmcnt_t)((100 - note_timbre) * 100)) / (pwmcnt_t)(10000));
} }
pwmcnt_t period = (pwmCFG.frequency / freq);
chSysLockFromISR(); chSysLockFromISR();
pwmChangePeriodI(&AUDIO_PWM_DRIVER, period); pwmChangePeriodI(&AUDIO_PWM_DRIVER, period);
pwmEnableChannelI(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1, pwmEnableChannelI(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1, width);
// adjust the duty-cycle so that the output is for 'note_timbre' duration HIGH
PWM_PERCENTAGE_TO_WIDTH(&AUDIO_PWM_DRIVER, (100 - note_timbre) * 100));
chSysUnlockFromISR(); chSysUnlockFromISR();
} }
@ -67,6 +68,9 @@ void channel_1_start(void) {
void channel_1_stop(void) { void channel_1_stop(void) {
pwmStop(&AUDIO_PWM_DRIVER); pwmStop(&AUDIO_PWM_DRIVER);
pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
pwmEnableChannel(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1, 0);
pwmStop(&AUDIO_PWM_DRIVER);
} }
static virtual_timer_t audio_vt; static virtual_timer_t audio_vt;

3
quantum/audio/audio.c
View File

@ -258,11 +258,10 @@ void audio_stop_tone(float pitch) {
for (int i = AUDIO_TONE_STACKSIZE - 1; i >= 0; i--) { for (int i = AUDIO_TONE_STACKSIZE - 1; i >= 0; i--) {
found = (tones[i].pitch == pitch); found = (tones[i].pitch == pitch);
if (found) { if (found) {
tones[i] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
for (int j = i; (j < AUDIO_TONE_STACKSIZE - 1); j++) { for (int j = i; (j < AUDIO_TONE_STACKSIZE - 1); j++) {
tones[j] = tones[j + 1]; tones[j] = tones[j + 1];
tones[j + 1] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
} }
tones[AUDIO_TONE_STACKSIZE - 1] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
break; break;
} }
} }