kenbarbour
/
uweather_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added a rough mapping of voltage to percent

master
Kenneth Barbour 2020-06-16 20:32:41 -04:00
parent 0de19abec5
commit 8f22c2e852
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/battery.h
View File

@ -6,6 +6,8 @@
const int BATT_IN_PIN = A0;
const int BATTERY_CHECK_INTERVAL = 5000;
const double BATTERY_PERCENT_MAP[] = {3.2, 3.6, 3.65, 3.7, 3.75, 3.85, 4.9, 4.0, 4.1, 4.15, 4.2};
typedef struct battery_info_t
{
uint last_raw = 0;
@ -21,6 +23,20 @@ float battery_get_voltage()
return (float) Battery.last_raw * .00042;
}
unsigned int battery_get_percent()
{
float v = battery_get_voltage();
int i = 0; // find the index of the first map element higher than v
if (v >= BATTERY_PERCENT_MAP[10]) return 100;
while (BATTERY_PERCENT_MAP[i] <= v) i++;
if (i == 0) return 0;
float a = v - BATTERY_PERCENT_MAP[i-1];
float b = BATTERY_PERCENT_MAP[i] - BATTERY_PERCENT_MAP[i-1];
float c = a / b * 10;
return (i-1) * 10 + c;
}
void uweather_handle_battery()
{
unsigned long now = millis();

5
src/web.cpp
View File

@ -88,12 +88,13 @@ void handle_weather_current(HttpRequest& req, HttpResponse& res)
dtostrf(battery_get_voltage(), 2, 1, buff[3]);
Serial.printf("temp= %s, pres= %s, hum=%s\r\n", buff[0], buff[1], buff[2]);
res.headers.set("Content-Type", "application/json");
content.printf("{\"time\": null, \"temperature\": %s, \"pressure\": %s, \"humidity\": %s, \"battery\": { \"voltage\": %s, \"is_charging\": %s}}",
content.printf("{\"time\": null, \"temperature\": %s, \"pressure\": %s, \"humidity\": %s, \"battery\": { \"voltage\": %s, \"is_charging\": %s, \"percent\": %d}}",
buff[0],
buff[1],
buff[2],
buff[3],
(Battery.is_charging ? "true":"false")
(Battery.is_charging ? "true":"false"),
battery_get_percent()
);
}