Merge pull request #11 from derlucas/master

fixed the ADC layout for board 4.10
This commit is contained in:
Benjamin Vedder 2015-10-19 20:20:12 +02:00
commit a6d1214adb
2 changed files with 7 additions and 7 deletions

View File

@ -117,13 +117,13 @@ void hw_setup_adc_channels(void) {
ADC_RegularChannelConfig(ADC2, ADC_Channel_1, 1, ADC_SampleTime_15Cycles); ADC_RegularChannelConfig(ADC2, ADC_Channel_1, 1, ADC_SampleTime_15Cycles);
ADC_RegularChannelConfig(ADC2, ADC_Channel_9, 2, ADC_SampleTime_15Cycles); ADC_RegularChannelConfig(ADC2, ADC_Channel_9, 2, ADC_SampleTime_15Cycles);
ADC_RegularChannelConfig(ADC2, ADC_Channel_6, 3, ADC_SampleTime_15Cycles); ADC_RegularChannelConfig(ADC2, ADC_Channel_6, 3, ADC_SampleTime_15Cycles);
ADC_RegularChannelConfig(ADC2, ADC_Channel_15, 4, ADC_SampleTime_15Cycles); ADC_RegularChannelConfig(ADC2, ADC_Channel_5, 4, ADC_SampleTime_15Cycles);
// ADC3 regular channels // ADC3 regular channels
ADC_RegularChannelConfig(ADC3, ADC_Channel_2, 1, ADC_SampleTime_15Cycles); ADC_RegularChannelConfig(ADC3, ADC_Channel_2, 1, ADC_SampleTime_15Cycles);
ADC_RegularChannelConfig(ADC3, ADC_Channel_3, 2, ADC_SampleTime_15Cycles); ADC_RegularChannelConfig(ADC3, ADC_Channel_3, 2, ADC_SampleTime_15Cycles);
ADC_RegularChannelConfig(ADC3, ADC_Channel_12, 3, ADC_SampleTime_15Cycles); ADC_RegularChannelConfig(ADC3, ADC_Channel_12, 3, ADC_SampleTime_15Cycles);
ADC_RegularChannelConfig(ADC3, ADC_Channel_10, 4, ADC_SampleTime_15Cycles); ADC_RegularChannelConfig(ADC3, ADC_Channel_3, 4, ADC_SampleTime_15Cycles);
// Injected channels // Injected channels
ADC_InjectedChannelConfig(ADC1, ADC_Channel_9, 1, ADC_SampleTime_15Cycles); ADC_InjectedChannelConfig(ADC1, ADC_Channel_9, 1, ADC_SampleTime_15Cycles);

View File

@ -36,15 +36,15 @@
* 0: IN0 SENS3 * 0: IN0 SENS3
* 1: IN1 SENS2 * 1: IN1 SENS2
* 2: IN2 SENS1 * 2: IN2 SENS1
* 3: IN5 CURR2 * 3: IN8 CURR2
* 4: IN6 CURR1 * 4: IN9 CURR1
* 5: IN3 TEMP_MOSFET * 5: IN3 TEMP_MOSFET
* 6: Vrefint * 6: Vrefint
* 7: IN9 ADC_EXT2 * 7: IN6 ADC_EXT2
* 8: IN12 AN_IN * 8: IN12 AN_IN
* 9: IN4 TX_SDA_NSS * 9: IN4 TX_SDA_NSS
* 10: IN15 ADC_EXT * 10: IN5 ADC_EXT
* 11: IN10 TEMP_MOTOR * 11: IN3 TEMP_MOTOR
*/ */
#define HW_ADC_CHANNELS 12 #define HW_ADC_CHANNELS 12