diff options
| author | Drashna Jael're <drashna@live.com> | 2020-08-21 12:39:22 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2020-08-21 12:39:22 -0700 |
| commit | d2bf02c91e44327b0ff02fc6658593cfad4de0f7 (patch) | |
| tree | 1f72dd2028f0f9690d2ae759faf3800b82d6d3b1 /quantum/audio | |
| parent | b0bd2e674be7e10ed561d7351dc793cc3b06a092 (diff) | |
Audio tweeks
Diffstat (limited to 'quantum/audio')
| -rw-r--r-- | quantum/audio/audio_chibios.c | 11 | ||||
| -rw-r--r-- | quantum/audio/musical_notes.h | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/quantum/audio/audio_chibios.c b/quantum/audio/audio_chibios.c index c21c117f7d..36e125d510 100644 --- a/quantum/audio/audio_chibios.c +++ b/quantum/audio/audio_chibios.c @@ -86,18 +86,25 @@ static void gpt_cb8(GPTDriver *gptp); #define START_CHANNEL_1() \ gptStart(&GPTD6, &gpt6cfg1); \ - gptStartContinuous(&GPTD6, 2U) + gptStartContinuous(&GPTD6, 2U); \ + palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG) + #define START_CHANNEL_2() \ gptStart(&GPTD7, &gpt7cfg1); \ gptStartContinuous(&GPTD7, 2U); \ palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG) -#define STOP_CHANNEL_1() gptStopTimer(&GPTD6) +#define STOP_CHANNEL_1() \ + gptStopTimer(&GPTD6); \ + palSetPadMode(GPIOA, 4, PAL_MODE_OUTPUT_PUSHPULL); \ + palSetPad(GPIOA, 4) + #define STOP_CHANNEL_2() \ gptStopTimer(&GPTD7); \ palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \ palSetPad(GPIOA, 5) + #define RESTART_CHANNEL_1() \ STOP_CHANNEL_1(); \ START_CHANNEL_1() diff --git a/quantum/audio/musical_notes.h b/quantum/audio/musical_notes.h index 9742e19c43..2cc3b1f4f5 100644 --- a/quantum/audio/musical_notes.h +++ b/quantum/audio/musical_notes.h @@ -18,7 +18,9 @@ #define MUSICAL_NOTES_H // Tempo Placeholder -#define TEMPO_DEFAULT 100 +#ifndef TEMPO_DEFAULT +# define TEMPO_DEFAULT 100 +#endif #define SONG(notes...) \ { notes } @@ -61,7 +63,9 @@ #define TIMBRE_25 0.250f #define TIMBRE_50 0.500f #define TIMBRE_75 0.750f -#define TIMBRE_DEFAULT TIMBRE_50 +#ifndef TIMBRE_DEFAULT +# define TIMBRE_DEFAULT TIMBRE_50 +#endif // Notes - # = Octave |