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 | |
| parent | f1a3ce49ccdfee79fbad76fd13bcf4448318eb6b (diff) | |
| parent | 8e8b7113dcf1ec8be0bdac75ed4a1d2b256a5965 (diff) | |
Merge branch 'develop' of github.com:qmk/qmk_firmware into develop
| -rw-r--r-- | drivers/chibios/usbpd_stm32g4.c | 2 | ||||
| -rw-r--r-- | quantum/audio/driver_chibios_dac_basic.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/chibios/usbpd_stm32g4.c b/drivers/chibios/usbpd_stm32g4.c index 54c1e1fb3d..f16ca8aeae 100644 --- a/drivers/chibios/usbpd_stm32g4.c +++ b/drivers/chibios/usbpd_stm32g4.c @@ -64,7 +64,7 @@ __attribute__((weak)) usbpd_allowance_t usbpd_get_allowance(void) { switch (vstate_max) { case 0: case 1: - return USBPD_500MA; // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device. + return USBPD_500MA; // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device. case 2: return USBPD_1500MA; case 3: diff --git a/quantum/audio/driver_chibios_dac_basic.c b/quantum/audio/driver_chibios_dac_basic.c index 9a1c9a8c19..b8cec5ff1b 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, static void gpt_audio_state_cb(GPTDriver *gptp); GPTConfig gptStateUpdateCfg = {.frequency = 10, - .callback = gpt_audio_state_cb, - .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ - .dier = 0U}; + .callback = gpt_audio_state_cb, + .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ + .dier = 0U}; static const DACConfig dac_conf_ch1 = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_DHRM_12BIT_RIGHT}; 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) { void channel_2_stop(void) { gptStopTimer(&GPTD7); - palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \ + palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); palSetPad(GPIOA, 5); } |