diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-21 23:10:47 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-21 23:10:49 -0400 |
| commit | 7b3f212500210ae85063b043952b5b3ef6988ad6 (patch) | |
| tree | 5a4f38677e7e4c5babc03272562a89e5138af77f /quantum/audio/voices.c | |
| parent | fa40e91b5649e4a7aa833f3ae203169386c02721 (diff) | |
| download | qmk_firmware-7b3f212500210ae85063b043952b5b3ef6988ad6.tar.gz qmk_firmware-7b3f212500210ae85063b043952b5b3ef6988ad6.zip | |
adds more voices, fixes macro redefines
Diffstat (limited to 'quantum/audio/voices.c')
| -rw-r--r-- | quantum/audio/voices.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c index 92ada47f7..98631f0cb 100644 --- a/quantum/audio/voices.c +++ b/quantum/audio/voices.c | |||
| @@ -72,15 +72,19 @@ float voice_envelope(float frequency) { | |||
| 72 | polyphony_rate = 0; | 72 | polyphony_rate = 0; |
| 73 | switch (compensated_index) { | 73 | switch (compensated_index) { |
| 74 | default: | 74 | default: |
| 75 | #define SPEED 10 | 75 | #define OCS_SPEED 10 |
| 76 | #define AMP .75 | 76 | #define OCS_AMP .25 |
| 77 | // sine wave is slow | 77 | // sine wave is slow |
| 78 | // note_timbre = (sin((float)compensated_index/10000*SPEED) * AMP / 2) + .5; | 78 | // note_timbre = (sin((float)compensated_index/10000*OCS_SPEED) * OCS_AMP / 2) + .5; |
| 79 | // triangle wave is a bit faster | 79 | // triangle wave is a bit faster |
| 80 | note_timbre = (float)abs((compensated_index*SPEED % 3000) - 1500) * ( AMP / 1500 ) + (1 - AMP) / 2; | 80 | note_timbre = (float)abs((compensated_index*OCS_SPEED % 3000) - 1500) * ( OCS_AMP / 1500 ) + (1 - OCS_AMP) / 2; |
| 81 | break; | 81 | break; |
| 82 | } | 82 | } |
| 83 | break; | 83 | break; |
| 84 | case duty_octave_down: | ||
| 85 | polyphony_rate = 0; | ||
| 86 | note_timbre = (envelope_index % 2) * .125 + .375 * 2; | ||
| 87 | break; | ||
| 84 | } | 88 | } |
| 85 | 89 | ||
| 86 | return frequency; | 90 | return frequency; |
