Skip to content

Additional font for clock #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Solmath wants to merge 12 commits into
base: main
Choose a base branch
from
+301 −16
Draft

Additional font for clock #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
64c76a7
Add MediumFont2 implementation and integrate into FontsService and La…
Solmath Feb 21, 2026
e50184f
Fix constructor string formatting in MediumFont2
Solmath Feb 21, 2026
9281e0b
Rename new font to MediumRegularFont
Solmath Feb 21, 2026
7e9fd43
Replace MediumFont2 with MediumRegularFont in FontsService and LargeC…
Solmath Feb 21, 2026
54d519c
Merge remote-tracking branch 'origin/main' into feature/new-medium-font
Solmath Feb 21, 2026
cf0b95e
Update bitmap patterns in MediumRegularFont for improved rendering
Solmath Feb 21, 2026
eb027f2
Fix bitmap pattern in MediumRegularFont for improved rendering
Solmath Feb 21, 2026
f201e7b
Make ascii vector in MediumRegularFont static inline to fix clang-tid…
Solmath Feb 21, 2026
540bb3e
Make ascii vector in font classes static inline to fix clang-tidy fin…
Solmath Feb 21, 2026
5b6dabf
Make unicode vector in font headers static inline to fix clang-tidy f…
Solmath Feb 21, 2026
7521f96
Reduce length of midstroke in '3'
Solmath Feb 22, 2026
aeb6a53
Remove redundant MediumFont header and simplify getChar method in Med…
Solmath Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion firmware/include/fonts/BrailleFont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class BrailleFont final : public FontModule
{
private:
const std::vector<Symbol> ascii = {
inline static const std::vector<Symbol> ascii = {
{
// 0x20, SPACE
{},
Expand Down
4 changes: 2 additions & 2 deletions firmware/include/fonts/LargeFont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class LargeFont final : public FontModule
{
private:
const std::vector<Symbol> ascii = {
inline static const std::vector<Symbol> ascii = {
{
// 0x20, SPACE
{},
Expand Down Expand Up @@ -123,7 +123,7 @@ class LargeFont final : public FontModule
},
};

const std::vector<SymbolExtended> unicode = {
inline static const std::vector<SymbolExtended> unicode = {
{
0x3C0, // π GREEK SMALL LETTER PI
{
Expand Down
6 changes: 3 additions & 3 deletions firmware/include/fonts/MediumBoldFont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class MediumBoldFont final : public FontModule
{
private:
const std::vector<Symbol> ascii = {
inline static const std::vector<Symbol> ascii = {
{
// 0x20, SPACE
{},
Expand Down Expand Up @@ -75,7 +75,7 @@ class MediumBoldFont final : public FontModule
0b011110,
0b111111,
0b000011,
0b011111,
0b001111,
0b000011,
0b111111,
0b011110,
Expand Down Expand Up @@ -106,7 +106,7 @@ class MediumBoldFont final : public FontModule
0b111110,
0b000011,
0b111111,
0b111110,
0b011110,
},
0,
0,
Expand Down
2 changes: 1 addition & 1 deletion firmware/include/fonts/MediumFont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class MediumFont final : public FontModule
{
private:
const std::vector<Symbol> ascii = {
inline static const std::vector<Symbol> ascii = {
{
// 0x20, SPACE
{},
Expand Down
269 changes: 269 additions & 0 deletions firmware/include/fonts/MediumRegularFont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,269 @@
#pragma once

#include "modules/FontModule.h"

class MediumRegularFont final : public FontModule
{
private:
inline static const std::vector<Symbol> 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,
0b110000,
0b111111,
},
0,
0,
},
{
// 0x33, 3
{
0b011110,
0b110011,
0b000011,
0b001110,
0b000011,
0b110011,
0b011110,
},
0,
0,
},
{
// 0x34, 4
{
0b110011,
0b110011,
0b110011,
0b011111,
0b000011,
0b000011,
0b000011,
},
0,
0,
},
{
// 0x35, 5
{
0b111111,
0b110000,
0b110000,
0b111110,
0b000011,
0b110011,
0b011110,
},
0,
0,
},
{
// 0x36, 6
{
0b011110,
0b110011,
0b110000,
0b111110,
0b110011,
0b110011,
0b011110,
},
0,
0,
},
{
// 0x37, 7
{
0b111111,
0b000011,
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 MediumRegularFont();

[[nodiscard]] Symbol getChar(uint32_t character) const override;
};

extern MediumRegularFont *FontMediumRegular;
4 changes: 2 additions & 2 deletions firmware/include/fonts/MicroFont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class MicroFont final : public FontModule
{
private:
const std::vector<Symbol> ascii = {
inline static const std::vector<Symbol> ascii = {
{
// 0x20, SPACE
{},
Expand Down Expand Up @@ -630,7 +630,7 @@ class MicroFont final : public FontModule
},
};

const std::vector<SymbolExtended> unicode = {
inline static const std::vector<SymbolExtended> unicode = {
{
0xB0, // ° DEGREE SIGN
{
Expand Down
4 changes: 2 additions & 2 deletions firmware/include/fonts/MiniFont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class MiniFont final : public FontModule
{
private:
const std::vector<Symbol> ascii = {
inline static const std::vector<Symbol> ascii = {
{
// 0x20, SPACE
{},
Expand Down Expand Up @@ -842,7 +842,7 @@ class MiniFont final : public FontModule
},
};

const std::vector<SymbolExtended> unicode = {
inline static const std::vector<SymbolExtended> unicode = {
{
0xB0, // ° DEGREE SIGN
{
Expand Down
4 changes: 2 additions & 2 deletions firmware/include/fonts/SmallFont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class SmallFont final : public FontModule
{
private:
const std::vector<Symbol> ascii = {
inline static const std::vector<Symbol> ascii = {
{
// 0x20, SPACE
{},
Expand Down Expand Up @@ -1230,7 +1230,7 @@ class SmallFont final : public FontModule
},
};

const std::vector<SymbolExtended> unicode = {
inline static const std::vector<SymbolExtended> unicode = {
{
0xB0, // ° DEGREE SIGN
{
Expand Down
Loading
Loading