~ruther/qmk_firmware

e7b6bb641c0636c01e3781fe51865fdb20014eeb — Jack Humbert 9 years ago 170d9b7
updates default voice, prunes voices
2 files changed, 29 insertions(+), 29 deletions(-)

M quantum/audio/voices.c
M quantum/audio/voices.h
M quantum/audio/voices.c => quantum/audio/voices.c +25 -25
@@ 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;

M quantum/audio/voices.h => quantum/audio/voices.h +4 -4
@@ 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;