Skip to content

Commit a2bd1ea

Browse files
committed
roll-back
1 parent 360121d commit a2bd1ea

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

src/current_sense/hardware_specific/stm32/stm32f1/stm32f1_hal.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,11 @@ int _adc_init(Stm32CurrentSenseParams* cs_params, const STM32DriverParams* drive
123123
}
124124

125125

126-
uint8_t rank_no = 0;
127126
for(int i=0; i<3; i++){
128127
// skip if not set
129128
if (!_isset(cs_params->pins[i])) continue;
130129

131-
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + rank_no++;
130+
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + i;
132131
sConfigInjected.InjectedChannel = STM_PIN_CHANNEL(pinmap_function(analogInputToPinName(cs_params->pins[i]), PinMap_ADC));
133132
if (HAL_ADCEx_InjectedConfigChannel(&hadc, &sConfigInjected) != HAL_OK){
134133
#ifdef SIMPLEFOC_STM32_DEBUG

src/current_sense/hardware_specific/stm32/stm32f4/stm32f4_hal.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,11 @@ int _adc_init(Stm32CurrentSenseParams* cs_params, const STM32DriverParams* drive
119119
#endif
120120
}
121121

122-
uint8_t rank_no = 0;
123122
for(int i=0; i<3; i++){
124123
// skip if not set
125124
if (!_isset(cs_params->pins[i])) continue;
126125

127-
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + rank_no++;
126+
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + i;
128127
sConfigInjected.InjectedChannel = _getADCChannel(analogInputToPinName(cs_params->pins[i]));
129128
if (HAL_ADCEx_InjectedConfigChannel(&hadc, &sConfigInjected) != HAL_OK){
130129
#ifdef SIMPLEFOC_STM32_DEBUG

src/current_sense/hardware_specific/stm32/stm32f7/stm32f7_hal.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,11 @@ int _adc_init(Stm32CurrentSenseParams* cs_params, const STM32DriverParams* drive
127127
#endif
128128
}
129129

130-
uint8_t rank_no = 0;
131130
for(int i=0; i<3; i++){
132131
// skip if not set
133132
if (!_isset(cs_params->pins[i])) continue;
134133

135-
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + rank_no++;
134+
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + i;
136135
sConfigInjected.InjectedChannel = _getADCChannel(analogInputToPinName(cs_params->pins[i]));
137136
if (HAL_ADCEx_InjectedConfigChannel(&hadc, &sConfigInjected) != HAL_OK){
138137
#ifdef SIMPLEFOC_STM32_DEBUG

src/current_sense/hardware_specific/stm32/stm32g4/stm32g4_hal.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,11 @@ int _adc_init(Stm32CurrentSenseParams* cs_params, const STM32DriverParams* drive
169169
#endif
170170
}
171171

172-
uint8_t rank_no = 0;
173172
for(int i=0; i<3; i++){
174173
// skip if not set
175174
if (!_isset(cs_params->pins[i])) continue;
176175

177-
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + rank_no++;
176+
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + i;
178177
sConfigInjected.InjectedChannel = _getADCChannel(analogInputToPinName(cs_params->pins[i]));
179178
if (HAL_ADCEx_InjectedConfigChannel(&hadc, &sConfigInjected) != HAL_OK){
180179
#ifdef SIMPLEFOC_STM32_DEBUG

src/current_sense/hardware_specific/stm32/stm32l4/stm32l4_hal.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ int _adc_init(Stm32CurrentSenseParams* cs_params, const STM32DriverParams* drive
167167
#endif
168168
}
169169

170-
uint8_t rank_no = 0;
170+
171171
for(int i=0; i<3; i++){
172172
// skip if not set
173173
if (!_isset(cs_params->pins[i])) continue;
174174

175-
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + rank_no++;
175+
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + i;
176176
sConfigInjected.InjectedChannel = _getADCChannel(analogInputToPinName(cs_params->pins[i]));
177177
if (HAL_ADCEx_InjectedConfigChannel(&hadc, &sConfigInjected) != HAL_OK){
178178
#ifdef SIMPLEFOC_STM32_DEBUG

0 commit comments

Comments
 (0)