diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-15 11:53:15 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 11:53:15 +1100 |
| commit | 8e8b7113dcf1ec8be0bdac75ed4a1d2b256a5965 (patch) | |
| tree | 3bb6c5e8690afeffbec4f6f6e8308e117eaaf0b6 | |
| parent | c80e5f9f8868ccaa8cb990be6f4da3f1011c2b78 (diff) | |
| download | qmk_firmware-8e8b7113dcf1ec8be0bdac75ed4a1d2b256a5965.tar.gz qmk_firmware-8e8b7113dcf1ec8be0bdac75ed4a1d2b256a5965.zip | |
Format code according to conventions (#11907)
Co-authored-by: QMK Bot <hello@qmk.fm>
| -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 54c1e1fb3..f16ca8aea 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) { | |||
| 64 | switch (vstate_max) { | 64 | switch (vstate_max) { |
| 65 | case 0: | 65 | case 0: |
| 66 | case 1: | 66 | case 1: |
| 67 | 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. | 67 | 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. |
| 68 | case 2: | 68 | case 2: |
| 69 | return USBPD_1500MA; | 69 | return USBPD_1500MA; |
| 70 | case 3: | 70 | case 3: |
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 | ||
