Regenerate data files with profont tool

data/Makefile

@@ -3,7 +3,18 @@ RAW = ${PNG:.png=.raw}
 
 all: ${RAW}
 
+pngs:
+	cargo run --release -- 7
+	cargo run --release -- 9
+	cargo run --release -- 10
+	cargo run --release -- 12
+	cargo run --release -- 14
+	cargo run --release -- 18
+	cargo run --release -- 24
+
 .SUFFIXES: .png .raw
 
 .png.raw:
 	convert ${.IMPSRC} -depth 1 gray:${.TARGET}
+
+.PHONY: pngs

src/lib.rs

@@ -5,6 +5,8 @@ extern crate embedded_graphics;
 
 use embedded_graphics::fonts::font_builder::{FontBuilder, FontBuilderConf};
 
+const CHARS_PER_ROW: u32 = 32;
+
 #[cfg(test)]
 pub(crate) mod mock_display;
 
@@ -14,7 +16,7 @@ impl FontBuilderConf for ProFont7PointConf {
     const FONT_IMAGE: &'static [u8] = include_bytes!("../data/ProFont7Point.raw");
     const CHAR_HEIGHT: u32 = 9;
     const CHAR_WIDTH: u32 = 5;
-    const FONT_IMAGE_WIDTH: u32 = 200;
+    const FONT_IMAGE_WIDTH: u32 = Self::CHAR_WIDTH * CHARS_PER_ROW;
     fn char_offset(c: char) -> u32 {
         let fallback = '?' as u32 - ' ' as u32;
         if c < ' ' {
@@ -39,7 +41,7 @@ impl FontBuilderConf for ProFont9PointConf {
     const FONT_IMAGE: &'static [u8] = include_bytes!("../data/ProFont9Point.raw");
     const CHAR_HEIGHT: u32 = 11;
     const CHAR_WIDTH: u32 = 6;
-    const FONT_IMAGE_WIDTH: u32 = 240;
+    const FONT_IMAGE_WIDTH: u32 = Self::CHAR_WIDTH * CHARS_PER_ROW;
     fn char_offset(c: char) -> u32 {
         let fallback = '?' as u32 - ' ' as u32;
         if c < ' ' {
@@ -64,7 +66,7 @@ impl FontBuilderConf for ProFont18PointConf {
     const FONT_IMAGE: &'static [u8] = include_bytes!("../data/ProFont18Point.raw");
     const CHAR_HEIGHT: u32 = 22;
     const CHAR_WIDTH: u32 = 12;
-    const FONT_IMAGE_WIDTH: u32 = 480;
+    const FONT_IMAGE_WIDTH: u32 = Self::CHAR_WIDTH * CHARS_PER_ROW;
     fn char_offset(c: char) -> u32 {
         let fallback = '?' as u32 - ' ' as u32;
         if c < ' ' {
@@ -87,9 +89,9 @@ pub type ProFont18Point<'a, C> = FontBuilder<'a, C, ProFont18PointConf>;
 pub enum ProFont24PointConf {}
 impl FontBuilderConf for ProFont24PointConf {
     const FONT_IMAGE: &'static [u8] = include_bytes!("../data/ProFont24Point.raw");
-    const CHAR_HEIGHT: u32 = 29;
+    const CHAR_HEIGHT: u32 = 30;
     const CHAR_WIDTH: u32 = 16;
-    const FONT_IMAGE_WIDTH: u32 = 640;
+    const FONT_IMAGE_WIDTH: u32 = Self::CHAR_WIDTH * CHARS_PER_ROW;
     fn char_offset(c: char) -> u32 {
         let fallback = '?' as u32 - ' ' as u32;
         if c < ' ' {

src/main.rs

@@ -142,7 +142,7 @@ fn main() {
         }
     }
 
-    let filename = format!("data/ProFont{}Point.png", font_size);
+    let filename = format!("ProFont{}Point.png", font_size);
     imgbuf.save(&filename).expect("error saving PNG");
     println!("Wrote {} with character size of {}", filename, char_size);
 }