From: Jack Humbert <jack.humb@gmail.com>
Date: Fri, 22 Apr 2016 05:04:13 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a8086126fecbdce1c192036cf1011329d406949d;p=qmk_firmware.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	quantum/audio/voices.c
---

a8086126fecbdce1c192036cf1011329d406949d
diff --cc quantum/audio/voices.c
index 8b3978f3d,330ffb803..886101187
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@@ -84,22 -94,10 +94,25 @@@ 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;
++            break;
 +        case duty_fifth_down:
 +            note_timbre = 0.5;
 +            if ((envelope_index % 5) == 0)
 +                note_timbre = 0.75;
-         break;
++            break;
 +        case duty_fourth_down:
 +            if ((envelope_index % 12) == 0)
 +                note_timbre = 0.25;
 +            else
 +                note_timbre = 0.5;
-         break;
++            break;
+ 
+ 		default:
+    			break;
      }
  
      return frequency;