diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-01-07 08:45:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 08:45:19 -0600 |
| commit | 0fb82c15a5c9a69e17cff8dcd04c652d21381958 (patch) | |
| tree | dd7a441ad7d086bb7cb4b093bd8d0cbd4d39d69d /quantum/process_keycode | |
| parent | db48b28eeb5ebe5252cc04495d5eb326fa62dc26 (diff) | |
| parent | e7df488a92da56cf160ac64c8cc7302ab717e145 (diff) | |
| download | qmk_firmware-0fb82c15a5c9a69e17cff8dcd04c652d21381958.tar.gz qmk_firmware-0fb82c15a5c9a69e17cff8dcd04c652d21381958.zip | |
Merge pull request #15 from jackhumbert/master
Merge from qmk
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_music.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c index bae43943e..ca68bef6c 100644 --- a/quantum/process_keycode/process_music.c +++ b/quantum/process_keycode/process_music.c | |||
| @@ -115,7 +115,16 @@ bool process_music(uint16_t keycode, keyrecord_t *record) { | |||
| 115 | return false; | 115 | return false; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | #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 | #elif defined(MUSIC_MODE_GUITAR) | ||
| 121 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(float)(MATRIX_ROWS - record->event.key.row + 7)*5.0/12); | ||
| 122 | #elif defined(MUSIC_MODE_VIOLIN) | ||
| 123 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(float)(MATRIX_ROWS - record->event.key.row + 5)*7.0/12); | ||
| 124 | #else | ||
| 118 | 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)); | 125 | 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)); |
| 126 | #endif | ||
| 127 | |||
| 119 | if (record->event.pressed) { | 128 | if (record->event.pressed) { |
| 120 | play_note(freq, 0xF); | 129 | play_note(freq, 0xF); |
| 121 | if (music_sequence_recording) { | 130 | if (music_sequence_recording) { |