intermediate checkin for sharing

This commit is contained in:
bunnie 2021-01-01 00:45:07 +08:00
parent 9d63d39cae
commit 534fb5373a
2 changed files with 58 additions and 19 deletions

View file

@ -40,7 +40,7 @@ mod implementation {
use heapless::consts::*; use heapless::consts::*;
/* /*
use typenum::{UInt, UTerm}; use typenum::{UInt, UTerm};'
use typenum::bit::{B0, B1}; use typenum::bit::{B0, B1};
type U1280 = UInt<UInt<UInt<UInt<UInt<UInt<UInt<UInt<UInt<UInt<UInt<UTerm, B1>, B0>, B1>, B0>, B0>, B0>, B0>, B0>, B0>, B0>, B0>; type U1280 = UInt<UInt<UInt<UInt<UInt<UInt<UInt<UInt<UInt<UInt<UInt<UTerm, B1>, B0>, B1>, B0>, B0>, B0>, B0>, B0>, B0>, B0>, B0>;
*/ */
@ -224,12 +224,12 @@ fn xmain() -> ! {
let shell_conn = xous::connect(shell_id).unwrap(); let shell_conn = xous::connect(shell_id).unwrap();
let agent_conn: usize; let agent_conn: usize;
if cfg!(feature = "fccagent") { //if cfg!(feature = "fccagent") {
let agent_id = xous::SID::from_bytes(b"fcc-agent-server").unwrap(); let agent_id = xous::SID::from_bytes(b"fcc-agent-server").unwrap();
agent_conn = xous::connect(agent_id).expect("Couldn't connect to fcc-agent! Are you building with the right features enabled?"); agent_conn = xous::connect(agent_id).expect("Couldn't connect to fcc-agent! Are you building with the right features enabled?");
} else { //} else {
agent_conn = 0; // bogus value // agent_conn = 0; // bogus value
} //}
// Create a new com object // Create a new com object
let mut com = XousCom::new(); let mut com = XousCom::new();
@ -306,12 +306,12 @@ fn xmain() -> ! {
stats[i*2] = data as u8; stats[i*2] = data as u8;
stats[i*2+1] = (data >> 8) as u8; stats[i*2+1] = (data >> 8) as u8;
} }
if cfg!(feature = "fccagent") { //if cfg!(feature = "fccagent") {
// hard-coded from fccagent to break circular dependency of fcc agent on com on agent on com on... // hard-coded from fccagent to break circular dependency of fcc agent on com on agent on com on...
let data = xous::carton::Carton::from_bytes(&stats); let data = xous::carton::Carton::from_bytes(&stats);
let m = xous::Message::Borrow(data.into_message(2)); let m = xous::Message::Borrow(data.into_message(2));
xous::send_message(agent_conn, m); xous::send_message(agent_conn, m);
} //}
} }
_ => error!("unknown opcode"), _ => error!("unknown opcode"),
} }

View file

