From 2a97d9a8275401ef5168416c09923134e736377e Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 24 Feb 2025 02:28:34 +0800 Subject: [PATCH] fix location of font offsets --- libs/blitstr2/codegen/lib/templates.go | 2 +- libs/blitstr2/src/fontmap.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/blitstr2/codegen/lib/templates.go b/libs/blitstr2/codegen/lib/templates.go index 400d971ba..f1b9beb14 100644 --- a/libs/blitstr2/codegen/lib/templates.go +++ b/libs/blitstr2/codegen/lib/templates.go @@ -187,7 +187,7 @@ const fontmapTemplate = `#![cfg_attr(rustfmt, rustfmt_skip)] #[cfg(not(feature = "cramium-soc"))] pub const FONT_BASE: usize = 0x2053_0000; #[cfg(feature = "cramium-soc")] -pub const FONT_BASE: usize = 0x6001_0000; +pub const FONT_BASE: usize = 0x6004_0000; {{range $f := .FontDir}}#[cfg(not(feature = "cramium-soc"))] pub const {{$f.Name}}: usize = 0x{{$f.Len}}; diff --git a/libs/blitstr2/src/fontmap.rs b/libs/blitstr2/src/fontmap.rs index 4ac959ac2..ed6016ec3 100644 --- a/libs/blitstr2/src/fontmap.rs +++ b/libs/blitstr2/src/fontmap.rs @@ -6,7 +6,7 @@ #[cfg(not(feature = "cramium-soc"))] pub const FONT_BASE: usize = 0x2053_0000; #[cfg(feature = "cramium-soc")] -pub const FONT_BASE: usize = 0x6001_0000; +pub const FONT_BASE: usize = 0x6004_0000; #[cfg(not(feature = "cramium-soc"))] pub const EMOJI_OFFSET: usize = 0x0;