diff --git a/ESP32_AP-Flasher/data/tagtypes/2E.json b/ESP32_AP-Flasher/data/tagtypes/2E.json index 39466d08..f820ca69 100644 --- a/ESP32_AP-Flasher/data/tagtypes/2E.json +++ b/ESP32_AP-Flasher/data/tagtypes/2E.json @@ -1,20 +1,21 @@ { - "name": "M3 9.7\"", - "width": 960, - "height": 672, - "rotatebuffer": 0, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] - }, - "shortlut": 0, - "options": ["button"], - "contentids": [ 22, 23, 1, 5, 8, 9, 7, 19, 10, 11 ], - "usetemplate": 1, + "name": "M3 9.7\"", + "width": 960, + "height": 672, + "rotatebuffer": 2, + "bpp": 2, + "colors": 3, + "colortable": { + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] + }, + "shortlut": 0, + "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 ], @@ -37,5 +38,5 @@ "days": 7, "gridparam": [ 7, 19, 30, "calibrib16.vlw", "REFSAN12.vlw", 16 ] } - } + } } \ No newline at end of file diff --git a/ESP32_AP-Flasher/data/tagtypes/2F.json b/ESP32_AP-Flasher/data/tagtypes/2F.json index fdf60a9c..6e71dd88 100644 --- a/ESP32_AP-Flasher/data/tagtypes/2F.json +++ b/ESP32_AP-Flasher/data/tagtypes/2F.json @@ -2,19 +2,20 @@ "name": "M3 4.3\"", "width": 522, "height": 152, - "rotatebuffer": 1, + "rotatebuffer": 3, "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": ["button"], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 11, 17, 18, 19, 20, 27], - "usetemplate": 1, + "zlib_compression": "27", + "options": [ "button" ], + "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 11, 17, 18, 19, 20, 27 ], + "usetemplate": 1, "template": { "1": { "weekday": [ 160, 5, "Signika-SB.ttf", 60 ], diff --git a/ESP32_AP-Flasher/data/tagtypes/30.json b/ESP32_AP-Flasher/data/tagtypes/30.json index 24117480..1f436a75 100644 --- a/ESP32_AP-Flasher/data/tagtypes/30.json +++ b/ESP32_AP-Flasher/data/tagtypes/30.json @@ -6,13 +6,14 @@ "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": ["button"], - "contentids": [ 22, 23, 1, 2, 3, 4, 8, 7, 19, 10, 21 ], - "usetemplate": 0 + "zlib_compression": "27", + "options": [ "button" ], + "contentids": [ 22, 23, 1, 2, 3, 4, 8, 7, 19, 10, 21 ], + "usetemplate": 0 } \ No newline at end of file diff --git a/ESP32_AP-Flasher/data/tagtypes/31.json b/ESP32_AP-Flasher/data/tagtypes/31.json index ca80ffa7..e4f78bab 100644 --- a/ESP32_AP-Flasher/data/tagtypes/31.json +++ b/ESP32_AP-Flasher/data/tagtypes/31.json @@ -2,22 +2,23 @@ "name": "M3 2.2\"", "width": 296, "height": 160, - "rotatebuffer": 1, + "rotatebuffer": 3, "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": ["button", "led"], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26], + "zlib_compression": "27", + "options": [ "button", "led" ], + "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26 ], "template": { "1": { - "weekday": [148, 5, "Signika-SB.ttf", 60], - "date": [148, 75, "Signika-SB.ttf", 50] + "weekday": [ 148, 5, "Signika-SB.ttf", 60 ], + "date": [ 148, 75, "Signika-SB.ttf", 50 ] }, "2": { "fonts": [ "Signika-SB.ttf", 150, 150, 110, 80, 60, 50 ], @@ -30,20 +31,20 @@ "bars": [ 5, 141, 10 ] }, "4": { - "location": [5, 5, "fonts/bahnschrift30"], - "wind": [280, 5, "fonts/bahnschrift30"], - "temp": [5, 65, "fonts/bahnschrift70"], - "icon": [285, 20, 70, 2], - "dir": [245, -12, 40], - "umbrella": [190, -50, 25] + "location": [ 5, 5, "fonts/bahnschrift30" ], + "wind": [ 280, 5, "fonts/bahnschrift30" ], + "temp": [ 5, 65, "fonts/bahnschrift70" ], + "icon": [ 285, 20, 70, 2 ], + "dir": [ 245, -12, 40 ], + "umbrella": [ 190, -50, 25 ] }, "8": { - "location": [5, 12, "t0_14b_tf"], - "column": [5, 59], - "day": [30, 18, "fonts/twcondensed20", 41, 108], - "icon": [30, 55, 30], - "wind": [18, 26], - "line": [20, 128] + "location": [ 5, 12, "t0_14b_tf" ], + "column": [ 5, 59 ], + "day": [ 30, 18, "fonts/twcondensed20", 41, 108 ], + "icon": [ 30, 55, 30 ], + "wind": [ 18, 26 ], + "line": [ 20, 128 ] }, "9": { "title": [ 5, 4, "bahnschrift20.vlw", 25 ], @@ -52,8 +53,8 @@ "desc": [ 0, 5, "", 1 ] }, "10": { - "title": [149, 5, "fonts/bahnschrift20"], - "pos": [149, 30] + "title": [ 149, 5, "fonts/bahnschrift20" ], + "pos": [ 149, 30 ] }, "11": { "mode": 0, diff --git a/ESP32_AP-Flasher/data/tagtypes/32.json b/ESP32_AP-Flasher/data/tagtypes/32.json index 2cd1426e..3a298211 100644 --- a/ESP32_AP-Flasher/data/tagtypes/32.json +++ b/ESP32_AP-Flasher/data/tagtypes/32.json @@ -2,66 +2,17 @@ "name": "M3 2.6\"", "width": 360, "height": 184, - "rotatebuffer": 1, + "rotatebuffer": 3, "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26], - "template": { - "1": { - "weekday": [148, 5, "Signika-SB.ttf", 60], - "date": [148, 75, "Signika-SB.ttf", 50] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 110, 80, 60, 50 ], - "xy": [ 148, 68 ] - }, - "16": { - "location": [ 5, 5, "fonts/bahnschrift30" ], - "title": [ 247, 11, "glasstown_nbp_tf" ], - "cols": [ 1, 155, 12, "glasstown_nbp_tf" ], - "bars": [ 5, 141, 10 ] - }, - "4": { - "location": [5, 5, "fonts/bahnschrift30"], - "wind": [280, 5, "fonts/bahnschrift30"], - "temp": [5, 65, "fonts/bahnschrift70"], - "icon": [285, 20, 70, 2], - "dir": [245, -12, 40], - "umbrella": [190, -50, 25] - }, - "8": { - "location": [5, 12, "t0_14b_tf"], - "column": [5, 59], - "day": [30, 18, "fonts/twcondensed20", 41, 108], - "icon": [30, 55, 30], - "wind": [18, 26], - "line": [20, 128] - }, - "9": { - "title": [ 5, 4, "bahnschrift20.vlw", 25 ], - "items": 8, - "line": [ 4, 25, "REFSAN12.vlw" ], - "desc": [ 0, 5, "", 1 ] - }, - "10": { - "title": [149, 5, "fonts/bahnschrift20"], - "pos": [149, 30] - }, - "11": { - "mode": 0, - "days": 1, - "title": [ 5, 2, "fonts/bahnschrift20" ], - "date": [ 290, 2 ], - "items": 10, - "red": [ 0, 21, 296, 14 ], - "line": [ 5, 32, 15, "t0_14b_tf", 50 ] - } - } + "zlib_compression": "27", + "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26 ], + "usetemplate": 1 } \ No newline at end of file diff --git a/ESP32_AP-Flasher/data/tagtypes/33.json b/ESP32_AP-Flasher/data/tagtypes/33.json index b98a8546..85a5c64d 100644 --- a/ESP32_AP-Flasher/data/tagtypes/33.json +++ b/ESP32_AP-Flasher/data/tagtypes/33.json @@ -2,18 +2,19 @@ "name": "M3 2.9\"", "width": 384, "height": 168, - "rotatebuffer": 1, + "rotatebuffer": 3, "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": ["button", "led"], - "contentids": [22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27], + "zlib_compression": "27", + "options": [ "button", "led" ], + "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27 ], "usetemplate": 1, "template": { "1": { @@ -31,12 +32,12 @@ "bars": [ 5, 141, 14 ] }, "8": { - "location": [5, 12, "t0_14b_tf"], - "column": [5, 76], - "day": [39, 23, "bahnschrift20.vlw", 48, 140], - "icon": [39, 65, 45], - "wind": [23, 26], - "line": [20, 168] + "location": [ 5, 12, "t0_14b_tf" ], + "column": [ 5, 76 ], + "day": [ 39, 23, "bahnschrift20.vlw", 48, 140 ], + "icon": [ 39, 65, 45 ], + "wind": [ 23, 26 ], + "line": [ 20, 168 ] }, "9": { "title": [ 5, 4, "bahnschrift20.vlw", 25 ], @@ -56,12 +57,12 @@ "items": 10, "red": [ 0, 21, 384, 16 ], "line": [ 5, 23, 18, "calibrib16.vlw", 55 ] - }, + }, "27": { "bars": [ 12, 360, 110, 20 ], "time": [ "calibrib16.vlw" ], "yaxis": [ "BellCent10.vlw", 1, 6 ], "head": [ "calibrib30.vlw" ] - } + } } } diff --git a/ESP32_AP-Flasher/data/tagtypes/34.json b/ESP32_AP-Flasher/data/tagtypes/34.json index f2cabadb..5f2aa429 100644 --- a/ESP32_AP-Flasher/data/tagtypes/34.json +++ b/ESP32_AP-Flasher/data/tagtypes/34.json @@ -6,13 +6,14 @@ "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": ["led"], + "zlib_compression": "27", + "options": [ "led" ], "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], "usetemplate": 2 } \ No newline at end of file diff --git a/ESP32_AP-Flasher/data/tagtypes/35.json b/ESP32_AP-Flasher/data/tagtypes/35.json index 620d7b64..3bd5fcbd 100644 --- a/ESP32_AP-Flasher/data/tagtypes/35.json +++ b/ESP32_AP-Flasher/data/tagtypes/35.json @@ -12,6 +12,7 @@ "gray": [ 150, 150, 150 ] }, "shortlut": 0, + "zlib_compression": "27", "options": [ "led" ], "contentids": [ 22, 23, 1, 4, 5, 8, 9, 7, 19, 10, 11 ], "usetemplate": 1, diff --git a/ESP32_AP-Flasher/data/tagtypes/36.json b/ESP32_AP-Flasher/data/tagtypes/36.json index 33c98b3b..7139d0c9 100644 --- a/ESP32_AP-Flasher/data/tagtypes/36.json +++ b/ESP32_AP-Flasher/data/tagtypes/36.json @@ -6,13 +6,14 @@ "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": ["button", "led"], - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20], - "usetemplate": 1 + "zlib_compression": "27", + "options": [ "button", "led" ], + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "usetemplate": 46 } diff --git a/ESP32_AP-Flasher/data/tagtypes/40.json b/ESP32_AP-Flasher/data/tagtypes/40.json index 2ef35aae..59f010c0 100644 --- a/ESP32_AP-Flasher/data/tagtypes/40.json +++ b/ESP32_AP-Flasher/data/tagtypes/40.json @@ -1,67 +1,18 @@ -@@ -0,0 +1,66 @@ { "name": "M3 2.9\" FREEZER", "width": 384, "height": 168, - "rotatebuffer": 1, - "bpp": 2, + "rotatebuffer": 3, + "bpp": 1, "colors": 2, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": ["button", "led"], - "contentids": [22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27], - "usetemplate": 1, - "template": { - "1": { - "weekday": [ 192, 0, "Signika-SB.ttf", 70 ], - "date": [ 192, 85, "Signika-SB.ttf", 60 ] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 110, 80, 60, 50 ], - "xy": [ 192, 72 ] - }, - "16": { - "location": [ 5, 5, "fonts/bahnschrift30" ], - "title": [ 335, 11, "glasstown_nbp_tf" ], - "cols": [ 1, 157, 16, "glasstown_nbp_tf" ], - "bars": [ 5, 141, 14 ] - }, - "8": { - "location": [5, 12, "t0_14b_tf"], - "column": [5, 76], - "day": [39, 23, "bahnschrift20.vlw", 48, 140], - "icon": [39, 65, 45], - "wind": [23, 26], - "line": [20, 168] - }, - "9": { - "title": [ 5, 4, "bahnschrift20.vlw", 25 ], - "items": 8, - "line": [ 4, 25, "REFSAN12.vlw" ], - "desc": [ 0, 5, "", 1 ] - }, - "10": { - "title": [ 192, 5, "fonts/bahnschrift20" ], - "pos": [ 192, 30 ] - }, - "11": { - "mode": 0, - "days": 1, - "title": [ 5, 2, "fonts/bahnschrift20" ], - "date": [ 378, 2 ], - "items": 10, - "red": [ 0, 21, 384, 16 ], - "line": [ 5, 23, 18, "calibrib16.vlw", 55 ] - }, - "27": { - "bars": [ 12, 360, 110, 20 ], - "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 1, 6 ], - "head": [ "calibrib30.vlw" ] - } - } -} \ No newline at end of file + "zlib_compression": "27", + "options": [ "button", "led" ], + "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27 ], + "usetemplate": 51 +} diff --git a/ESP32_AP-Flasher/data/tagtypes/41.json b/ESP32_AP-Flasher/data/tagtypes/41.json index 3335cbf7..dc352497 100644 --- a/ESP32_AP-Flasher/data/tagtypes/41.json +++ b/ESP32_AP-Flasher/data/tagtypes/41.json @@ -6,62 +6,14 @@ "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": [], - "contentids": [22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27], - "usetemplate": 1, - "template": { - "1": { - "weekday": [ 192, 0, "Signika-SB.ttf", 70 ], - "date": [ 192, 85, "Signika-SB.ttf", 60 ] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 110, 80, 60, 50 ], - "xy": [ 192, 72 ] - }, - "16": { - "location": [ 5, 5, "fonts/bahnschrift30" ], - "title": [ 335, 11, "glasstown_nbp_tf" ], - "cols": [ 1, 157, 16, "glasstown_nbp_tf" ], - "bars": [ 5, 141, 14 ] - }, - "8": { - "location": [5, 12, "t0_14b_tf"], - "column": [5, 76], - "day": [39, 23, "bahnschrift20.vlw", 48, 140], - "icon": [39, 65, 45], - "wind": [23, 26], - "line": [20, 168] - }, - "9": { - "title": [ 5, 4, "bahnschrift20.vlw", 25 ], - "items": 8, - "line": [ 4, 25, "REFSAN12.vlw" ], - "desc": [ 0, 5, "", 1 ] - }, - "10": { - "title": [ 192, 5, "fonts/bahnschrift20" ], - "pos": [ 192, 30 ] - }, - "11": { - "mode": 0, - "days": 1, - "title": [ 5, 2, "fonts/bahnschrift20" ], - "date": [ 378, 2 ], - "items": 10, - "red": [ 0, 21, 384, 16 ], - "line": [ 5, 23, 18, "calibrib16.vlw", 55 ] - }, - "27": { - "bars": [ 12, 360, 110, 20 ], - "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 1, 6 ], - "head": [ "calibrib30.vlw" ] - } - } + "zlib_compression": "27", + "options": [ ], + "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27 ], + "usetemplate": 51 } \ No newline at end of file diff --git a/ESP32_AP-Flasher/data/tagtypes/42.json b/ESP32_AP-Flasher/data/tagtypes/42.json index 2082c9a2..ef1eb019 100644 --- a/ESP32_AP-Flasher/data/tagtypes/42.json +++ b/ESP32_AP-Flasher/data/tagtypes/42.json @@ -3,64 +3,16 @@ "width": 792, "height": 272, "rotatebuffer": 0, - "bpp": 2, + "bpp": 1, "colors": 2, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "shortlut": 0, - "options": [], - "contentids": [22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27], - "usetemplate": 1, - "template": { - "1": { - "weekday": [ 192, 0, "Signika-SB.ttf", 70 ], - "date": [ 192, 85, "Signika-SB.ttf", 60 ] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 110, 80, 60, 50 ], - "xy": [ 192, 72 ] - }, - "16": { - "location": [ 5, 5, "fonts/bahnschrift30" ], - "title": [ 335, 11, "glasstown_nbp_tf" ], - "cols": [ 1, 157, 16, "glasstown_nbp_tf" ], - "bars": [ 5, 141, 14 ] - }, - "8": { - "location": [5, 12, "t0_14b_tf"], - "column": [5, 76], - "day": [39, 23, "bahnschrift20.vlw", 48, 140], - "icon": [39, 65, 45], - "wind": [23, 26], - "line": [20, 168] - }, - "9": { - "title": [ 5, 4, "bahnschrift20.vlw", 25 ], - "items": 8, - "line": [ 4, 25, "REFSAN12.vlw" ], - "desc": [ 0, 5, "", 1 ] - }, - "10": { - "title": [ 192, 5, "fonts/bahnschrift20" ], - "pos": [ 192, 30 ] - }, - "11": { - "mode": 0, - "days": 1, - "title": [ 5, 2, "fonts/bahnschrift20" ], - "date": [ 378, 2 ], - "items": 10, - "red": [ 0, 21, 384, 16 ], - "line": [ 5, 23, 18, "calibrib16.vlw", 55 ] - }, - "27": { - "bars": [ 12, 360, 110, 20 ], - "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 1, 6 ], - "head": [ "calibrib30.vlw" ] - } - } + "zlib_compression": "27", + "options": [ ], + "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27 ], + "usetemplate": 51 } \ No newline at end of file diff --git a/ESP32_AP-Flasher/data/tagtypes/B3.json b/ESP32_AP-Flasher/data/tagtypes/B3.json index 58eb1cb6..8d679f02 100644 --- a/ESP32_AP-Flasher/data/tagtypes/B3.json +++ b/ESP32_AP-Flasher/data/tagtypes/B3.json @@ -6,76 +6,11 @@ "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 21, 27 ], - "template": { - "1": { - "weekday": [ 148, -3, "Signika-SB.ttf", 60 ], - "date": [ 148, 65, "Signika-SB.ttf", 48 ] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 150, 120, 100, 80 ], - "xy": [ 148, 53 ] - }, - "16": { - "location": [ 5, 5, "fonts/bahnschrift30" ], - "title": [ 247, 11, "glasstown_nbp_tf" ], - "cols": [ 1, 125, 12, "glasstown_nbp_tf" ], - "bars": [ 5, 111, 10 ] - }, - "4": { - "location": [5, 5, "fonts/bahnschrift30"], - "wind": [280, 5, "fonts/bahnschrift30"], - "temp": [5, 65, "fonts/bahnschrift70"], - "icon": [285, 20, 70, 2], - "dir": [235, -12, 40], - "umbrella": [190, -50, 25] - }, - "8": { - "location": [5, 12, "t0_14b_tf"], - "column": [5, 59], - "day": [30, 18, "fonts/twcondensed20", 41, 108], - "icon": [30, 55, 30], - "wind": [18, 26], - "line": [20, 128] - }, - "9": { - "title": [ 2, 0, "bahnschrift20.vlw", 25 ], - "items": 8, - "line": [ 1, 25, "REFSAN12.vlw" ], - "desc": [ 0, 5, "", 1 ] - }, - "10": { - "title": [149, 5, "fonts/bahnschrift20"], - "pos": [149, 27] - }, - "11": { - "mode": 0, - "days": 1, - "title": [5, 2, "fonts/bahnschrift20"], - "date": [290, 2], - "items": 7, - "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": [ 9, 288, 90, 10 ], - "time": [ "BellCent10.vlw" ], - "yaxis": [ "BellCent10.vlw", 0, 6 ], - "head": [ "calibrib30.vlw" ] - } - } + "usetemplate": 1 } diff --git a/ESP32_AP-Flasher/data/tagtypes/B5.json b/ESP32_AP-Flasher/data/tagtypes/B5.json index 1eb366b3..90f2e1f1 100644 --- a/ESP32_AP-Flasher/data/tagtypes/B5.json +++ b/ESP32_AP-Flasher/data/tagtypes/B5.json @@ -6,50 +6,11 @@ "bpp": 2, "colors": 3, "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ], + "gray": [ 150, 150, 150 ] }, - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 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 ] - }, - "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", "BellCent10.vlw", 14 ] - } - } + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "usetemplate": 2 } diff --git a/ESP32_AP-Flasher/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp index 0ae6d099..fe12e6cc 100644 --- a/ESP32_AP-Flasher/src/newproto.cpp +++ b/ESP32_AP-Flasher/src/newproto.cpp @@ -209,6 +209,15 @@ bool prepareDataAvail(String& filename, uint8_t dataType, uint8_t dataTypeArgume file.close(); uint16_t attempts = 60 * 24; + if (memcmp(md5bytes, taginfo->md5, 16) == 0) { + wsLog("new image is the same as current image. not updating tag."); + wsSendTaginfo(dst, SYNC_TAGSTATUS); + if (contentFS->exists(filename) && resend == false) { + contentFS->remove(filename); + } + return true; + } + if (dataType != DATATYPE_FW_UPDATE) { char dst_path[64]; sprintf(dst_path, "/current/%02X%02X%02X%02X%02X%02X%02X%02X_%lu.pending", dst[7], dst[6], dst[5], dst[4], dst[3], dst[2], dst[1], dst[0], millis() % 1000000); @@ -440,7 +449,7 @@ void processXferComplete(struct espXferComplete* xfc, bool local) { if (config.preview && (queueItem->pendingdata.availdatainfo.dataType == DATATYPE_IMG_RAW_2BPP || queueItem->pendingdata.availdatainfo.dataType == DATATYPE_IMG_RAW_1BPP || queueItem->pendingdata.availdatainfo.dataType == DATATYPE_IMG_ZLIB)) { contentFS->rename(queueItem->filename, String(dst_path)); } else { - contentFS->remove(queueItem->filename); + if (queueItem->pendingdata.availdatainfo.dataType != DATATYPE_FW_UPDATE) contentFS->remove(queueItem->filename); } } memcpy(md5bytes, &queueItem->pendingdata.availdatainfo.dataVer, sizeof(uint64_t));