diff --git a/Odrive.ioc b/Odrive.ioc index 6f40b43c..32bc879c 100755 --- a/Odrive.ioc +++ b/Odrive.ioc @@ -24,7 +24,7 @@ ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_3CYCLES ADC1.SamplingTime-1\#ChannelInjectedConversion=ADC_SAMPLETIME_3CYCLES ADC1.ScanConvMode=DISABLE ADC1.master=1 -ADC2.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_5 +ADC2.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_13 ADC2.Channel-1\#ChannelInjectedConversion=ADC_CHANNEL_10 ADC2.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4 ADC2.ContinuousConvMode=DISABLE @@ -48,7 +48,7 @@ ADC2.Resolution=ADC_RESOLUTION_12B ADC2.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_3CYCLES ADC2.SamplingTime-1\#ChannelInjectedConversion=ADC_SAMPLETIME_3CYCLES ADC2.ScanConvMode=DISABLE -ADC3.Channel-7\#ChannelRegularConversion=ADC_CHANNEL_10 +ADC3.Channel-7\#ChannelRegularConversion=ADC_CHANNEL_12 ADC3.Channel-8\#ChannelInjectedConversion=ADC_CHANNEL_11 ADC3.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4 ADC3.ContinuousConvMode=DISABLE @@ -153,7 +153,7 @@ Mcu.Pin7=PC2 Mcu.Pin8=PC3 Mcu.Pin9=PA0-WKUP Mcu.PinsNb=55 -Mcu.UserConstants=TIM_CLOCK_HZ,84000000;TIM_PERIOD_CLOCKS,8192;TIM_DEADTIME_CLOCKS,20 +Mcu.UserConstants=TIM_CLOCK_HZ,168000000;TIM_PERIOD_CLOCKS,8192;TIM_DEADTIME_CLOCKS,20 Mcu.UserName=STM32F405RGTx MxCube.Version=4.17.0 MxDb.Version=DB.4.0.170 diff --git a/Src/adc.c b/Src/adc.c index 215cafa7..717e3c37 100644 --- a/Src/adc.c +++ b/Src/adc.c @@ -132,7 +132,7 @@ void MX_ADC2_Init(void) /**Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time. */ - sConfig.Channel = ADC_CHANNEL_5; + sConfig.Channel = ADC_CHANNEL_13; sConfig.Rank = 1; sConfig.SamplingTime = ADC_SAMPLETIME_3CYCLES; if (HAL_ADC_ConfigChannel(&hadc2, &sConfig) != HAL_OK) @@ -183,7 +183,7 @@ void MX_ADC3_Init(void) /**Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time. */ - sConfig.Channel = ADC_CHANNEL_10; + sConfig.Channel = ADC_CHANNEL_12; sConfig.Rank = 1; sConfig.SamplingTime = ADC_SAMPLETIME_3CYCLES; if (HAL_ADC_ConfigChannel(&hadc3, &sConfig) != HAL_OK)