From 6e8987a8ba993a216fb1ae5df6f3389c8f4a4a49 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sun, 28 Jun 2020 22:11:17 +0200 Subject: [PATCH] - glcd: add pakenham.ttf as a seperate font Signed-off-by: Thilo Graf --- data/oled/fonts/Makefile.am | 6 ++++++ data/oled/fonts/pakenham.ttf | Bin 0 -> 66764 bytes src/driver/glcd/weather.cpp | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 data/oled/fonts/pakenham.ttf diff --git a/data/oled/fonts/Makefile.am b/data/oled/fonts/Makefile.am index 2a7ce62ad..1b83b4361 100644 --- a/data/oled/fonts/Makefile.am +++ b/data/oled/fonts/Makefile.am @@ -1,6 +1,12 @@ installdir = $(FONTDIR)/oled +# NOTE: led.ttf is used for the LED clock in standby mode +# lcd.ttf is used for the LCD clock in standby mode +# pakenham.ttf is used for the temperature digits +# terminator.ttf is used for the status markers + install_DATA = \ led.ttf \ lcd.ttf \ + pakenham.ttf \ terminator.ttf diff --git a/data/oled/fonts/pakenham.ttf b/data/oled/fonts/pakenham.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b90efefa230cda53c8feaa9c14159c592fc3a282 GIT binary patch literal 66764 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 CkP=D& literal 0 HcmV?d00001 diff --git a/src/driver/glcd/weather.cpp b/src/driver/glcd/weather.cpp index cb17865f8..fbde4e5a0 100644 --- a/src/driver/glcd/weather.cpp +++ b/src/driver/glcd/weather.cpp @@ -143,11 +143,11 @@ void WeatherUpdateFonts(void) { cGLCD *cglcd = cGLCD::getInstance(); int fontsize_temperature = 0; - int percent_temperature = std::min(24, 100); + int percent_temperature = std::min(24, 100); // WTF? int fontsize_temperature_new = percent_temperature * cglcd->lcd->Height() / 100; if (!fonts_initialized || (fontsize_temperature_new != fontsize_temperature)) { fontsize_temperature = fontsize_temperature_new; - if (!font_temperature.LoadFT2(FONTDIR "/pakenham.ttf", "UTF-8", fontsize_temperature)) { + if (!font_temperature.LoadFT2(FONTDIR "/oled/pakenham.ttf", "UTF-8", fontsize_temperature)) { font_temperature.LoadFT2(g_settings.font_file, "UTF-8", fontsize_temperature); } }