aboutsummaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorGravatar Jack Humbert <jack.humb@gmail.com>2016-12-12 16:06:41 -0500
committerGravatar Jack Humbert <jack.humb@gmail.com>2016-12-12 16:06:41 -0500
commitae95834f5af7404c04e6fe3446019046278d814b (patch)
treef73447fc32940c7bc6b691a83567186d1afbc991 /quantum
parent0edfe55bfe4afd037918ff73e49552a28f39a5ca (diff)
downloadqmk_firmware-ae95834f5af7404c04e6fe3446019046278d814b.tar.gz
specialise music variables
Diffstat (limited to 'quantum')
-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 2d52e47a7..bae43943e 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) {