diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-01-26 09:05:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 09:05:55 +0100 |
| commit | b7b94bfb132aa5f2f79b587fcfa6b1197485db27 (patch) | |
| tree | 4cae966728b7b6baf101a7ab2b95eeff16cce141 /quantum/process_keycode/process_music.c | |
| parent | f91f0a715d51286064bfe808b0d463878a6d3588 (diff) | |
| parent | aac7c0aa4db6b27f4c8d8f3849f8fd41f07e892a (diff) | |
| download | qmk_firmware-b7b94bfb132aa5f2f79b587fcfa6b1197485db27.tar.gz qmk_firmware-b7b94bfb132aa5f2f79b587fcfa6b1197485db27.zip | |
Merge pull request #17 from qmk/master
Merged from QMK project
Diffstat (limited to 'quantum/process_keycode/process_music.c')
| -rw-r--r-- | quantum/process_keycode/process_music.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c index ca68bef6c..1e2648bff 100644 --- a/quantum/process_keycode/process_music.c +++ b/quantum/process_keycode/process_music.c | |||
| @@ -114,6 +114,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) { | |||
| 114 | music_sequence_interval+=10; | 114 | music_sequence_interval+=10; |
| 115 | return false; | 115 | return false; |
| 116 | } | 116 | } |
| 117 | #define MUSIC_MODE_GUITAR | ||
| 117 | 118 | ||
| 118 | #ifdef MUSIC_MODE_CHROMATIC | 119 | #ifdef MUSIC_MODE_CHROMATIC |
| 119 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(MATRIX_ROWS - record->event.key.row)); | 120 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(MATRIX_ROWS - record->event.key.row)); |