summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-04-22 11:58:29 -0400
committerJack Humbert <jack.humb@gmail.com>2016-04-22 11:58:29 -0400
commita718c53fe77f0b3b4361c850531eee5f23e3e13d (patch)
tree2fba1b882c8e3c8cb5653578b59108ad269949ab
parenta8086126fecbdce1c192036cf1011329d406949d (diff)
adds more voice harmonics
-rw-r--r--quantum/audio/voices.c19
-rw-r--r--quantum/audio/voices.h2
2 files changed, 18 insertions, 3 deletions
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 8861011871..0b4b463c47 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -101,14 +101,27 @@ float voice_envelope(float frequency) {
break;
case duty_fifth_down:
note_timbre = 0.5;
- if ((envelope_index % 5) == 0)
+ 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;
- else
- note_timbre = 0.5;
break;
default:
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index cdd14798b1..66184c3a27 100644
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -18,6 +18,8 @@ typedef enum {
duty_octave_down,
duty_fifth_down,
duty_fourth_down,
+ duty_third_down,
+ duty_fifth_third_down,
number_of_voices // important that this is last
} voice_type;