Add multiple font support to `print`

This also adds a new font, the API changes are backwards compatible so it should be fine, I will also leave here a font converter from BDF to STM whatever.

use std::{iter, env, error::Error, io};
use itertools::Itertools;
use bdf;

const CHARSET: &[char] = &[' ', '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~'];

fn main() -> Result<(), Box<dyn Error>> {
	let name = env::args().nth(1).expect("no font name provided");
	let font = bdf::read(io::stdin())?;

	println!("#include \"fonts.h\"");
	println!("const uint8_t {name}_Table[] =", name = name);
	println!("{{");

	for (&ch, glyph) in CHARSET.iter().map(|ch| (ch, font.glyphs().get(ch).unwrap())) {
		println!();
		println!("\t// @{codepoint} {ch:?} ({width} pixels wide)",
			codepoint = ch as usize,
			ch = ch,
			width = glyph.width());

		for y in 0 .. glyph.height() {
			print!("\t");

			let mut draw = String::new();

			for bits in &iter::repeat(false).take(glyph.bounds().x as usize)
				.chain((0 .. glyph.width()).map(|x| glyph.map().get(x, y)))
				.chunks(8)
			{
				let mut bits = bits.collect::<Vec<_>>();
				if bits.len() < 8 {
					for _ in 0 .. 8 - bits.len() {
						bits.push(false);
					}
				}

				let byte = bits.into_iter()
					.rev().enumerate()
					.fold(0, |acc, (i, b)| acc | ((b as u8) << i));

				draw.push_str(&format!("{1:00$b}", glyph.width() as usize, byte));

				print!("0x{:02X}, ", byte);
			}

			println!("//{}", draw.replace("1", "#").replace("0", " "));
		}

		// Print the right amount of empty lines.
		for _ in 0 .. font.bounds().y.abs() + glyph.bounds().y {
			for _ in 0 .. (glyph.width() + glyph.bounds().x as u32) / 8 {
				print!("0x{:02X}, ", 0);
			}

			println!();
		}
	}

	println!("}};");
	println!();

	println!("sFONT {name} = {{ {name}_Table, {width}, {height} }};",
		name = name,
		width = font.bounds().width,
		height = font.bounds().height);

	Ok(())
}

added 1 commit

• c3538a07 - feat: add GohuFont as supported font

Compare with previous version

So this kinda overlaps with !214 (merged) (the part of listing existing fonts) and !259 (closed) (which is a first step towards adding new fonts loaded from the filesystem, but doesn't do that yet)

I talked about this with meh IRL and we agreed that this is the hacky but quick way to add new fonts. It's good for personal usage if anyone wants to merge in new fonts, but otherwise it'd be better to go with the other approaches.

On the other hand, the rust script is definitely interesting and useful!

added 3-Module 6 - Needs Review labels

@dx, @meh: What should we do with this MR?

I'd say close this in favor of whatever else but keep the font conversion tool around because that's very useful.

@meh, can you open a new merge-request which adds the font conversion tool into a folder tools/font-converter/*? Ideally also add a README describing what it does.

(or a more fitting name, if you want)

added 53 commits

• c3538a07...622d2145 - 52 commits from branch card10:master
• 2da41e3f - feat: add GohuFont as supported font

Compare with previous version

Sorry, it looks like this Merge Request has some code quality issues!

The pipeline lint has failed - look at its failure output to understand what sort of diffs we'd like you to apply.

You can also use tools/code-style.sh to fix files that have issues.

Good luck! I will update this comment when I detect you have applied your fixes.

Changing an existing API call is never allowed, for backwards compatibility. Please either create a new one, or make use of the existing print_adv call here.

This change would break existing code.

Please remove this change. Code in the lib/gfx/ folder should be formatted just as well. If you want to exclude the font file, please add a /* clang-format off */ at the very top.

If I am not mistaken, this is dead code.

added 6 - Changes Requested label and removed 6 - Needs Review label

mentioned in merge request !340 (closed)

Took the rust script into !340 (closed), closing this one

closed

@dx, the rust script was not the main point of this MR. It was the addition of the Gohufont which I would still like to see.

reopened

@rahix Oh okay, I was going by https://git.card10.badge.events.ccc.de/card10/firmware/merge_requests/256#note_4835 and https://git.card10.badge.events.ccc.de/card10/firmware/merge_requests/256#note_4856