mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
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.
This commit is contained in:
parent
ded9049ee4
commit
bb4b6ad55a
3 changed files with 3 additions and 4 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -4441,7 +4441,6 @@ checksum = "5c0e04424e733e69714ca1bbb9204c1a57f09f5493439520f9f68c132ad25eec"
|
||||||
name = "status"
|
name = "status"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"app-loader",
|
|
||||||
"chrono",
|
"chrono",
|
||||||
"codec",
|
"codec",
|
||||||
"com",
|
"com",
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ fn main() -> ! {
|
||||||
log::info!("Result of ping: {:?}", result);
|
log::info!("Result of ping: {:?}", result);
|
||||||
|
|
||||||
// load the app from the binary file
|
// 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_len = bin.len();
|
||||||
let bin_loc = bin.as_ptr() as usize;
|
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") };
|
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") };
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ use num_traits::*;
|
||||||
|
|
||||||
use crate::{StatusOpcode, app_autogen};
|
use crate::{StatusOpcode, app_autogen};
|
||||||
|
|
||||||
pub fn create_app_menu(status_conn: xous::CID) -> Option<MenuMatic> {
|
pub fn create_app_menu(status_conn: xous::CID) {
|
||||||
let mut menu_items = Vec::<MenuItem>::new();
|
let mut menu_items = Vec::<MenuItem>::new();
|
||||||
|
|
||||||
menu_items.push(MenuItem {
|
menu_items.push(MenuItem {
|
||||||
|
|
@ -25,5 +25,5 @@ pub fn create_app_menu(status_conn: xous::CID) -> Option<MenuMatic> {
|
||||||
action_payload: MenuPayload::Scalar([0, 0, 0, 0]),
|
action_payload: MenuPayload::Scalar([0, 0, 0, 0]),
|
||||||
close_on_select: true,
|
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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue