Skip to content

Commit c50b50e

Browse files
Nebuleonmechlovin
authored andcommitted
Optimize the additive DAC code, fixing performance-related hangs (qmk#21662)
1 parent 54d1940 commit c50b50e

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

platforms/chibios/drivers/audio_dac_additive.c

+9-6
Original file line numberDiff line numberDiff line change
@@ -121,24 +121,27 @@ __attribute__((weak)) uint16_t dac_value_generate(void) {
121121
/* doing additive wave synthesis over all currently playing tones = adding up
122122
* sine-wave-samples for each frequency, scaled by the number of active tones
123123
*/
124-
uint16_t value = 0;
125-
float frequency = 0.0f;
124+
uint_fast16_t value = 0;
125+
float frequency = 0.0f;
126126

127-
for (uint8_t i = 0; i < active_tones_snapshot_length; i++) {
127+
for (size_t i = 0; i < active_tones_snapshot_length; i++) {
128128
/* Note: a user implementation does not have to rely on the active_tones_snapshot, but
129129
* could directly query the active frequencies through audio_get_processed_frequency */
130130
frequency = active_tones_snapshot[i];
131131

132-
dac_if[i] = dac_if[i] + ((frequency * AUDIO_DAC_BUFFER_SIZE) / AUDIO_DAC_SAMPLE_RATE) * 2 / 3;
132+
float new_dac_if = dac_if[i];
133+
new_dac_if += frequency * ((float)AUDIO_DAC_BUFFER_SIZE / AUDIO_DAC_SAMPLE_RATE * 2.0f / 3.0f);
133134
/*Note: the 2/3 are necessary to get the correct frequencies on the
134135
* DAC output (as measured with an oscilloscope), since the gpt
135136
* timer runs with 3*AUDIO_DAC_SAMPLE_RATE; and the DAC callback
136137
* is called twice per conversion.*/
137138

138-
dac_if[i] = fmodf(dac_if[i], AUDIO_DAC_BUFFER_SIZE);
139+
while (new_dac_if >= AUDIO_DAC_BUFFER_SIZE)
140+
new_dac_if -= AUDIO_DAC_BUFFER_SIZE;
141+
dac_if[i] = new_dac_if;
139142

140143
// Wavetable generation/lookup
141-
uint16_t dac_i = (uint16_t)dac_if[i];
144+
size_t dac_i = (size_t)new_dac_if;
142145

143146
#if defined(AUDIO_DAC_SAMPLE_WAVEFORM_SINE)
144147
value += dac_buffer_sine[dac_i] / active_tones_snapshot_length;

0 commit comments

Comments
 (0)