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

battery.cpp sanitized

Browse Source
This commit is contained in:
Klaus K Wilting 2018-11-05 21:43:22 +01:00
parent b0fa5e9021
commit 22577ea92a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/battery.cpp
View File

@ -1,5 +1,3 @@
#ifdef HAS_BATTERY_PROBE
#include "globals.h" #include "globals.h"
// Local logging tag // Local logging tag
@ -14,6 +12,7 @@ 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;
void calibrate_voltage(void) { void calibrate_voltage(void) {
#ifdef HAS_BATTERY_PROBE
// configure ADC // configure ADC
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(adc_channel, atten)); ESP_ERROR_CHECK(adc1_config_channel_atten(adc_channel, atten));
@ -30,9 +29,11 @@ void calibrate_voltage(void) {
} else { } else {
ESP_LOGI(TAG, "ADC characterization based on default reference voltage"); ESP_LOGI(TAG, "ADC characterization based on default reference voltage");
} }
#endif
} }
uint16_t read_voltage() { uint16_t read_voltage() {
#ifdef HAS_BATTERY_PROBE
// multisample ADC // multisample ADC
uint32_t adc_reading = 0; uint32_t adc_reading = 0;
for (int i = 0; i < NO_OF_SAMPLES; i++) { for (int i = 0; i < NO_OF_SAMPLES; i++) {
@ -47,6 +48,9 @@ uint16_t read_voltage() {
#endif #endif
ESP_LOGD(TAG, "Raw: %d / Voltage: %dmV", adc_reading, voltage); ESP_LOGD(TAG, "Raw: %d / Voltage: %dmV", adc_reading, voltage);
return voltage; return voltage;
#else
return 0;
#endif
} }
bool batt_sufficient() { bool batt_sufficient() {
@ -57,6 +61,4 @@ bool batt_sufficient() {
#else #else
return true; return true;
#endif #endif
} }
#endif // HAS_BATTERY_PROBE