Skip to content

Commit 7006f90

Browse files
committed
chore(deps): upgrade rtt-target to ^0.3.1
<probe-rs/rtt-target@v0.2.2...v0.3.1> `rtt-target 0.3.1` was in use by `panic-rtt-target` already, but `r3_port_arm_m_test_driver` used `rtt_init!` from `rtt-target 0.2.2`, which means the panic output wasn't functional. Upgrading the direct dependency on `rtt-target` fixes this issue.
1 parent 577dfa2 commit 7006f90

File tree

6 files changed

+14
-27
lines changed

6 files changed

+14
-27
lines changed

Cargo.lock

Lines changed: 7 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/basic_gr_peach/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ r3_port_arm = { path = "../../src/r3_port_arm" }
1010
r3_kernel = { path = "../../src/r3_kernel", features = ["system_time"] }
1111
r3 = { path = "../../src/r3" }
1212

13-
rtt-target = { version = "0.2.0" }
13+
rtt-target = { version = "0.3.0" }
1414
rza1 = { version = "0.2.0", features = ["cpg", "gpio", "scif"] }

examples/basic_nucleo_f401re/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ r3_port_arm_m = { path = "../../src/r3_port_arm_m" }
1212
r3_kernel = { path = "../../src/r3_kernel", features = ["system_time"] }
1313
r3 = { path = "../../src/r3", features = ["sync"] }
1414

15-
panic-rtt-target = { version = "0.1.0", features = ["cortex-m"] }
15+
panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] }
1616
nucleo-f401re = { version = "0.4.1" }
1717
cortex-m-rt = { version = "0.6.12" }
18-
rtt-target = { version = "0.2.0", features = ["cortex-m"] }
18+
rtt-target = { version = "0.3.0", features = ["cortex-m"] }

src/r3_port_arm_m_test_driver/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ r3 = { path = "../r3", optional = true }
4343

4444
cortex-m-semihosting = { version = "0.3.5", optional = true }
4545
panic-semihosting = { version = "0.5.3", optional = true }
46-
panic-rtt-target = { version = "0.1.0", optional = true, features = ["cortex-m"] }
46+
panic-rtt-target = { version = "0.1.2", optional = true, features = ["cortex-m"] }
4747
cortex-m-rt = { version = "0.6.12", optional = true, features = ["device"] }
4848
rp2040-pac = { version = "0.3.0", optional = true }
49-
rtt-target = { version = "0.2.0", optional = true, features = ["cortex-m"] }
49+
rtt-target = { version = "0.3.0", optional = true, features = ["cortex-m"] }
5050
cortex-m = { version = "0.7.3", optional = true, features = ["inline-asm"] }
5151
log = { version = "0.4.8", optional = true }
5252

src/r3_port_riscv_test_driver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ r3_port_riscv = { path = "../r3_port_riscv", optional = true }
7878
r3_portkit = { path = "../r3_portkit", optional = true }
7979
r3 = { path = "../r3", optional = true }
8080

81-
rtt-target = { version = "0.2.0", optional = true }
81+
rtt-target = { version = "0.3.0", optional = true, features = ["riscv"] }
8282
e310x-hal = { version = "0.9.0", optional = true, features = ["g002"] }
8383
k210-hal = { version = "0.2.0", optional = true }
8484
riscv-rt = { version = ">= 0.6.0, < 0.9.0", optional = true }

src/r3_port_riscv_test_driver/src/main.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,7 @@ macro_rules! instantiate_test {
271271
}
272272
};
273273

274-
unsafe {
275-
rtt_target::set_print_channel_cs(
276-
channels.up.0,
277-
&((|arg, f| f(arg)) as rtt_target::CriticalSectionFunc),
278-
)
279-
};
274+
rtt_target::set_print_channel(channels.up.0);
280275
logger_rtt::init(channels.up.1);
281276
}).finish(b);
282277

0 commit comments

Comments
 (0)