summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-04-25 06:59:47 +0200
committerJack Humbert <jack.humb@gmail.com>2016-04-25 06:59:47 +0200
commite7b6bb641c0636c01e3781fe51865fdb20014eeb (patch)
tree770890b8c71adc31b15e23acb9a1a9edd0a5c31b /quantum
parent170d9b7d15c8483cee8ff976936aad0da21e4c92 (diff)
downloadqmk_firmware-e7b6bb641c0636c01e3781fe51865fdb20014eeb.tar.gz
qmk_firmware-e7b6bb641c0636c01e3781fe51865fdb20014eeb.tar.xz
updates default voice, prunes voices
Diffstat (limited to 'quantum')
-rw-r--r--quantum/audio/voices.c50
-rw-r--r--quantum/audio/voices.h8
2 files changed, 29 insertions, 29 deletions
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 0b4b463c4..de9f8ae54 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -6,7 +6,7 @@ extern uint16_t envelope_index;
extern float note_timbre;
extern float polyphony_rate;
-voice_type voice = duty_osc;
+voice_type voice = default_voice;
void set_voice(voice_type v) {
voice = v;
@@ -99,30 +99,30 @@ float voice_envelope(float frequency) {
if ((envelope_index % 8) == 0)
note_timbre = 0;
break;
- case duty_fifth_down:
- note_timbre = 0.5;
- if ((envelope_index % 3) == 0)
- note_timbre = 0.75;
- break;
- case duty_fourth_down:
- note_timbre = 0.0;
- if ((envelope_index % 12) == 0)
- note_timbre = 0.75;
- if (((envelope_index % 12) % 4) != 1)
- note_timbre = 0.75;
- break;
- case duty_third_down:
- note_timbre = 0.5;
- if ((envelope_index % 5) == 0)
- note_timbre = 0.75;
- break;
- case duty_fifth_third_down:
- note_timbre = 0.5;
- if ((envelope_index % 5) == 0)
- note_timbre = 0.75;
- if ((envelope_index % 3) == 0)
- note_timbre = 0.25;
- break;
+ // case duty_fifth_down:
+ // note_timbre = 0.5;
+ // if ((envelope_index % 3) == 0)
+ // note_timbre = 0.75;
+ // break;
+ // case duty_fourth_down:
+ // note_timbre = 0.0;
+ // if ((envelope_index % 12) == 0)
+ // note_timbre = 0.75;
+ // if (((envelope_index % 12) % 4) != 1)
+ // note_timbre = 0.75;
+ // break;
+ // case duty_third_down:
+ // note_timbre = 0.5;
+ // if ((envelope_index % 5) == 0)
+ // note_timbre = 0.75;
+ // break;
+ // case duty_fifth_third_down:
+ // note_timbre = 0.5;
+ // if ((envelope_index % 5) == 0)
+ // note_timbre = 0.75;
+ // if ((envelope_index % 3) == 0)
+ // note_timbre = 0.25;
+ // break;
default:
break;
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index 66184c3a2..4b894f28d 100644
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -16,10 +16,10 @@ typedef enum {
octave_crunch,
duty_osc,
duty_octave_down,
- duty_fifth_down,
- duty_fourth_down,
- duty_third_down,
- duty_fifth_third_down,
+ // duty_fifth_down,
+ // duty_fourth_down,
+ // duty_third_down,
+ // duty_fifth_third_down,
number_of_voices // important that this is last
} voice_type;