Merge branch 'main' into cram-dev

betrusted-io · Feb 23, 2025 · 0d5a4e8 · 0d5a4e8
2 parents 558c61a + 8c89189
commit 0d5a4e8
Show file tree

Hide file tree

Showing 118 changed files with 1,943 additions and 3,540 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/app-loader/Cargo.toml b/apps/app-loader/Cargo.toml
@@ -13,7 +13,7 @@ log-server = { package = "xous-api-log", version = "0.1.63" }
 log = "0.4.14"
 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" }
 modals = { path = "../../services/modals" }
 ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.63" }
 locales = { path = "../../locales" }

diff --git a/apps/chat-test/Cargo.toml b/apps/chat-test/Cargo.toml
@@ -16,7 +16,6 @@ log-server = { package = "xous-api-log", version = "0.1.63" }
 ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.63" }
 xous-names = { package = "xous-api-names", version = "0.9.65" }
 gam = { path = "../../services/gam" }
-graphics-server = { path = "../../services/graphics-server" }
 trng = { path = "../../services/trng" }
 locales = { path = "../../locales" }
 ime-plugin-api = { path = "../../services/ime-plugin-api" }

diff --git a/apps/hello/Cargo.toml b/apps/hello/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" }
 

diff --git a/apps/hello/src/main.rs b/apps/hello/src/main.rs
@@ -3,12 +3,13 @@
 
 use core::fmt::Write;
 
-use graphics_server::api::GlyphStyle;
-use graphics_server::{DrawStyle, Gid, PixelColor, Point, Rectangle, TextBounds, TextView};
+use blitstr2::GlyphStyle;
 use locales::t;
 use num_traits::*;
 #[cfg(feature = "tts")]
 use tts_frontend::*;
+use ux_api::minigfx::*;
+use ux_api::service::api::Gid;
 
 /// Basic 'Hello World!' application that draws a simple
 /// TextView to the screen.

diff --git 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
@@ -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_";
 

diff --git a/apps/mtxchat/Cargo.toml b/apps/mtxchat/Cargo.toml
@@ -16,7 +16,8 @@ log-server = { package = "xous-api-log", version = "0.1.63" }
 ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.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" }
 trng = { path = "../../services/trng" }
 locales = { path = "../../locales" }
 ime-plugin-api = { path = "../../services/ime-plugin-api" }