From 1359db06f4422ea8013d9c2beff4c3017f5346ba Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 3 Jan 2021 03:04:25 +0800 Subject: [PATCH] add repeat command for stand-alone emissions testing --- services/com/src/main.rs | 4 +- services/fcc-agent/src/main.rs | 79 ++++++++++++++++++++++++++++++++-- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/services/com/src/main.rs b/services/com/src/main.rs index aa1e2b78a..e69a4061f 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -273,8 +273,8 @@ fn xmain() -> ! { } Opcode::EcGitRev => { com.txrx(ComState::EC_GIT_REV.verb); - let rev_msb = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as u8; - let rev_lsb = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as u8; + let rev_msb = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as u16; + let rev_lsb = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as u16; let dirty = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as u8; xous::return_scalar2( envelope.sender, diff --git a/services/fcc-agent/src/main.rs b/services/fcc-agent/src/main.rs index 86eff68b2..d6e4768cb 100644 --- a/services/fcc-agent/src/main.rs +++ b/services/fcc-agent/src/main.rs @@ -159,7 +159,46 @@ impl Write for Uart { } } -fn do_agent(cmd: &mut String, com_cid: xous::CID, pds_list: &mut Vec, U16>) -> Result<(), xous::Error> { +fn was_continuous(cmd: &mut String) -> bool { + let mut tokens = Vec::<_, U16>::new(); + for i in 0..16 { + let mut empty: String = 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; + } + } + } + } + + let command = &tokens[0]; + + if command.len() == 0 { + return false; + } else { + if command.trim() == "repeat" { + println!("repeating last PDS data"); + return true; + } + } + false +} + +fn do_agent(cmd: &mut String, com_cid: xous::CID, pds_list: &mut Vec, U16>, info_csr: &utralib::CSR) -> Result<(), xous::Error> { if false { let tokens: Vec<&str, U16> = cmd.as_mut_str().split(' ').collect(); for token in tokens.iter() { @@ -242,6 +281,20 @@ fn do_agent(cmd: &mut String, com_cid: xous::CID, pds_list: &mut Vec ! { let mut cmd_string: String = String::from(""); + let info_mem = xous::syscall::map_memory( + xous::MemoryAddress::new(utra::info::HW_INFO_BASE), + None, + 4096, + xous::MemoryFlags::R | xous::MemoryFlags::W, + ) + .expect("couldn't map INFO CSR range"); + let info_csr = CSR::new(info_mem.as_mut_ptr() as *mut u32); + uart.enable_rx(); print!("\n\r\n\r*** FCC agent ***\n\r\n\r"); let mut last_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap(); let mut pds_list: Vec, U16> = Vec::new(); + let mut repeat = false; loop { let envelope = xous::try_receive_message(agent_server_sid).unwrap(); match envelope { @@ -325,7 +388,8 @@ fn xmain() -> ! { cmd_string.push(c as char).unwrap(); } else { println!(""); - do_agent(&mut cmd_string, com_conn, &mut pds_list).unwrap(); + do_agent(&mut cmd_string, com_conn, &mut pds_list, &info_csr).unwrap(); + repeat = was_continuous(&mut cmd_string); // print!("agent@precursor:~$ "); cmd_string.clear(); } @@ -350,8 +414,17 @@ fn xmain() -> ! { } // Periodic tasks if let Ok(elapsed_time) = ticktimer_server::elapsed_ms(ticktimer_conn) { - if elapsed_time - last_time > 10_000 { + if elapsed_time - last_time > 20_000 { last_time = elapsed_time; + + if repeat { + for pds in pds_list.iter() { + let mut sendable_string = xous::String::new(4096); + write!(&mut sendable_string, "{}", pds); + println!("{}", sendable_string); + send_pds_line(com_conn, &sendable_string); + } + } /* let mut string_buffer = xous::String::new(4096); write!(&mut string_buffer, "\"{{i:{{a:7,b:1,f:3E8,c:{{a:0,b:0,c:0,d:44}},d:{{a:BB8,b:0,c:0,d:15,e:64,f:4}},e:{{}}}}}}\"").expect("Can't write");