From dd5d96d1ee9a20d5012156d531b6c5550adb9139 Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Fri, 25 Oct 2024 16:20:38 +0200 Subject: [PATCH] add dayahead prices to 4.2" displays; add custom interval to weather don't forget to reboot the AP and clear browser cache after updating (or to open your browser developer tools and check 'disable cache' the first time you reload the UI) --- .../data/www/content_cards.json.gz | Bin 4681 -> 4709 bytes ESP32_AP-Flasher/src/contentmanager.cpp | 4 +- ESP32_AP-Flasher/wwwroot/content_cards.json | 11 +++++ resources/tagtypes/02.json | 10 +++- resources/tagtypes/05.json | 4 +- resources/tagtypes/12.json | 45 ++---------------- resources/tagtypes/34.json | 4 +- resources/tagtypes/3C.json | 4 +- resources/tagtypes/83.json | 4 +- resources/tagtypes/B5.json | 4 +- 10 files changed, 34 insertions(+), 56 deletions(-) diff --git a/ESP32_AP-Flasher/data/www/content_cards.json.gz b/ESP32_AP-Flasher/data/www/content_cards.json.gz index 4bb80d90b066b2d2d9b14d243fc55aa38e70f25c..247844d8cb6c11569e26dc02bfc3ebf161218178 100644 GIT binary patch literal 4709 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 LF{<_|Yg7OL@3#X4 diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index b41464f1..9e6532ca 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -336,8 +336,8 @@ void drawNew(const uint8_t mac[8], tagRecord *&taginfo) { // https://github.com/erikflowers/weather-icons drawWeather(filename, cfgobj, taginfo, imageParams); - taginfo->nextupdate = now + 1800; - updateTagImage(filename, mac, 15, taginfo, imageParams); + taginfo->nextupdate = now + interval; + updateTagImage(filename, mac, interval / 60, taginfo, imageParams); break; case 8: // Forecast diff --git a/ESP32_AP-Flasher/wwwroot/content_cards.json b/ESP32_AP-Flasher/wwwroot/content_cards.json index 0d75e93e..fa5b0d7f 100644 --- a/ESP32_AP-Flasher/wwwroot/content_cards.json +++ b/ESP32_AP-Flasher/wwwroot/content_cards.json @@ -106,6 +106,17 @@ "1": "Fahrenheit / mph / inches" } }, + { + "key": "interval", + "name": "Interval", + "desc": "How often the info is being refreshed.", + "type": "select", + "options": { + "30": "-Every 30 minutes", + "60": "Every hour", + "180": "Every three hours" + } + }, { "key": "#lat", "name": "Lat", diff --git a/resources/tagtypes/02.json b/resources/tagtypes/02.json index 15d13605..a92a59b8 100644 --- a/resources/tagtypes/02.json +++ b/resources/tagtypes/02.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "M2 4.2\"", "width": 400, "height": 300, @@ -12,7 +12,7 @@ }, "shortlut": 1, "options": [ "button" ], - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ], "template": { "1": { "weekday": [ 200, 0, "Signika-SB.ttf", 70 ], @@ -51,6 +51,12 @@ "mode": 1, "days": 4, "gridparam": [ 5, 17, 20, "calibrib16.vlw", "tahoma9.vlw", 14 ] + }, + "27": { + "bars": [ 15, 385, 240, 20 ], + "time": [ "calibrib16.vlw" ], + "yaxis": [ "tahoma9.vlw", 3, 6 ], + "head": [ "calibrib30.vlw" ] } } } diff --git a/resources/tagtypes/05.json b/resources/tagtypes/05.json index e1196a8e..5a73e269 100644 --- a/resources/tagtypes/05.json +++ b/resources/tagtypes/05.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "M2 7.4\"", "width": 640, "height": 384, @@ -54,7 +54,7 @@ "gridparam": [ 3, 17, 30, "calibrib16.vlw", "tahoma9.vlw", 14 ] }, "27": { - "bars": [ 12, 630, 340, 20 ], + "bars": [ 18, 612, 350, 20 ], "time": [ "calibrib16.vlw" ], "yaxis": [ "calibrib16.vlw", 1, 12 ], "head": [ "calibrib30.vlw" ] diff --git a/resources/tagtypes/12.json b/resources/tagtypes/12.json index cd514976..81df6747 100644 --- a/resources/tagtypes/12.json +++ b/resources/tagtypes/12.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M2 4.2\" UC", "width": 400, "height": 300, @@ -12,45 +12,6 @@ }, "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", "tahoma9.vlw", 14 ] - } - } + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ], + "usetemplate": 2 } diff --git a/resources/tagtypes/34.json b/resources/tagtypes/34.json index 9f31c83a..773dbdc7 100644 --- a/resources/tagtypes/34.json +++ b/resources/tagtypes/34.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 4.2\"", "width": 400, "height": 300, @@ -13,6 +13,6 @@ "shortlut": 0, "zlib_compression": "27", "options": [ "button", "led" ], - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "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/3C.json b/resources/tagtypes/3C.json index 8feeda68..a29b594e 100644 --- a/resources/tagtypes/3C.json +++ b/resources/tagtypes/3C.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 4.2\" BWY", "width": 400, "height": 300, @@ -13,6 +13,6 @@ "shortlut": 0, "zlib_compression": "27", "options": [ "button", "led" ], - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ], "usetemplate": 2 } diff --git a/resources/tagtypes/83.json b/resources/tagtypes/83.json index b0b3bfd0..412db155 100644 --- a/resources/tagtypes/83.json +++ b/resources/tagtypes/83.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "Chroma42 4.2\"", "width": 400, "height": 300, @@ -11,6 +11,6 @@ "red": [255, 0, 0] }, "shortlut": 0, - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ], "usetemplate": 2 } diff --git a/resources/tagtypes/B5.json b/resources/tagtypes/B5.json index 1e669596..0583f823 100644 --- a/resources/tagtypes/B5.json +++ b/resources/tagtypes/B5.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "Gicisky BLE EPD BWR 4.2\"", "width": 400, "height": 300, @@ -10,6 +10,6 @@ "black": [ 0, 0, 0 ], "red": [ 255, 0, 0 ] }, - "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], + "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ], "usetemplate": 2 }