adds more voices, fixes macro redefines

diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 92ada47f7b4c7f5d05188f7bcc468706d7456ca5..98631f0cb47736b9d40c3bf88a1f42db4c6ed6d6 100644 (file)
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -72,15 +72,19 @@ float voice_envelope(float frequency) {
             polyphony_rate = 0;
             switch (compensated_index) {
                 default:
-                    #define SPEED 10
-                    #define AMP   .75
+                    #define OCS_SPEED 10
+                    #define OCS_AMP   .25
                     // sine wave is slow
-                    // note_timbre = (sin((float)compensated_index/10000*SPEED) * AMP / 2) + .5;
+                    // note_timbre = (sin((float)compensated_index/10000*OCS_SPEED) * OCS_AMP / 2) + .5;
                     // triangle wave is a bit faster
-                    note_timbre = (float)abs((compensated_index*SPEED % 3000) - 1500) * ( AMP / 1500 ) + (1 - AMP) / 2;
+                    note_timbre = (float)abs((compensated_index*OCS_SPEED % 3000) - 1500) * ( OCS_AMP / 1500 ) + (1 - OCS_AMP) / 2;
                 break;
             }
         break;
+        case duty_octave_down:
+            polyphony_rate = 0;
+            note_timbre = (envelope_index % 2) * .125 + .375 * 2;
+        break;
     }
 
     return frequency;

diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index 44c5066b55c8e6c422e68290b75958f5d9b92f5e..5aa99f4b1d7131ab19b69cba667e53d600a5fb97 100644 (file)
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -15,6 +15,7 @@ typedef enum {
     butts_fader,
     octave_crunch,
     duty_osc,
+    duty_octave_down,
     number_of_voices // important that this is last
 } voice_type;