DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adcread.cpp: code sanitization

Browse Source
This commit is contained in:
Klaus K Wilting 2018-06-03 15:20:55 +02:00
parent 63eda7db03
commit 161749f178
1 changed files with 15 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/adcread.cpp
View File

@ -1,54 +1,25 @@
#ifdef HAS_BATTERY_PROBE #ifdef HAS_BATTERY_PROBE
/* ADC1 Example
This example code is in the Public Domain (or CC0 licensed, at your option.)
Unless required by applicable law or agreed to in writing, this
software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied.
*/
#include "globals.h" #include "globals.h"
#include <driver/adc.h> #include <driver/adc.h>
#include <esp_adc_cal.h> #include <esp_adc_cal.h>
#define DEFAULT_VREF 1100 // optional use adc2_vref_to_gpio() to obtain a better estimate #define DEFAULT_VREF 1100 // to be done: use adc2_vref_to_gpio() to obtain a better estimate
#define NO_OF_SAMPLES 64 // we do multisampling #define NO_OF_SAMPLES 64 // we do multisampling
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = "main";
#ifdef VERBOSE static void print_char_val_type(esp_adc_cal_value_t val_type)
{
static void check_efuse() if (val_type == ESP_ADC_CAL_VAL_EFUSE_TP) {
{ ESP_LOGI(TAG,"ADC calibration using efuse Two Point Value");
//Check if two point calibration values are burned into eFuse } else if (val_type == ESP_ADC_CAL_VAL_EFUSE_VREF) {
if (esp_adc_cal_check_efuse(ESP_ADC_CAL_VAL_EFUSE_TP) == ESP_OK) { ESP_LOGI(TAG,"ADC calibration using eFuse Vref");
ESP_LOGI(TAG,"eFuse Two Point: Supported"); } else {
} else { ESP_LOGI(TAG,"ADC calibration using default Vref");
ESP_LOGI(TAG,"eFuse Two Point: NOT supported");
}
//Check Vref is burned into eFuse
if (esp_adc_cal_check_efuse(ESP_ADC_CAL_VAL_EFUSE_VREF) == ESP_OK) {
ESP_LOGI(TAG,"eFuse Vref: Supported");
} else {
ESP_LOGI(TAG,"eFuse Vref: NOT supported");
}
} }
}
static void print_char_val_type(esp_adc_cal_value_t val_type)
{
if (val_type == ESP_ADC_CAL_VAL_EFUSE_TP) {
ESP_LOGI(TAG,"Characterized using Two Point Value");
} else if (val_type == ESP_ADC_CAL_VAL_EFUSE_VREF) {
ESP_LOGI(TAG,"Characterized using eFuse Vref");
} else {
ESP_LOGI(TAG,"Characterized using Default Vref");
}
}
#endif // verbose
uint16_t read_voltage(void) uint16_t read_voltage(void)
{ {
@ -56,27 +27,17 @@ uint16_t read_voltage(void)
static const adc_atten_t atten = ADC_ATTEN_DB_11; static const adc_atten_t atten = ADC_ATTEN_DB_11;
static const adc_unit_t unit = ADC_UNIT_1; static const adc_unit_t unit = ADC_UNIT_1;
#ifdef VERBOSE //configure ADC1
//show if Two Point or Vref are burned into eFuse
check_efuse();
#endif
//Configure ADC1
ESP_ERROR_CHECK(adc1_config_width(ADC_WIDTH_BIT_12)); ESP_ERROR_CHECK(adc1_config_width(ADC_WIDTH_BIT_12));
ESP_ERROR_CHECK(adc1_config_channel_atten(channel, atten)); ESP_ERROR_CHECK(adc1_config_channel_atten(channel, atten));
//Characterize ADC1 //calibrate ADC1
esp_adc_cal_characteristics_t *adc_chars = (esp_adc_cal_characteristics_t *) calloc(1, sizeof(esp_adc_cal_characteristics_t)); esp_adc_cal_characteristics_t *adc_chars = (esp_adc_cal_characteristics_t *) calloc(1, sizeof(esp_adc_cal_characteristics_t));
esp_adc_cal_value_t val_type = esp_adc_cal_characterize(unit, atten, ADC_WIDTH_BIT_12, DEFAULT_VREF, adc_chars); esp_adc_cal_value_t val_type = esp_adc_cal_characterize(unit, atten, ADC_WIDTH_BIT_12, DEFAULT_VREF, adc_chars);
print_char_val_type(val_type);
#ifdef VERBOSE //multisample ADC1
//show calibration source
print_char_val_type(val_type);
#endif
//sample ADC1
uint32_t adc_reading = 0; uint32_t adc_reading = 0;
//Multisampling
for (int i = 0; i < NO_OF_SAMPLES; i++) { for (int i = 0; i < NO_OF_SAMPLES; i++) {
adc_reading += adc1_get_raw(channel); adc_reading += adc1_get_raw(channel);
} }