diff --git a/ESP32_AP-Flasher/data/tagtypes/00.json b/ESP32_AP-Flasher/data/tagtypes/00.json deleted file mode 100644 index ee5c25b8..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/00.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "M2 1.54\"", - "width": 152, - "height": 152, - "rotatebuffer": 0, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 2, - "options": [ "button", "customlut" ], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 10, 14, 15, 17, 18, 19, 20, 21 ], - "template": { - "1": { - "weekday": [ 76, 9, "fonts/calibrib30" ], - "month": [ 76, 120, "fonts/calibrib30" ], - "day": [ 76, 13, "Signika-SB.ttf", 100 ] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 150, 110, 80, 60, 50, 40 ], - "xy": [ 76, 65 ] - }, - "4": { - "location": [ 10, 145, "t0_14b_tf" ], - "wind": [ 140, 10, "fonts/bahnschrift30" ], - "temp": [ 10, 10, "fonts/bahnschrift30" ], - "icon": [ 75, 26, 70, 1 ], - "dir": [ 110, -12, 40 ], - "umbrella": [ 125, 110, 30 ] - }, - "10": { - "title": [ 76, 15, "t0_14b_tf" ], - "pos": [ 76, 20 ] - }, - "21": [ - { "text": [ 2, 5, "OpenEpaperLink", "bahnschrift20", 1, 0, 0 ] }, - { "text": [ 2, 25, "Access Point", "bahnschrift20", 1, 0, 0 ] }, - { "text": [ 3, 65, "IP address:", "glasstown_nbp_tf", 1, 0, 0 ] }, - { "text": [ 10, 80, "{ap_ip}", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 3, 95, "Channel:", "glasstown_nbp_tf", 1, 0, 0 ] }, - { "text": [ 10, 110, "{ap_ch}", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 3, 125, "Tag count:", "glasstown_nbp_tf", 1, 0, 0 ] }, - { "text": [ 10, 140, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] } - ] - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/01.json b/ESP32_AP-Flasher/data/tagtypes/01.json deleted file mode 100644 index 55bda393..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/01.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "M2 2.9\"", - "width": 296, - "height": 128, - "rotatebuffer": 1, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 2, - "options": [ "button", "customlut" ], - "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" ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/02.json b/ESP32_AP-Flasher/data/tagtypes/02.json deleted file mode 100644 index 1d753b0d..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/02.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "M2 4.2\"", - "width": 400, - "height": 300, - "rotatebuffer": 0, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 1, - "options": [ "button" ], - "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 ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/05.json b/ESP32_AP-Flasher/data/tagtypes/05.json deleted file mode 100644 index e54a1825..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/05.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "name": "M2 7.4\"", - "width": 640, - "height": 384, - "rotatebuffer": 0, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 1, - "zlib_compression": "27", - "options": [ ], - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], - "template": { - "1": { - "weekday": [ 320, -5, "Signika-SB.ttf", 100 ], - "month": [ 320, 265, "Signika-SB.ttf", 100 ], - "day": [ 320, 60, "Signika-SB.ttf", 220 ] - }, - "4": { - "location": [ 20, 20, "fonts/calibrib30" ], - "wind": [ 90, 83, "fonts/calibrib30" ], - "temp": [ 20, 170, "fonts/calibrib30" ], - "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", 32 ], - "items": 6, - "line": [ 9, 40, "calibrib16.vlw" ], - "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] - }, - "10": { - "title": [ 320, 10, "fonts/bahnschrift20" ], - "pos": [ 320, 40 ] - }, - "11": { - "rotate": 0, - "mode": 1, - "days": 7, - "gridparam": [ 3, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/11.json b/ESP32_AP-Flasher/data/tagtypes/11.json deleted file mode 100644 index 79486de9..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/11.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "M2 2.9\" (UC8151)", - "width": 296, - "height": 128, - "rotatebuffer": 1, - "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, 2, 3, 4, 5, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 19, 20, 21, 27 ], - "usetemplate": 1 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/21.json b/ESP32_AP-Flasher/data/tagtypes/21.json deleted file mode 100644 index 8b2de423..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/21.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "ST‐GM29XXF 2.9\"", - "width": 296, - "height": 128, - "rotatebuffer": 1, - "bpp": 1, - "colors": 2, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "highlight_color": 5, - "shortlut": 0, - "options": [ "button", "customlut" ], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 21 ], - "usetemplate": 1 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/22.json b/ESP32_AP-Flasher/data/tagtypes/22.json deleted file mode 100644 index c0a33a2a..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/22.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "M2 2.7\"", - "width": 264, - "height": 176, - "rotatebuffer": 1, - "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": [ 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], - "usetemplate": 1 -} \ No newline at end of file diff --git a/ESP32_AP-Flasher/data/tagtypes/26.json b/ESP32_AP-Flasher/data/tagtypes/26.json deleted file mode 100644 index d876dd67..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/26.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "M2 7.5\" BW", - "width": 640, - "height": 384, - "rotatebuffer": 0, - "bpp": 1, - "colors": 2, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ] - }, - "shortlut": 1, - "zlib_compression": "27", - "highlight_color": 5, - "options": [ ], - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], - "template": { - "1": { - "weekday": [ 320, -5, "Signika-SB.ttf", 100 ], - "month": [ 320, 265, "Signika-SB.ttf", 100 ], - "day": [ 320, 60, "Signika-SB.ttf", 220 ] - }, - "4": { - "location": [ 20, 20, "fonts/calibrib30" ], - "wind": [ 90, 83, "fonts/calibrib30" ], - "temp": [ 20, 170, "fonts/calibrib30" ], - "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", 32 ], - "items": 5, - "line": [ 9, 40, "calibrib16.vlw" ], - "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] - }, - "10": { - "title": [ 320, 10, "fonts/bahnschrift20" ], - "pos": [ 320, 40 ] - }, - "11": { - "rotate": 0, - "mode": 1, - "days": 7, - "gridparam": [ 3, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/27.json b/ESP32_AP-Flasher/data/tagtypes/27.json deleted file mode 100644 index 3e9f3185..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/27.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "ST‐GM29MT1 2.9\"", - "width": 296, - "height": 128, - "rotatebuffer": 1, - "bpp": 1, - "colors": 2, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ] - }, - "shortlut": 0, - "options": [ "button", "customlut" ], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 21 ], - "usetemplate": 1 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/2E.json b/ESP32_AP-Flasher/data/tagtypes/2E.json deleted file mode 100644 index f820ca69..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/2E.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "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 ], - "month": [ 480, 480, "Signika-SB.ttf", 160 ], - "day": [ 480, 110, "Signika-SB.ttf", 380 ] - }, - "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": [ 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 deleted file mode 100644 index 6e71dd88..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/2F.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "name": "M3 4.3\"", - "width": 522, - "height": 152, - "rotatebuffer": 3, - "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, 2, 3, 4, 5, 7, 8, 9, 11, 17, 18, 19, 20, 27 ], - "usetemplate": 1, - "template": { - "1": { - "weekday": [ 160, 5, "Signika-SB.ttf", 60 ], - "month": [ 160, 75, "Signika-SB.ttf", 60 ], - "day": [ 422, -27, "Signika-SB.ttf", 170 ] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 170, 170, 170, 170, 170, 170 ], - "xy": [ 261, 63 ] - }, - "9": { - "title": [ 6, 0, "Signika-SB.ttf", 25 ], - "items": 1, - "line": [ 9, 40, "calibrib16.vlw" ], - "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] - }, - "11": { - "rotate": 1, - "mode": 1, - "days": 1, - "gridparam": [ 5, 17, 20, "calibrib16.vlw", "BellCent10.vlw", 14 ] - }, - "27": { - "bars": [ 27, 468, 100, 18 ], - "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 5, 6 ], - "head": [ "calibrib30.vlw" ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/30.json b/ESP32_AP-Flasher/data/tagtypes/30.json deleted file mode 100644 index 1f436a75..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/30.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "M3 1.6\"", - "width": 200, - "height": 200, - "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, - "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 deleted file mode 100644 index 69169e71..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/31.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "name": "M3 2.2\"", - "width": 296, - "height": 160, - "rotatebuffer": 3, - "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", "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 ] - }, - "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/calibrib80" ], - "icon": [ 275, 20, 90, 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 ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/32.json b/ESP32_AP-Flasher/data/tagtypes/32.json deleted file mode 100644 index 3a298211..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/32.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "M3 2.6\"", - "width": 360, - "height": 184, - "rotatebuffer": 3, - "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", - "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 deleted file mode 100644 index 85a5c64d..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/33.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "M3 2.9\"", - "width": 384, - "height": 168, - "rotatebuffer": 3, - "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", "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" ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/34.json b/ESP32_AP-Flasher/data/tagtypes/34.json deleted file mode 100644 index 5f2aa429..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/34.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "M3 4.2\"", - "width": 400, - "height": 300, - "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, - "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 deleted file mode 100644 index 3bd5fcbd..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/35.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "M3 6.0\"", - "width": 600, - "height": 448, - "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, - "zlib_compression": "27", - "options": [ "led" ], - "contentids": [ 22, 23, 1, 4, 5, 8, 9, 7, 19, 10, 11 ], - "usetemplate": 1, - "template": { - "1": { - "weekday": [ 300, 0, "Signika-SB.ttf", 110 ], - "month": [ 300, 310, "Signika-SB.ttf", 110 ], - "day": [ 300, 75, "Signika-SB.ttf", 250 ] - }, - "10": { - "title": [ 300, 10, "fonts/bahnschrift30" ], - "pos": [ 300, 50 ] - }, - "9": { - "title": [ 6, 0, "Signika-SB.ttf", 32 ], - "items": 6, - "line": [ 9, 40, "calibrib16.vlw" ], - "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] - }, - "11": { - "rotate": 0, - "mode": 1, - "days": 7, - "gridparam": [ 7, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/36.json b/ESP32_AP-Flasher/data/tagtypes/36.json deleted file mode 100644 index 7139d0c9..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/36.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "M3 7.5\"", - "width": 800, - "height": 480, - "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, - "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 deleted file mode 100644 index 59f010c0..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/40.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "M3 2.9\" FREEZER", - "width": 384, - "height": 168, - "rotatebuffer": 3, - "bpp": 1, - "colors": 2, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 0, - "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 deleted file mode 100644 index dc352497..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/41.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "M3 5.85\"", - "width": 792, - "height": 272, - "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, - "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 deleted file mode 100644 index ef1eb019..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/42.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "M3 5.85\" FREEZER", - "width": 792, - "height": 272, - "rotatebuffer": 0, - "bpp": 1, - "colors": 2, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 0, - "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/55.json b/ESP32_AP-Flasher/data/tagtypes/55.json deleted file mode 100644 index 5b87cc92..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/55.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "name": "HS BWR 2.13\"", - "width": 256, - "height": 128, - "rotatebuffer": 1, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 0, - "options": [ "led" ], - "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 19, 20, 21, 22, 23, 27 ], - - "template": { - "1": { - "weekday": [ 128, 3, "Signika-SB.ttf", 50 ], - "date": [ 128, 62, "Signika-SB.ttf", 40 ] - }, - "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 150, 115, 90, 70 ], - "xy": [ 128, 53 ] - }, - "16": { - "location": [ 7, 15, "t0_14b_tf" ], - "title": [ 210, 11, "glasstown_nbp_tf" ], - "cols": [ 4, 121, 10, "glasstown_nbp_tf" ], - "bars": [ 10, 110, 8 ] - }, - "4": { - "location": [ 5, 3, "fonts/bahnschrift30" ], - "wind": [ 245, 3, "fonts/bahnschrift30" ], - "temp": [ 10, 60, "fonts/bahnschrift70" ], - "icon": [ 240, 20, 70, 2 ], - "dir": [ 210, -12, 40 ], - "umbrella": [ 175, -50, 25 ] - }, - "8": { - "location": [ 5, 12, "t0_14b_tf" ], - "column": [ 5, 51 ], - "day": [ 28, 18, "fonts/twcondensed20", 41, 108 ], - "icon": [ 28, 55, 30 ], - "wind": [ 18, 26 ], - "line": [ 20, 128 ] - }, - "9": { - "title": [ 8, 2, "bahnschrift20.vlw", 25 ], - "items": 5, - "line": [ 8, 25, "REFSAN12.vlw" ], - "desc": [ 0, 5, "", 1 ] - }, - "10": { - "title": [ 128, 2, "calibrib16.vlw" ], - "pos": [ 128, 16 ] - }, - "11": { - "mode": 0, - "days": 1, - "title": [ 10, 2, "fonts/bahnschrift20" ], - "date": [ 245, 2 ], - "items": 7, - "red": [ 0, 21, 256, 14 ], - "line": [ 10, 32, 15, "t0_14b_tf", 50 ] - }, - "21": [ - { "text": [ 10, 5, "OpenEpaperLink AP", "bahnschrift20", 1, 0, 0 ] }, - { "text": [ 10, 50, "IP address:", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 110, 50, "{ap_ip}", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 10, 70, "Channel:", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 110, 70, "{ap_ch}", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 10, 90, "Tag count:", "t0_14b_tf", 1, 0, 0 ] }, - { "text": [ 110, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] } - ], - "27": { - "bars": [ 26, 216, 80, 20 ], - "time": [ "BellCent10.vlw" ], - "yaxis": [ "BellCent10.vlw", 6, 6 ], - "head": [ "bahnschrift20.vlw" ] - } - } -} \ No newline at end of file diff --git a/ESP32_AP-Flasher/data/tagtypes/60.json b/ESP32_AP-Flasher/data/tagtypes/60.json deleted file mode 100644 index f0d64c0d..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/60.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "HS BWY 3.5\"", - "width": 384, - "height": 184, - "rotatebuffer": 1, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "yellow": [ 200, 200, 0 ], - "gray": [ 150, 150, 150 ] - }, - "highlight_color": 2, - "shortlut": 0, - "options": [ "led" ], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20, 27 ], - "usetemplate": 51, - "template": { - "27": { - "bars": [ 12, 360, 125, 20 ], - "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 1, 6 ], - "head": [ "calibrib30.vlw" ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/61.json b/ESP32_AP-Flasher/data/tagtypes/61.json deleted file mode 100644 index e28081c8..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/61.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "HS BWR 3.5\"", - "width": 384, - "height": 184, - "rotatebuffer": 1, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 0, - "options": [ "led" ], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20 ], - "usetemplate": 51 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/62.json b/ESP32_AP-Flasher/data/tagtypes/62.json deleted file mode 100644 index e77c27dc..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/62.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "HS BW 3.5\"", - "width": 384, - "height": 184, - "rotatebuffer": 1, - "bpp": 1, - "colors": 2, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "highlight_color": 5, - "shortlut": 0, - "options": [ "led" ], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20 ], - "usetemplate": 51 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/80.json b/ESP32_AP-Flasher/data/tagtypes/80.json deleted file mode 100755 index 921fa1f8..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/80.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "Chroma 7.4\"", - "width": 640, - "height": 384, - "rotatebuffer": 0, - "bpp": 2, - "colors": 3, - "colortable": { - "white": [255, 255, 255], - "black": [0, 0, 0], - "red": [255, 0, 0], - "gray": [150, 150, 150] - }, - "shortlut": 1, - "options": [], - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20], - "template": { - "1": { - "weekday": [ 320, -5, "Signika-SB.ttf", 100 ], - "month": [ 320, 265, "Signika-SB.ttf", 100 ], - "day": [ 320, 60, "Signika-SB.ttf", 220 ] - }, - "4": { - "location": [ 20, 20, "fonts/calibrib30" ], - "wind": [ 90, 83, "fonts/calibrib30" ], - "temp": [ 20, 170, "fonts/calibrib30" ], - "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", 32 ], - "items": 5, - "line": [ 9, 40, "calibrib16.vlw" ], - "desc": [ 2, 8, "REFSAN12.vlw", 1.2 ] - }, - "10": { - "title": [ 320, 10, "fonts/bahnschrift20" ], - "pos": [ 320, 40 ] - }, - "11": { - "rotate": 0, - "mode": 1, - "days": 7, - "gridparam": [ 3, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/81.json b/ESP32_AP-Flasher/data/tagtypes/81.json deleted file mode 100755 index 8b00f36c..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/81.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Chroma29 2.9\" (UC8154)", - "width": 296, - "height": 128, - "rotatebuffer": 1, - "bpp": 2, - "colors": 3, - "colortable": { - "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, 14, 15, 16, 17, 18, 19, 20, 21, 27], - "usetemplate": 1 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/82.json b/ESP32_AP-Flasher/data/tagtypes/82.json deleted file mode 100755 index c9fa4af6..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/82.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Chroma29 2.9\"", - "width": 296, - "height": 128, - "rotatebuffer": 1, - "bpp": 2, - "colors": 3, - "colortable": { - "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, 14, 15, 16, 17, 18, 19, 20, 21, 27], - "usetemplate": 1 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/83.json b/ESP32_AP-Flasher/data/tagtypes/83.json deleted file mode 100755 index 460c6eee..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/83.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "name": "Chroma42 4.2\"", - "width": 400, - "height": 300, - "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, - "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 ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/B2.json b/ESP32_AP-Flasher/data/tagtypes/B2.json deleted file mode 100644 index 8d0dd570..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/B2.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Gicisky BLE EPD BW 2.9\"", - "width": 296, - "height": 128, - "rotatebuffer": 1, - "bpp": 1, - "colors": 2, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ] - }, - "shortlut": 0, - "options": [ "button", "customlut" ], - "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 21 ], - "usetemplate": 1 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/B3.json b/ESP32_AP-Flasher/data/tagtypes/B3.json deleted file mode 100644 index 8d679f02..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/B3.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Gicisky BLE EPD BWR 2.9\"", - "width": 296, - "height": 128, - "rotatebuffer": 1, - "bpp": 2, - "colors": 3, - "colortable": { - "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 ], - "usetemplate": 1 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/B5.json b/ESP32_AP-Flasher/data/tagtypes/B5.json deleted file mode 100644 index 90f2e1f1..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/B5.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Gicisky BLE EPD BWR 4.2\"", - "width": 400, - "height": 300, - "rotatebuffer": 0, - "bpp": 2, - "colors": 3, - "colortable": { - "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 ], - "usetemplate": 2 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/BD.json b/ESP32_AP-Flasher/data/tagtypes/BD.json deleted file mode 100644 index be7eaf39..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/BD.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "name": "BLE EPD BWR 2.9\" Silabs", - "width": 384, - "height": 168, - "rotatebuffer": 1, - "bpp": 2, - "colors": 3, - "colortable": { - "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], - "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" ] - } - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/BE.json b/ESP32_AP-Flasher/data/tagtypes/BE.json deleted file mode 100644 index 49842551..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/BE.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "ATC MiThermometer BLE", - "width": 6, - "height": 8, - "rotatebuffer": 1, - "bpp": 1, - "colors": 1, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ] - }, - "shortlut": 0, - "options": [ ], - "contentids": [ 22 ], - "usetemplate": 0 -} diff --git a/ESP32_AP-Flasher/data/tagtypes/E0.json b/ESP32_AP-Flasher/data/tagtypes/E0.json deleted file mode 100644 index 5040dd25..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/E0.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "TFT 320x172", - "width": 320, - "height": 172, - "rotatebuffer": 0, - "bpp": 16, - "colors": 4, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 0, - "options": [ ], - "contentids": [ 22, 1, 2, 3, 4, 8, 7, 19, 10, 11, 21 ], - "usetemplate": 1, - "template": { - "21": [ - { "box": [ 0, 0, 320, 172, 1 ] }, - { "text": [ 10, 15, "OpenEpaperLink AP", "calibrib30", 2, 0, 0, 1 ] }, - { "text": [ 10, 70, "IP address:", "bahnschrift20", "#888888", 0, 0, 1 ] }, - { "text": [ 120, 70, "{ap_ip}", "bahnschrift20", 0, 0, 0, 1 ] }, - { "text": [ 10, 95, "Channel:", "bahnschrift20", "#888888", 0, 0, 1 ] }, - { "text": [ 120, 95, "{ap_ch}", "bahnschrift20", 0, 0, 0, "1" ] }, - { "text": [ 10, 120, "Tag count:", "bahnschrift20", "#888888", 0, 0, 1 ] }, - { "text": [ 120, 120, "{ap_tagcount}", "bahnschrift20", 0, 0, 0, "1" ] } - ] - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/E1.json b/ESP32_AP-Flasher/data/tagtypes/E1.json deleted file mode 100644 index 8d783097..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/E1.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "TFT 160x80", - "width": 160, - "height": 80, - "rotatebuffer": 1, - "bpp": 16, - "colors": 4, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ], - "gray": [ 150, 150, 150 ] - }, - "shortlut": 0, - "options": [ ], - "contentids": [ 22, 21 ], - "template": { - "21": [ - { "box": [ 0, 0, 160, 80, 1 ] }, - { "text": [ 1, 3, "OpenEpaperLink AP", "calibrib16.vlw", 2, 0, 0, 1 ] }, - { "text": [ 1, 28, "IP:", "REFSAN12.vlw", "#888888", 0, 0, 1 ] }, - { "text": [ 45, 28, "{ap_ip}", "REFSAN12.vlw", 0, 0, 0, 1 ] }, - { "text": [ 1, 45, "Ch:", "REFSAN12.vlw", "#888888", 0, 0, 1 ] }, - { "text": [ 45, 45, "{ap_ch}", "REFSAN12.vlw", 0, 0, 0, "1" ] }, - { "text": [ 1, 62, "Tags:", "REFSAN12.vlw", "#888888", 0, 0, 1 ] }, - { "text": [ 45, 62, "{ap_tagcount}", "REFSAN12.vlw", 0, 0, 0, "1" ] } - ] - } -} diff --git a/ESP32_AP-Flasher/data/tagtypes/F0.json b/ESP32_AP-Flasher/data/tagtypes/F0.json deleted file mode 100644 index fa460c22..00000000 --- a/ESP32_AP-Flasher/data/tagtypes/F0.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SLT‐EM007 Segmented", - "width": 0, - "height": 0, - "rotatebuffer": 0, - "bpp": 1, - "colors": 0, - "colortable": { }, - "shortlut": 0, - "options": [ ], - "contentids": [ 1, 2, 3, 4, 5, 13, 17, 18 ], - "template": { - } -} diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index a76725d5..1f667b1c 100644 Binary files a/ESP32_AP-Flasher/data/www/main.js.gz and b/ESP32_AP-Flasher/data/www/main.js.gz differ diff --git a/ESP32_AP-Flasher/data/www/ota.js.gz b/ESP32_AP-Flasher/data/www/ota.js.gz index 69d4abef..d1a929ae 100644 Binary files a/ESP32_AP-Flasher/data/www/ota.js.gz and b/ESP32_AP-Flasher/data/www/ota.js.gz differ diff --git a/ESP32_AP-Flasher/src/tag_db.cpp b/ESP32_AP-Flasher/src/tag_db.cpp index 0b909e1b..02d5b766 100644 --- a/ESP32_AP-Flasher/src/tag_db.cpp +++ b/ESP32_AP-Flasher/src/tag_db.cpp @@ -253,7 +253,7 @@ bool loadDB(const String& filename) { } void destroyDB() { - Serial.println("destoying DB"); + Serial.println("destroying DB"); util::printHeap(); for (tagRecord*& tag : tagDB) { if (tag->data != nullptr) { diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js index 29152c9b..2356971e 100644 --- a/ESP32_AP-Flasher/wwwroot/main.js +++ b/ESP32_AP-Flasher/wwwroot/main.js @@ -1323,7 +1323,7 @@ const downloadTagtype = async (hwtype) => { try { console.log("download tagtype " + hwtype); let repo = apConfig.repo || 'jjwbruijn/OpenEPaperLink'; - let url = "https://raw.githubusercontent.com/" + repo + "/master/ESP32_AP-Flasher/resources/tagtypes/" + hwtype + ".json"; + let url = "https://raw.githubusercontent.com/" + repo + "/master/resources/tagtypes/" + hwtype + ".json"; console.log(url); const response = await fetch(url); diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js index 4157ab20..25d25974 100644 --- a/ESP32_AP-Flasher/wwwroot/ota.js +++ b/ESP32_AP-Flasher/wwwroot/ota.js @@ -611,7 +611,7 @@ async function fetchAndCheckTagtypes(cleanup) { } if (check) { - let githubUrl = "https://raw.githubusercontent.com/" + repo + "/master/ESP32_AP-Flasher/resources/tagtypes/" + filename; + let githubUrl = "https://raw.githubusercontent.com/" + repo + "/master/resources/tagtypes/" + filename; const localResponse = await fetch(`/tagtypes/${filename}`); const localJson = await localResponse.json();