From e8a92c4fcbf8e82f6442a9516f182e285ddfea60 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 22 Oct 2025 01:09:26 +0200 Subject: [PATCH 1/3] Add definitions for more now-known Solum BWRY tags https://github.com/OpenEPaperLink/Tag_FW_EFR32xG22/issues/11 --- resources/tagtypes/2B.json | 24 ++++++++++++ resources/tagtypes/2C.json | 24 ++++++++++++ resources/tagtypes/4A.json | 24 ++++++++++++ resources/tagtypes/4B.json | 24 ++++++++++++ resources/tagtypes/4C.json | 75 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 171 insertions(+) create mode 100644 resources/tagtypes/2B.json create mode 100644 resources/tagtypes/2C.json create mode 100644 resources/tagtypes/4A.json create mode 100644 resources/tagtypes/4B.json create mode 100644 resources/tagtypes/4C.json diff --git a/resources/tagtypes/2B.json b/resources/tagtypes/2B.json new file mode 100644 index 00000000..4827d647 --- /dev/null +++ b/resources/tagtypes/2B.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "name": "M3 2.9\" BWRY", + "width": 384, + "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 +} diff --git a/resources/tagtypes/2C.json b/resources/tagtypes/2C.json new file mode 100644 index 00000000..eab1a52f --- /dev/null +++ b/resources/tagtypes/2C.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "name": "M3 4.3\" BWRY", + "width": 522, + "height": 152, + "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 +} diff --git a/resources/tagtypes/4A.json b/resources/tagtypes/4A.json new file mode 100644 index 00000000..649738be --- /dev/null +++ b/resources/tagtypes/4A.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "name": "M3 1.6\" 200px BWRY", + "width": 200, + "height": 200, + "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": 1 +} diff --git a/resources/tagtypes/4B.json b/resources/tagtypes/4B.json new file mode 100644 index 00000000..888425f4 --- /dev/null +++ b/resources/tagtypes/4B.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "name": "M3 2.2\" BWRY", + "width": 296, + "height": 160, + "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 +} diff --git a/resources/tagtypes/4C.json b/resources/tagtypes/4C.json new file mode 100644 index 00000000..92be7d7d --- /dev/null +++ b/resources/tagtypes/4C.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "name": "M3 7.5\" BWRY", + "width": 800, + "height": 480, + "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": 0, + "zlib_compression": "27", + "options": [ "led" ], + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "template": { + "1": { + "weekday": [ 400, -5, "Signika-SB.ttf", 130 ], + "month": [ 400, 330, "Signika-SB.ttf", 130 ], + "day": [ 400, 70, "Signika-SB.ttf", 280 ] + }, + "4": { + "location": [ 20, 20, "fonts/calibrib50" ], + "icon": [ 580, 20, 200, 2 ], + "temp": [ 40, 180, "fonts/calibrib120" ], + "wind": [ 40, 370, "fonts/calibrib40" ], + "dir": [ 250, 360, 80 ], + "umbrella": [ 400, 360, 80 ] + }, + "8": { + "location": [ 10, 0, "fonts/calibrib50" ], + "column": [ 7, 114 ], + "day": [ 55, 210, "fonts/calibrib30", 250, 385 ], + "rain": [ 58, 440 ], + "icon": [ 55, 280, 60 ], + "wind": [ 37, 220 ], + "line": [ 195, 470 ], + + "currentwind": [ 460, 130, "fonts/calibrib40" ], + "temp": [ 10, 50, "fonts/calibrib120", 1 ], + "currenticon": [ 770, 0, 140, 2 ], + "dir": [ 410, 100, 80 ], + "umbrella": [ 390, 50, 60 ] + }, + "9": { + "title": [ 6, 0, "Signika-SB.ttf", 32 ], + "items": 10, + "line": [ 9, 40, "calibrib16.vlw" ], + "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] + }, + "10": { + "title": [ 400, 10, "fonts/bahnschrift20" ], + "pos": [ 400, 40 ] + }, + "11": { + "rotate": 0, + "mode": 1, + "days": 7, + "gridparam": [ 3, 17, 30, "calibrib16.vlw", "tahoma11.vlw", 14 ] + }, + "27": { + "bars": [ 40, 690, 380, 25, 50 ], + "time": [ "fonts/bahnschrift20" ], + "yaxis": [ "fonts/bahnschrift20", 5, 12, 14 ], + "head": [ "fonts/calibrib50.vlw" ] + } + } +} From 0e8e7b5b755d147b4f2487179d637d6e5cf91036 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 28 Oct 2025 19:16:58 +0100 Subject: [PATCH 2/3] Add 11.6" BWRY and fix previous BWRY definitions --- resources/tagtypes/2B.json | 3 +- resources/tagtypes/2C.json | 3 +- resources/tagtypes/4A.json | 3 +- resources/tagtypes/4B.json | 3 +- resources/tagtypes/4C.json | 1 + resources/tagtypes/4D.json | 62 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 resources/tagtypes/4D.json diff --git a/resources/tagtypes/2B.json b/resources/tagtypes/2B.json index 4827d647..3d314b4e 100644 --- a/resources/tagtypes/2B.json +++ b/resources/tagtypes/2B.json @@ -14,9 +14,10 @@ "perceptual": { "white": [ 255, 255, 255 ], "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], "yellow": [ 200, 200, 0 ] }, - "shortlut": 2, + "shortlut": 0, "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 ], diff --git a/resources/tagtypes/2C.json b/resources/tagtypes/2C.json index eab1a52f..c6b6dbc5 100644 --- a/resources/tagtypes/2C.json +++ b/resources/tagtypes/2C.json @@ -14,9 +14,10 @@ "perceptual": { "white": [ 255, 255, 255 ], "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], "yellow": [ 200, 200, 0 ] }, - "shortlut": 2, + "shortlut": 0, "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 ], diff --git a/resources/tagtypes/4A.json b/resources/tagtypes/4A.json index 649738be..ab79f8c6 100644 --- a/resources/tagtypes/4A.json +++ b/resources/tagtypes/4A.json @@ -14,9 +14,10 @@ "perceptual": { "white": [ 255, 255, 255 ], "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], "yellow": [ 200, 200, 0 ] }, - "shortlut": 2, + "shortlut": 0, "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 ], diff --git a/resources/tagtypes/4B.json b/resources/tagtypes/4B.json index 888425f4..59ad272b 100644 --- a/resources/tagtypes/4B.json +++ b/resources/tagtypes/4B.json @@ -14,9 +14,10 @@ "perceptual": { "white": [ 255, 255, 255 ], "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], "yellow": [ 200, 200, 0 ] }, - "shortlut": 2, + "shortlut": 0, "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 ], diff --git a/resources/tagtypes/4C.json b/resources/tagtypes/4C.json index 92be7d7d..271ed404 100644 --- a/resources/tagtypes/4C.json +++ b/resources/tagtypes/4C.json @@ -14,6 +14,7 @@ "perceptual": { "white": [ 255, 255, 255 ], "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], "yellow": [ 200, 200, 0 ] }, "shortlut": 0, diff --git a/resources/tagtypes/4D.json b/resources/tagtypes/4D.json new file mode 100644 index 00000000..f1ff1635 --- /dev/null +++ b/resources/tagtypes/4D.json @@ -0,0 +1,62 @@ +{ + "version": 3, + "name": "M3 11.6\" BWRY", + "width": 960, + "height": 640, + "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 ], + "red": [ 255, 0, 0 ], + "yellow": [ 200, 200, 0 ] + }, + "shortlut": 0, + "zlib_compression": "27", + "options": [ "led" ], + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "template": { + "1": { + "weekday": [ 480, -5, "Signika-SB.ttf", 160 ], + "month": [ 480, 440, "Signika-SB.ttf", 160 ], + "day": [ 480, 85, "Signika-SB.ttf", 380 ] + }, + "8": { + "location": [ 25, 0, "fonts/calibrib60" ], + "column": [ 7, 137 ], + "day": [ 68, 245, "fonts/calibrib42", 325, 540 ], + "rain": [ 72, 585 ], + "icon": [ 67, 390, 90 ], + "wind": [ 45, 290 ], + "line": [ 240, 672 ], + + "currentwind": [ 670, 130, "fonts/calibrib60" ], + "temp": [ 25, 45, "fonts/calibrib150", 1 ], + "currenticon": [ 900, 0, 160, 2 ], + "dir": [ 600, 100, 90 ], + "umbrella": [ 630, 50, 60 ] + }, + "9": { + "title": [ 6, 0, "Signika-SB.ttf", 32 ], + "items": 12, + "line": [ 9, 40, "calibrib16.vlw" ], + "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] + }, + "10": { + "title": [ 480, 0, "Signika-SB.ttf", 50 ], + "pos": [ 480, 70 ] + }, + "11": { + "rotate": 0, + "mode": 1, + "days": 7, + "gridparam": [ 3, 25, 40, "fonts/calibrib30", "REFSAN12.vlw", 16 ] + } + } +} \ No newline at end of file From 25b185da28342c197fba17d381af58f4b6d552d4 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 7 Dec 2025 19:36:58 +0100 Subject: [PATCH 3/3] Use correct base templates for BWRY variants --- resources/tagtypes/2B.json | 2 +- resources/tagtypes/2C.json | 2 +- resources/tagtypes/4A.json | 2 +- resources/tagtypes/4B.json | 2 +- resources/tagtypes/4C.json | 53 +------------------------------------- resources/tagtypes/4D.json | 41 ++--------------------------- 6 files changed, 7 insertions(+), 95 deletions(-) diff --git a/resources/tagtypes/2B.json b/resources/tagtypes/2B.json index 3d314b4e..c8d10448 100644 --- a/resources/tagtypes/2B.json +++ b/resources/tagtypes/2B.json @@ -21,5 +21,5 @@ "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 + "usetemplate": 51 } diff --git a/resources/tagtypes/2C.json b/resources/tagtypes/2C.json index c6b6dbc5..0dfed0eb 100644 --- a/resources/tagtypes/2C.json +++ b/resources/tagtypes/2C.json @@ -21,5 +21,5 @@ "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 + "usetemplate": 47 } diff --git a/resources/tagtypes/4A.json b/resources/tagtypes/4A.json index ab79f8c6..44d8ff88 100644 --- a/resources/tagtypes/4A.json +++ b/resources/tagtypes/4A.json @@ -21,5 +21,5 @@ "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 + "usetemplate": 48 } diff --git a/resources/tagtypes/4B.json b/resources/tagtypes/4B.json index 59ad272b..5d0c6ac2 100644 --- a/resources/tagtypes/4B.json +++ b/resources/tagtypes/4B.json @@ -21,5 +21,5 @@ "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 + "usetemplate": 49 } diff --git a/resources/tagtypes/4C.json b/resources/tagtypes/4C.json index 271ed404..1fe04f32 100644 --- a/resources/tagtypes/4C.json +++ b/resources/tagtypes/4C.json @@ -21,56 +21,5 @@ "zlib_compression": "27", "options": [ "led" ], "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], - "template": { - "1": { - "weekday": [ 400, -5, "Signika-SB.ttf", 130 ], - "month": [ 400, 330, "Signika-SB.ttf", 130 ], - "day": [ 400, 70, "Signika-SB.ttf", 280 ] - }, - "4": { - "location": [ 20, 20, "fonts/calibrib50" ], - "icon": [ 580, 20, 200, 2 ], - "temp": [ 40, 180, "fonts/calibrib120" ], - "wind": [ 40, 370, "fonts/calibrib40" ], - "dir": [ 250, 360, 80 ], - "umbrella": [ 400, 360, 80 ] - }, - "8": { - "location": [ 10, 0, "fonts/calibrib50" ], - "column": [ 7, 114 ], - "day": [ 55, 210, "fonts/calibrib30", 250, 385 ], - "rain": [ 58, 440 ], - "icon": [ 55, 280, 60 ], - "wind": [ 37, 220 ], - "line": [ 195, 470 ], - - "currentwind": [ 460, 130, "fonts/calibrib40" ], - "temp": [ 10, 50, "fonts/calibrib120", 1 ], - "currenticon": [ 770, 0, 140, 2 ], - "dir": [ 410, 100, 80 ], - "umbrella": [ 390, 50, 60 ] - }, - "9": { - "title": [ 6, 0, "Signika-SB.ttf", 32 ], - "items": 10, - "line": [ 9, 40, "calibrib16.vlw" ], - "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] - }, - "10": { - "title": [ 400, 10, "fonts/bahnschrift20" ], - "pos": [ 400, 40 ] - }, - "11": { - "rotate": 0, - "mode": 1, - "days": 7, - "gridparam": [ 3, 17, 30, "calibrib16.vlw", "tahoma11.vlw", 14 ] - }, - "27": { - "bars": [ 40, 690, 380, 25, 50 ], - "time": [ "fonts/bahnschrift20" ], - "yaxis": [ "fonts/bahnschrift20", 5, 12, 14 ], - "head": [ "fonts/calibrib50.vlw" ] - } - } + "usetemplate": 54 } diff --git a/resources/tagtypes/4D.json b/resources/tagtypes/4D.json index f1ff1635..9e42c404 100644 --- a/resources/tagtypes/4D.json +++ b/resources/tagtypes/4D.json @@ -21,42 +21,5 @@ "zlib_compression": "27", "options": [ "led" ], "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], - "template": { - "1": { - "weekday": [ 480, -5, "Signika-SB.ttf", 160 ], - "month": [ 480, 440, "Signika-SB.ttf", 160 ], - "day": [ 480, 85, "Signika-SB.ttf", 380 ] - }, - "8": { - "location": [ 25, 0, "fonts/calibrib60" ], - "column": [ 7, 137 ], - "day": [ 68, 245, "fonts/calibrib42", 325, 540 ], - "rain": [ 72, 585 ], - "icon": [ 67, 390, 90 ], - "wind": [ 45, 290 ], - "line": [ 240, 672 ], - - "currentwind": [ 670, 130, "fonts/calibrib60" ], - "temp": [ 25, 45, "fonts/calibrib150", 1 ], - "currenticon": [ 900, 0, 160, 2 ], - "dir": [ 600, 100, 90 ], - "umbrella": [ 630, 50, 60 ] - }, - "9": { - "title": [ 6, 0, "Signika-SB.ttf", 32 ], - "items": 12, - "line": [ 9, 40, "calibrib16.vlw" ], - "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] - }, - "10": { - "title": [ 480, 0, "Signika-SB.ttf", 50 ], - "pos": [ 480, 70 ] - }, - "11": { - "rotate": 0, - "mode": 1, - "days": 7, - "gridparam": [ 3, 25, 40, "fonts/calibrib30", "REFSAN12.vlw", 16 ] - } - } -} \ No newline at end of file + "usetemplate": 55 +}