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 000000000..b90efefa2 Binary files /dev/null and b/data/oled/fonts/pakenham.ttf differ 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); } }