@@ -149,7 +149,7 @@ void __analogReadResolution(uint8_t bits)
149
149
#endif
150
150
}
151
151
152
- uint16_t __analogRead (uint8_t pin )
152
+ uint16_t __analogReadRaw (uint8_t pin )
153
153
{
154
154
int8_t channel = digitalPinToAnalogChannel (pin );
155
155
int value = 0 ;
@@ -173,8 +173,14 @@ uint16_t __analogRead(uint8_t pin)
173
173
}
174
174
} else {
175
175
value = adc1_get_raw (channel );
176
- return mapResolution ( value ) ;
176
+ return value ;
177
177
}
178
+ return value ;
179
+ }
180
+
181
+ uint16_t __analogRead (uint8_t pin )
182
+ {
183
+ uint16_t value = __analogReadRaw (pin );
178
184
return mapResolution (value );
179
185
}
180
186
@@ -201,7 +207,7 @@ uint32_t __analogReadMilliVolts(uint8_t pin){
201
207
if (__analogVRefPin ){
202
208
esp_adc_cal_characteristics_t chars ;
203
209
if (adc_vref_to_gpio (ADC_UNIT_2 , __analogVRefPin ) == ESP_OK ){
204
- __analogVRef = __analogRead (__analogVRefPin );
210
+ __analogVRef = __analogReadRaw (__analogVRefPin );
205
211
esp_adc_cal_characterize (1 , __analogAttenuation , __analogWidth , DEFAULT_VREF , & chars );
206
212
__analogVRef = esp_adc_cal_raw_to_voltage (__analogVRef , & chars );
207
213
log_d ("Vref to GPIO%u: %u" , __analogVRefPin , __analogVRef );
@@ -215,7 +221,7 @@ uint32_t __analogReadMilliVolts(uint8_t pin){
215
221
unit = 2 ;
216
222
}
217
223
218
- uint16_t adc_reading = __analogRead (pin );
224
+ uint16_t adc_reading = __analogReadRaw (pin );
219
225
220
226
uint8_t atten = __analogAttenuation ;
221
227
if (__pin_attenuation [pin ] != ADC_ATTENDB_MAX ){
@@ -266,6 +272,7 @@ int __hallRead() //hall sensor using idf read
266
272
#endif
267
273
268
274
extern uint16_t analogRead (uint8_t pin ) __attribute__ ((weak , alias ("__analogRead" )));
275
+ extern uint16_t analogReadRaw (uint8_t pin ) __attribute__ ((weak , alias ("__analogReadRaw" )));
269
276
extern uint32_t analogReadMilliVolts (uint8_t pin ) __attribute__ ((weak , alias ("__analogReadMilliVolts" )));
270
277
extern void analogReadResolution (uint8_t bits ) __attribute__ ((weak , alias ("__analogReadResolution" )));
271
278
extern void analogSetClockDiv (uint8_t clockDiv ) __attribute__ ((weak , alias ("__analogSetClockDiv" )));
0 commit comments