diff --git a/ESP32_AP-Flasher/data/fonts/BellCent10.vlw b/ESP32_AP-Flasher/data/fonts/BellCent10.vlw deleted file mode 100644 index b1d32e74..00000000 Binary files a/ESP32_AP-Flasher/data/fonts/BellCent10.vlw and /dev/null differ diff --git a/ESP32_AP-Flasher/data/fonts/tahoma9.vlw b/ESP32_AP-Flasher/data/fonts/tahoma9.vlw new file mode 100644 index 00000000..b1074a06 Binary files /dev/null and b/ESP32_AP-Flasher/data/fonts/tahoma9.vlw differ diff --git a/ESP32_AP-Flasher/data/update_actions.json b/ESP32_AP-Flasher/data/update_actions.json index b34d9ed0..f67e1f37 100644 --- a/ESP32_AP-Flasher/data/update_actions.json +++ b/ESP32_AP-Flasher/data/update_actions.json @@ -17,6 +17,7 @@ "/fonts/calibrib120.vlw", "/fonts/calibrib150.vlw", "/fonts/calibrib50.vlw", - "/fonts/calibrib60.vlw" + "/fonts/calibrib60.vlw", + "/fonts/BellCent10.vlw" ] } diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index e3ea135a..40b89441 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -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") { @@ -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; @@ -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()); 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() / n; diff --git a/resources/tagtypes/01.json b/resources/tagtypes/01.json index ead6d55e..4d4e7ad5 100644 --- a/resources/tagtypes/01.json +++ b/resources/tagtypes/01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M2 2.9\"", "width": 296, "height": 128, @@ -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" ] } } diff --git a/resources/tagtypes/02.json b/resources/tagtypes/02.json index 8bd6fba5..15d13605 100644 --- a/resources/tagtypes/02.json +++ b/resources/tagtypes/02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M2 4.2\"", "width": 400, "height": 300, @@ -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 ] } } } diff --git a/resources/tagtypes/05.json b/resources/tagtypes/05.json index b35d98ec..caf89462 100644 --- a/resources/tagtypes/05.json +++ b/resources/tagtypes/05.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M2 7.4\"", "width": 640, "height": 384, @@ -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 ] } } } diff --git a/resources/tagtypes/2F.json b/resources/tagtypes/2F.json index da4f5eb3..cd90d240 100644 --- a/resources/tagtypes/2F.json +++ b/resources/tagtypes/2F.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 4.3\"", "width": 522, "height": 152, @@ -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" ] } } diff --git a/resources/tagtypes/33.json b/resources/tagtypes/33.json index dd08928b..7d02b8f4 100644 --- a/resources/tagtypes/33.json +++ b/resources/tagtypes/33.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 2.9\"", "width": 384, "height": 168, @@ -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" ] } } diff --git a/resources/tagtypes/34.json b/resources/tagtypes/34.json index dc9d42be..9f31c83a 100644 --- a/resources/tagtypes/34.json +++ b/resources/tagtypes/34.json @@ -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 } \ No newline at end of file diff --git a/resources/tagtypes/35.json b/resources/tagtypes/35.json index 1ac5551d..e44f9d33 100644 --- a/resources/tagtypes/35.json +++ b/resources/tagtypes/35.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 6.0\"", "width": 600, "height": 448, @@ -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": { @@ -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 ] } } } diff --git a/resources/tagtypes/36.json b/resources/tagtypes/36.json index 7b68b36e..d7d552db 100644 --- a/resources/tagtypes/36.json +++ b/resources/tagtypes/36.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 7.5\"", "width": 800, "height": 480, @@ -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 ] } } } diff --git a/resources/tagtypes/55.json b/resources/tagtypes/55.json index 0abbf2be..05d97e46 100644 --- a/resources/tagtypes/55.json +++ b/resources/tagtypes/55.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "HS BWR 2.13\"", "width": 256, "height": 128, @@ -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" ] } } diff --git a/resources/tagtypes/60.json b/resources/tagtypes/60.json index 7a451085..6c295ed4 100644 --- a/resources/tagtypes/60.json +++ b/resources/tagtypes/60.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "HS BWY 3.5\"", "width": 384, "height": 184, @@ -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" ] } } diff --git a/resources/tagtypes/BD.json b/resources/tagtypes/BD.json index 8b476055..d10a0196 100644 --- a/resources/tagtypes/BD.json +++ b/resources/tagtypes/BD.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "BLE EPD BWR 2.9\" Silabs", "width": 384, "height": 168, @@ -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" ] } }