Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-04-19 07:32:45 +00:00
commit 2c0b3649fb

View file

@ -101,7 +101,7 @@ static const DACConversionGroup dac_conv_grp_ch2 = {.num_channels = 1U, .trigger
void channel_1_start(void) { void channel_1_start(void) {
gptStart(&GPTD6, &gpt6cfg1); gptStart(&GPTD6, &gpt6cfg1);
gptStartContinuous(&GPTD6, 2U); gptStartContinuous(&GPTD6, 2U);
palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG); palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG);
} }
void channel_1_stop(void) { void channel_1_stop(void) {