Skip to content

Commit 360121d

Browse files
committed
typo if a channel not used
1 parent 7c80c9a commit 360121d

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

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

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

125125

126-
126+
uint8_t rank_no = 0;
127127
for(int i=0; i<3; i++){
128128
// skip if not set
129129
if (!_isset(cs_params->pins[i])) continue;
130130

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

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

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

122+
uint8_t rank_no = 0;
122123
for(int i=0; i<3; i++){
123124
// skip if not set
124125
if (!_isset(cs_params->pins[i])) continue;
125126

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

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

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

130-
130+
uint8_t rank_no = 0;
131131
for(int i=0; i<3; i++){
132132
// skip if not set
133133
if (!_isset(cs_params->pins[i])) continue;
134134

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

src/current_sense/hardware_specific/stm32/stm32f7/stm32f7_utils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
uint32_t _getADCChannel(PinName pin);
1717

1818
// timer to injected TRGO
19-
// https://github.com/stm32duino/Arduino_Core_STM32/blob/e156c32db24d69cb4818208ccc28894e2f427cfa/system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h#L179
19+
https://github.com/stm32duino/Arduino_Core_STM32/blob/e156c32db24d69cb4818208ccc28894e2f427cfa/system/Drivers/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_adc_ex.h#L178
2020
uint32_t _timerToInjectedTRGO(TIM_HandleTypeDef* timer);
2121

2222
// timer to regular TRGO
23-
// https://github.com/stm32duino/Arduino_Core_STM32/blob/e156c32db24d69cb4818208ccc28894e2f427cfa/system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc.h#L331
23+
https://github.com/stm32duino/Arduino_Core_STM32/blob/e156c32db24d69cb4818208ccc28894e2f427cfa/system/Drivers/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_adc.h#L331
2424
uint32_t _timerToRegularTRGO(TIM_HandleTypeDef* timer);
2525

2626
// function returning index of the ADC instance

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

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

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

177-
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + i;
177+
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + rank_no++;
178178
sConfigInjected.InjectedChannel = _getADCChannel(analogInputToPinName(cs_params->pins[i]));
179179
if (HAL_ADCEx_InjectedConfigChannel(&hadc, &sConfigInjected) != HAL_OK){
180180
#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-
170+
uint8_t rank_no = 0;
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 + i;
175+
sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1 + rank_no++;
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)