From 2699216d258c31fc02d93741c41520e6d1c07b22 Mon Sep 17 00:00:00 2001 From: Wizmo2 Date: Thu, 13 May 2021 19:53:55 -0400 Subject: [PATCH] Add atten to battery service --- components/services/battery.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/services/battery.c b/components/services/battery.c index 30e69b82..254705ca 100644 --- a/components/services/battery.c +++ b/components/services/battery.c @@ -32,12 +32,13 @@ static const char *TAG = "battery"; static struct { int channel; float sum, avg, scale; - int count; + int count, attenuation; int cells; TimerHandle_t timer; } battery = { .channel = CONFIG_BAT_CHANNEL, .cells = 2, + .attenuation = ADC_ATTEN_DB_0, }; /**************************************************************************************** @@ -82,6 +83,7 @@ void battery_svc_init(void) { #ifndef CONFIG_BAT_LOCKED if ((p = strcasestr(nvs_item, "channel")) != NULL) battery.channel = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "scale")) != NULL) battery.scale = atof(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "atten")) != NULL) battery.attenuation = atoi(strchr(p, '=') + 1); #endif if ((p = strcasestr(nvs_item, "cells")) != NULL) battery.cells = atof(strchr(p, '=') + 1); free(nvs_item); @@ -89,7 +91,7 @@ void battery_svc_init(void) { if (battery.channel != -1) { adc1_config_width(ADC_WIDTH_BIT_12); - adc1_config_channel_atten(battery.channel, ADC_ATTEN_DB_0); + adc1_config_channel_atten(battery.channel, battery.attenuation); battery.avg = adc1_get_raw(battery.channel) * battery.scale / 4095.0; battery.timer = xTimerCreate("battery", BATTERY_TIMER / portTICK_RATE_MS, pdTRUE, NULL, battery_callback);