diff --git a/apps/hidv2/Cargo.toml b/apps/hidv2/Cargo.toml index 366385099..f42856af2 100644 --- a/apps/hidv2/Cargo.toml +++ b/apps/hidv2/Cargo.toml @@ -12,7 +12,8 @@ xous-ipc = "0.10.4" log-server = { package = "xous-api-log", version = "0.1.63" } xous-names = { package = "xous-api-names", version = "0.9.65" } gam = { path = "../../services/gam" } -graphics-server = { path = "../../services/graphics-server" } +ux-api = { path = "../../libs/ux-api" } +blitstr2 = { path = "../../libs/blitstr2" } locales = { path = "../../locales" } tts-frontend = { path = "../../services/tts" } usb-device-xous = { path = "../../services/usb-device-xous" } diff --git a/apps/hidv2/src/main.rs b/apps/hidv2/src/main.rs index 81671e565..6e59724f2 100644 --- a/apps/hidv2/src/main.rs +++ b/apps/hidv2/src/main.rs @@ -4,10 +4,11 @@ use core::fmt::Write; use std::sync::mpsc::{self, Receiver, Sender}; -use graphics_server::api::GlyphStyle; -use graphics_server::{DrawStyle, Gid, PixelColor, Point, Rectangle, TextBounds, TextView}; +use blitstr2::GlyphStyle; use num_traits::*; use usb_device_xous::UsbHid; +use ux_api::minigfx::*; +use ux_api::service::api::*; pub(crate) const SERVER_NAME_HIDV2: &str = "_HIDv2_";