From 0e8e7b5b755d147b4f2487179d637d6e5cf91036 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 28 Oct 2025 19:16:58 +0100 Subject: [PATCH] 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