diff --git a/kandinsky/fonts/LargeFont.ttf b/kandinsky/fonts/LargeFont.ttf index a248bbb6d..0d7966eae 100644 Binary files a/kandinsky/fonts/LargeFont.ttf and b/kandinsky/fonts/LargeFont.ttf differ diff --git a/kandinsky/fonts/SmallFont.ttf b/kandinsky/fonts/SmallFont.ttf index 059148375..1473fd3a5 100644 Binary files a/kandinsky/fonts/SmallFont.ttf and b/kandinsky/fonts/SmallFont.ttf differ diff --git a/kandinsky/fonts/code_points.h b/kandinsky/fonts/code_points.h index 6712bcc2a..c7c584c47 100644 --- a/kandinsky/fonts/code_points.h +++ b/kandinsky/fonts/code_points.h @@ -131,6 +131,7 @@ uint32_t CodePoints[] = { 0x393, // Γ // GREEK CAPITAL LETTER GAMMA 0x394, // Δ // GREEK CAPITAL LETTER DELTA + 0x3a9, // Ω // GREEK CAPITAL LETTER OMEGA 0x3b8, // θ // GREEK SMALL LETTER THETA 0x3bb, // λ // GREEK SMALL LETTER LAMDA 0x3bc, // μ // GREEK SMALL LETTER MU diff --git a/kandinsky/include/kandinsky/font.h b/kandinsky/include/kandinsky/font.h index 8c5d668a7..4765584dd 100644 --- a/kandinsky/include/kandinsky/font.h +++ b/kandinsky/include/kandinsky/font.h @@ -59,7 +59,7 @@ public: CodePoint m_codePoint; GlyphIndex m_glyphIndex; }; - static constexpr GlyphIndex IndexForReplacementCharacterCodePoint = 132; + static constexpr GlyphIndex IndexForReplacementCharacterCodePoint = 133; GlyphIndex indexForCodePoint(CodePoint c) const; void setGlyphGreyscalesForCodePoint(CodePoint codePoint, GlyphBuffer * glyphBuffer) const; diff --git a/poincare/include/poincare/unit.h b/poincare/include/poincare/unit.h index 1440820c3..ca91bc214 100644 --- a/poincare/include/poincare/unit.h +++ b/poincare/include/poincare/unit.h @@ -341,9 +341,9 @@ public: LongScalePrefixes, LongScalePrefixesCount), }, ElectricResistanceRepresentatives[] = { - Representative("Ohm", "_kg*_m^2*_s^-3*_A^-2", + Representative("Ω", "_kg*_m^2*_s^-3*_A^-2", Representative::Prefixable::Yes, - LongScalePrefixes, LongScalePrefixesCount), //FIXME Omega CodePoint? + LongScalePrefixes, LongScalePrefixesCount), }, ElectricConductanceRepresentatives[] = { Representative("S", "_A^2*_s^3*_kg^-1*_m^-2",