update gam to refer to blitstr2 crate

This commit is contained in:
bunnie 2025-02-17 18:27:36 +08:00
parent 5fd75ec373
commit b67e8ac798
8 changed files with 9 additions and 6 deletions

View file

@ -20,6 +20,7 @@ trng = { path = "../trng", optional = true }
xous = "0.9.64"
xous-ipc = "0.10.4"
xous-names = { package = "xous-api-names", version = "0.9.65" }
blitstr2 = { path = "../../libs/blitstr2" }
num-derive = { version = "0.4.2", default-features = false }
num-traits = { version = "0.2.14", default-features = false }

View file

@ -1,11 +1,12 @@
use std::collections::HashMap;
use blitstr2::GlyphStyle;
#[cfg(feature = "cramium-soc")]
use cram_hal_service::trng;
use graphics_server::*;
use crate::Canvas;
use crate::contexts::MISC_CONTEXT_DEFAULT_TRUST;
use crate::{Canvas, GlyphStyle};
use crate::{LayoutApi, LayoutBehavior};
const TRUST_OFFSET: u8 = 2;

View file

@ -15,7 +15,7 @@ pub mod bitmap;
use api::Opcode; // if you prefer to map the api into your local namespace
#[cfg(feature = "ditherpunk")]
pub use bitmap::{Bitmap, DecodePng, Img, PixelType};
pub use graphics_server::api::GlyphStyle;
pub use blitstr2::GlyphStyle;
pub use graphics_server::api::PixelColor;
#[cfg(feature = "ditherpunk")]
pub use graphics_server::api::Tile;

View file

@ -15,6 +15,7 @@ use core::sync::atomic::{AtomicU32, Ordering};
use std::collections::HashMap;
use api::Opcode;
use blitstr2::GlyphStyle;
#[cfg(feature = "cramium-soc")]
use cram_hal_service::trng;
use gam::{MAIN_MENU_NAME, ROOTKEY_MODAL_NAME};

View file

@ -22,8 +22,8 @@ mod bip39entry;
use core::fmt::Write;
pub use bip39entry::*;
pub use blitstr2::GlyphStyle;
use enum_dispatch::enum_dispatch;
pub use graphics_server::api::GlyphStyle;
use graphics_server::api::*;
use num_traits::*;
use xous_ipc::Buffer;

View file

@ -2,7 +2,7 @@ use core::cell::Cell;
use core::fmt::Write;
use std::string::String;
use glyphstyle::GlyphStyle;
use blitstr2::{GlyphStyle, glyph_to_height_hint};
use graphics_server::api::*;
use locales::t;
use xous_ipc::Buffer;

View file

@ -1,4 +1,4 @@
use graphics_server::api::GlyphStyle;
use blitstr2::GlyphStyle;
use crate::*;

View file

@ -2,7 +2,7 @@ use core::cell::Cell;
use core::fmt::Write;
use std::cell::RefCell;
use graphics_server::api::GlyphStyle;
use blitstr2::*;
use graphics_server::api::*;
use num_traits::*;
use xous_ipc::Buffer;