File tree Expand file tree Collapse file tree 5 files changed +10
-10
lines changed
src/r3_test_runner/src/targets Expand file tree Collapse file tree 5 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -115,9 +115,9 @@ impl DebugProbe for Fe310JLinkDebugProbe {
115
115
let mut cmd = String :: new ( ) ;
116
116
writeln ! ( cmd, "r" ) . unwrap ( ) ;
117
117
for ( path, ( _, offset) ) in section_files. iter ( ) . zip ( regions. iter ( ) ) {
118
- writeln ! ( cmd, "loadbin \" {}\" 0x {offset:08x}" , path. display( ) ) . unwrap ( ) ;
118
+ writeln ! ( cmd, "loadbin \" {}\" {offset:# 08x}" , path. display( ) ) . unwrap ( ) ;
119
119
}
120
- writeln ! ( cmd, "setpc 0x {entry:x}" ) . unwrap ( ) ;
120
+ writeln ! ( cmd, "setpc {entry:# x}" ) . unwrap ( ) ;
121
121
writeln ! ( cmd, "g" ) . unwrap ( ) ;
122
122
writeln ! ( cmd, "q" ) . unwrap ( ) ;
123
123
Original file line number Diff line number Diff line change @@ -213,7 +213,7 @@ impl DebugProbe for KflashDebugProbe {
213
213
log:: debug!( "Programming the region {} of {}" , i + 1 , regions. len( ) ) ;
214
214
if region. 1 < 0x80000000 {
215
215
log:: debug!(
216
- "Starting address (0x{: x}) is out of range, ignoreing" ,
216
+ "Starting address ({:# x}) is out of range, ignoreing" ,
217
217
region. 1
218
218
) ;
219
219
continue ;
@@ -222,7 +222,7 @@ impl DebugProbe for KflashDebugProbe {
222
222
}
223
223
224
224
// Boot the program
225
- log:: debug!( "Booting from 0x {entry:08x}" ) ;
225
+ log:: debug!( "Booting from {entry:# 08x}" ) ;
226
226
boot ( & mut self . serial , entry as u32 ) . await ?;
227
227
228
228
// Now, pass the channel to the caller
@@ -371,7 +371,7 @@ async fn flash_dataframe(
371
371
let chunk_addr = address + ( i * CHUNK_LEN ) as u32 ;
372
372
373
373
log:: debug!(
374
- "Programming the range {:?}/{:?} at 0x {chunk_addr:x} ({}%)" ,
374
+ "Programming the range {:?}/{:?} at {chunk_addr:# x} ({}%)" ,
375
375
( i * CHUNK_LEN ) ..( i * CHUNK_LEN + chunk. len( ) ) ,
376
376
data. len( ) ,
377
377
i * CHUNK_LEN * 100 / data. len( ) ,
Original file line number Diff line number Diff line change @@ -169,7 +169,7 @@ pub async fn attach_rtt(
169
169
. await
170
170
. unwrap ( ) ;
171
171
if let Some ( x) = addr {
172
- log:: debug!( "Found the RTT header at 0x {x:x}" ) ;
172
+ log:: debug!( "Found the RTT header at {x:# x}" ) ;
173
173
probe_rs_rtt:: ScanRegion :: Exact ( x as u32 )
174
174
} else {
175
175
probe_rs_rtt:: ScanRegion :: Ram
Original file line number Diff line number Diff line change @@ -233,7 +233,7 @@ async fn program_and_run_by_picoboot(exe: &std::path::Path) -> Result<()> {
233
233
log:: debug!( "Transfering the image" ) ;
234
234
for ( region_data, region_addr) in loadable_code. regions . iter ( ) {
235
235
log:: debug!(
236
- " ... 0x {region_addr:08x}..=0x{: 08x}" ,
236
+ " ... {region_addr:# 08x}..={:# 08x}" ,
237
237
region_addr + region_data. len( ) as u64 - 1
238
238
) ;
239
239
@@ -261,7 +261,7 @@ async fn program_and_run_by_picoboot(exe: &std::path::Path) -> Result<()> {
261
261
}
262
262
263
263
log:: debug!(
264
- "Rebooting RP2040 to start execution at 0x{: 08x}" ,
264
+ "Rebooting RP2040 to start execution at {:# 08x}" ,
265
265
loadable_code. entry
266
266
) ;
267
267
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ enum FrameExtractorAction {
32
32
33
33
#[ derive( thiserror:: Error , Debug , Clone , Copy ) ]
34
34
pub enum FrameExtractorProtocolError {
35
- #[ error( "Expected SLIP escape, got 0x {0:x }" ) ]
35
+ #[ error( "Expected SLIP escape, got {0:#02x }" ) ]
36
36
InvalidEscape ( u8 ) ,
37
37
}
38
38
@@ -54,7 +54,7 @@ impl FrameExtractorState {
54
54
Ok ( Some ( FrameExtractorAction :: StartFrame ) )
55
55
}
56
56
_ => {
57
- log:: trace!( "Ignoring 0x {b:? } outside a frame" ) ;
57
+ log:: trace!( "Ignoring {b:#02x } outside a frame" ) ;
58
58
Ok ( None )
59
59
}
60
60
} ,
You can’t perform that action at this time.
0 commit comments