jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Audio tweeks

Browse Source
This commit is contained in:
Drashna Jael're
2020-08-21 12:39:22 -07:00
parent b0bd2e674b
commit d2bf02c91e
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
quantum/audio/audio_chibios.c
View File

@@ -86,18 +86,25 @@ static void gpt_cb8(GPTDriver *gptp);
#define START_CHANNEL_1() \ #define START_CHANNEL_1() \
gptStart(&GPTD6, &gpt6cfg1); \ gptStart(&GPTD6, &gpt6cfg1); \
gptStartContinuous(&GPTD6, 2U) gptStartContinuous(&GPTD6, 2U); \
palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG)
#define START_CHANNEL_2() \ #define START_CHANNEL_2() \
gptStart(&GPTD7, &gpt7cfg1); \ gptStart(&GPTD7, &gpt7cfg1); \
gptStartContinuous(&GPTD7, 2U); \ gptStartContinuous(&GPTD7, 2U); \
palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG) 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() \ #define STOP_CHANNEL_2() \
gptStopTimer(&GPTD7); \ gptStopTimer(&GPTD7); \
palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \ palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \
palSetPad(GPIOA, 5) palSetPad(GPIOA, 5)
#define RESTART_CHANNEL_1() \ #define RESTART_CHANNEL_1() \
STOP_CHANNEL_1(); \ STOP_CHANNEL_1(); \
START_CHANNEL_1() START_CHANNEL_1()

8
quantum/audio/musical_notes.h
View File

@@ -18,7 +18,9 @@
#define MUSICAL_NOTES_H #define MUSICAL_NOTES_H
// Tempo Placeholder // Tempo Placeholder
#define TEMPO_DEFAULT 100 #ifndef TEMPO_DEFAULT
# define TEMPO_DEFAULT 100
#endif
#define SONG(notes...) \ #define SONG(notes...) \
{ notes } { notes }
@@ -61,7 +63,9 @@
#define TIMBRE_25 0.250f #define TIMBRE_25 0.250f
#define TIMBRE_50 0.500f #define TIMBRE_50 0.500f
#define TIMBRE_75 0.750f #define TIMBRE_75 0.750f
#define TIMBRE_DEFAULT TIMBRE_50 #ifndef TIMBRE_DEFAULT
# define TIMBRE_DEFAULT TIMBRE_50
#endif
// Notes - # = Octave // Notes - # = Octave