From 7782a37c978d847efcd368fb2429f558d4628182 Mon Sep 17 00:00:00 2001
From: Jonas Niesner <jonas.niesner@gmail.com>
Date: Tue, 27 May 2025 12:01:47 +0200
Subject: [PATCH 1/5] Update conditional-build-test.yml

---
 .github/workflows/conditional-build-test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conditional-build-test.yml b/.github/workflows/conditional-build-test.yml
index 43f6f1c0..80183f4b 100644
--- a/.github/workflows/conditional-build-test.yml
+++ b/.github/workflows/conditional-build-test.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   determine-builds:
     name: Evaluate Required Builds
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 1
     # Map a step output to job output
     outputs:
@@ -26,7 +26,7 @@ jobs:
   tag-build:
     name: Build Tag FW
     needs: [determine-builds]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Code (with submodules)
         uses: actions/checkout@v4
@@ -71,7 +71,7 @@ jobs:
           - ESP32_S3_16_8_YELLOW_AP
           - OpenEPaperLink_Mini_AP_v4
           - OpenEPaperLink_ESP32-PoE-ISO_AP
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

From caf5e49595c0556c954ab4be4b165d41bf3007b7 Mon Sep 17 00:00:00 2001
From: Jelmer <jelmer_bruijn@hotmail.com>
Date: Wed, 28 May 2025 00:48:35 +0200
Subject: [PATCH 2/5] Create 29.json

Added 2.4" BWRY definition
---
 resources/tagtypes/29.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 resources/tagtypes/29.json

diff --git a/resources/tagtypes/29.json b/resources/tagtypes/29.json
new file mode 100644
index 00000000..44383f82
--- /dev/null
+++ b/resources/tagtypes/29.json
@@ -0,0 +1,24 @@
+{
+	"version": 1,
+	"name": "M3 2.4\" BWRY",
+	"width": 296,
+	"height": 168,
+	"rotatebuffer": 3,
+	"bpp": 2,
+	"colortable": {
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"yellow": [ 255, 255, 0 ]
+	},
+	"perceptual": {
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"yellow": [ 200, 200, 0 ]
+	},
+	"shortlut": 2,
+	"zlib_compression": "27",
+	"options": [ "led" ],
+	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 14, 16, 17, 18, 19, 20, 21, 27 ],
+	"usetemplate": 1
+}

From c2255a3de78d3a09aebc90ba122afb4256e39252 Mon Sep 17 00:00:00 2001
From: Jelmer <jelmer_bruijn@hotmail.com>
Date: Wed, 28 May 2025 00:50:15 +0200
Subject: [PATCH 3/5] Create 28.json

---
 resources/tagtypes/28.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 resources/tagtypes/28.json

diff --git a/resources/tagtypes/28.json b/resources/tagtypes/28.json
new file mode 100644
index 00000000..f885902c
--- /dev/null
+++ b/resources/tagtypes/28.json
@@ -0,0 +1,24 @@
+{
+	"version": 1,
+	"name": "M3 1.6\" BWRY",
+	"width": 168,
+	"height": 168,
+	"rotatebuffer": 0,
+	"bpp": 2,
+	"colortable": {
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"yellow": [ 255, 255, 0 ]
+	},
+	"perceptual": {
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"yellow": [ 200, 200, 0 ]
+	},
+	"shortlut": 2,
+	"zlib_compression": "27",
+	"options": [ "led" ],
+	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 14, 16, 17, 18, 19, 20, 21, 27 ],
+	"usetemplate": 0
+}

From 957b94469f9f6df5e1e04f561eb8086cd8f25dbb Mon Sep 17 00:00:00 2001
From: Jelmer <jelmer_bruijn@hotmail.com>
Date: Wed, 28 May 2025 00:52:01 +0200
Subject: [PATCH 4/5] Create 2A.json

---
 resources/tagtypes/2A.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 resources/tagtypes/2A.json

diff --git a/resources/tagtypes/2A.json b/resources/tagtypes/2A.json
new file mode 100644
index 00000000..0ad31259
--- /dev/null
+++ b/resources/tagtypes/2A.json
@@ -0,0 +1,24 @@
+{
+	"version": 1,
+	"name": "M3 3.0\" BWRY",
+	"width": 400,
+	"height": 168,
+	"rotatebuffer": 3,
+	"bpp": 2,
+	"colortable": {
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"yellow": [ 255, 255, 0 ]
+	},
+	"perceptual": {
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"yellow": [ 200, 200, 0 ]
+	},
+	"shortlut": 2,
+	"zlib_compression": "27",
+	"options": [ "led" ],
+	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 14, 16, 17, 18, 19, 20, 21, 27 ],
+	"usetemplate": 1
+}

From f40238a49d54c6975fee4fd0e0e03935f2f4e143 Mon Sep 17 00:00:00 2001
From: atc1441 <atc1441@googlemail.com>
Date: Thu, 29 May 2025 09:36:40 +0200
Subject: [PATCH 5/5] Update 45.json

---
 resources/tagtypes/45.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/tagtypes/45.json b/resources/tagtypes/45.json
index 54dfbd87..ed565f75 100644
--- a/resources/tagtypes/45.json
+++ b/resources/tagtypes/45.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"name": "M3 2.2 Lite\"",
 	"width": 250,
 	"height": 128,
@@ -17,7 +17,7 @@
 	
 	"template": {
 		"1": {
-			"weekday": [ 128, 3, "Signika-SB.ttf", 50 ],
+			"weekday": [ 128, 3, "Signika-SB.ttf", 40 ],
 			"date": [ 128, 62, "Signika-SB.ttf", 40 ]
 		},
 		"2": {