Fix wrong attenuation being set to pins (#5522)

me-no-dev · web-flow · commit 5fd737925fc7 · 2021-08-11T13:05:26.000+03:00
Fixes: #5503
diff --git a/cores/esp32/esp32-hal-adc.c b/cores/esp32/esp32-hal-adc.c
@@ -104,7 +104,9 @@ void __analogSetPinAttenuation(uint8_t pin, adc_attenuation_t attenuation)
         adc1_config_channel_atten(channel, attenuation);
     }
     __analogInit();
-    __pin_attenuation[pin] = attenuation;
+    if((__pin_attenuation[pin] != ADC_ATTENDB_MAX) || (attenuation != __analogAttenuation)){
+        __pin_attenuation[pin] = attenuation;
+    }
 }
 
 bool __adcAttachPin(uint8_t pin){
@@ -113,6 +115,7 @@ bool __adcAttachPin(uint8_t pin){
         log_e("Pin %u is not ADC pin!", pin);
         return false;
     }
+    __analogInit();
     int8_t pad = digitalPinToTouchChannel(pin);
     if(pad >= 0){
 #if CONFIG_IDF_TARGET_ESP32

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,9 @@ void __analogSetPinAttenuation(uint8_t pin, adc_attenuation_t attenuation)`
`104`	`104`	`adc1_config_channel_atten(channel, attenuation);`
`105`	`105`	`}`
`106`	`106`	`__analogInit();`
`107`		`- __pin_attenuation[pin] = attenuation;`
	`107`	`+ if((__pin_attenuation[pin] != ADC_ATTENDB_MAX) \|\| (attenuation != __analogAttenuation)){`
	`108`	`+ __pin_attenuation[pin] = attenuation;`
	`109`	`+ }`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`bool __adcAttachPin(uint8_t pin){`
`@@ -113,6 +115,7 @@ bool __adcAttachPin(uint8_t pin){`
`113`	`115`	`log_e("Pin %u is not ADC pin!", pin);`
`114`	`116`	`return false;`
`115`	`117`	`}`
	`118`	`+ __analogInit();`
`116`	`119`	`int8_t pad = digitalPinToTouchChannel(pin);`
`117`	`120`	`if(pad >= 0){`
`118`	`121`	`#if CONFIG_IDF_TARGET_ESP32`