Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Cache for pressure values to get faster drawing + some layout improvements

master
Marco Heiming 2022-01-28 13:19:15 +01:00
parent 4e7833b808
commit f9d2d59e60
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/circlesclock/app.js
View File

@ -70,6 +70,7 @@ const colorGreen = '#008000';
const colorBlue = '#0000ff'; const colorBlue = '#0000ff';
const colorYellow = '#ffff00'; const colorYellow = '#ffff00';
const widgetOffset = showWidgets ? 24 : 0; const widgetOffset = showWidgets ? 24 : 0;
const dowOffset = circleCount == 3 ? 22 : 24; // dow offset relative to date
const h = g.getHeight() - widgetOffset; const h = g.getHeight() - widgetOffset;
const w = g.getWidth(); const w = g.getWidth();
const hOffset = 30 - widgetOffset; const hOffset = 30 - widgetOffset;
@ -107,8 +108,6 @@ const defaultCircleTypes = ["steps", "hr", "battery", "weather"];
function draw() { function draw() {
g.clear(true);
if (!showWidgets) { if (!showWidgets) {
/* /*
* we are not drawing the widgets as we are taking over the whole screen * we are not drawing the widgets as we are taking over the whole screen
@ -125,8 +124,9 @@ function draw() {
Bangle.drawWidgets(); Bangle.drawWidgets();
} }
g.clearRect(0, widgetOffset, w, h2 + 22);
g.setColor(colorBg); g.setColor(colorBg);
g.fillRect(0, widgetOffset, w, h); g.fillRect(0, widgetOffset, w, h2 + 22);
// time // time
g.setFont("Vector:50"); g.setFont("Vector:50");
@ -139,7 +139,7 @@ function draw() {
g.setFont("Vector:21"); g.setFont("Vector:21");
g.setFontAlign(-1, 0); g.setFontAlign(-1, 0);
g.drawString(locale.date(new Date()), w > 180 ? 2 * w / 10 : w / 10, h2); g.drawString(locale.date(new Date()), w > 180 ? 2 * w / 10 : w / 10, h2);
g.drawString(locale.dow(new Date()), w > 180 ? 2 * w / 10 : w / 10, h2 + 22); g.drawString(locale.dow(new Date()), w > 180 ? 2 * w / 10 : w / 10, h2 + dowOffset);
drawCircle(1); drawCircle(1);
drawCircle(2); drawCircle(2);
@ -410,7 +410,6 @@ function drawTemperature(w) {
getPressureValue("temperature").then((temperature) => { getPressureValue("temperature").then((temperature) => {
drawCircleBackground(w); drawCircleBackground(w);
g.setColor(colorFg);
drawInnerCircleAndTriangle(w); drawInnerCircleAndTriangle(w);
@ -438,12 +437,11 @@ function drawPressure(w) {
getPressureValue("pressure").then((pressure) => { getPressureValue("pressure").then((pressure) => {
drawCircleBackground(w); drawCircleBackground(w);
g.setColor(colorFg);
drawInnerCircleAndTriangle(w); drawInnerCircleAndTriangle(w);
if (pressure && pressure > 0) { if (pressure && pressure > 0) {
const minPressure = 900; const minPressure = 950;
const maxPressure = 1050; const maxPressure = 1050;
const percent = (pressure - minPressure) / (maxPressure - minPressure); const percent = (pressure - minPressure) / (maxPressure - minPressure);
drawGauge(w, h3, percent, colorGreen); drawGauge(w, h3, percent, colorGreen);
@ -466,7 +464,6 @@ function drawAltitude(w) {
getPressureValue("altitude").then((altitude) => { getPressureValue("altitude").then((altitude) => {
drawCircleBackground(w); drawCircleBackground(w);
g.setColor(colorFg);
drawInnerCircleAndTriangle(w); drawInnerCircleAndTriangle(w);
@ -614,6 +611,7 @@ function getSunProgress() {
* Draws the background and the grey circle * Draws the background and the grey circle
*/ */
function drawCircleBackground(w) { function drawCircleBackground(w) {
g.clearRect(w - radiusOuter - 3, h3 - radiusOuter - 3, w + radiusOuter + 3, h3 + radiusOuter + 3);
// Draw rectangle background: // Draw rectangle background:
g.setColor(colorBg); g.setColor(colorBg);
g.fillRect(w - radiusOuter - 3, h3 - radiusOuter - 3, w + radiusOuter + 3, h3 + radiusOuter + 3); g.fillRect(w - radiusOuter - 3, h3 - radiusOuter - 3, w + radiusOuter + 3, h3 + radiusOuter + 3);
@ -705,17 +703,22 @@ function enableHRMSensor() {
} }
let pressureLocked = false; let pressureLocked = false;
let lastPressureValue; let pressureCache;
function getPressureValue(type) { function getPressureValue(type) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (Bangle.getPressure) { if (Bangle.getPressure) {
if (!pressureLocked) { if (!pressureLocked) {
pressureLocked = true; pressureLocked = true;
if (pressureCache && pressureCache[type]) {
resolve(pressureCache[type]);
} else {
reject();
}
Bangle.getPressure().then(function(d) { Bangle.getPressure().then(function(d) {
pressureLocked = false; pressureLocked = false;
if (d) { if (d) {
lastPressureValue = d; pressureCache = d;
if (d[type]) { if (d[type]) {
resolve(d[type]); resolve(d[type]);
} }
@ -724,8 +727,8 @@ function getPressureValue(type) {
} }
}).catch(reject); }).catch(reject);
} else { } else {
if (lastPressureValue && lastPressureValue[type]) { if (pressureCache && pressureCache[type]) {
resolve(lastPressureValue[type]); resolve(pressureCache[type]);
} else { } else {
reject(); reject();
} }
@ -762,6 +765,8 @@ Bangle.on('HRM', function(hrm) {
Bangle.setUI("clock"); Bangle.setUI("clock");
Bangle.loadWidgets(); Bangle.loadWidgets();
g.clear(true);
draw(); draw();
setInterval(draw, 60000); setInterval(draw, 60000);