diff options
| author | xyverz <xyverz@gmail.com> | 2016-12-13 18:06:49 -0800 |
|---|---|---|
| committer | xyverz <xyverz@gmail.com> | 2016-12-13 18:06:49 -0800 |
| commit | 0523657923d2bc8e9515fcb8125d8ceb7a70d862 (patch) | |
| tree | c52a29838a67eb6c032b1950839ac889a1a6330c /quantum/process_keycode/process_music.c | |
| parent | 592b90dd221d3847d359b9a4dbd258b9ceb2b3ce (diff) | |
| parent | 20892bf706219f19a5f9cd34abd4f772ab4ee570 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/process_keycode/process_music.c')
| -rw-r--r-- | quantum/process_keycode/process_music.c | 6 |
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) { |