Trying to add pcsenior font to embedded graphics

jackra1n · Nov 21, 2023 · 4c57614 · 4c57614
1 parent f645704
commit 4c57614
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/data/pcsenior.png b/data/pcsenior.png
diff --git a/data/pcsenior.raw b/data/pcsenior.raw
diff --git a/src/display.rs b/src/display.rs
@@ -2,14 +2,15 @@ use linux_embedded_hal::I2cdev;
 use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306, mode::BufferedGraphicsMode};
 use display_interface::DisplayError;
 use embedded_graphics::{
-    mono_font::{ascii, MonoTextStyleBuilder, MonoTextStyle},
+    image::ImageRaw,
+    mono_font::{ascii, MonoTextStyleBuilder, MonoFont, MonoTextStyle, DecorationDimensions, mapping::StrGlyphMapping},
     pixelcolor::BinaryColor,
     prelude::*,
     text::Text
 };
 use profont::PROFONT_12_POINT;
 
-const PROFONT12: MonoTextStyle<'_, BinaryColor> = MonoTextStyleBuilder::new()
+const OLD_PROFONT12: MonoTextStyle<'_, BinaryColor> = MonoTextStyleBuilder::new()
     .font(&PROFONT_12_POINT)
     .text_color(BinaryColor::On)
     .build();
@@ -24,6 +25,27 @@ const FONT_5X8: MonoTextStyle<'_, BinaryColor> = MonoTextStyleBuilder::new()
     .text_color(BinaryColor::On)
     .build();
 
+const GLYPH_MAPPING: StrGlyphMapping = StrGlyphMapping::new(" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~°", '?' as usize - ' ' as usize);
+
+const PCSENIOR12: MonoFont = MonoFont {
+    image: ImageRaw::new(
+        include_bytes!("../data/pcsenior.raw"),
+        192,
+    ),
+    character_size: Size::new(12, 15),
+    character_spacing: 0,
+    baseline: 11,
+    underline: DecorationDimensions::new(13, 1),
+    strikethrough: DecorationDimensions::new(15 / 2, 1),
+    glyph_mapping: &GLYPH_MAPPING,
+};
+
+const PROFONT12: MonoTextStyle<'_, BinaryColor> = MonoTextStyleBuilder::new()
+    .font(&PCSENIOR12)
+    .text_color(BinaryColor::On)
+    .build();
+
+
 type Display = Ssd1306<I2CInterface<I2cdev>, DisplaySize128x32, BufferedGraphicsMode<DisplaySize128x32>>;
 
 pub struct PoeDisplay {