Merge pull request #8 from jackhumbert/master

[qmk_firmware.git] / quantum / audio / voices.c

diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 330ffb803ae737eb34daef71fcb93b58528c64bb..6d4172a06c2dedd3def472ea500ec233f69eb4a8 100644 (file)
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -1,4 +1,5 @@
 #include "voices.h"
+#include "audio.h"
 #include "stdlib.h"
 
 // these are imported from audio.c
@@ -6,7 +7,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;
@@ -53,28 +54,28 @@ float voice_envelope(float frequency) {
             }
            break;
 
-        case octave_crunch:
-            polyphony_rate = 0;
-            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 octave_crunch:
+        //     polyphony_rate = 0;
+        //     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 duty_osc:
             // This slows the loop down a substantial amount, so higher notes may freeze
@@ -94,11 +95,71 @@ float voice_envelope(float frequency) {
         case duty_octave_down:
             polyphony_rate = 0;
             note_timbre = (envelope_index % 2) * .125 + .375 * 2;
-               break;
+            if ((envelope_index % 4) == 0)
+                note_timbre = 0.5;
+            if ((envelope_index % 8) == 0)
+                note_timbre = 0;
+            break;
+        case delayed_vibrato:
+            polyphony_rate = 0;
+            note_timbre = TIMBRE_50;
+            #define VOICE_VIBRATO_DELAY 150
+            #define VOICE_VIBRATO_SPEED 50
+            switch (compensated_index) {
+                case 0 ... VOICE_VIBRATO_DELAY:
+                    break;
+                default:
+                    frequency = frequency * vibrato_lut[(int)fmod((((float)compensated_index - (VOICE_VIBRATO_DELAY + 1))/1000*VOICE_VIBRATO_SPEED), VIBRATO_LUT_LENGTH)];
+                    break;
+            }
+            break;
+        // case delayed_vibrato_octave:
+        //     polyphony_rate = 0;
+        //     if ((envelope_index % 2) == 1) {
+        //         note_timbre = 0.55;
+        //     } else {
+        //         note_timbre = 0.45;
+        //     }
+        //     #define VOICE_VIBRATO_DELAY 150
+        //     #define VOICE_VIBRATO_SPEED 50
+        //     switch (compensated_index) {
+        //         case 0 ... VOICE_VIBRATO_DELAY:
+        //             break;
+        //         default:
+        //             frequency = frequency * VIBRATO_LUT[(int)fmod((((float)compensated_index - (VOICE_VIBRATO_DELAY + 1))/1000*VOICE_VIBRATO_SPEED), VIBRATO_LUT_LENGTH)];
+        //             break;
+        //     }
+        //     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;
     }
 
     return frequency;
-}
\ No newline at end of file
+}
+
+