diff --git a/baremetal/src/platform/bao1x.rs b/baremetal/src/platform/bao1x.rs index 03ed3b200..ae994414f 100644 --- a/baremetal/src/platform/bao1x.rs +++ b/baremetal/src/platform/bao1x.rs @@ -11,4 +11,4 @@ pub mod irq; #[cfg(feature = "bao1x-usb")] pub mod usb; -pub const UART_BAUD: u32 = 1_000_000; +pub const UART_BAUD: u32 = bao1x_api::UART_BAUD; diff --git a/baremetal/src/repl.rs b/baremetal/src/repl.rs index 6bba5124c..f00d962ae 100644 --- a/baremetal/src/repl.rs +++ b/baremetal/src/repl.rs @@ -123,7 +123,7 @@ impl Repl { "peek" => { if args.len() == 1 || args.len() == 2 { let addr = usize::from_str_radix(&args[0], 16) - .map_err(|_| Error::help("Peek address is in hex"))?; + .map_err(|_| Error::help("Peek address is in hex, no leading 0x"))?; let count = if args.len() == 2 { if let Ok(count) = u32::from_str_radix(&args[1], 10) { count } else { 1 } @@ -146,10 +146,10 @@ impl Repl { "poke" => { if args.len() == 2 || args.len() == 3 { let addr = u32::from_str_radix(&args[0], 16) - .map_err(|_| Error::help("Poke address is in hex"))?; + .map_err(|_| Error::help("Poke address is in hex, no leading 0x"))?; - let value = - u32::from_str_radix(&args[1], 16).map_err(|_| Error::help("Poke value is in hex"))?; + let value = u32::from_str_radix(&args[1], 16) + .map_err(|_| Error::help("Poke value is in hex, no leading 0x"))?; let count = if args.len() == 3 { if let Ok(count) = u32::from_str_radix(&args[2], 10) { count } else { 1 } } else {