mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
version with threads compiles, but doesn't work yet
This commit is contained in:
parent
4ee7f67f82
commit
99d8f2a525
3 changed files with 26 additions and 16 deletions
|
|
@ -21,8 +21,8 @@ riscv = "0.5.6"
|
||||||
debug-print = []
|
debug-print = []
|
||||||
print-panics = []
|
print-panics = []
|
||||||
report-memory = ["stats_alloc"]
|
report-memory = ["stats_alloc"]
|
||||||
#default = ["print-panics", "debug-print"]
|
default = ["print-panics", "debug-print"]
|
||||||
default = []
|
#default = []
|
||||||
|
|
||||||
[target.'cfg(any(windows, unix))'.dependencies]
|
[target.'cfg(any(windows, unix))'.dependencies]
|
||||||
lazy_static = "1.4"
|
lazy_static = "1.4"
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ mod implementation {
|
||||||
self.txrx(tx)
|
self.txrx(tx)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn process_queue(&mut self) {
|
pub fn process_queue(&mut self) {
|
||||||
if !self.workqueue.is_empty() && !self.busy {
|
if !self.workqueue.is_empty() && !self.busy {
|
||||||
self.busy = true;
|
self.busy = true;
|
||||||
let work_descriptor = self.workqueue.swap_remove(0); // not quite FIFO, but Vec does not support FIFO (best we can do with "heapless")
|
let work_descriptor = self.workqueue.swap_remove(0); // not quite FIFO, but Vec does not support FIFO (best we can do with "heapless")
|
||||||
|
|
@ -224,11 +224,12 @@ fn xmain() -> ! {
|
||||||
println!("COM Init");
|
println!("COM Init");
|
||||||
log_server::init_wait().unwrap();
|
log_server::init_wait().unwrap();
|
||||||
|
|
||||||
let shell_id = xous::SID::from_bytes(b"shell ").unwrap();
|
|
||||||
let shell_conn = xous::connect(shell_id).unwrap();
|
|
||||||
let com_server =
|
let com_server =
|
||||||
xous::create_server(b"com ").expect("Couldn't create COM server");
|
xous::create_server(b"com ").expect("Couldn't create COM server");
|
||||||
|
|
||||||
|
let shell_id = xous::SID::from_bytes(b"shell ").unwrap();
|
||||||
|
let shell_conn = xous::connect(shell_id).unwrap();
|
||||||
|
|
||||||
// Create a new com object
|
// Create a new com object
|
||||||
let mut com = XousCom::new();
|
let mut com = XousCom::new();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -118,21 +118,30 @@ impl Bounce {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
use core::sync::atomic::{AtomicU16, AtomicI16, AtomicU8, Ordering};
|
||||||
pub struct ShellReturn {
|
|
||||||
batt_stats: BattStats,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn com_thread(retvals: &mut ShellReturn) {
|
// need atomic global constants to pass data between threads
|
||||||
|
// as we do not yet have a "Mutex" in Xous
|
||||||
|
static BATT_STATS_VOLTAGE: AtomicU16 = AtomicU16::new(3700);
|
||||||
|
static BATT_STATS_CURRENT: AtomicI16 = AtomicI16::new(-150);
|
||||||
|
static BATT_STATS_SOC: AtomicU8 = AtomicU8::new(50);
|
||||||
|
static BATT_STATS_REMAINING: AtomicU16 = AtomicU16::new(750);
|
||||||
|
|
||||||
|
fn com_thread(_arg: Option<u32>) {
|
||||||
let shell_server = xous::create_server(b"shell ").expect("Couldn't create Shell server");
|
let shell_server = xous::create_server(b"shell ").expect("Couldn't create Shell server");
|
||||||
let shell_id = xous::SID::from_bytes(b"shell ").unwrap();
|
let shell_id = xous::SID::from_bytes(b"shell ").unwrap();
|
||||||
|
info!("SHELL|com_thread: starting COM response handler thread");
|
||||||
loop {
|
loop {
|
||||||
let mut envelope =
|
let mut envelope =
|
||||||
xous::syscall::receive_message(shell_id).expect("couldn't get address");
|
xous::syscall::receive_message(shell_id).expect("couldn't get address");
|
||||||
|
info!("SHELL|com_thread: got message {:?}", envelope);
|
||||||
if let Ok(opcode) = com::api::Opcode::try_from(&envelope.body) {
|
if let Ok(opcode) = com::api::Opcode::try_from(&envelope.body) {
|
||||||
match opcode {
|
match opcode {
|
||||||
com::api::Opcode::BattStatsReturn(stats) => {
|
com::api::Opcode::BattStatsReturn(stats) => {
|
||||||
retvals.batt_stats = stats;
|
BATT_STATS_VOLTAGE.store(stats.voltage, Ordering::Relaxed);
|
||||||
|
BATT_STATS_CURRENT.store(stats.current, Ordering::Relaxed);
|
||||||
|
BATT_STATS_SOC.store(stats.soc, Ordering::Relaxed);
|
||||||
|
BATT_STATS_REMAINING.store(stats.remaining_capacity, Ordering::Relaxed);
|
||||||
},
|
},
|
||||||
_ => error!("shell received an opcode that wasn't expected")
|
_ => error!("shell received an opcode that wasn't expected")
|
||||||
}
|
}
|
||||||
|
|
@ -147,6 +156,9 @@ fn shell_main() -> ! {
|
||||||
timer::init();
|
timer::init();
|
||||||
log_server::init_wait().unwrap();
|
log_server::init_wait().unwrap();
|
||||||
|
|
||||||
|
// make a thread to catch responses from the COM
|
||||||
|
xous::create_thread_simple(com_thread, None).unwrap();
|
||||||
|
|
||||||
// let log_server_id = xous::SID::from_bytes(b"xous-logs-output").unwrap();
|
// let log_server_id = xous::SID::from_bytes(b"xous-logs-output").unwrap();
|
||||||
let graphics_server_id = xous::SID::from_bytes(b"graphics-server ").unwrap();
|
let graphics_server_id = xous::SID::from_bytes(b"graphics-server ").unwrap();
|
||||||
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
|
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
|
||||||
|
|
@ -174,9 +186,6 @@ fn shell_main() -> ! {
|
||||||
"SHELL: graphics and ticktimer connections are the same!"
|
"SHELL: graphics and ticktimer connections are the same!"
|
||||||
);
|
);
|
||||||
|
|
||||||
let mut retvals: ShellReturn = ShellReturn::default();
|
|
||||||
xous::create_thread_simple(com_thread, &mut retvals);
|
|
||||||
|
|
||||||
let screensize = graphics_server::screen_size(graphics_conn).expect("Couldn't get screen size");
|
let screensize = graphics_server::screen_size(graphics_conn).expect("Couldn't get screen size");
|
||||||
|
|
||||||
let dark = graphics_server::Color::from(0);
|
let dark = graphics_server::Color::from(0);
|
||||||
|
|
@ -226,7 +235,7 @@ fn shell_main() -> ! {
|
||||||
}
|
}
|
||||||
|
|
||||||
string_buffer.clear();
|
string_buffer.clear();
|
||||||
write!(&mut string_buffer, "{}mV Uptime: {:.2}s", retvals.batt_stats.voltage, last_time as f32 / 1000f32).expect("Can't write");
|
write!(&mut string_buffer, "{}mV Uptime: {:.2}s", /*BATT_STATS_VOLTAGE.load(Ordering::Relaxed)*/ -1, last_time as f32 / 1000f32).expect("Can't write");
|
||||||
graphics_server::set_glyph(graphics_conn, GlyphSet::Small).expect("unable to set glyph");
|
graphics_server::set_glyph(graphics_conn, GlyphSet::Small).expect("unable to set glyph");
|
||||||
let (_, h) = graphics_server::query_glyph(graphics_conn).expect("unable to query glyph");
|
let (_, h) = graphics_server::query_glyph(graphics_conn).expect("unable to query glyph");
|
||||||
graphics_server::clear_region(graphics_conn, 0, 0, screensize.x as usize - 1, h)
|
graphics_server::clear_region(graphics_conn, 0, 0, screensize.x as usize - 1, h)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue