From bb4b6ad55a7dab93fff1d782cd7c714f8fb095f7 Mon Sep 17 00:00:00 2001 From: Vihaan Jim Date: Wed, 2 Aug 2023 15:09:38 -0400 Subject: [PATCH] Small changes to status and apploader I forgot to revert to the previous versions of the other status files (turns out I only need to do it for one). I also changed to using the hello binary in debug. --- Cargo.lock | 1 - apps/app-loader/src/main.rs | 2 +- services/status/src/appmenu.rs | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d1b164caf..92ccf0781 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4441,7 +4441,6 @@ checksum = "5c0e04424e733e69714ca1bbb9204c1a57f09f5493439520f9f68c132ad25eec" name = "status" version = "0.1.0" dependencies = [ - "app-loader", "chrono", "codec", "com", diff --git a/apps/app-loader/src/main.rs b/apps/app-loader/src/main.rs index 8f7f33f4b..190e5e2b6 100644 --- a/apps/app-loader/src/main.rs +++ b/apps/app-loader/src/main.rs @@ -77,7 +77,7 @@ fn main() -> ! { log::info!("Result of ping: {:?}", result); // load the app from the binary file - let bin = include_bytes!("hello"); + let bin = include_bytes!("../../../target/riscv32imac-unknown-xous-elf/release/hello"); let bin_len = bin.len(); let bin_loc = bin.as_ptr() as usize; let buf = unsafe { xous::MemoryRange::new(bin_loc & !0xFFF, bin_len + if bin_len & 0xFFF == 0 { 0 } else {0x1000 - (bin_len & 0xFFF)}).expect("Couldn't create a buffer from the segment") }; diff --git a/services/status/src/appmenu.rs b/services/status/src/appmenu.rs index d38393e30..4eb5868b5 100644 --- a/services/status/src/appmenu.rs +++ b/services/status/src/appmenu.rs @@ -4,7 +4,7 @@ use num_traits::*; use crate::{StatusOpcode, app_autogen}; -pub fn create_app_menu(status_conn: xous::CID) -> Option { +pub fn create_app_menu(status_conn: xous::CID) { let mut menu_items = Vec::::new(); menu_items.push(MenuItem { @@ -25,5 +25,5 @@ pub fn create_app_menu(status_conn: xous::CID) -> Option { action_payload: MenuPayload::Scalar([0, 0, 0, 0]), close_on_select: true, }); - menu_matic(menu_items, gam::APP_MENU_NAME, Some(xous::create_server().expect("Couldn't create appmenu server!"))) + menu_matic(menu_items, gam::APP_MENU_NAME, None); }