From e4351c23f3ceadc4cc29945cf4ab5ad1d3e683b9 Mon Sep 17 00:00:00 2001
From: "Thomas B. Ruecker" <thomas@ruecker.fi>
Date: Mon, 6 May 2024 16:28:31 +0300
Subject: [PATCH] Updating 7.4in/640x384 templates (#308)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Maximising use of screen real estate. (It's free real estate!)
Within capabilities of current templating engine.
Further improvements will require changes to templating engine.

Co-authored-by: Thomas B. Rücker <thomas.ruecker@relexsolutions.com>
---
 resources/tagtypes/05.json | 34 ++++++++++++++++++++--------------
 resources/tagtypes/26.json |  2 +-
 resources/tagtypes/80.json |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/resources/tagtypes/05.json b/resources/tagtypes/05.json
index caf894621..e1196a8e9 100644
--- a/resources/tagtypes/05.json
+++ b/resources/tagtypes/05.json
@@ -13,7 +13,7 @@
 	"shortlut": 1,
 	"zlib_compression": "27",
 	"options": [ ],
-	"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ],
+	"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ],
 	"template": {
 		"1": {
 			"weekday": [ 320, -5, "Signika-SB.ttf", 100 ],
@@ -21,21 +21,21 @@
 			"day": [ 320, 60, "Signika-SB.ttf", 220 ]
 		},
 		"4": {
-			"location": [ 20, 20, "fonts/calibrib30" ],
-			"wind": [ 90, 83, "fonts/calibrib30" ],
-			"temp": [ 20, 170, "fonts/calibrib30" ],
-			"icon": [ 385, 0, 100, 2 ],
-			"dir": [ 40, 50, 80 ],
-			"umbrella": [ 325, 155, 78 ]
+			"location": [ 40, 20, "fonts/calibrib80" ],
+			"wind": [ 175, 180, "fonts/calibrib30" ],
+			"temp": [ 45, 240, "fonts/calibrib100" ],
+			"icon": [ 520, 80, 150, 2 ],
+			"dir": [ 120, 60, 180 ],
+			"umbrella": [ 575, 250, 102 ]
 		},
 		"8": {
-			"location": [ 10, 10, "fonts/calibrib30" ],
-			"column": [ 6, 66 ],
-			"day": [ 33, 60, "fonts/bahnschrift20", 104, 230 ],
-			"rain": [ 34, 260 ],
-			"icon": [ 32, 145, 30 ],
-			"wind": [ 17, 90 ],
-			"line": [ 50, 300 ]
+			"location": [ 10, 0, "fonts/calibrib80" ],
+			"column": [ 7, 91 ],
+			"day": [ 42, 110, "fonts/calibrib30", 150, 285 ],
+			"rain": [ 48, 340 ],
+			"icon": [ 45, 180, 60 ],
+			"wind": [ 17, 120 ],
+			"line": [ 95, 370 ]
 		},
 		"9": {
 			"title": [ 6, 0, "Signika-SB.ttf", 32 ],
@@ -52,6 +52,12 @@
 			"mode": 1,
 			"days": 7,
 			"gridparam": [ 3, 17, 30, "calibrib16.vlw", "tahoma9.vlw", 14 ]
+		},
+		"27": {
+				  "bars": [ 12, 630, 340, 20 ],
+				  "time": [ "calibrib16.vlw" ],
+				  "yaxis": [ "calibrib16.vlw", 1, 12 ],
+				  "head": [ "calibrib30.vlw" ]
 		}
 	}
 }
diff --git a/resources/tagtypes/26.json b/resources/tagtypes/26.json
index 99189b8ff..2cda34836 100644
--- a/resources/tagtypes/26.json
+++ b/resources/tagtypes/26.json
@@ -13,6 +13,6 @@
 	"zlib_compression": "27",
 	"highlight_color": 5,
 	"options": [ ],
-	"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ],
+	"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ],
 	"usetemplate" : 5
 }
diff --git a/resources/tagtypes/80.json b/resources/tagtypes/80.json
index 44280c5a6..3bc3cf57f 100644
--- a/resources/tagtypes/80.json
+++ b/resources/tagtypes/80.json
@@ -12,6 +12,6 @@
  },
  "shortlut": 1,
  "options": [ ],
- "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ],
+ "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ],
  "usetemplate": 5
 }