Add analogSetAttenuation and analogSetPinAttenuation

Author: me-no-dev

cores/esp32/esp32-hal-adc.c

@@ -22,7 +22,7 @@
 #include"soc/rtc_cntl_reg.h"
 #include"soc/sens_reg.h"
 
-staticuint8_t__analogAttenuation=0;//0db
+staticuint8_t__analogAttenuation=3;//11db
 staticuint8_t__analogWidth=3;//12 bits
 staticuint8_t__analogCycles=8;
 staticuint8_t__analogSamples=0;//1 sample
@@ -66,22 +66,24 @@ void __analogSetClockDiv(uint8_t clockDiv){
 SET_PERI_REG_BITS(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_CLK_DIV, __analogClockDiv, SENS_SAR2_CLK_DIV_S);
 }
 
-void__analogSetAttenuation(uint8_tattenuation){
+void__analogSetAttenuation(adc_attenuation_tattenuation)
+{
 __analogAttenuation=attenuation&3;
 uint32_tatt_data=0;
-inti=8;
+inti=10;
 while(i--){
 att_data |= __analogAttenuation << (i*2);
  }
-SET_PERI_REG_BITS(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_DATA_SAR, att_data, SENS_MEAS1_DATA_SAR_S);
-SET_PERI_REG_BITS(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_DATA_SAR, att_data, SENS_MEAS2_DATA_SAR_S);
+WRITE_PERI_REG(SENS_SAR_ATTEN1_REG, att_data&0xFFFF);//ADC1 has 8 channels
+WRITE_PERI_REG(SENS_SAR_ATTEN2_REG, att_data);
 }
 
 voidIRAM_ATTR__analogInit(){
 staticboolinitialized= false;
 if(initialized){
 return;
  }
+
 __analogSetAttenuation(__analogAttenuation);
 __analogSetCycles(__analogCycles);
 __analogSetSamples(__analogSamples+1);//in samples
@@ -108,6 +110,20 @@ void IRAM_ATTR __analogInit(){
 initialized= true;
 }
 
+void__analogSetPinAttenuation(uint8_tpin, adc_attenuation_tattenuation)
+{
+int8_tchannel=digitalPinToAnalogChannel(pin);
+if(channel<0||attenuation>3){
+return ;
+ }
+__analogInit();
+if(channel>7){
+SET_PERI_REG_BITS(SENS_SAR_ATTEN2_REG, 3, attenuation, ((channel-10) *2));
+ } else{
+SET_PERI_REG_BITS(SENS_SAR_ATTEN1_REG, 3, attenuation, (channel*2));
+ }
+}
+
 uint16_tIRAM_ATTR__analogRead(uint8_tpin)
 {
 int8_tchannel=digitalPinToAnalogChannel(pin);
@@ -150,6 +166,7 @@ uint16_t IRAM_ATTR __analogRead(uint8_t pin)
 while (GET_PERI_REG_MASK(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_DONE_SAR) ==0){}; //read done
 returnGET_PERI_REG_BITS2(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_DATA_SAR, SENS_MEAS1_DATA_SAR_S);
 }
+
 int__hallRead() //hall sensor without LNA
 {
 intSens_Vp0;
@@ -179,5 +196,6 @@ extern void analogSetWidth(uint8_t bits) __attribute__ ((weak, alias("__analogSe
 externvoidanalogSetCycles(uint8_tcycles) __attribute__ ((weak, alias("__analogSetCycles")));
 externvoidanalogSetSamples(uint8_tsamples) __attribute__ ((weak, alias("__analogSetSamples")));
 externvoidanalogSetClockDiv(uint8_tclockDiv) __attribute__ ((weak, alias("__analogSetClockDiv")));
-//extern void analogSetAttenuation(uint8_t attenuation) __attribute__ ((weak, alias("__analogSetAttenuation")));
+externvoidanalogSetAttenuation(adc_attenuation_tattenuation) __attribute__ ((weak, alias("__analogSetAttenuation")));
+externvoidanalogSetPinAttenuation(uint8_tpin, adc_attenuation_tattenuation) __attribute__ ((weak, alias("__analogSetPinAttenuation")));
 externinthallRead() __attribute__ ((weak, alias("__hallRead")));

cores/esp32/esp32-hal-adc.h

@@ -26,13 +26,22 @@ extern "C"{
 
 #include"esp32-hal.h"
 
+typedefenum{
+ADC_0db,
+ADC_2_5db,
+ADC_6db,
+ADC_11db
+} adc_attenuation_t;
+
 /*
  * Get ADC value for pin
  * */
 uint16_tanalogRead(uint8_tpin);
 
 /*
- * Sets the sample bits (9 - 12)
+ * Sets the sample bits
+ * Default is 12bit (0 - 4095)
+ * Range is 9 - 12
  * */
 voidanalogSetWidth(uint8_tbits);
 
@@ -61,6 +70,18 @@ void analogSetSamples(uint8_t samples);
  * */
 voidanalogSetClockDiv(uint8_tclockDiv);
 
+/*
+ * Set the attenuation for all channels
+ * Default is 11db
+ * */
+voidanalogSetAttenuation(adc_attenuation_tattenuation);
+
+/*
+ * Set the attenuation for particular pin
+ * Default is 11db
+ * */
+voidanalogSetPinAttenuation(uint8_tpin, adc_attenuation_tattenuation);
+
 /*
  * Get value for HALL sensor (without LNA)
  * connected to pins 36(SVP) and 39(SVN)