ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

converts tabs to spaces

Browse source
This commit is contained in:
Jack Humbert 2016-04-21 00:40:00 -04:00
parent 73228f5e5d
commit e89b806b85
2 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

88
quantum/audio/voices.c
View file

@ -6,55 +6,55 @@ extern float note_timbre;
voice_type voice = default_voice;
void set_voice(voice_type v) {
voice = v;
voice = v;
}
float voice_envelope(float frequency) {
// envelope_index ranges from 0 to 0xFFFF, which is preserved at 880.0 Hz
// envelope_index ranges from 0 to 0xFFFF, which is preserved at 880.0 Hz
uint16_t compensated_index = (uint16_t)((float)envelope_index * (880.0 / frequency));
switch (voice) {
case default_voice:
// nothing here on purpose
break;
case butts_fader:
switch (compensated_index) {
case 0 ... 9:
frequency = frequency / 4;
note_timbre = TIMBRE_12;
break;
case 10 ... 19:
frequency = frequency / 2;
note_timbre = TIMBRE_12;
break;
case 20 ... 200:
note_timbre = .125 - pow(((float)compensated_index - 20) / (200 - 20), 2)*.125;
break;
default:
note_timbre = 0;
break;
}
break;
case octave_crunch:
switch (compensated_index) {
case 0 ... 9:
case 20 ... 24:
case 30 ... 32:
frequency = frequency / 2;
note_timbre = TIMBRE_12;
break;
case 10 ... 19:
case 25 ... 29:
case 33 ... 35:
frequency = frequency * 2;
note_timbre = TIMBRE_12;
break;
default:
note_timbre = TIMBRE_12;
break;
}
break;
}
case default_voice:
// nothing here on purpose
break;
case butts_fader:
switch (compensated_index) {
case 0 ... 9:
frequency = frequency / 4;
note_timbre = TIMBRE_12;
break;
case 10 ... 19:
frequency = frequency / 2;
note_timbre = TIMBRE_12;
break;
case 20 ... 200:
note_timbre = .125 - pow(((float)compensated_index - 20) / (200 - 20), 2)*.125;
break;
default:
note_timbre = 0;
break;
}
break;
case octave_crunch:
switch (compensated_index) {
case 0 ... 9:
case 20 ... 24:
case 30 ... 32:
frequency = frequency / 2;
note_timbre = TIMBRE_12;
break;
case 10 ... 19:
case 25 ... 29:
case 33 ... 35:
frequency = frequency * 2;
note_timbre = TIMBRE_12;
break;
default:
note_timbre = TIMBRE_12;
break;
}
break;
}
return frequency;
return frequency;
}

6
quantum/audio/voices.h
View file

@ -11,9 +11,9 @@
float voice_envelope(float frequency);
typedef enum {
default_voice,
butts_fader,
octave_crunch
default_voice,
butts_fader,
octave_crunch
} voice_type;
void set_voice(voice_type v);