Swap stop watch positions

antonclk/antonclk.app.js

@@ -18,7 +18,8 @@
 	let stopWatchTimer = null;
 
 	let myMessage = "";
-	let temperature = "";
+	let temperature = "?";
+	let feels_like = "?";
 
 	let drawTimer = null;
 
@@ -48,9 +49,9 @@
 			}
 			let Ttxt1 = timeToText(Tt1);
 
-			g.clearRect(0, y-60, w, y-34);
+			g.clearRect(0, y+61, w, y+88);
 			g.setColor(g.theme.fg);
-			g.setFontAlign(0, 0).setFont("Vector", 26).drawString("S1: " + Ttxt1, x, y-45);
+			g.setFontAlign(0, 0).setFont("Vector", 26).drawString(Ttxt1, x, y+74);
 		}
 
 		if (stopWatch.start2 || stopWatch.elapsed2) {
@@ -67,9 +68,9 @@
 			}
 			let Ttxt2 = timeToText(Tt2);
 
-			g.clearRect(0, y+61, w, y+88);
+			g.clearRect(0, y-60, w, y-34);
 			g.setColor(g.theme.fg);
-			g.setFontAlign(0, 0).setFont("Vector", 26).drawString("S2: " + Ttxt2, x, y+76);
+			g.setFontAlign(0, 0).setFont("Vector", 26).drawString(Ttxt2, x, y-45);
 		}
 	}
 
@@ -90,25 +91,28 @@
 		var utcHour = Math.floor(utc / 3600);
 		var utcMinute = Math.floor((utc % 3600) / 60);
 		var utcStr = utcHour.toString().padStart(2, '0') + ":" + utcMinute.toString().padStart(2, '0');
-		g.setFontAlign(0, 0).setFont("Vector", 36).drawString(utcStr, x-25, y+43);
+		g.setFontAlign(0, 0).setFont("Vector", 36).drawString(utcStr, x-32, y+43);
 
-		var tz_offset = date.toString().indexOf("GMT");
+		//var tz_offset = date.toString().indexOf("GMT");
-		var tz = date.toString().substring(tz_offset+3, tz_offset+6);
+		//var tz = date.toString().substring(tz_offset+3, tz_offset+6);
-		g.setFontAlign(0, 0).setFont("Vector", 24).drawString(tz, x+60, y+43);
+		//g.setFontAlign(0, 0).setFont("Vector", 24).drawString(tz, x+60, y+43);
+
+		g.setFontAlign(0, 0).setFont("Vector", 26).drawString(temperature, x+53, y+43);
 
 		// Show date and day of week
 		const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-		var dateStr = date.getDate() + " " + days[date.getDay()] + " " + temperature;
+		var dateStr = date.getDate() + " " + days[date.getDay()];
 
-		// don't draw date string if stopwatch 2 is running
+		// don't draw date string if stopwatch 1 is running
-		if (!stopWatch.start2 && !stopWatch.elapsed2) {
+		if (!stopWatch.start1 && !stopWatch.elapsed1) {
-			g.setFontAlign(0, 0).setFont("Vector", 26).drawString(dateStr, x, y+76);
+			g.setFontAlign(0, 0).setFont("Vector", 26).drawString(dateStr, x-32, y+74);
+			g.setFontAlign(0, 0).setFont("Vector", 26).drawString(feels_like, x+53, y+74);
 		}
 
 		//var wrapped = g.wrapString(myMessage, g.getWidth()-10).join("\n");
 
-		// don't draw message if stopwatch 1 is running
+		// don't draw message if stopwatch 2 is running
-		if (!stopWatch.start1 && !stopWatch.elapsed1) {
+		if (!stopWatch.start2 && !stopWatch.elapsed2) {
 			g.setFontAlign(0, 0).setFont("Vector", 26).drawString(myMessage, x, y-45);
 		}
 
@@ -122,6 +126,7 @@
 				let result = JSON.parse(event.resp);
 				myMessage = result.context;
 				temperature = result.temperature;
+				feels_like = result.feels_like;
 				if (watchState == STATE_IDLE) {
 					if (paintFace) paintFace();
 				}