localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

restructures audio, begins voicing

This commit is contained in:
Jack Humbert 2016-04-21 00:37:45 -04:00
parent 2e60054951
commit 73228f5e5d
9 changed files with 91 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
quantum/audio.c → quantum/audio/audio.c
View File

@ -299,27 +299,6 @@ float vibrato(float average_freq) {
#endif
float envelope(float f) {
uint16_t compensated_index = (uint16_t)((float)envelope_index * (880.0 / f));
switch (compensated_index) {
case 0 ... 9:
f = f / 4;
note_timbre = TIMBRE_12;
break;
case 10 ... 19:
f = f / 2;
note_timbre = TIMBRE_12;
break;
case 20 ... 200:
note_timbre = .125 - pow(((float)compensated_index - 20) / (200 - 20), 2)*.125;
break;
default:
note_timbre = 0;
break;
}
return f;
}
ISR(TIMER3_COMPA_vect) {
if (note) {
#ifdef PWM_AUDIO
@ -413,7 +392,7 @@ ISR(TIMER3_COMPA_vect) {
if (envelope_index < 65535) {
envelope_index++;
}
freq = envelope(freq);
freq = voice_envelope(freq);
if (freq < 30.517578125)
freq = 30.52;
@ -456,6 +435,11 @@ ISR(TIMER3_COMPA_vect) {
freq = note_frequency;
}
if (envelope_index < 65535) {
envelope_index++;
}
freq = voice_envelope(freq);
ICR3 = (int)(((double)F_CPU) / (freq * CPU_PRESCALER)); // Set max to the period
OCR3A = (int)((((double)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre); // Set compare to half the period
} else {
@ -498,6 +482,7 @@ ISR(TIMER3_COMPA_vect) {
note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
note_length = (*notes_pointer)[current_note][1] * (note_tempo / 100);
#else
envelope_index = 0;
note_frequency = (*notes_pointer)[current_note][0];
note_length = ((*notes_pointer)[current_note][1] / 4) * (note_tempo / 100);
#endif

1
quantum/audio.h → quantum/audio/audio.h
View File

@ -4,6 +4,7 @@
#include <util/delay.h>
#include "musical_notes.h"
#include "song_list.h"
#include "voices.h"
#ifndef AUDIO_H
#define AUDIO_H

0
quantum/musical_notes.h → quantum/audio/musical_notes.h
View File

0
quantum/song_list.h → quantum/audio/song_list.h
View File

0
quantum/vibrato_lut.h → quantum/audio/vibrato_lut.h
View File

60
quantum/audio/voices.c Normal file
View File

@ -0,0 +1,60 @@
#include "voices.h"
extern uint16_t envelope_index;
extern float note_timbre;
voice_type voice = default_voice;
void set_voice(voice_type v) {
voice = v;
}
float voice_envelope(float frequency) {
// envelope_index ranges from 0 to 0xFFFF, which is preserved at 880.0 Hz
uint16_t compensated_index = (uint16_t)((float)envelope_index * (880.0 / frequency));
switch (voice) {
case default_voice:
// nothing here on purpose
break;
case butts_fader:
switch (compensated_index) {
case 0 ... 9:
frequency = frequency / 4;
note_timbre = TIMBRE_12;
break;
case 10 ... 19:
frequency = frequency / 2;
note_timbre = TIMBRE_12;
break;
case 20 ... 200:
note_timbre = .125 - pow(((float)compensated_index - 20) / (200 - 20), 2)*.125;
break;
default:
note_timbre = 0;
break;
}
break;
case octave_crunch:
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;
}
return frequency;
}

21
quantum/audio/voices.h Normal file
View File

@ -0,0 +1,21 @@
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
#include "musical_notes.h"
#include "song_list.h"
#ifndef VOICES_H
#define VOICES_H
float voice_envelope(float frequency);
typedef enum {
default_voice,
butts_fader,
octave_crunch
} voice_type;
void set_voice(voice_type v);
#endif

0
quantum/wave.h → quantum/audio/wave.h
View File

3
quantum/quantum.mk
View File

@ -28,7 +28,7 @@ ifeq ($(strip $(MIDI_ENABLE)), yes)
endif
ifeq ($(strip $(AUDIO_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/audio.c
SRC += $(QUANTUM_DIR)/audio/audio.c $(QUANTUM_DIR)/audio/voices.c
endif
ifeq ($(strip $(UNICODE_ENABLE)), yes)
@ -47,6 +47,7 @@ endif
# Search Path
VPATH += $(TOP_DIR)/$(QUANTUM_DIR)
VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/keymap_extras
VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/audio
include $(TMK_DIR)/protocol/lufa.mk