jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation issues

Browse Source
This commit is contained in:
Drashna Jael're
2022-03-25 16:31:52 -07:00
parent 53ff570bf0
commit 07a3743e87
6 changed files with 2 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quantum/audio/voices.c
-5
View File
@@ -36,10 +36,6 @@ void set_voice(voice_type v) {
voice = v;
}
<<<<<<< HEAD
void voice_iterate() { voice = (voice + 1) % number_of_voices; }
void voice_deiterate() { voice = (voice - 1 + number_of_voices) % number_of_voices; }
=======
void voice_iterate() {
voice = (voice + 1) % number_of_voices;
}
@@ -47,7 +43,6 @@ void voice_iterate() {
void voice_deiterate() {
voice = (voice - 1 + number_of_voices) % number_of_voices;
}
>>>>>>> qmk/master
#ifdef AUDIO_VOICES
float mod(float a, int b) {