@ -120,8 +120,43 @@ impl Write for Uart {
} }
fn do_agent(cmd: &mut String<U2048>, com_cid: xous::CID) -> Result<(), xous::Error> { fn do_agent(cmd: &mut String<U2048>, com_cid: xous::CID) -> Result<(), xous::Error> {
let tokens: Vec<&str, U16> = cmd.as_mut_str().split(' ').collect(); /*
let command = tokens[0]; We want to do this:
let tokens: Vec<&str, U16> = cmd.as_mut_str().split(' ').collect();
But we can't. Heapless is having big problems with this for lots of reasons, so we make it manually.
*/
let mut tokens = Vec::<_, U16>::new();
for i in 0..16 {
let mut empty: String<U512> = String::from("");
tokens.push(empty).unwrap();
}
let mut tokindex: usize = 0;
let mut in_space = true;
for c in cmd.as_str().chars() {
if in_space && (c == ' ') {
continue;
} else {
if c != ' ' {
in_space = false;
tokens[tokindex].push(c).unwrap();
} else {
in_space = true;
tokindex += 1;
if tokindex >= 16 {
break;
}
}
}
}
/*
for token in tokens.iter() {
println!("token: {}", token);
}
return Ok(());*/
let command = &tokens[0];
if command.len() == 0 { if command.len() == 0 {
return Ok(()); return Ok(());
@ -132,12 +167,14 @@ fn do_agent(cmd: &mut String<U2048>, com_cid: xous::CID) -> Result<(), xous::Err
return Ok(()); return Ok(());
} }
if tokens[1].trim() == "read_agent_version" { if tokens[1].trim() == "read_agent_version" {
println!("1.0.0"); println!("1.0.0\n\r");
} /* else if tokens[1].trim() == "read_fw_version" { } else if tokens[1].trim() == "--help" {
println!("I need all the help I can get.\n\r");
} else if tokens[1].trim() == "read_fw_version" {
let (major, minor, build) = get_wf200_fw_rev(com_cid).unwrap(); let (major, minor, build) = get_wf200_fw_rev(com_cid).unwrap();
println!("{}.{}.{}", major, minor, build); println!("{}.{}.{}\n\r", major, minor, build);
} else if tokens[1].trim() == "read_driver_version" { } else if tokens[1].trim() == "read_driver_version" {
println!("n/a"); println!("n/a\n\r");
} else if tokens[1].trim() == "write_test_data" { } else if tokens[1].trim() == "write_test_data" {
if tokens.len() != 3 { if tokens.len() != 3 {
// wrong command length, ignore // wrong command length, ignore
@ -146,8 +183,9 @@ fn do_agent(cmd: &mut String<U2048>, com_cid: xous::CID) -> Result<(), xous::Err
let pdsline = tokens[2].trim(); let pdsline = tokens[2].trim();
send_pds_line(com_cid, pdsline.as_bytes())?; send_pds_line(com_cid, pdsline.as_bytes())?;
} else if tokens[1].trim() == "read_rx_stats" { } else if tokens[1].trim() == "read_rx_stats" {
println!("sending rx stats request");
get_rx_stats_agent(com_cid).unwrap(); get_rx_stats_agent(com_cid).unwrap();
} */ }
} else { } else {
println!("{}: command not recognized.", command.trim()); println!("{}: command not recognized.", command.trim());
@ -214,7 +252,7 @@ fn xmain() -> ! {
uart.enable_rx(); uart.enable_rx();
print!("\n\n*** FCC agent ***\n\n"); print!("\n\r\n\r*** FCC agent ***\n\r\n\r");
let mut last_time: u64 = 0; let mut last_time: u64 = 0;
loop { loop {
let envelope = xous::try_receive_message(agent_server_sid).unwrap(); let envelope = xous::try_receive_message(agent_server_sid).unwrap();
@ -223,17 +261,18 @@ fn xmain() -> ! {
if let Ok(opcode) = Opcode::try_from(&env.body) { if let Ok(opcode) = Opcode::try_from(&env.body) {
match opcode { match opcode {
Opcode::Char(c) => { Opcode::Char(c) => {
print!("{:?}", c as char);
if c != b'\r' && c != b'\n' { if c != b'\r' && c != b'\n' {
print!("{}", c as char);
cmd_string.push(c as char).unwrap(); cmd_string.push(c as char).unwrap();
} else { } else {
println!("");
do_agent(&mut cmd_string, com_conn).unwrap(); do_agent(&mut cmd_string, com_conn).unwrap();
print!("\nagent@precursor:~$ "); // print!("agent@precursor:~$ ");
cmd_string.clear(); cmd_string.clear();
} }
}, },
/*
Opcode::RxStats(stats) => { Opcode::RxStats(stats) => {
println!("got rxstats message");
let mut stats_u: sl_wfx_indication_data_u = sl_wfx_indication_data_u {raw_data: [0; 376]}; let mut stats_u: sl_wfx_indication_data_u = sl_wfx_indication_data_u {raw_data: [0; 376]};
for i in 0..stats.len() { for i in 0..stats.len() {
unsafe{ stats_u.raw_data[i] = stats[i]; } unsafe{ stats_u.raw_data[i] = stats[i]; }
@ -243,7 +282,7 @@ fn xmain() -> ! {
println!("PER on total number of frames: {}", unsafe{stats_u.rx_stats.per_total}); println!("PER on total number of frames: {}", unsafe{stats_u.rx_stats.per_total});
println!("Throughput on correct frames received: {}", unsafe{stats_u.rx_stats.throughput}); println!("Throughput on correct frames received: {}", unsafe{stats_u.rx_stats.throughput});
// TODO: fill in more stats output // TODO: fill in more stats output
},*/ },
_ => () _ => ()
} }
} }