aboutsummaryrefslogtreecommitdiff
path: root/quantum/audio/voices.c
diff options
context:
space:
mode:
authorIBNobody <IBNobody@users.noreply.github.com>2016-05-03 12:56:40 -0500
committerJack Humbert <jack.humb@gmail.com>2016-05-03 13:56:40 -0400
commit83e1cc241e3aabd69f6cdcd2581477d4b85bb8d3 (patch)
treefd0c9714f93e1afec478ddc42a86a6823136ad5f /quantum/audio/voices.c
parent2c070163ffffffde546fb00acaa2fbb96b93da64 (diff)
downloadqmk_firmware-83e1cc241e3aabd69f6cdcd2581477d4b85bb8d3.tar.gz
qmk_firmware-83e1cc241e3aabd69f6cdcd2581477d4b85bb8d3.zip
Clarified audio.c (#302)
* Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs
Diffstat (limited to 'quantum/audio/voices.c')
-rw-r--r--quantum/audio/voices.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index d2316ba1b..6d4172a06 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -1,6 +1,6 @@
1#include "voices.h" 1#include "voices.h"
2#include "audio.h"
2#include "stdlib.h" 3#include "stdlib.h"
3#include "vibrato_lut.h"
4 4
5// these are imported from audio.c 5// these are imported from audio.c
6extern uint16_t envelope_index; 6extern uint16_t envelope_index;
@@ -109,7 +109,7 @@ float voice_envelope(float frequency) {
109 case 0 ... VOICE_VIBRATO_DELAY: 109 case 0 ... VOICE_VIBRATO_DELAY:
110 break; 110 break;
111 default: 111 default:
112 frequency = frequency * VIBRATO_LUT[(int)fmod((((float)compensated_index - (VOICE_VIBRATO_DELAY + 1))/1000*VOICE_VIBRATO_SPEED), VIBRATO_LUT_LENGTH)]; 112 frequency = frequency * vibrato_lut[(int)fmod((((float)compensated_index - (VOICE_VIBRATO_DELAY + 1))/1000*VOICE_VIBRATO_SPEED), VIBRATO_LUT_LENGTH)];
113 break; 113 break;
114 } 114 }
115 break; 115 break;
@@ -160,4 +160,6 @@ float voice_envelope(float frequency) {
160 } 160 }
161 161
162 return frequency; 162 return frequency;
163} \ No newline at end of file 163}
164
165