Skip to content

Commit

Permalink
added Dansk (thanks Cokeman), added Nebular 213 templates, removed fl…
Browse files Browse the repository at this point in the history
…asher icon in S2 based AP's
  • Loading branch information
nlimper committed Feb 29, 2024
1 parent 294ed5b commit f6a8fa3
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 2 deletions.
7 changes: 7 additions & 0 deletions ESP32_AP-Flasher/data/languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [ "", "MA", "TI", "ON", "TO", "FR", "" ],
"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" ]
}
}
84 changes: 84 additions & 0 deletions ESP32_AP-Flasher/data/tagtypes/55.json
Original file line number Diff line number Diff line change
@@ -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" ]
}
}
}
Binary file modified ESP32_AP-Flasher/data/www/index.html.gz
Binary file not shown.
Binary file modified ESP32_AP-Flasher/data/www/main.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion ESP32_AP-Flasher/src/language.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions ESP32_AP-Flasher/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ <h3>Access Point config</h3>
<option value="7">PL Polski</option>
<option value="8">ES Español</option>
<option value="9">SV Svenska</option>
<option value="10">DK Dansk</option>
</select>
</p>
<p title="Depending on the content, a tag can sleep for
Expand Down
2 changes: 1 addition & 1 deletion ESP32_AP-Flasher/wwwroot/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ window.addEventListener("loadConfig", function () {
if (optionToRemove) $("#apcfgchid").removeChild(optionToRemove);
$('#c6Option').style.display = 'block';
}
if (data.hasFlasher) {
if (data.hasFlasher == 1) {
$('[data-target="flashtab"]').style.display = 'block';
}
if (data.hasBLE == 0) {
Expand Down

0 comments on commit f6a8fa3

Please sign in to comment.