From b095eb74cd45b27c542394bfa160d425f0deb1ab Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Thu, 27 Oct 2022 21:09:43 +0200
Subject: [PATCH] barometer

- update every second
- go back with short button press
---
 apps/barometer/ChangeLog     |  1 +
 apps/barometer/app.js        | 28 ++++++++++++++++++----------
 apps/barometer/metadata.json |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/apps/barometer/ChangeLog b/apps/barometer/ChangeLog
index de3a5cb96..b429dda17 100644
--- a/apps/barometer/ChangeLog
+++ b/apps/barometer/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Display pressure as number and hand
 0.02: Use theme color
 0.03: workaround for some firmwares that return 'undefined' for first call to barometer
+0.04: Update every second, go back with short button press
diff --git a/apps/barometer/app.js b/apps/barometer/app.js
index 77d4c974f..7e793af4f 100644
--- a/apps/barometer/app.js
+++ b/apps/barometer/app.js
@@ -59,6 +59,7 @@ function drawTicks(){
 function drawScaleLabels(){
   g.setColor(g.theme.fg);
   g.setFont("Vector",12);
+  g.setFontAlign(-1,-1);
 
   let label = MIN;
   for (let i=0;i <= NUMBER_OF_LABELS; i++){
@@ -103,22 +104,29 @@ function drawIcons() {
 }
 
 g.setBgColor(g.theme.bg);
-g.clear();
-
-drawTicks();
-drawScaleLabels();
-drawIcons();
 
 try {
   function baroHandler(data) {
-    if (data===undefined) // workaround for https://github.com/espruino/BangleApps/issues/1429
-      setTimeout(() => Bangle.getPressure().then(baroHandler), 500);
-    else
+    g.clear();
+
+    drawTicks();
+    drawScaleLabels();
+    drawIcons();
+    if (data!==undefined) {
       drawHand(Math.round(data.pressure));
+    }
   }
   Bangle.getPressure().then(baroHandler);
+  setInterval(() => Bangle.getPressure().then(baroHandler), 1000);
 } catch(e) {
-  print(e.message);
-  print("barometer not supporter, show a demo value");
+  if (e !== undefined) {
+    print(e.message);
+  }
+  print("barometer not supported, show a demo value");
   drawHand(MIN);
 }
+
+Bangle.setUI({
+  mode : "custom",
+  back : function() {load();}
+});
diff --git a/apps/barometer/metadata.json b/apps/barometer/metadata.json
index a385f2be2..767fa630b 100644
--- a/apps/barometer/metadata.json
+++ b/apps/barometer/metadata.json
@@ -1,7 +1,7 @@
 { "id": "barometer",
   "name": "Barometer",
   "shortName":"Barometer",
-  "version":"0.03",
+  "version":"0.04",
   "description": "A simple barometer that displays the current air pressure",
   "icon": "barometer.png",
   "tags": "tool,outdoors",