Skip to content

Commit

Permalink
updated tiny font for better readability
Browse files Browse the repository at this point in the history
  • Loading branch information
@nlimper
nlimper committed Mar 27, 2024
1 parent 889d6b5 commit 303c07b
Show file tree
Hide file tree
Showing 15 changed files with 31 additions and 30 deletions.
Binary file removed ESP32_AP-Flasher/data/fonts/BellCent10.vlw
View file
Binary file not shown.
Binary file added ESP32_AP-Flasher/data/fonts/tahoma9.vlw
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion ESP32_AP-Flasher/data/update_actions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"/fonts/calibrib120.vlw",
"/fonts/calibrib150.vlw",
"/fonts/calibrib50.vlw",
"/fonts/calibrib60.vlw"
"/fonts/calibrib60.vlw",
"/fonts/BellCent10.vlw"
]
}
6 changes: 3 additions & 3 deletions ESP32_AP-Flasher/src/contentmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ void drawString(TFT_eSprite &spr, String content, int16_t posx, int16_t posy, St
}
}
if (font == "glasstown_nbp_tf") {
font = "BellCent10.vlw";
font = "tahoma9.vlw";
posy -= 8;
}
if (font == "7x14_tf") {
Expand Down Expand Up @@ -1244,7 +1244,7 @@ bool getCalFeed(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgPa
// 1: 20; offset cal block
// 2: 30; offset left
// 3: calibrib16.vlw; headers font
// 4: BellCent10.vlw; appointments font
// 4: tahoma9.vlw; appointments font
// 5: 14; line height

timeinfo.tm_hour = 0;
Expand Down Expand Up @@ -1556,7 +1556,7 @@ bool getDayAheadFeed(String &filename, JsonObject &cfgobj, tagRecord *&taginfo,
for (double i = minPrice; i <= maxPrice; i += yAxisScale.step) {
int y = mapDouble(i, minPrice, maxPrice, spr.height() - barBottom, spr.height() - barBottom - loc["bars"][2].as<int>());
spr.drawLine(0, y, spr.width(), y, TFT_BLACK);
drawString(spr, String(int(i * units)), yAxisX, y - 8, loc["yaxis"][0], TL_DATUM, TFT_BLACK);
drawString(spr, String(int(i * units)), yAxisX, y - 9, loc["yaxis"][0], TL_DATUM, TFT_BLACK);
}

uint16_t barwidth = loc["bars"][1].as<int>() / n;
Expand Down
8 changes: 4 additions & 4 deletions resources/tagtypes/01.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "M2 2.9\"",
"width": 296,
"height": 128,
Expand Down Expand Up @@ -73,9 +73,9 @@
{ "text": [ 120, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] }
],
"27": {
"bars": [ 9, 288, 90, 10 ],
"time": [ "BellCent10.vlw" ],
"yaxis": [ "BellCent10.vlw", 0, 6 ],
"bars": [ 9, 288, 90, 11 ],
"time": [ "tahoma9.vlw" ],
"yaxis": [ "tahoma9.vlw", 0, 6 ],
"head": [ "calibrib30.vlw" ]
}
}
Expand Down
4 changes: 2 additions & 2 deletions resources/tagtypes/02.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "M2 4.2\"",
"width": 400,
"height": 300,
Expand Down Expand Up @@ -50,7 +50,7 @@
"rotate": 0,
"mode": 1,
"days": 4,
"gridparam": [ 5, 17, 20, "calibrib16.vlw", "BellCent10.vlw", 14 ]
"gridparam": [ 5, 17, 20, "calibrib16.vlw", "tahoma9.vlw", 14 ]
}
}
}
4 changes: 2 additions & 2 deletions resources/tagtypes/05.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "M2 7.4\"",
"width": 640,
"height": 384,
Expand Down Expand Up @@ -51,7 +51,7 @@
"rotate": 0,
"mode": 1,
"days": 7,
"gridparam": [ 3, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ]
"gridparam": [ 3, 17, 30, "calibrib16.vlw", "tahoma9.vlw", 14 ]
}
}
}
6 changes: 3 additions & 3 deletions resources/tagtypes/2F.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "M3 4.3\"",
"width": 522,
"height": 152,
Expand Down Expand Up @@ -35,12 +35,12 @@
"rotate": 1,
"mode": 1,
"days": 1,
"gridparam": [ 5, 17, 20, "calibrib16.vlw", "BellCent10.vlw", 14 ]
"gridparam": [ 5, 17, 20, "calibrib16.vlw", "tahoma9.vlw", 14 ]
},
"27": {
"bars": [ 27, 468, 100, 18 ],
"time": [ "calibrib16.vlw" ],
"yaxis": [ "BellCent10.vlw", 5, 6 ],
"yaxis": [ "tahoma9.vlw", 5, 6 ],
"head": [ "calibrib30.vlw" ]
}
}
Expand Down
4 changes: 2 additions & 2 deletions resources/tagtypes/33.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "M3 2.9\"",
"width": 384,
"height": 168,
Expand Down Expand Up @@ -60,7 +60,7 @@
"27": {
"bars": [ 12, 360, 110, 20 ],
"time": [ "calibrib16.vlw" ],
"yaxis": [ "BellCent10.vlw", 1, 6 ],
"yaxis": [ "tahoma9.vlw", 1, 6 ],
"head": [ "calibrib30.vlw" ]
}
}
Expand Down
2 changes: 1 addition & 1 deletion resources/tagtypes/34.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"shortlut": 0,
"zlib_compression": "27",
"options": [ "led" ],
"options": [ "button", "led" ],
"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ],
"usetemplate": 2
}
6 changes: 3 additions & 3 deletions resources/tagtypes/35.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "M3 6.0\"",
"width": 600,
"height": 448,
Expand All @@ -12,7 +12,7 @@
},
"shortlut": 0,
"zlib_compression": "27",
"options": [ "led" ],
"options": [ "button", "led" ],
"contentids": [ 22, 23, 1, 4, 5, 8, 9, 7, 19, 10, 11 ],
"usetemplate": 1,
"template": {
Expand All @@ -35,7 +35,7 @@
"rotate": 0,
"mode": 1,
"days": 7,
"gridparam": [ 7, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ]
"gridparam": [ 7, 17, 30, "calibrib16.vlw", "tahoma9.vlw", 14 ]
}
}
}
4 changes: 2 additions & 2 deletions resources/tagtypes/36.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "M3 7.5\"",
"width": 800,
"height": 480,
Expand Down Expand Up @@ -51,7 +51,7 @@
"rotate": 0,
"mode": 1,
"days": 7,
"gridparam": [ 3, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ]
"gridparam": [ 3, 17, 30, "calibrib16.vlw", "tahoma9.vlw", 14 ]
}
}
}
6 changes: 3 additions & 3 deletions resources/tagtypes/55.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "HS BWR 2.13\"",
"width": 256,
"height": 128,
Expand Down Expand Up @@ -75,8 +75,8 @@
],
"27": {
"bars": [ 26, 216, 80, 20 ],
"time": [ "BellCent10.vlw" ],
"yaxis": [ "BellCent10.vlw", 6, 6 ],
"time": [ "tahoma9.vlw" ],
"yaxis": [ "tahoma9.vlw", 6, 6 ],
"head": [ "bahnschrift20.vlw" ]
}
}
Expand Down
4 changes: 2 additions & 2 deletions resources/tagtypes/60.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "HS BWY 3.5\"",
"width": 384,
"height": 184,
Expand All @@ -19,7 +19,7 @@
"27": {
"bars": [ 12, 360, 125, 20 ],
"time": [ "calibrib16.vlw" ],
"yaxis": [ "BellCent10.vlw", 1, 6 ],
"yaxis": [ "tahoma9.vlw", 1, 6 ],
"head": [ "calibrib30.vlw" ]
}
}
Expand Down
4 changes: 2 additions & 2 deletions resources/tagtypes/BD.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"name": "BLE EPD BWR 2.9\" Silabs",
"width": 384,
"height": 168,
Expand Down Expand Up @@ -57,7 +57,7 @@
"27": {
"bars": [ 12, 360, 110, 20 ],
"time": [ "calibrib16.vlw" ],
"yaxis": [ "BellCent10.vlw", 1, 6 ],
"yaxis": [ "tahoma9.vlw", 1, 6 ],
"head": [ "calibrib30.vlw" ]
}
}
Expand Down

0 comments on commit 303c07b

Please sign in to comment.