From 2fc5c54b8ebb5b335b2e824726f01dcdb45966d7 Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Thu, 3 Apr 2025 22:31:07 +0200 Subject: [PATCH] new tagtype M3 2.7" and M3 11.6" layouts and other tweaks --- resources/tagtypes/00.json | 2 +- resources/tagtypes/01.json | 2 +- resources/tagtypes/03.json | 2 +- resources/tagtypes/04.json | 2 +- resources/tagtypes/21.json | 2 +- resources/tagtypes/27.json | 2 +- resources/tagtypes/37.json | 24 ++++++++++--- resources/tagtypes/47.json | 70 +++++++++++++++++++++++++++++++++++-- resources/tagtypes/57.json | 2 +- resources/tagtypes/63.json | 71 ++------------------------------------ resources/tagtypes/67.json | 2 +- resources/tagtypes/B2.json | 2 +- 12 files changed, 99 insertions(+), 84 deletions(-) diff --git a/resources/tagtypes/00.json b/resources/tagtypes/00.json index 917c347b..42cc02b5 100644 --- a/resources/tagtypes/00.json +++ b/resources/tagtypes/00.json @@ -12,7 +12,7 @@ }, "g5_compression": "29", "shortlut": 2, - "options": [ "button", "customlut" ], + "options": [ "button" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 10, 14, 17, 18, 19, 20, 21, 27 ], "template": { "1": { diff --git a/resources/tagtypes/01.json b/resources/tagtypes/01.json index a2809539..a8fbaa82 100644 --- a/resources/tagtypes/01.json +++ b/resources/tagtypes/01.json @@ -12,7 +12,7 @@ }, "g5_compression": "29", "shortlut": 2, - "options": [ "button", "customlut" ], + "options": [ "button" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 21, 27 ], "template": { "1": { diff --git a/resources/tagtypes/03.json b/resources/tagtypes/03.json index 70b7e959..92eff848 100644 --- a/resources/tagtypes/03.json +++ b/resources/tagtypes/03.json @@ -12,7 +12,7 @@ }, "g5_compression": "29", "shortlut": 2, - "options": [ "button", "customlut" ], + "options": [ "button" ], "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 14, 16, 17, 19, 20, 21, 22, 23, 27 ], "template": { "1": { diff --git a/resources/tagtypes/04.json b/resources/tagtypes/04.json index fcb944af..e628973e 100644 --- a/resources/tagtypes/04.json +++ b/resources/tagtypes/04.json @@ -12,7 +12,7 @@ }, "g5_compression": "29", "shortlut": 2, - "options": [ "button", "customlut" ], + "options": [ "button" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 21, 27 ], "template": { "1": { diff --git a/resources/tagtypes/21.json b/resources/tagtypes/21.json index 081bd9db..f72f6145 100644 --- a/resources/tagtypes/21.json +++ b/resources/tagtypes/21.json @@ -11,7 +11,7 @@ }, "highlight_color": 5, "shortlut": 0, - "options": [ "button", "customlut" ], + "options": [ "button" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 21 ], "usetemplate": 1 } diff --git a/resources/tagtypes/27.json b/resources/tagtypes/27.json index 645b887f..4b292b22 100644 --- a/resources/tagtypes/27.json +++ b/resources/tagtypes/27.json @@ -12,7 +12,7 @@ "g5_compression": "29", "highlight_color": 5, "shortlut": 0, - "options": [ "button", "customlut" ], + "options": [ "button" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 21 ], "usetemplate": 1 } diff --git a/resources/tagtypes/37.json b/resources/tagtypes/37.json index 6968bb7e..59ffc3f6 100644 --- a/resources/tagtypes/37.json +++ b/resources/tagtypes/37.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 3, "name": "M3 11.6\"", "width": 960, "height": 640, @@ -14,12 +14,26 @@ "zlib_compression": "27", "options": [ "button" ], "contentids": [ 22, 23, 1, 5, 8, 9, 7, 19, 10, 11 ], - "usetemplate": 1, "template": { "1": { "weekday": [ 480, -5, "Signika-SB.ttf", 160 ], - "month": [ 480, 480, "Signika-SB.ttf", 160 ], - "day": [ 480, 110, "Signika-SB.ttf", 380 ] + "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 ], @@ -35,7 +49,7 @@ "rotate": 0, "mode": 1, "days": 7, - "gridparam": [ 7, 19, 30, "calibrib16.vlw", "REFSAN12.vlw", 16 ] + "gridparam": [ 3, 25, 40, "fonts/calibrib30", "REFSAN12.vlw", 16 ] } } } \ No newline at end of file diff --git a/resources/tagtypes/47.json b/resources/tagtypes/47.json index 313b78b8..9bc101a9 100644 --- a/resources/tagtypes/47.json +++ b/resources/tagtypes/47.json @@ -13,6 +13,72 @@ "zlib_compression": "27", "shortlut": 0, "options": [ "button" ], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 14, 16, 17, 18, 19, 20, 21, 27, 28 ], - "usetemplate": 4 + "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 21, 27 ], + "template": { + "1": { + "weekday": [ 150, 25, "Signika-SB.ttf", 60 ], + "date": [ 150, 100, "Signika-SB.ttf", 48 ] + }, + "2": { + "fonts": [ "Signika-SB.ttf", 200, 200, 170, 120, 100, 80 ], + "xy": [ 150, 85 ] + }, + "4": { + "location": [ 5, 15, "fonts/bahnschrift30" ], + "wind": [ 280, 15, "fonts/bahnschrift30" ], + "temp": [ 5, 96, "fonts/calibrib90" ], + "icon": [ 280, 65, 80, 2 ], + "dir": [ 235, -2, 40 ], + "umbrella": [ 190, -30, 25 ] + }, + "8": { + "location": [ 5, 10, "calibrib16.vlw" ], + "column": [ 5, 60 ], + "day": [ 30, 70, "bahnschrift20.vlw", 91, 155 ], + "rain": [ 34, 176 ], + "icon": [ 30, 106, 30 ], + "wind": [ 18, 76 ], + "line": [ 70, 200 ], + + "currentwind": [ 195, 35, "fonts/calibrib24" ], + "temp": [ 5, 11, "fonts/calibrib50", 1 ], + "currenticon": [ 290, -3, 45, 2 ], + "dir": [ 207, 25, 36 ], + "umbrella": [ 200, 5, 25 ] + }, + "9": { + "title": [ 3, 2, "bahnschrift20.vlw", 25 ], + "items": 8, + "line": [ 3, 25, "REFSAN12.vlw" ], + "desc": [ 0, 5, "", 1 ] + }, + "10": { + "title": [ 150, 5, "fonts/bahnschrift20" ], + "pos": [ 150, 27 ] + }, + "11": { + "mode": 0, + "days": 1, + "title": [ 5, 2, "fonts/bahnschrift20" ], + "date": [ 290, 2 ], + "items": 12, + "red": [ 0, 21, 296, 14 ], + "line": [ 5, 32, 15, "t0_14b_tf", 50 ] + }, + "21": [ + { "text": [ 5, 5, "OpenEpaperLink AP", "bahnschrift20", 1, 0, 0 ] }, + { "text": [ 5, 50, "IP address:", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 120, 50, "{ap_ip}", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 5, 70, "Channel:", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 120, 70, "{ap_ch}", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 5, 90, "Tag count:", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 120, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] } + ], + "27": { + "bars": [ 12, 288, 130, 23, 20 ], + "time": [ "tahoma9.vlw" ], + "yaxis": [ "tahoma9.vlw", 0, 6 ], + "head": [ "calibrib30.vlw" ] + } + } } diff --git a/resources/tagtypes/57.json b/resources/tagtypes/57.json index ecf6553e..2141a416 100644 --- a/resources/tagtypes/57.json +++ b/resources/tagtypes/57.json @@ -12,7 +12,7 @@ }, "shortlut": 2, "zlib_compression": "27", - "options": ["button", "customlut"], + "options": [ "button" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 10, 14, 17, 18, 19, 20, 21], "template": { "1": { diff --git a/resources/tagtypes/63.json b/resources/tagtypes/63.json index 1cb725e1..1c2b085e 100644 --- a/resources/tagtypes/63.json +++ b/resources/tagtypes/63.json @@ -1,5 +1,5 @@ { - "version": 5, + "version": 6, "name": "TLSR BWR 4.2\"", "width": 400, "height": 300, @@ -13,71 +13,6 @@ "shortlut": 0, "zlib_compression": "27", "options": ["led"], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 17, 18, 19, 20 ], - - "template": { - "1": { - "weekday": [ 200, 0, "Signika-SB.ttf", 70 ], - "month": [ 200, 210, "Signika-SB.ttf", 70 ], - "day": [ 200, 45, "Signika-SB.ttf", 170 ] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 150, 120, 100, 80 ], - "xy": [ 148, 53 ] - }, - "4": { - "location": [ 20, 20, "fonts/calibrib30" ], - "wind": [ 90, 83, "fonts/calibrib50" ], - "temp": [ 20, 170, "fonts/calibrib100" ], - "icon": [ 385, 0, 100, 2 ], - "dir": [ 40, 50, 80 ], - "umbrella": [ 325, 155, 78 ] - }, - "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 ] - }, - "9": { - "title": [ 6, 0, "Signika-SB.ttf", 25 ], - "items": 4, - "line": [ 9, 40, "calibrib16.vlw" ], - "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] - }, - "10": { - "title": [ 200, 10, "fonts/bahnschrift20" ], - "pos": [ 200, 35 ] - }, - "11": { - "rotate": 0, - "mode": 1, - "days": 4, - "gridparam": [ 5, 17, 20, "calibrib16.vlw", "tahoma9.vlw", 14 ] - }, - "16": { - "location": [ 5, 5, "fonts/bahnschrift30" ], - "title": [ 247, 11, "glasstown_nbp_tf" ], - "cols": [ 1, 125, 12, "glasstown_nbp_tf" ], - "bars": [ 5, 111, 10 ] - }, - "27": { - "bars": [ 15, 385, 225, 20, 22 ], - "time": [ "calibrib16.vlw" ], - "yaxis": [ "tahoma9.vlw", 3, 6 ], - "head": [ "calibrib30.vlw" ] - }, - "21": [ - { "text": [ 5, 5, "OpenEpaperLink AP", "bahnschrift20", 1, 0, 0 ] }, - { "text": [ 5, 50, "IP address:", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 120, 50, "{ap_ip}", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 5, 70, "Channel:", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 120, 70, "{ap_ch}", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 5, 90, "Tag count:", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 120, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] } - ] - } + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ], + "usetemplate": 2 } \ No newline at end of file diff --git a/resources/tagtypes/67.json b/resources/tagtypes/67.json index 811625de..cda33208 100644 --- a/resources/tagtypes/67.json +++ b/resources/tagtypes/67.json @@ -18,7 +18,7 @@ "highlight_color": 3, "shortlut": 2, "zlib_compression": "27", - "options": [ "button", "customlut" ], + "options": [ "button" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 10, 14, 17, 18, 19, 20, 21 ], "template": { "1": { diff --git a/resources/tagtypes/B2.json b/resources/tagtypes/B2.json index 5ea7cc17..69b61462 100644 --- a/resources/tagtypes/B2.json +++ b/resources/tagtypes/B2.json @@ -10,7 +10,7 @@ "black": [ 0, 0, 0 ] }, "shortlut": 0, - "options": [ "button", "customlut" ], + "options": [ "button" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 21 ], "usetemplate": 1 }