diff options
| author | Joshua Diamond <josh@windowoffire.com> | 2021-02-14 20:00:20 -0500 |
|---|---|---|
| committer | Joshua Diamond <josh@windowoffire.com> | 2021-02-14 20:00:20 -0500 |
| commit | 328a8322f4134fdec2f29b8dd58501c99b4de876 (patch) | |
| tree | e2f79e3e6b3a197d0d4df1b0c042e830ab17c355 /quantum | |
| parent | f1a3ce49ccdfee79fbad76fd13bcf4448318eb6b (diff) | |
| parent | 8e8b7113dcf1ec8be0bdac75ed4a1d2b256a5965 (diff) | |
| download | qmk_firmware-328a8322f4134fdec2f29b8dd58501c99b4de876.tar.gz qmk_firmware-328a8322f4134fdec2f29b8dd58501c99b4de876.zip | |
Merge branch 'develop' of github.com:qmk/qmk_firmware into develop
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/audio/driver_chibios_dac_basic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/quantum/audio/driver_chibios_dac_basic.c b/quantum/audio/driver_chibios_dac_basic.c index 9a1c9a8c1..b8cec5ff1 100644 --- a/quantum/audio/driver_chibios_dac_basic.c +++ b/quantum/audio/driver_chibios_dac_basic.c | |||
| @@ -74,9 +74,9 @@ GPTConfig gpt7cfg1 = {.frequency = AUDIO_DAC_SAMPLE_RATE, | |||
| 74 | 74 | ||
| 75 | static void gpt_audio_state_cb(GPTDriver *gptp); | 75 | static void gpt_audio_state_cb(GPTDriver *gptp); |
| 76 | GPTConfig gptStateUpdateCfg = {.frequency = 10, | 76 | GPTConfig gptStateUpdateCfg = {.frequency = 10, |
| 77 | .callback = gpt_audio_state_cb, | 77 | .callback = gpt_audio_state_cb, |
| 78 | .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ | 78 | .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ |
| 79 | .dier = 0U}; | 79 | .dier = 0U}; |
| 80 | 80 | ||
| 81 | static const DACConfig dac_conf_ch1 = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_DHRM_12BIT_RIGHT}; | 81 | static const DACConfig dac_conf_ch1 = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_DHRM_12BIT_RIGHT}; |
| 82 | static const DACConfig dac_conf_ch2 = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_DHRM_12BIT_RIGHT}; | 82 | static const DACConfig dac_conf_ch2 = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_DHRM_12BIT_RIGHT}; |
| @@ -131,7 +131,7 @@ void channel_2_start(void) { | |||
| 131 | 131 | ||
| 132 | void channel_2_stop(void) { | 132 | void channel_2_stop(void) { |
| 133 | gptStopTimer(&GPTD7); | 133 | gptStopTimer(&GPTD7); |
| 134 | palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \ | 134 | palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); |
| 135 | palSetPad(GPIOA, 5); | 135 | palSetPad(GPIOA, 5); |
| 136 | } | 136 | } |
| 137 | 137 | ||