diff --git a/apps/daisy/ChangeLog b/apps/daisy/ChangeLog index 3bc9dda43..3d8ef0472 100644 --- a/apps/daisy/ChangeLog +++ b/apps/daisy/ChangeLog @@ -11,3 +11,4 @@ 0.11: Minor code improvements 0.12: Added setting to change Battery estimate to hours 0.13: Fixed Battery estimate Default to percentage and improved setting string +0.14: Use `power_usage` module diff --git a/apps/daisy/app.js b/apps/daisy/app.js index 7cafe6d48..4aa7eb132 100644 --- a/apps/daisy/app.js +++ b/apps/daisy/app.js @@ -116,7 +116,7 @@ function updateSunRiseSunSet(now, lat, lon, line){ function batteryString(){ let stringToInsert; if (settings.batt_hours) { - var batt_usage = 200000/E.getPowerUsage().total; + var batt_usage = require("power_usage").get().hrsLeft; let rounded; if (batt_usage > 24) { var days = Math.floor(batt_usage/24); diff --git a/apps/daisy/metadata.json b/apps/daisy/metadata.json index 2367452cc..178cd8b20 100644 --- a/apps/daisy/metadata.json +++ b/apps/daisy/metadata.json @@ -1,6 +1,6 @@ { "id": "daisy", "name": "Daisy", - "version": "0.13", + "version": "0.14", "dependencies": {"mylocation":"app"}, "description": "A beautiful digital clock with large ring guage, idle timer and a cyclic information line that includes, day, date, steps, battery, sunrise and sunset times", "icon": "app.png",