Skip to content

Commit 6adcf6e

Browse files
committed
Fix ESP32 Lowside Current Sense ADC2 init
Co-authored-by: @nmscode
1 parent 0caaf03 commit 6adcf6e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/current_sense/hardware_specific/esp32/esp32_adc_driver.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,8 @@ bool IRAM_ATTR __adcStart(uint8_t pin){
154154
}
155155

156156
if(channel > 9){
157-
channel -= 10;
158157
CLEAR_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_START_SAR_M);
159-
SET_PERI_REG_BITS(SENS_SAR_MEAS_START2_REG, SENS_SAR2_EN_PAD, (1 << channel), SENS_SAR2_EN_PAD_S);
158+
SET_PERI_REG_BITS(SENS_SAR_MEAS_START2_REG, SENS_SAR2_EN_PAD, (1 << (channel - 10)), SENS_SAR2_EN_PAD_S);
160159
SET_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_START_SAR_M);
161160
} else {
162161
CLEAR_PERI_REG_MASK(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_START_SAR_M);
@@ -225,9 +224,8 @@ uint16_t IRAM_ATTR adcRead(uint8_t pin)
225224
__analogInit();
226225

227226
if(channel > 9){
228-
channel -= 10;
229227
CLEAR_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_START_SAR_M);
230-
SET_PERI_REG_BITS(SENS_SAR_MEAS_START2_REG, SENS_SAR2_EN_PAD, (1 << channel), SENS_SAR2_EN_PAD_S);
228+
SET_PERI_REG_BITS(SENS_SAR_MEAS_START2_REG, SENS_SAR2_EN_PAD, (1 << (channel - 10)), SENS_SAR2_EN_PAD_S);
231229
SET_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_START_SAR_M);
232230
} else {
233231
CLEAR_PERI_REG_MASK(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_START_SAR_M);
@@ -257,4 +255,4 @@ uint16_t IRAM_ATTR adcRead(uint8_t pin)
257255
}
258256

259257

260-
#endif
258+
#endif

0 commit comments

Comments
 (0)