From aab746f34d489dc6175ce8d465f6842589f2549e Mon Sep 17 00:00:00 2001
From: xxDUxx <96152564+xxDUxx@users.noreply.github.com>
Date: Mon, 20 Jun 2022 04:27:33 +0200
Subject: [PATCH] Update app.js

---
 apps/tinyVario/app.js | 128 ++++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/apps/tinyVario/app.js b/apps/tinyVario/app.js
index b1604aa8c..315db3934 100644
--- a/apps/tinyVario/app.js
+++ b/apps/tinyVario/app.js
@@ -1,22 +1,63 @@
 Bangle.setBarometerPower(true, "tinyVario");
 Bangle.setGPSPower(true, "tinyVario");
 
-require("Font8x16").add(Graphics);
-
 var intTime=10,pressureInterval=100;
 var altH = [];
-var fAlt=0, fAlt2=0;
+var altFast=-10000, altSlow=0;
+var fastGain=0.2, slowGain=0.168;
 var roc=0,rocAvg=0;
 var gs;
 var lastPressure = Date.now();
 var flying=false;
 var takeoffTime, flyingTime;
+var Layout = require("Layout");
 
+function drawVario() {
+  var p = pfd.vario;
+  //roc=(altFast-altSlow)/(pressureInterval/1000/slowGain)-(pressureInterval/1000/fastGain);
+  g.reset();
+  g.drawRect(p.x,p.y,p.x+p.w,p.y+p.h);
+  g.clearRect(p.x+1,p.y+1,p.x+p.w-1,p.y+p.h-1);
 
+  if (roc>0.1) g.setColor(0,1,0);
+  if (roc<-1) g.setColor(1,0,0);
+  var y=p.y+p.h/2-roc*(p.h/2)/5;
+  g.fillRect(p.x+1,p.y+(p.h/2),p.x+p.w-1,Math.clip(y,p.y+1,p.y+p.h-1));
+  //print (pfd.vario);
+}
+
+var pfd = new Layout(
+  {type:"v",c: [
+    {type:"h",c: [
+      {type:"", fillx:1, height:"1"}
+      ]},
+    {type:"h",c: [
+      {type:"custom", width:"20", render:drawVario, id:"vario",filly:1 },
+      {type:"v",fillx:"1", c: [
+        {type:"txt", font:"25%", halign:1, filly:1, label:"-", id:"alt"},
+        {type:"", fillx:1, height:"1", bgCol:"#FFF"},
+        {type:"txt", font:"18%", halign:1, filly:1, label:"-", id:"roc" },
+        {type:"", fillx:1, height:"1", bgCol:"#FFF"},
+        {type:"txt", font:"18%", halign:1, filly:1, label:"-", id:"gs" },
+        {type:"", fillx:1, height:"1", bgCol:"#FFF"}
+
+      ]}
+    ]},
+    {type:"h",pad:"5",c: [
+      {type:"txt", font:"15%",fillx:"1", label:"-", id:"time"},
+      {type:"", width:"1", bgCol:"#FFF"},
+
+      {type:"txt", font:"15%", fillx:"1", label:"-", id:"flyingtime" }
+    ]}
+  ]},{lazy:"true"}
+);
 Bangle.on('pressure', function(e) {
-  if ((fAlt)==0) fAlt=e.altitude;
-  fAlt=fAlt+(e.altitude-fAlt)*0.1;
-  fAlt2=fAlt2+(e.altitude-fAlt2)*0.09093;
+  if ((altFast)==-10000) {
+    altFast=e.altitude;
+    altSlow=e.altitude;
+  }
+  altFast=altFast+(e.altitude-altFast)*fastGain;
+  altSlow=altSlow+(e.altitude-altSlow)*0.09093;
 });
 
 Bangle.on('GPS', function(fix) {
@@ -28,71 +69,34 @@ Bangle.on('GPS', function(fix) {
 }, BTN1);*/
 
 setInterval(function () { 
-  altH.push(fAlt);
+  altH.push(altSlow);
   while (altH.length>intTime*1000/pressureInterval) altH.shift();
 }, pressureInterval);
 
 setInterval(function() {
-  var y=0;
-  //gs=100;
-  //fAlt=7777;
   if ((!flying) && ((rocAvg>1) || (rocAvg<-1) || (gs>10))) { //take-off detected
     takeoffTime=Date().getTime();
     flying=true;
-    flyingTime=0;
+   // flyingTime=0;
   } 
   if (flying) {
     flyingTime=Date().getTime()-takeoffTime;
-    ftString=(flyingTime / 3600000).toFixed(0)+":"+(flyingTime / 60000 % 60).toFixed(0).padStart(2,'0');
-  }
-  
-  if (altH.length==intTime*1000/pressureInterval) {
-    rocAvg=(altH[altH.length-1]-altH[0])/intTime;
-    //roc=(altH[altH.length-1]-altH[altH.length-(1000/pressureInterval)]);
-    roc=(fAlt-fAlt2)*(1000/pressureInterval);
-  }
+    pfd.flyingtime.label=(flyingTime / 3600000).toFixed(0)+":"+(flyingTime / 60000 % 60).toFixed(0).padStart(2,'0');
+  } else pfd.flyingtime.label="--:--";
+  if (altH.length==intTime*1000/pressureInterval) rocAvg=(altH[altH.length-1]-altH[0])/intTime;
+  roc=(altFast-altSlow)/(pressureInterval/1000/slowGain)-(pressureInterval/1000/fastGain);
+  pfd.alt.label=(altSlow).toFixed(0)+"m";
+  if (rocAvg>0.1) {pfd.roc.col="#0f0";}
+  else if (rocAvg<-1) {pfd.roc.col="#f00";}
+  else {pfd.roc.col="#fff";}
+  pfd.roc.label=rocAvg.toFixed(1)+"m/s";
+  if (!isNaN(gs)) pfd.gs.label=gs.toFixed(0)+"km/h";
+  else pfd.gs.label="NO GPS";
+  pfd.time.label=require("locale").time(Date(),1);
+  pfd.update();
 
-  var timeStr = require("locale").time(Date(),1);
-  
-  g.reset();
-  g.clear();
-  //draw altitude
-  g.setFont("8x16",3).setFontAlign(1,-1).drawString((fAlt).toFixed(0)+"m", g.getWidth(), y); 
-  //-------------
-  y+=16*3;
-  g.drawLine(24,y-2,g.getWidth(),y-2);
-  //draw rate of climb
-  if (rocAvg>0.1) g.setColor(0,1,0);
-  if (rocAvg<-1) g.setColor(1,0,0);
-  g.setFont("8x16",3).setFontAlign(1,-1).drawString(rocAvg.toFixed(1), g.getWidth()-20, y);
-  g.setColor(1,1,1);
-  g.setFont("8x16",2).setFontAlign(-1,-1).drawString("m", g.getWidth()-20, y);
-  g.setFont("8x16",2).setFontAlign(-1,-1).drawString("s", g.getWidth()-20, y+20);
-  g.drawLine(g.getWidth()-20,y+26,g.getWidth()-8,y+26);
-  //-------------
-  y+=16*3;
-  g.drawLine(24,y-2,g.getWidth(),y-2);
-  //draw groundspeed
-  if (!isNaN(gs)) {
-    g.setFont("8x16",3).setFontAlign(1,-1).drawString(gs.toFixed(0), g.getWidth()-20, y);
-    g.setFont("8x16",1).setFontAlign(-1,-1).drawString("km", g.getWidth()-20, y+4);
-    g.setFont("8x16",1).setFontAlign(-1,-1).drawString("h", g.getWidth()-20, y+24);
-    g.drawLine(g.getWidth()-20,y+21,g.getWidth()-8,y+21);
-  }  
-  //-------------
-  y+=16*3;
-  g.drawLine(0,y-2,g.getWidth(),y-2);
-  g.drawLine(24,0,24,y-2);
-  g.drawLine(g.getWidth()/2,y-2,g.getWidth()/2,g.getHeight()-1);
-  g.setColor(1,1,1);
-  //draw flight time
-  if (flying) {
-    g.setFont("8x16",2).setFontAlign(0,-1).drawString(ftString, g.getWidth()*0.75, 14*10+4);
-  }
-  //draw time
-  g.setFont("8x16",2).setFontAlign(0,-1).drawString(timeStr, g.getWidth()/4, 14*10+4);
-  //draw bar graph
-  if (roc>0.1) g.setColor(0,1,0);
-  if (roc<-1) g.setColor(1,0,0);
-  g.fillRect(0,(y-2)/2,23,Math.clip((y-2)/2-roc*20,0,y-2));
+  pfd.render();
+  drawVario();
 }, 250);
+
+g.clear();