mirrors/embedded-trainings-2020
1
0
Fork 0
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git synced 2025-01-25 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10 from ferrous-systems/beginner_rtt_blocking

Browse source 
Beginner rtt blocking
This commit is contained in:
Lotte Steenbrink 2020-06-24 15:37:07 +02:00 committed by GitHub
commit 87386e54f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boards/dk/src/lib.rs
View file

@ -177,7 +177,10 @@ pub fn init() -> Result<Board, ()> {
// NOTE this must be executed as early as possible or the tool will timeout // NOTE this must be executed as early as possible or the tool will timeout
// NOTE the unsafety of this macro is incorrect; it must be run at most once // NOTE the unsafety of this macro is incorrect; it must be run at most once
rtt_init_print!(NoBlockSkip, 2048); #[cfg(feature = "beginner")]
rtt_init_print!(BlockIfFull, 16384);
#[cfg(feature = "advanced")]
rtt_init_print!(NoBlockSkip, 16384);
log::set_logger(&Logger).unwrap(); log::set_logger(&Logger).unwrap();

4
tools/dk-run/src/main.rs
View file

@ -195,7 +195,7 @@ fn notmain() -> Result<i32, anyhow::Error> {
let rtt_addr_res = rtt_addr.ok_or_else(|| anyhow!("RTT control block not available"))?; let rtt_addr_res = rtt_addr.ok_or_else(|| anyhow!("RTT control block not available"))?;
let mut rtt_res: Result<Rtt, probe_rs_rtt::Error> = let mut rtt_res: Result<Rtt, probe_rs_rtt::Error> =
Err(probe_rs_rtt::Error::ControlBlockNotFound); Err(probe_rs_rtt::Error::ControlBlockNotFound);
const NUM_RETRIES: usize = 3; // picked at random, increase if necessary const NUM_RETRIES: usize = 5; // picked at random, increase if necessary
for try_index in 0..=NUM_RETRIES { for try_index in 0..=NUM_RETRIES {
rtt_res = Rtt::attach_region(core.clone(), &sess, &ScanRegion::Exact(rtt_addr_res)); rtt_res = Rtt::attach_region(core.clone(), &sess, &ScanRegion::Exact(rtt_addr_res));
@ -208,7 +208,7 @@ fn notmain() -> Result<i32, anyhow::Error> {
if try_index < NUM_RETRIES { if try_index < NUM_RETRIES {
log::info!("Could not attach because the target's RTT control block isn't initialized (yet). retrying"); log::info!("Could not attach because the target's RTT control block isn't initialized (yet). retrying");
} else { } else {
log::info!("Max number RTT attach of retries exceeded. Did you call dk::init() first thing in your program?"); log::info!("Max number of RTT attach retries exceeded. Did you call dk::init() first thing in your program?");
return Err(anyhow!(probe_rs_rtt::Error::ControlBlockNotFound)); return Err(anyhow!(probe_rs_rtt::Error::ControlBlockNotFound));
} }
} }