diff --git a/ESP32_AP-Flasher/data/languages.json b/ESP32_AP-Flasher/data/languages.json index 7eccbffa..fa7577e9 100644 --- a/ESP32_AP-Flasher/data/languages.json +++ b/ESP32_AP-Flasher/data/languages.json @@ -68,5 +68,12 @@ "days": [ "Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag" ], "months": [ "Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December" ], "date_format": [ "%d-%m-%Y", "%d-%m" ] + }, + "10": { + "language": "dk", + "daysShort": [ "SØ", "MA", "TI", "ON", "TO", "FR", "LØ" ], + "days": [ "Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag" ], + "months": [ "Januar", "Februar", "Marts", "April", "Maj", "Juni", "Juli", "August", "September", "Oktober", "November", "December" ], + "date_format": [ "%d-%m-%Y", "%d-%m" ] } } diff --git a/ESP32_AP-Flasher/data/tagtypes/55.json b/ESP32_AP-Flasher/data/tagtypes/55.json new file mode 100644 index 00000000..5b87cc92 --- /dev/null +++ b/ESP32_AP-Flasher/data/tagtypes/55.json @@ -0,0 +1,84 @@ +{ + "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/www/index.html.gz b/ESP32_AP-Flasher/data/www/index.html.gz index 58c5c055..97b5cff8 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.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index 027e61ac..9923adf2 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/src/language.cpp b/ESP32_AP-Flasher/src/language.cpp index 69d1c2ba..e59e81ce 100644 --- a/ESP32_AP-Flasher/src/language.cpp +++ b/ESP32_AP-Flasher/src/language.cpp @@ -17,7 +17,7 @@ int currentLanguage = 0; void updateLanguageFromConfig() { int tempLang = config.language; - if (tempLang < 0 || tempLang > 9) { + if (tempLang < 0 || tempLang > 10) { Serial.println("Language not supported"); return; } diff --git a/ESP32_AP-Flasher/wwwroot/index.html b/ESP32_AP-Flasher/wwwroot/index.html index 2b5b6fdc..2a72504f 100644 --- a/ESP32_AP-Flasher/wwwroot/index.html +++ b/ESP32_AP-Flasher/wwwroot/index.html @@ -331,6 +331,7 @@ options: +