From 64c76a78e3174a28f280eedc7c31c19c7080ac3f Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 14:22:32 +0100 Subject: [PATCH 01/11] Add MediumFont2 implementation and integrate into FontsService and LargeClockMode --- firmware/include/fonts/MediumFont2.h | 269 +++++++++++++++++++++++ firmware/include/services/FontsService.h | 2 + firmware/src/fonts/MediumFont2.cpp | 14 ++ firmware/src/modes/LargeClockMode.cpp | 2 + 4 files changed, 287 insertions(+) create mode 100644 firmware/include/fonts/MediumFont2.h create mode 100644 firmware/src/fonts/MediumFont2.cpp diff --git a/firmware/include/fonts/MediumFont2.h b/firmware/include/fonts/MediumFont2.h new file mode 100644 index 00000000..fb31c3d5 --- /dev/null +++ b/firmware/include/fonts/MediumFont2.h @@ -0,0 +1,269 @@ +#pragma once + +#include "modules/FontModule.h" + +class MediumFont2 final : public FontModule +{ +private: + const std::vector ascii = { + { + // 0x20, SPACE + {}, + 6, + 0, + }, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + { + // 0x30, 0 + { + 0b011110, + 0b110011, + 0b110011, + 0b110011, + 0b110011, + 0b110011, + 0b011110, + }, + 0, + 0, + }, + { + // 0x31, 1 + { + 0b0011, + 0b0111, + 0b1111, + 0b0011, + 0b0011, + 0b0011, + 0b0011, + }, + 0, + 0, + }, + { + // 0x32, 2 + { + 0b011110, + 0b110011, + 0b000011, + 0b001110, + 0b011000, + 0b111111, + 0b111111, + }, + 0, + 0, + }, + { + // 0x33, 3 + { + 0b011110, + 0b110011, + 0b000011, + 0b011110, + 0b000011, + 0b110011, + 0b011110, + }, + 0, + 0, + }, + { + // 0x34, 4 + { + 0b110011, + 0b110011, + 0b110011, + 0b011111, + 0b000011, + 0b000011, + 0b000011, + }, + 0, + 0, + }, + { + // 0x35, 5 + { + 0b111111, + 0b111111, + 0b110000, + 0b111110, + 0b000011, + 0b110011, + 0b111110, + }, + 0, + 0, + }, + { + // 0x36, 6 + { + 0b011110, + 0b110011, + 0b110000, + 0b111110, + 0b110011, + 0b110011, + 0b011110, + }, + 0, + 0, + }, + { + // 0x37, 7 + { + 0b111111, + 0b111111, + 0b000110, + 0b001100, + 0b001100, + 0b001100, + 0b001100, + }, + 0, + 0, + }, + { + // 0x38, 8 + { + 0b011110, + 0b110011, + 0b110011, + 0b011110, + 0b110011, + 0b110011, + 0b011110, + }, + 0, + 0, + }, + { + // 0x39, 9 + { + 0b011110, + 0b110011, + 0b110011, + 0b011111, + 0b000011, + 0b110011, + 0b011110, + }, + 0, + 0, + }, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + { + // 0x49, I + { + 0b111111, + 0b001100, + 0b001100, + 0b001100, + 0b001100, + 0b001100, + 0b111111, + }, + 0, + 0, + }, + {}, + {}, + {}, + {}, + {}, + { + // 0x4F, O + { + 0b011110, + 0b111111, + 0b110011, + 0b110011, + 0b110011, + 0b111111, + 0b011110, + }, + 0, + 0, + }, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + { + // 0x6F, o + { + 0b01110, + 0b11111, + 0b11011, + 0b11111, + 0b01110, + }, + 0, + 0, + }, + }; + +public: + explicit MediumFont2(); + + [[nodiscard]] Symbol getChar(uint32_t character) const override; +}; + +extern MediumFont2 *FontMedium2; diff --git a/firmware/include/services/FontsService.h b/firmware/include/services/FontsService.h index 311e6efc..500ce8ca 100644 --- a/firmware/include/services/FontsService.h +++ b/firmware/include/services/FontsService.h @@ -4,6 +4,7 @@ #include "fonts/LargeFont.h" #include "fonts/MediumBoldFont.h" #include "fonts/MediumFont.h" +#include "fonts/MediumFont2.h" #include "fonts/MicroFont.h" #include "fonts/MiniFont.h" #include "fonts/SmallFont.h" @@ -22,6 +23,7 @@ class FontsService final : public ServiceModule new MiniFont(), new SmallFont(), new MediumFont(), + new MediumFont2(), new MediumBoldFont(), new LargeFont(), }; diff --git a/firmware/src/fonts/MediumFont2.cpp b/firmware/src/fonts/MediumFont2.cpp new file mode 100644 index 00000000..59490729 --- /dev/null +++ b/firmware/src/fonts/MediumFont2.cpp @@ -0,0 +1,14 @@ +#include "fonts/MediumFont2.h" + +MediumFont2 *FontMedium2 = nullptr; + +MediumFont2::MediumFont2() : FontModule("Medium2") { FontMedium2 = this; } + +FontModule::Symbol MediumFont2::getChar(uint32_t character) const +{ + if (character >= 0x20 && character <= 0x7F && character < ascii.size() + 0x20) + { + return ascii[character - 0x20]; + } + return {}; +} diff --git a/firmware/src/modes/LargeClockMode.cpp b/firmware/src/modes/LargeClockMode.cpp index d93cdeba..0e13bc82 100644 --- a/firmware/src/modes/LargeClockMode.cpp +++ b/firmware/src/modes/LargeClockMode.cpp @@ -6,6 +6,7 @@ #include "extensions/HomeAssistantExtension.h" #include "fonts/MediumBoldFont.h" #include "fonts/MediumFont.h" +#include "fonts/MediumFont2.h" #include "handlers/TextHandler.h" #include "services/DeviceService.h" #include "services/DisplayService.h" @@ -17,6 +18,7 @@ void LargeClockMode::configure() { fonts = { FontMedium, + FontMedium2, FontMediumBold, }; Preferences Storage; From e50184f0ea33954d3abbbb8ca31822cf9044bedf Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 14:48:17 +0100 Subject: [PATCH 02/11] Fix constructor string formatting in MediumFont2 --- firmware/src/fonts/MediumFont2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/src/fonts/MediumFont2.cpp b/firmware/src/fonts/MediumFont2.cpp index 59490729..623d50b8 100644 --- a/firmware/src/fonts/MediumFont2.cpp +++ b/firmware/src/fonts/MediumFont2.cpp @@ -2,7 +2,7 @@ MediumFont2 *FontMedium2 = nullptr; -MediumFont2::MediumFont2() : FontModule("Medium2") { FontMedium2 = this; } +MediumFont2::MediumFont2() : FontModule("Medium 2") { FontMedium2 = this; } FontModule::Symbol MediumFont2::getChar(uint32_t character) const { From 9281e0b79a737256473ca790564a8e0fbbefe314 Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 15:03:37 +0100 Subject: [PATCH 03/11] Rename new font to MediumRegularFont --- firmware/include/fonts/MediumBoldFont.h | 2 +- .../fonts/{MediumFont2.h => MediumRegularFont.h} | 8 ++++---- firmware/src/fonts/MediumFont2.cpp | 14 -------------- firmware/src/fonts/MediumRegularFont.cpp | 14 ++++++++++++++ firmware/src/modes/LargeClockMode.cpp | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) rename firmware/include/fonts/{MediumFont2.h => MediumRegularFont.h} (96%) delete mode 100644 firmware/src/fonts/MediumFont2.cpp create mode 100644 firmware/src/fonts/MediumRegularFont.cpp diff --git a/firmware/include/fonts/MediumBoldFont.h b/firmware/include/fonts/MediumBoldFont.h index d19ec296..eed7309e 100644 --- a/firmware/include/fonts/MediumBoldFont.h +++ b/firmware/include/fonts/MediumBoldFont.h @@ -106,7 +106,7 @@ class MediumBoldFont final : public FontModule 0b111110, 0b000011, 0b111111, - 0b111110, + 0b011110, }, 0, 0, diff --git a/firmware/include/fonts/MediumFont2.h b/firmware/include/fonts/MediumRegularFont.h similarity index 96% rename from firmware/include/fonts/MediumFont2.h rename to firmware/include/fonts/MediumRegularFont.h index fb31c3d5..20e2d918 100644 --- a/firmware/include/fonts/MediumFont2.h +++ b/firmware/include/fonts/MediumRegularFont.h @@ -2,7 +2,7 @@ #include "modules/FontModule.h" -class MediumFont2 final : public FontModule +class MediumRegularFont final : public FontModule { private: const std::vector ascii = { @@ -106,7 +106,7 @@ class MediumFont2 final : public FontModule 0b111110, 0b000011, 0b110011, - 0b111110, + 0b011110, }, 0, 0, @@ -261,9 +261,9 @@ class MediumFont2 final : public FontModule }; public: - explicit MediumFont2(); + explicit MediumRegularFont(); [[nodiscard]] Symbol getChar(uint32_t character) const override; }; -extern MediumFont2 *FontMedium2; +extern MediumRegularFont *FontMediumRegular; diff --git a/firmware/src/fonts/MediumFont2.cpp b/firmware/src/fonts/MediumFont2.cpp deleted file mode 100644 index 623d50b8..00000000 --- a/firmware/src/fonts/MediumFont2.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "fonts/MediumFont2.h" - -MediumFont2 *FontMedium2 = nullptr; - -MediumFont2::MediumFont2() : FontModule("Medium 2") { FontMedium2 = this; } - -FontModule::Symbol MediumFont2::getChar(uint32_t character) const -{ - if (character >= 0x20 && character <= 0x7F && character < ascii.size() + 0x20) - { - return ascii[character - 0x20]; - } - return {}; -} diff --git a/firmware/src/fonts/MediumRegularFont.cpp b/firmware/src/fonts/MediumRegularFont.cpp new file mode 100644 index 00000000..9e90e7d7 --- /dev/null +++ b/firmware/src/fonts/MediumRegularFont.cpp @@ -0,0 +1,14 @@ +#include "fonts/MediumRegularFont.h" + +MediumRegularFont *FontMediumRegular = nullptr; + +MediumRegularFont::MediumRegularFont() : FontModule("Medium regular") { FontMediumRegular = this; } + +FontModule::Symbol MediumRegularFont::getChar(uint32_t character) const +{ + if (character >= 0x20 && character <= 0x7F && character < ascii.size() + 0x20) + { + return ascii[character - 0x20]; + } + return {}; +} diff --git a/firmware/src/modes/LargeClockMode.cpp b/firmware/src/modes/LargeClockMode.cpp index 0e13bc82..fcbafbc9 100644 --- a/firmware/src/modes/LargeClockMode.cpp +++ b/firmware/src/modes/LargeClockMode.cpp @@ -18,7 +18,7 @@ void LargeClockMode::configure() { fonts = { FontMedium, - FontMedium2, + FontMediumRegular, FontMediumBold, }; Preferences Storage; From 7e9fd436642f3cdc878bd1bbc3468ed34a5795e0 Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 15:05:53 +0100 Subject: [PATCH 04/11] Replace MediumFont2 with MediumRegularFont in FontsService and LargeClockMode --- firmware/include/services/FontsService.h | 4 ++-- firmware/src/modes/LargeClockMode.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/include/services/FontsService.h b/firmware/include/services/FontsService.h index 500ce8ca..4761ab46 100644 --- a/firmware/include/services/FontsService.h +++ b/firmware/include/services/FontsService.h @@ -4,7 +4,7 @@ #include "fonts/LargeFont.h" #include "fonts/MediumBoldFont.h" #include "fonts/MediumFont.h" -#include "fonts/MediumFont2.h" +#include "fonts/MediumRegularFont.h" #include "fonts/MicroFont.h" #include "fonts/MiniFont.h" #include "fonts/SmallFont.h" @@ -23,7 +23,7 @@ class FontsService final : public ServiceModule new MiniFont(), new SmallFont(), new MediumFont(), - new MediumFont2(), + new MediumRegularFont(), new MediumBoldFont(), new LargeFont(), }; diff --git a/firmware/src/modes/LargeClockMode.cpp b/firmware/src/modes/LargeClockMode.cpp index fcbafbc9..6d2d6570 100644 --- a/firmware/src/modes/LargeClockMode.cpp +++ b/firmware/src/modes/LargeClockMode.cpp @@ -6,7 +6,7 @@ #include "extensions/HomeAssistantExtension.h" #include "fonts/MediumBoldFont.h" #include "fonts/MediumFont.h" -#include "fonts/MediumFont2.h" +#include "fonts/MediumRegularFont.h" #include "handlers/TextHandler.h" #include "services/DeviceService.h" #include "services/DisplayService.h" From cf0b95ea7035c513dcf168a7a4cb1faac60e9cc5 Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 19:07:50 +0100 Subject: [PATCH 05/11] Update bitmap patterns in MediumRegularFont for improved rendering --- firmware/include/fonts/MediumRegularFont.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/include/fonts/MediumRegularFont.h b/firmware/include/fonts/MediumRegularFont.h index 20e2d918..f37da851 100644 --- a/firmware/include/fonts/MediumRegularFont.h +++ b/firmware/include/fonts/MediumRegularFont.h @@ -63,7 +63,7 @@ class MediumRegularFont final : public FontModule 0b000011, 0b001110, 0b011000, - 0b111111, + 0b110001, 0b111111, }, 0, @@ -101,7 +101,7 @@ class MediumRegularFont final : public FontModule // 0x35, 5 { 0b111111, - 0b111111, + 0b110001, 0b110000, 0b111110, 0b000011, @@ -129,7 +129,7 @@ class MediumRegularFont final : public FontModule // 0x37, 7 { 0b111111, - 0b111111, + 0b000011, 0b000110, 0b001100, 0b001100, From eb027f2f9f6ca2bfffa822d4befdddbb813d2554 Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 19:15:48 +0100 Subject: [PATCH 06/11] Fix bitmap pattern in MediumRegularFont for improved rendering --- firmware/include/fonts/MediumRegularFont.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/include/fonts/MediumRegularFont.h b/firmware/include/fonts/MediumRegularFont.h index f37da851..e9ef5032 100644 --- a/firmware/include/fonts/MediumRegularFont.h +++ b/firmware/include/fonts/MediumRegularFont.h @@ -63,7 +63,7 @@ class MediumRegularFont final : public FontModule 0b000011, 0b001110, 0b011000, - 0b110001, + 0b110000, 0b111111, }, 0, @@ -101,7 +101,7 @@ class MediumRegularFont final : public FontModule // 0x35, 5 { 0b111111, - 0b110001, + 0b110000, 0b110000, 0b111110, 0b000011, From f201e7ba7e036811cc32011cdaf12f7e99d41b7d Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 19:58:15 +0100 Subject: [PATCH 07/11] Make ascii vector in MediumRegularFont static inline to fix clang-tidy finding --- firmware/include/fonts/MediumRegularFont.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/include/fonts/MediumRegularFont.h b/firmware/include/fonts/MediumRegularFont.h index e9ef5032..a55bb165 100644 --- a/firmware/include/fonts/MediumRegularFont.h +++ b/firmware/include/fonts/MediumRegularFont.h @@ -5,7 +5,7 @@ class MediumRegularFont final : public FontModule { private: - const std::vector ascii = { + inline static const std::vector ascii = { { // 0x20, SPACE {}, From 540bb3e168dc807504bdb3ae4a70ea908689f20e Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 20:32:23 +0100 Subject: [PATCH 08/11] Make ascii vector in font classes static inline to fix clang-tidy finding --- firmware/include/fonts/BrailleFont.h | 2 +- firmware/include/fonts/LargeFont.h | 2 +- firmware/include/fonts/MediumBoldFont.h | 2 +- firmware/include/fonts/MediumFont.h | 2 +- firmware/include/fonts/MicroFont.h | 2 +- firmware/include/fonts/MiniFont.h | 2 +- firmware/include/fonts/SmallFont.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/include/fonts/BrailleFont.h b/firmware/include/fonts/BrailleFont.h index ae4b8065..47c7923d 100644 --- a/firmware/include/fonts/BrailleFont.h +++ b/firmware/include/fonts/BrailleFont.h @@ -7,7 +7,7 @@ class BrailleFont final : public FontModule { private: - const std::vector ascii = { + inline static const std::vector ascii = { { // 0x20, SPACE {}, diff --git a/firmware/include/fonts/LargeFont.h b/firmware/include/fonts/LargeFont.h index 5b99d111..44dc3d82 100644 --- a/firmware/include/fonts/LargeFont.h +++ b/firmware/include/fonts/LargeFont.h @@ -5,7 +5,7 @@ class LargeFont final : public FontModule { private: - const std::vector ascii = { + inline static const std::vector ascii = { { // 0x20, SPACE {}, diff --git a/firmware/include/fonts/MediumBoldFont.h b/firmware/include/fonts/MediumBoldFont.h index eed7309e..d78090c7 100644 --- a/firmware/include/fonts/MediumBoldFont.h +++ b/firmware/include/fonts/MediumBoldFont.h @@ -5,7 +5,7 @@ class MediumBoldFont final : public FontModule { private: - const std::vector ascii = { + inline static const std::vector ascii = { { // 0x20, SPACE {}, diff --git a/firmware/include/fonts/MediumFont.h b/firmware/include/fonts/MediumFont.h index 63e3daf1..edc1f8e8 100644 --- a/firmware/include/fonts/MediumFont.h +++ b/firmware/include/fonts/MediumFont.h @@ -5,7 +5,7 @@ class MediumFont final : public FontModule { private: - const std::vector ascii = { + inline static const std::vector ascii = { { // 0x20, SPACE {}, diff --git a/firmware/include/fonts/MicroFont.h b/firmware/include/fonts/MicroFont.h index f83b20b4..2a4bfa39 100644 --- a/firmware/include/fonts/MicroFont.h +++ b/firmware/include/fonts/MicroFont.h @@ -5,7 +5,7 @@ class MicroFont final : public FontModule { private: - const std::vector ascii = { + inline static const std::vector ascii = { { // 0x20, SPACE {}, diff --git a/firmware/include/fonts/MiniFont.h b/firmware/include/fonts/MiniFont.h index 3a92794a..c9ae4a6a 100644 --- a/firmware/include/fonts/MiniFont.h +++ b/firmware/include/fonts/MiniFont.h @@ -5,7 +5,7 @@ class MiniFont final : public FontModule { private: - const std::vector ascii = { + inline static const std::vector ascii = { { // 0x20, SPACE {}, diff --git a/firmware/include/fonts/SmallFont.h b/firmware/include/fonts/SmallFont.h index 1b264eaf..6c729a8e 100644 --- a/firmware/include/fonts/SmallFont.h +++ b/firmware/include/fonts/SmallFont.h @@ -9,7 +9,7 @@ class SmallFont final : public FontModule { private: - const std::vector ascii = { + inline static const std::vector ascii = { { // 0x20, SPACE {}, From 5b6dabfe58a6f0234e50a1276c985d96d97ea906 Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sat, 21 Feb 2026 20:37:24 +0100 Subject: [PATCH 09/11] Make unicode vector in font headers static inline to fix clang-tidy findings --- firmware/include/fonts/LargeFont.h | 2 +- firmware/include/fonts/MicroFont.h | 2 +- firmware/include/fonts/MiniFont.h | 2 +- firmware/include/fonts/SmallFont.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/include/fonts/LargeFont.h b/firmware/include/fonts/LargeFont.h index 44dc3d82..a774a1e3 100644 --- a/firmware/include/fonts/LargeFont.h +++ b/firmware/include/fonts/LargeFont.h @@ -123,7 +123,7 @@ class LargeFont final : public FontModule }, }; - const std::vector unicode = { + inline static const std::vector unicode = { { 0x3C0, // π GREEK SMALL LETTER PI { diff --git a/firmware/include/fonts/MicroFont.h b/firmware/include/fonts/MicroFont.h index 2a4bfa39..a76606b0 100644 --- a/firmware/include/fonts/MicroFont.h +++ b/firmware/include/fonts/MicroFont.h @@ -630,7 +630,7 @@ class MicroFont final : public FontModule }, }; - const std::vector unicode = { + inline static const std::vector unicode = { { 0xB0, // ° DEGREE SIGN { diff --git a/firmware/include/fonts/MiniFont.h b/firmware/include/fonts/MiniFont.h index c9ae4a6a..776539bd 100644 --- a/firmware/include/fonts/MiniFont.h +++ b/firmware/include/fonts/MiniFont.h @@ -842,7 +842,7 @@ class MiniFont final : public FontModule }, }; - const std::vector unicode = { + inline static const std::vector unicode = { { 0xB0, // ° DEGREE SIGN { diff --git a/firmware/include/fonts/SmallFont.h b/firmware/include/fonts/SmallFont.h index 6c729a8e..98af9418 100644 --- a/firmware/include/fonts/SmallFont.h +++ b/firmware/include/fonts/SmallFont.h @@ -1230,7 +1230,7 @@ class SmallFont final : public FontModule }, }; - const std::vector unicode = { + inline static const std::vector unicode = { { 0xB0, // ° DEGREE SIGN { From 7521f96a74c9de1d2caee6d45bc22ce9534d6f5c Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sun, 22 Feb 2026 10:42:34 +0100 Subject: [PATCH 10/11] Reduce length of midstroke in '3' --- firmware/include/fonts/MediumBoldFont.h | 2 +- firmware/include/fonts/MediumRegularFont.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/include/fonts/MediumBoldFont.h b/firmware/include/fonts/MediumBoldFont.h index d78090c7..e4c37095 100644 --- a/firmware/include/fonts/MediumBoldFont.h +++ b/firmware/include/fonts/MediumBoldFont.h @@ -75,7 +75,7 @@ class MediumBoldFont final : public FontModule 0b011110, 0b111111, 0b000011, - 0b011111, + 0b001111, 0b000011, 0b111111, 0b011110, diff --git a/firmware/include/fonts/MediumRegularFont.h b/firmware/include/fonts/MediumRegularFont.h index a55bb165..f17e0841 100644 --- a/firmware/include/fonts/MediumRegularFont.h +++ b/firmware/include/fonts/MediumRegularFont.h @@ -75,7 +75,7 @@ class MediumRegularFont final : public FontModule 0b011110, 0b110011, 0b000011, - 0b011110, + 0b001110, 0b000011, 0b110011, 0b011110, From aeb6a538a053f8770379a74b43a2f0925d5a214b Mon Sep 17 00:00:00 2001 From: Solmath <33658856+Solmath@users.noreply.github.com> Date: Sun, 22 Feb 2026 16:00:50 +0100 Subject: [PATCH 11/11] Remove redundant MediumFont header and simplify getChar method in MediumBoldFont --- firmware/src/fonts/MediumBoldFont.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/firmware/src/fonts/MediumBoldFont.cpp b/firmware/src/fonts/MediumBoldFont.cpp index ce2d26e5..40ba6b0e 100644 --- a/firmware/src/fonts/MediumBoldFont.cpp +++ b/firmware/src/fonts/MediumBoldFont.cpp @@ -1,7 +1,5 @@ #include "fonts/MediumBoldFont.h" -#include "fonts/MediumFont.h" - MediumBoldFont *FontMediumBold = nullptr; MediumBoldFont::MediumBoldFont() : FontModule("Medium bold") { FontMediumBold = this; } @@ -12,5 +10,5 @@ FontModule::Symbol MediumBoldFont::getChar(uint32_t character) const { return ascii[character - 0x20]; } - return FontMedium->getChar(character); + return {}; }