josh/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck

Browse Source
This commit is contained in:
IBNobody
2016-04-17 12:55:19 -05:00
parent d5b72e7bde a67d425f4d
commit 3103ea542f
8 changed files with 150 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quantum/audio.c
View File

@@ -353,7 +353,6 @@ if (audio_config.enable) {
if (note)
stop_all_notes();
notes = true;
notes_pointer = np;
notes_count = n_count;
@@ -378,6 +377,8 @@ if (audio_config.enable) {
TIMSK3 |= _BV(OCIE3A);
TCCR3A |= _BV(COM3A1);
#endif
notes = true;
}
}
@@ -407,7 +408,6 @@ if (audio_config.enable && voices < 8) {
if (notes)
stop_all_notes();
note = true;
#ifdef PWM_AUDIO
freq = freq / SAMPLE_RATE;
#endif
@@ -439,6 +439,7 @@ if (audio_config.enable && voices < 8) {
TCCR3A |= _BV(COM3A1);
#endif
note = true;
}
}