dow.code-workspace

@@ -7,12 +7,5 @@
 			"path": "firmware"
 		}
 	],
-	"settings": {
-		"files.associations": {
-			"*.ejs": "html",
-			".env": "env",
-			".env.*": "env",
-			"cmath": "cpp"
-		}
-	}
+	"settings": {}
 }

firmware/dow.cpp

@@ -26,8 +26,6 @@ void dow_get_text_item_rect(GxEPD2_BW<GxEPD2_583_GDEQ0583T31, GxEPD2_583_GDEQ058
   dow_apply_font(display, item->font);
   display.getTextBounds(item->contents, 0, 0, &tbx, &tby, &tbw, &tbh);
 
-  // bool debug = item->contents.equals("Srazky");
-
   int x = item->x;
   int y = item->y;
   int w = tbw;
@@ -52,14 +50,14 @@ void dow_get_text_item_rect(GxEPD2_BW<GxEPD2_583_GDEQ0583T31, GxEPD2_583_GDEQ058
   {
   case ITEM_ALIGN_CENTER:
   {
-    y -= (h + tby);
+    y += tby;
     y += round((double)h / 2);
     break;
   }
 
   case ITEM_ALIGN_START:
   {
-    y -= (h + tby);
+    y += tby;
     y += h;
     break;
   }
@@ -81,27 +79,6 @@ void dow_get_text_item_rect(GxEPD2_BW<GxEPD2_583_GDEQ0583T31, GxEPD2_583_GDEQ058
   *ry = y;
   *rw = w;
   *rh = h;
-
-  /*
-  if (debug)
-  {
-    Serial.print(x);
-    Serial.print(", ");
-    Serial.print(y);
-    Serial.print(", ");
-    Serial.print(w);
-    Serial.print(", ");
-    Serial.print(h);
-    Serial.print(", tbx:");
-    Serial.print(tbx);
-    Serial.print(", tby:");
-    Serial.print(tby);
-    Serial.print(", tbw:");
-    Serial.print(tbw);
-    Serial.print(", tbh:");
-    Serial.println(tbh);
-  }
-  */
 }
 
 void dow_get_item_rect(GxEPD2_BW<GxEPD2_583_GDEQ0583T31, GxEPD2_583_GDEQ0583T31::HEIGHT> &display, dow_item_t *item, int *rx, int *ry, int *rw, int *rh)

server/src/app/routes/dow.ts

@@ -168,35 +168,31 @@ export const dowRoutes = router((router, ctx) => {
 
 			const next12Hours = Object.entries(weather.hours).slice(1, 22)
 
-			const tempY = 210
+			const tempY = 230
 			const tempX = 30
 			const tempW = 280
 			const tempH = 120
-
 			const tempGraphP = 5
-			const tempGraphX = tempX + tempGraphP * 2
-			const tempGraphY = tempY + 24 + tempGraphP
 			const tempGraphW = tempW - tempGraphP * 4
-			const tempGraphH = tempH - 24 - tempGraphP * 2
 
 			widgets.push(
 				...rectangleWithTitle({
 					x: tempX,
-					y: tempY,
+					y: tempY - 20,
 					width: tempW,
 					height: tempH,
 					title: 'Teplota',
-					titleHeight: 24,
+					titleHeight: 20,
 					titleFont: 3,
 				}),
 			)
 
 			widgets.push(
 				...barGraph({
-					x: tempGraphX,
-					y: tempGraphY,
+					x: tempX + tempGraphP * 2,
+					y: tempY + tempGraphP,
 					width: tempGraphW,
-					height: tempGraphH,
+					height: tempH - 20 - tempGraphP * 2,
 					data: next12Hours.map(([offset, h]) => ({
 						x: now.plus({ hours: +offset }).hour.toString().padStart(2, '0'),
 						yFormatted: Math.floor(h.temperature as number).toString(),
@@ -210,35 +206,59 @@ export const dowRoutes = router((router, ctx) => {
 				}),
 			)
 
-			const preY = 230 + 124
+			/*
+			const minPre = Math.min(
+				...next12Hours.map(([, h]) => h.precipitationAmount as number),
+			)
+
+			const maxPre = Math.max(
+				...next12Hours.map(([, h]) => h.precipitationAmount as number),
+			)
+
+			const maxPreIndex = Object.entries(weather.hours).reduce(
+				(acc, [i, h]) => {
+					if (typeof h.precipitationAmount !== 'number') {
+						return acc
+					}
+
+					if (!acc || h.precipitationAmount > acc.pre) {
+						return { pre: h.precipitationAmount, index: i }
+					}
+
+					return acc
+				},
+				{} as { pre: number; index: string } | undefined,
+			)?.index
+
+			const displayedMaxPre = Math.max(maxPre, 1)
+			const preRange = displayedMaxPre - minPre
+			*/
+
+			const preY = 250 + 120
 			const preX = 30
 			const preW = 280
-			const preH = 116
-
+			const preH = 120
 			const preGraphP = 5
-			const preGraphX = preX + preGraphP * 2
-			const preGraphY = preY + 24 + preGraphP
 			const preGraphW = preW - preGraphP * 4
-			const preGraphH = preH - 24 - preGraphP * 2
 
 			widgets.push(
 				...rectangleWithTitle({
 					x: preX,
-					y: preY,
+					y: preY - 20,
 					width: preW,
 					height: preH,
 					title: 'Srazky',
-					titleHeight: 24,
+					titleHeight: 20,
 					titleFont: 3,
 				}),
 			)
 
 			widgets.push(
 				...barGraph({
-					x: preGraphX,
-					y: preGraphY,
+					x: preX + preGraphP * 2,
+					y: preY + preGraphP,
 					width: preGraphW,
-					height: preGraphH,
+					height: preH - 20 - preGraphP * 2,
 					data: next12Hours.map(([offset, h]) => ({
 						x: now.plus({ hours: +offset }).hour.toString().padStart(2, '0'),
 						yFormatted: (h.precipitationAmount as number).toFixed(1) + 'mm',