diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-16 23:07:50 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-16 23:07:50 -0400 |
| commit | 8bbd064cf52a76508589579f19595607a1f3af21 (patch) | |
| tree | cb11676373bc7adafa99a16a2239250fcde5ced0 /quantum | |
| parent | 41cc35425ab32c9a9492006da8b667d01d32dfa6 (diff) | |
| download | firmware-8bbd064cf52a76508589579f19595607a1f3af21.tar.gz firmware-8bbd064cf52a76508589579f19595607a1f3af21.tar.bz2 firmware-8bbd064cf52a76508589579f19595607a1f3af21.zip | |
changes to play_notes, goodbye
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/audio.c | 2 | ||||
| -rw-r--r-- | quantum/keymap_common.c | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/quantum/audio.c b/quantum/audio.c index 40d09d62f..773edfd8e 100644 --- a/quantum/audio.c +++ b/quantum/audio.c @@ -318,7 +318,7 @@ ISR(TIMER3_COMPA_vect) { return; } } - if (!note_resting && ((int)notes_rest != 0)) { + if (!note_resting && (notes_rest > 0)) { note_resting = true; note_frequency = 0; note_length = notes_rest; diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 457f70a44..8f35521a2 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -33,12 +33,14 @@ extern keymap_config_t keymap_config; #include <inttypes.h> #ifdef AUDIO_ENABLE #include "audio.h" - - float goodbye[][2] = { - {440.0*pow(2.0,(31)/12.0), 8}, - {440.0*pow(2.0,(24)/12.0), 8}, - {440.0*pow(2.0,(19)/12.0), 12}, - }; + #ifndef GOODBYE_TUNE + #define GOODBYE_TUNE { \ + {440.0*pow(2.0,(31)/12.0), 8}, \ + {440.0*pow(2.0,(24)/12.0), 8}, \ + {440.0*pow(2.0,(19)/12.0), 12}, \ + } + #endif + float goodbye_tune[][2] = GOODBYE_TUNE; #endif static action_t keycode_to_action(uint16_t keycode); @@ -189,7 +191,7 @@ static action_t keycode_to_action(uint16_t keycode) case RESET: ; // RESET is 0x5000, which is why this is here clear_keyboard(); #ifdef AUDIO_ENABLE - play_notes(&goodbye, 3, false, 0); + play_notes(&goodbye_tune, false, 0); #endif _delay_ms(250); #ifdef ATREUS_ASTAR |