diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2019-05-20 15:48:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 15:48:36 +0900 |
| commit | 3ed039ed768252d64ef64865737d1cb10e8a3f2f (patch) | |
| tree | f75d7d0bcef60fda2c0407bdeaa5062a54100f44 /quantum/audio | |
| parent | be58a6847364a9a8243a77b5398e9c209628d1ef (diff) | |
| parent | 24d05fee49bd9d86863f896d70eafd25674ec248 (diff) | |
Merge branch 'master' into fix/mouse_keys
Diffstat (limited to 'quantum/audio')
| -rw-r--r-- | quantum/audio/audio_arm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/quantum/audio/audio_arm.c b/quantum/audio/audio_arm.c index de0cd15c58..e5164f2abb 100644 --- a/quantum/audio/audio_arm.c +++ b/quantum/audio/audio_arm.c @@ -85,10 +85,13 @@ static void gpt_cb8(GPTDriver *gptp); #endif #define START_CHANNEL_1() gptStart(&GPTD6, &gpt6cfg1); \ - gptStartContinuous(&GPTD6, 2U) + gptStartContinuous(&GPTD6, 2U); \ + palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG); #define START_CHANNEL_2() gptStart(&GPTD7, &gpt7cfg1); \ gptStartContinuous(&GPTD7, 2U) -#define STOP_CHANNEL_1() gptStopTimer(&GPTD6) +#define STOP_CHANNEL_1() gptStopTimer(&GPTD6); \ + palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \ + palSetPad(GPIOA, 5); #define STOP_CHANNEL_2() gptStopTimer(&GPTD7) #define RESTART_CHANNEL_1() STOP_CHANNEL_1(); \ START_CHANNEL_1() @@ -298,6 +301,8 @@ void audio_init() { */ palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG); palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG); + palSetPad(GPIOA, 5); + dacStart(&DACD1, &dac1cfg1); dacStart(&DACD2, &dac1cfg2); |