summaryrefslogtreecommitdiff
path: root/quantum/process_keycode
diff options
context:
space:
mode:
authorOfer Plesser <plesserofer@gmail.com>2016-12-16 21:52:51 +0200
committerOfer Plesser <plesserofer@gmail.com>2016-12-16 21:52:51 +0200
commit6a462c818cc35ad5a51576bee96077d9614b1a8d (patch)
treecda535a4e64bd0183b800b6abe87005c3f98a74f /quantum/process_keycode
parent6e7cfa83b9424061914793b02757fa4ec75b356b (diff)
parentb8e13167c813b59ebd6f4484dccae37bde2bfdba (diff)
downloadqmk_firmware-6a462c818cc35ad5a51576bee96077d9614b1a8d.tar.gz
qmk_firmware-6a462c818cc35ad5a51576bee96077d9614b1a8d.zip
Merge branch 'master' into feature/combos
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r--quantum/process_keycode/process_music.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index 2d52e47a72..bae43943e0 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -1,8 +1,8 @@
#include "process_music.h"
bool music_activated = false;
-uint8_t starting_note = 0x0C;
-int offset = 7;
+uint8_t music_starting_note = 0x0C;
+int music_offset = 7;
// music sequencer
static bool music_sequence_recording = false;
@@ -115,7 +115,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
return false;
}
- float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row));
+ float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + SCALE[record->event.key.col + music_offset])/12.0+(MATRIX_ROWS - record->event.key.row));
if (record->event.pressed) {
play_note(freq, 0xF);
if (music_sequence_recording) {