From 7805ab2b467f71bb94e1aed650b48e7847f62294 Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Mon, 4 Nov 2024 23:53:54 +0100 Subject: [PATCH] new templates for M2 2.2" and M2 2.6" --- ESP32_AP-Flasher/data/www/main.js.gz | Bin 15734 -> 15742 bytes ESP32_AP-Flasher/data/www/ota.js.gz | Bin 5514 -> 5452 bytes ESP32_AP-Flasher/src/contentmanager.cpp | 2 +- ESP32_AP-Flasher/wwwroot/main.js | 5 +- ESP32_AP-Flasher/wwwroot/ota.js | 4 +- resources/tagtypes/03.json | 69 ++++++++++++------------ resources/tagtypes/04.json | 33 ++++++------ 7 files changed, 56 insertions(+), 57 deletions(-) diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index d726db29fe1171fa1631df971e5787e73cdcea7d..e705c4021671790da6cf5f05432f2e2f498d9ebd 100644 GIT binary patch delta 15715 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

G>S+y8k%tZT@wC^I5bx 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 V+-bdm_O+Vv{{Y;)7g7TJ000WwF delta 15690 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 diff --git a/ESP32_AP-Flasher/data/www/ota.js.gz b/ESP32_AP-Flasher/data/www/ota.js.gz index 7ef651e2b7da72ca731889595e5fdab2e9df4742..edaa5270752b7a8b6c39c49abc197f2a28970366 100644 GIT binary patch delta 4615 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 delta 4678 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 Ix_4v%051UoHvj+t diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index f0bb2070..99e82c72 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -681,7 +681,7 @@ void drawTextBox(TFT_eSprite &spr, String &content, int16_t &posx, int16_t &posy switch (processFontPath(font)) { case 2: { // truetype - Serial.println("truetype font not implemented for drawStringBox"); + Serial.println("truetype font not implemented for drawTextBox"); } break; case 3: { // vlw bitmap font diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js index 270a09b8..b5cc3a2b 100644 --- a/ESP32_AP-Flasher/wwwroot/main.js +++ b/ESP32_AP-Flasher/wwwroot/main.js @@ -1895,11 +1895,12 @@ function showPreview(previewWindow, element) { console.log('refresh ' + element.mac); previewWindow.pending = element.pending; previewWindow.hash = ""; + let cachetag = Date.now(); if (element.isexternal && element.contentMode == 12) { - imageSrc = 'http://' + tagDB[element.mac].apip + '/getdata?mac=' + element.mac + '&md5=0000000000000000'; + imageSrc = 'http://' + tagDB[element.mac].apip + '/getdata?mac=' + element.mac + '&md5=0000000000000000&c=' + cachetag; } else { - imageSrc = '/getdata?mac=' + element.mac + '&md5=0000000000000000'; + imageSrc = '/getdata?mac=' + element.mac + '&md5=0000000000000000&c=' + cachetag; } } else if (element.hash != previewWindow.hash) { diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js index 7e577469..dd631e91 100644 --- a/ESP32_AP-Flasher/wwwroot/ota.js +++ b/ESP32_AP-Flasher/wwwroot/ota.js @@ -56,12 +56,10 @@ export async function initUpdate() { .then(([sdata, rdata]) => { if (sdata.env) { - let matchtest = ''; - if (parseInt(sdata.buildversion) != parseInt(filesystemversion) && filesystemversion != "custom" && sdata.buildversion != "custom") matchtest = " <- not matching!" print(`env: ${sdata.env}`); print(`build date: ${formatEpoch(sdata.buildtime)}`); print(`esp32 version: ${sdata.buildversion}`); - print(`filesystem version: ${filesystemversion}` + matchtest); + print(`filesystem version: ${filesystemversion}`); print(`psram size: ${sdata.psramsize}`); print(`flash size: ${sdata.flashsize}`); print("--------------------------", "gray"); diff --git a/resources/tagtypes/03.json b/resources/tagtypes/03.json index e50da13e..06dc73fb 100644 --- a/resources/tagtypes/03.json +++ b/resources/tagtypes/03.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "name": "M2 2.2\"", "width": 212, "height": 104, @@ -12,43 +12,42 @@ }, "shortlut": 2, "options": [ "button", "customlut" ], - "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 19, 20, 21, 22, 23, 27 ], - + "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 14, 15, 16, 17, 19, 20, 21, 22, 23, 27 ], "template": { "1": { - "weekday": [ 106, 2, "Signika-SB.ttf", 40 ], - "date": [ 106, 60, "Signika-SB.ttf", 30 ] + "weekday": [ 106, 5, "fonts/calibrib40", 40 ], + "date": [ 106, 55, "fonts/calibrib30", 30 ] }, "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 150, 115, 90, 70 ], - "xy": [ 106, 52 ] + "fonts": [ "Signika-SB.ttf", 135, 135, 100, 90, 70, 50 ], + "xy": [ 106, 44 ] }, "16": { - "location": [ 7, 15, "t0_14b_tf" ], - "title": [ 210, 11, "glasstown_nbp_tf" ], - "cols": [ 4, 121, 10, "glasstown_nbp_tf" ], - "bars": [ 10, 110, 8 ] + "location": [ 4, 10, "glasstown_nbp_tf" ], + "title": [ 165, 10, "glasstown_nbp_tf" ], + "cols": [ 4, 101, 8, "glasstown_nbp_tf" ], + "bars": [ 5, 90, 6 ] }, "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 ], + "location": [ 5, 3, "fonts/calibrib16.vlw" ], + "wind": [ 190, 3, "fonts/bahnschrift30" ], + "temp": [ 5, 30, "fonts/calibrib70" ], + "icon": [ 180, 25, 50, 2 ], + "dir": [ 170, -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 ] + "column": [ 4, 53 ], + "day": [ 28, 18, "fonts/twcondensed20", 38, 88 ], + "icon": [ 28, 48, 25 ], + "wind": [ 18, 24 ], + "line": [ 20, 100 ] }, "9": { - "title": [ 8, 2, "bahnschrift20.vlw", 25 ], - "items": 5, - "line": [ 8, 25, "REFSAN12.vlw" ], + "title": [ 3, 2, "fonts/calibrib16", 25 ], + "items": 4, + "line": [ 3, 20, "tahoma9.vlw" ], "desc": [ 0, 5, "", 1 ] }, "10": { @@ -58,26 +57,26 @@ "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 ] + "title": [ 5, 2, "fonts/calibrib16.vlw" ], + "date": [ 205, 2 ], + "items": 8, + "red": [ 0, 21, 211, 10 ], + "line": [ 5, 21, 11, "tahoma9.vlw", 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": [ 100, 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": [ 100, 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 ] } + { "text": [ 100, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] } ], "27": { - "bars": [ 26, 216, 80, 20 ], + "bars": [ 20, 180, 65, 12, 10 ], "time": [ "tahoma9.vlw" ], - "yaxis": [ "tahoma9.vlw", 6, 6 ], - "head": [ "bahnschrift20.vlw" ] + "yaxis": [ "tahoma9.vlw", 2, 6 ], + "head": [ "fonts/calibrib16.vlw" ] } } } \ No newline at end of file diff --git a/resources/tagtypes/04.json b/resources/tagtypes/04.json index 2293280d..f96131f4 100644 --- a/resources/tagtypes/04.json +++ b/resources/tagtypes/04.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M2 2.6\"", "width": 296, "height": 152, @@ -15,39 +15,40 @@ "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 ] + "weekday": [ 148, 9, "Signika-SB.ttf", 60 ], + "date": [ 148, 73, "Signika-SB.ttf", 48 ] }, "2": { - "fonts": [ "Signika-SB.ttf", 150, 150, 150, 120, 100, 80 ], - "xy": [ 148, 53 ] + "fonts": [ "Signika-SB.ttf", 170, 170, 170, 120, 100, 80 ], + "xy": [ 148, 62 ] }, "16": { "location": [ 5, 5, "fonts/bahnschrift30" ], "title": [ 247, 11, "glasstown_nbp_tf" ], - "cols": [ 1, 125, 12, "glasstown_nbp_tf" ], - "bars": [ 5, 111, 10 ] + "cols": [ 1, 149, 12, "glasstown_nbp_tf" ], + "bars": [ 5, 135, 10 ] }, "4": { "location": [ 5, 5, "fonts/bahnschrift30" ], "wind": [ 280, 5, "fonts/bahnschrift30" ], - "temp": [ 5, 65, "fonts/bahnschrift70" ], - "icon": [ 285, 20, 70, 2 ], + "temp": [ 5, 58, "fonts/calibrib90" ], + "icon": [ 280, 35, 80, 2 ], "dir": [ 235, -12, 40 ], - "umbrella": [ 190, -50, 25 ] + "umbrella": [ 190, -30, 25 ] }, "8": { "location": [ 5, 12, "t0_14b_tf" ], "column": [ 5, 59 ], - "day": [ 30, 18, "fonts/twcondensed20", 41, 108 ], + "day": [ 30, 20, "fonts/twcondensed20", 41, 105 ], + "rain": [ 34, 130 ], "icon": [ 30, 55, 30 ], "wind": [ 18, 26 ], - "line": [ 20, 128 ] + "line": [ 20, 150 ] }, "9": { - "title": [ 2, 0, "bahnschrift20.vlw", 25 ], + "title": [ 3, 2, "bahnschrift20.vlw", 25 ], "items": 8, - "line": [ 1, 25, "REFSAN12.vlw" ], + "line": [ 3, 25, "REFSAN12.vlw" ], "desc": [ 0, 5, "", 1 ] }, "10": { @@ -59,7 +60,7 @@ "days": 1, "title": [ 5, 2, "fonts/bahnschrift20" ], "date": [ 290, 2 ], - "items": 7, + "items": 9, "red": [ 0, 21, 296, 14 ], "line": [ 5, 32, 15, "t0_14b_tf", 50 ] }, @@ -73,7 +74,7 @@ { "text": [ 120, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] } ], "27": { - "bars": [ 9, 288, 90, 11 ], + "bars": [ 9, 288, 90, 11, 15 ], "time": [ "tahoma9.vlw" ], "yaxis": [ "tahoma9.vlw", 0, 6 ], "head": [ "calibrib30.vlw" ]