diff --git a/ESP32_AP-Flasher/data/www/content_cards.json.gz b/ESP32_AP-Flasher/data/www/content_cards.json.gz index a6e932a2..ccac4508 100644 Binary files a/ESP32_AP-Flasher/data/www/content_cards.json.gz and b/ESP32_AP-Flasher/data/www/content_cards.json.gz differ diff --git a/ESP32_AP-Flasher/data/www/index.html.gz b/ESP32_AP-Flasher/data/www/index.html.gz index 0540a265..a369830b 100644 Binary files a/ESP32_AP-Flasher/data/www/index.html.gz and b/ESP32_AP-Flasher/data/www/index.html.gz differ diff --git a/ESP32_AP-Flasher/data/www/main.css.gz b/ESP32_AP-Flasher/data/www/main.css.gz index 9ba87224..45a4fddc 100644 Binary files a/ESP32_AP-Flasher/data/www/main.css.gz and b/ESP32_AP-Flasher/data/www/main.css.gz differ diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index ce140bfd..ee8fa512 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 f3d27e17..b3894736 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/wwwroot/content_cards.json b/ESP32_AP-Flasher/wwwroot/content_cards.json index f16b55a6..1c7f2bba 100644 --- a/ESP32_AP-Flasher/wwwroot/content_cards.json +++ b/ESP32_AP-Flasher/wwwroot/content_cards.json @@ -140,7 +140,7 @@ { "id": 8, "name": "Weather forecast", - "desc": "Weather forecast for the next five days. Weather data by Open-Meteo.com. Parameters Lat, Lon and Time Zone are filled automatically from the entered location. In case of an ambiguous location, you can alter those manually.", + "desc": "Weather forecast for the next five days. Weather data by Open-Meteo.com. Parameters Lat, Lon and Time Zone are filled automatically from the entered location. In case of an ambiguous location, choose from the drop down list.", "param": [ { "key": "location", diff --git a/resources/tagtypes/2F.json b/resources/tagtypes/2F.json index cd90d240..d099ad9c 100644 --- a/resources/tagtypes/2F.json +++ b/resources/tagtypes/2F.json @@ -1,47 +1,56 @@ { - "version": 2, - "name": "M3 4.3\"", - "width": 522, - "height": 152, - "rotatebuffer": 3, - "bpp": 2, - "colortable": { - "white": [ 255, 255, 255 ], - "black": [ 0, 0, 0 ], - "red": [ 255, 0, 0 ] - }, - "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", "tahoma9.vlw", 14 ] - }, - "27": { - "bars": [ 27, 468, 100, 18 ], - "time": [ "calibrib16.vlw" ], - "yaxis": [ "tahoma9.vlw", 5, 6 ], - "head": [ "calibrib30.vlw" ] - } - } + "version": 3, + "name": "M3 4.3\"", + "width": 522, + "height": 152, + "rotatebuffer": 3, + "bpp": 2, + "colortable": { + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ] + }, + "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": 4, + "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 ] + }, + "8": { + "location": [ 5, 12, "t0_14b_tf" ], + "column": [ 7, 74 ], + "day": [ 37, 20, "fonts/twcondensed20", 41, 105 ], + "rain": [ 34, 130 ], + "icon": [ 30, 55, 30 ], + "wind": [ 18, 26 ], + "line": [ 20, 150 ] + }, + "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", "tahoma9.vlw", 14 ] + }, + "27": { + "bars": [ 27, 468, 100, 18 ], + "time": [ "calibrib16.vlw" ], + "yaxis": [ "tahoma9.vlw", 5, 6 ], + "head": [ "calibrib30.vlw" ] + } + } } diff --git a/resources/tagtypes/F0.json b/resources/tagtypes/F0.json index f75f5c0d..392b76c2 100644 --- a/resources/tagtypes/F0.json +++ b/resources/tagtypes/F0.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "SLT‐EM007 Segmented", "width": 0, "height": 0, @@ -8,7 +8,7 @@ "colortable": { }, "shortlut": 0, "options": [ ], - "contentids": [ 1, 2, 3, 4, 5, 13, 17, 18 ], + "contentids": [ 1, 2, 3, 5, 13, 17, 18 ], "template": { } }