update some more

indridieinarsson · Jan 1, 2024 · 1a828b0 · 1a828b0
1 parent b85643e
commit 1a828b0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/apps/ieclock/app.js b/apps/ieclock/app.js
@@ -45,16 +45,16 @@ sunrise.compactTime = function(t) {
 
 sunrise.draw = function(x, y, Radius, Settings) {
     loadLocation();
-    updateSunRiseSunSet(new Date(), location.lat, location.lon);
+    //updateSunRiseSunSet(new Date(), location.lat, location.lon);
     let halfScreenWidth   = g.getWidth() / 2;
     let largeComplication = (x === halfScreenWidth);
     auxdial = require("https://raw.githubusercontent.com/indridieinarsson/espruino_sandbox/master/24hAuxDial.js");
     let rmult = (largeComplication?1.7:1.35);
-	let h1 = sunRise.getHours();
-	let m1 = sunRise.getMinutes();
-	let h2 = sunSet.getHours();
-	let m2 = sunSet.getMinutes();
-    auxdial.draw(Settings, x, y, Math.round(Radius*rmult), h1 ,m1 , true);
+	let h1 = tidesrv.sunrise.getHours();
+	let m1 = tidesrv.sunrise.getMinutes();
+	let h2 = tidesrv.sunset.getHours();
+	let m2 = tidesrv.sunset.getMinutes();
+    auxdial.draw(Settings, x, y, Math.round(Radius*rmult), h1 ,m1 , h2, m2);
 
     // let Text = this.compactTime(sunRise);
     // g.setColor(Settings.Foreground === 'Theme' ? g.theme.fg : Settings.Foreground || '#000000');
@@ -89,11 +89,19 @@ tide.draw = function(x, y, Radius, Settings) {
     {
         return;
     }
-    let h = ieclock.tides.time.getHours();
-    let m = ieclock.tides.time.getMinutes();
-    auxdial.draw(Settings, x, y, Math.round(Radius*rmult),h ,m , true);
+    let h1 = tidesrv.tides.time.getHours();
+    let m1 = tidesrv.tides.time.getMinutes();
+	let tlast = Date(tidesrv.tides.timelast);
+	let h2 = tlast.getHours();
+	let m2 = tlast.getMinutes();
+
+    if (tidesrv.tides.high) {
+	    auxdial.draw(Settings, x, y, Math.round(Radius*rmult),h2 ,m2 , h1, m1);
+    }else {
+	    auxdial.draw(Settings, x, y, Math.round(Radius*rmult),h1 ,m1 , h2, m2);
+    }
     // if (largeComplication){
-	let th = ieclock.tides.height;
+	let th = tidesrv.tides.height;
         let t1=th.toFixed(0);
         let t2=((Math.abs(th)%1)*10).toFixed();
         g.setColor(Settings.Foreground === 'Theme' ? g.theme.fg : Settings.Foreground || '#000000');

diff --git a/apps/ieclock/metadata.json b/apps/ieclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "ieclock",
   "name": "Analog Clock with barometer info",
   "shortName":"IE Clock",
-  "version":"0.39",
+  "version":"0.40",
   "description": "a simple analog clock with tidal information",
   "icon": "app-icon.png",
   "type": "clock",