diff --git a/apps.json b/apps.json index 9caa60ee7..cc488ca10 100644 --- a/apps.json +++ b/apps.json @@ -1272,7 +1272,7 @@ "name": "Battery Chart", "shortName":"Battery Chart", "icon": "app.png", - "version":"0.09", + "version":"0.10", "readme": "README.md", "description": "A widget and an app for recording and visualizing battery percentage over time.", "tags": "app,widget,battery,time,record,chart,tool", diff --git a/apps/batchart/ChangeLog b/apps/batchart/ChangeLog index 66b40fbbf..31c386684 100644 --- a/apps/batchart/ChangeLog +++ b/apps/batchart/ChangeLog @@ -6,4 +6,5 @@ 0.06: Fixes widget events and charting of component states 0.07: Improve logging and charting of component states and add widget icon 0.08: Fix for Home button in the app and README added. -0.09: Fix failing dismissal of Gadgetbridge notifications, record (coarse) bluetooth state \ No newline at end of file +0.09: Fix failing dismissal of Gadgetbridge notifications, record (coarse) bluetooth state +0.10: Remove widget icon and improve listener and setInterval handling for widget (might help with https://github.com/espruino/BangleApps/issues/381) \ No newline at end of file diff --git a/apps/batchart/widget.js b/apps/batchart/widget.js index 96f8b4b25..4a116c990 100644 --- a/apps/batchart/widget.js +++ b/apps/batchart/widget.js @@ -1,6 +1,7 @@ (() => { + let recordingInterval = null; const Storage = require("Storage"); - + const switchableConsumers = { none: 0, lcd: 1, @@ -14,53 +15,44 @@ const recordingInterval10Min = 60 * 10 * 1000; const recordingInterval1Min = 60 * 1000; //For testing const recordingInterval10S = 10 * 1000; //For testing - var recordingInterval = null; var compassEventReceived = false; var gpsEventReceived = false; var hrmEventReceived = false; - // draw your widget function draw() { - let x = this.x; - let y = this.y; - - g.setColor(0, 1, 0); - g.fillPoly([x + 5, y, x + 5, y + 4, x + 1, y + 4, x + 1, y + 20, x + 18, y + 20, x + 18, y + 4, x + 13, y + 4, x + 13, y], true); - - g.setColor(0, 0, 0); - g.drawPoly([x + 5, y + 6, x + 8, y + 12, x + 13, y + 12, x + 16, y + 18], false); - - g.reset(); + // void } - function onMag() { + function batteryChartOnMag() { compassEventReceived = true; // Stop handling events when no longer necessarry - Bangle.removeListener("mag", onMag); + Bangle.removeListener("mag", batteryChartOnMag); } - function onGps() { + function batterChartOnGps() { gpsEventReceived = true; - Bangle.removeListener("GPS", onGps); + Bangle.removeListener("GPS", batterChartOnGps); } - function onHrm() { + function batteryChartOnHrm() { hrmEventReceived = true; - Bangle.removeListener("HRM", onHrm); + Bangle.removeListener("HRM", batteryChartOnHrm); } function getEnabledConsumersValue() { // Wait for an event from each of the devices to see if they are switched on var enabledConsumers = switchableConsumers.none; - Bangle.on('mag', onMag); - Bangle.on('GPS', onGps); - Bangle.on('HRM', onHrm); + Bangle.on('mag', batteryChartOnMag); + Bangle.on('GPS', batterChartOnGps); + Bangle.on('HRM', batteryChartOnHrm); // Wait two seconds, that should be enough for each of the events to get raised once setTimeout(() => { - Bangle.removeAllListeners(); + Bangle.removeListener('mag', batteryChartOnMag); + Bangle.removeListener('GPS', batterChartOnGps); + Bangle.removeListener('HRM', batteryChartOnHrm); }, 2000); if (Bangle.isLCDOn()) @@ -112,14 +104,20 @@ } function reload() { - WIDGETS["batchart"].width = 24; + console.log("Reloading BatteryChart widget"); + WIDGETS["batchart"].width = 0; + + if (recordingInterval) { + clearInterval(recordingInterval); + recordingInterval = null; + } recordingInterval = setInterval(logBatteryData, recordingInterval10Min); } // add the widget WIDGETS["batchart"] = { - area: "tl", width: 24, draw: draw, reload: reload + area: "tl", width: 0, draw: draw, reload: reload }; reload();