From 526d8353fde54fcfc42f4ad2a106a4153421813a Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Mon, 2 Jun 2025 11:26:35 +0800 Subject: [PATCH 01/14] hello world exercise --- Cargo.lock | 17 +++-- services/bao-console/src/cmds.rs | 5 ++ services/bao-console/src/cmds/cute.rs | 92 +++++++++++++++++++++++++++ services/bao-console/src/cmds/pddb.rs | 1 + services/bao-console/src/main.rs | 14 ++-- xtask/src/main.rs | 3 +- 6 files changed, 118 insertions(+), 14 deletions(-) create mode 100644 services/bao-console/src/cmds/cute.rs diff --git a/Cargo.lock b/Cargo.lock index 12cb31635..081eb6a2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1308,26 +1308,25 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "4.1.2" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#bef542a781348054c32a9beaf6bd1195814cace2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", - "engine25519-as", "fiat-crypto 0.2.7", - "log", + "platforms", "rustc_version 0.4.0", "subtle", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", ] [[package]] name = "curve25519-dalek-derive" version = "0.1.1" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#bef542a781348054c32a9beaf6bd1195814cace2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", @@ -4075,6 +4074,12 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +[[package]] +name = "platforms" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d43467300237085a4f9e864b937cf0bc012cef7740be12be1a48b10d2c8a3701" + [[package]] name = "plotters" version = "0.3.5" diff --git a/services/bao-console/src/cmds.rs b/services/bao-console/src/cmds.rs index df1e995c2..76ff189e0 100644 --- a/services/bao-console/src/cmds.rs +++ b/services/bao-console/src/cmds.rs @@ -91,6 +91,8 @@ use usb::*; mod pddb; #[cfg(feature = "with-pddb")] use pddb::*; +mod cute; +use cute::*; pub struct CmdEnv { common_env: CommonEnv, @@ -138,11 +140,14 @@ impl CmdEnv { let mut echo_cmd = Echo {}; // this command has no persistent storage, so we can "create" it every time we call dispatch (but it's a zero-cost absraction so this doesn't actually create any instructions) let mut ver_cmd = Ver {}; let mut console_cmd = Test {}; + let mut cute_cmd = Cute{}; + let commands: &mut [&mut dyn ShellCmdApi] = &mut [ ///// 4. add your command to this array, so that it can be looked up and dispatched &mut echo_cmd, &mut ver_cmd, &mut self.trng_cmd, + &mut cute_cmd, &mut console_cmd, #[cfg(feature = "usb")] &mut self.usb, diff --git a/services/bao-console/src/cmds/cute.rs b/services/bao-console/src/cmds/cute.rs new file mode 100644 index 000000000..277a96022 --- /dev/null +++ b/services/bao-console/src/cmds/cute.rs @@ -0,0 +1,92 @@ +use String; + +use crate::{CommonEnv, ShellCmdApi}; + +#[derive(Debug)] +pub struct Cute {} + +impl<'a> ShellCmdApi<'a> for Cute { + cmd_api!(cute); + + fn process(&mut self, args: String, _env: &mut CommonEnv) -> Result, xous::Error> { + use core::fmt::Write; + let mut ret = String::new(); + let helpstring = "Usage: + cute cat - prints cat ascii art + cute bread - prints bread ascii art + cute breadcat - prints breadcat ascii art"; + + let mut tokens = args.split_whitespace(); + + if let Some(sub_cmd) = tokens.next() { + match sub_cmd { + "cat" => { + let cat_art = r#" +⠀⠀⠀⠀⢀⠠⠤⠀⢀⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠐⠀⠐⠀⠀⢀⣾⣿⡇⠀⠀⠀⠀⠀⢀⣼⡇⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⣸⣿⣿⣿⠀⠀⠀⠀⣴⣿⣿⠇⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⠀⠀⢀⣾⣿⣿⣿⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠐⠀⡀ +⠀⠀⠀⠀⢰⡿⠉⠀⡜⣿⣿⣿⡿⠿⢿⣿⣿⡃⠀⠀⠂⠄⠀ +⠀⠀⠒⠒⠸⣿⣄⡘⣃⣿⣿⡟⢰⠃⠀⢹⣿⡇⠀⠀⠀⠀⠀ +⠀⠀⠚⠉⠀⠊⠻⣿⣿⣿⣿⣿⣮⣤⣤⣿⡟⠁⠘⠠⠁⠀⠀ +⠀⠀⠀⠀⠀⠠⠀⠀⠈⠙⠛⠛⠛⠛⠛⠁⠀⠒⠤⠀⠀⠀⠀ +⠨⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠀⠀⠀⠀⠀⠀ +⠁⠃⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +"#; + write!(ret, "{}", cat_art).unwrap(); + } + "bread" => { + let bread_art = r#" +⠀⠀⠀⠀⣀⣠⣤⣤⣤⣤⣤⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⣴⣿⣿⠿⠛⣉⣁⣠⣤⣤⣤⣬⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⣿⣿⣿⣿⣿⣿⡿⠛⣉⣁⣠⣤⣤⣤⣬⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⣿⣿⣿⣿⣿⣵⣾⣿⡿⠟⠛⠉⣉⣉⣉⣉⠉⠓⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⣿⣿⣿⣿⣿⣿⡟⢁⣤⣶⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⣿⣿⣿⣿⣿⣿⠀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀ +⠀⢿⣿⣿⣿⣿⣿⣿⡄⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠈⠻⣿⣿⣿⣿⣿⣷⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠈⠻⣿⣿⣿⣿⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠙⢿⣿⠇⢰⣿⣿⣿⣿⡿⠛⢉⣩⣉⡉⠛⠻⠇⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠙⠀⠸⠿⠿⠟⢉⣠⣾⣿⣿⣿⣿⣷⣶⣦⣤⣄⣀⣀⡀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡷⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣉⣉⠉⠛⠛⠻⠿⣿⣿⣿⣿⣿⣿⣿⠿⠋⣀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⠛⠛⠛⠻⠶⣶⣤⣈⣉⣉⣉⣁⣤⣴⠾⠛⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠙⠛⠉⠉⠉⠀⠀⠀⠀ +"#; + write!(ret, "{}", bread_art).unwrap(); + } + "breadcat" => { + let breadcat_art = r#" +⠀⠀⠀⠰⣦⣤⣤⣀⠀⠀⡀⠀⠀⠀⠀⣀⣀⠀⠠⢤⣶⣶⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⢿⣿⢋⣵⣾⣿⣿⡿⣥⣮⢻⣿⣿⣿⣿⣶⣌⢿⣿⢰⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠘⢡⣿⣿⣿⣿⣿⣷⡹⠟⣵⣿⣿⣿⣿⣿⣿⣦⢃⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⢺⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢨⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⣿⡟⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠙⣿⣷⣬⣿⣿⣿⣿⣿⣿⣿⡼⣿⣿⡟⣱⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⣧⣠⣿⣿⣿⣿⣿⣿⣿⣀⣾⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣅⣽⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠛⠙⠋⠋⠋⠋⠋⠋⠋⠋⠛⠙⠙⠁⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⢿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⣴⣶⣉⢿⣿⣿⣿⡟⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣆⡻⣿⣷⠜⣿⣏⣾⣿⣿⡿⠁⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⣿⣿⣽⣿⣿⣿⠿⠋⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿⣿⠿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +"#; + write!(ret, "{}", breadcat_art).unwrap(); + } + _ => { + write!(ret, "{}\n", helpstring).unwrap(); + } + } + } else { + write!(ret, "{}\n", helpstring).unwrap(); + } + + Ok(Some(ret)) +} + + +} \ No newline at end of file diff --git a/services/bao-console/src/cmds/pddb.rs b/services/bao-console/src/cmds/pddb.rs index 0945ee357..6c06637be 100644 --- a/services/bao-console/src/cmds/pddb.rs +++ b/services/bao-console/src/cmds/pddb.rs @@ -15,6 +15,7 @@ pub struct PddbCmd { } impl PddbCmd { pub fn new() -> Self { + log::info!("here"); let pddb = pddb::Pddb::new(); log::info!("PDDB mount result: {:?}", pddb.try_mount()); PddbCmd { pddb } diff --git a/services/bao-console/src/main.rs b/services/bao-console/src/main.rs index cfc282e35..40b635705 100644 --- a/services/bao-console/src/main.rs +++ b/services/bao-console/src/main.rs @@ -117,13 +117,13 @@ fn main() { let mut buf = [0u8, 0u8]; loop { tt.sleep_ms(2_000).ok(); - for (name, offset) in measurements { - i2c.i2c_read(AXP2101_DEV, offset, &mut buf, false).unwrap(); - let v: u32 = (((buf[0] as u32) & 0x3F) << 8) | buf[1] as u32; - log::info!("{}: {:0.3}V", name, v as f32 / 1000.0); - i2c.i2c_read(AXP2101_DEV, REG_SOC, &mut buf[0..1], false).unwrap(); - log::info!("SOC: {}%", buf[0]); - } + // for (name, offset) in measurements { + // i2c.i2c_read(AXP2101_DEV, offset, &mut buf, false).unwrap(); + // let v: u32 = (((buf[0] as u32) & 0x3F) << 8) | buf[1] as u32; + // log::info!("{}: {:0.3}V", name, v as f32 / 1000.0); + // i2c.i2c_read(AXP2101_DEV, REG_SOC, &mut buf[0..1], false).unwrap(); + // log::info!("SOC: {}%", buf[0]); + // } } } #[cfg(any(feature = "hosted-baosec", not(feature = "battery-readout")))] diff --git a/xtask/src/main.rs b/xtask/src/main.rs index afd85b59c..79b617517 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -612,13 +612,14 @@ fn main() -> Result<(), Box> { // - [planned] vault application let bao_rram_pkgs = ["xous-ticktimer", "xous-log", "xous-names", "keystore" /* "usb-cramium" */].to_vec(); /* "usb-cramium" */ - let bao_swap_pkgs = ["cram-hal-service", "bao-console", "modals", "pddb", "bao-video"].to_vec(); /* "bao-video" */ + let bao_swap_pkgs = ["cram-hal-service", "bao-console", /*"modals", "pddb", "bao-video"*/].to_vec(); /* "bao-video" */ if !builder.is_swap_set() { builder.set_swap(0, 8 * 1024 * 1024); } builder.add_loader_feature("swap"); builder.add_kernel_feature("swap"); builder.add_feature("swap"); + // builder.add_feature("autotest"); builder.add_loader_feature("debug-print"); // the following feature needs to be uncommented if we also enable From 0d0267f0ea3c3de43d3e50ae304971dc2d8bc316 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 6 Jun 2025 16:45:00 +0800 Subject: [PATCH 02/14] scaffolding the i2cdetect command --- Cargo.lock | 17 ++++++----------- services/bao-console/src/cmds.rs | 8 ++++---- .../src/cmds/{cute.rs => i2cdetect.rs} | 12 ++++++------ 3 files changed, 16 insertions(+), 21 deletions(-) rename services/bao-console/src/cmds/{cute.rs => i2cdetect.rs} (95%) diff --git a/Cargo.lock b/Cargo.lock index 081eb6a2e..12cb31635 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1308,25 +1308,26 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#bef542a781348054c32a9beaf6bd1195814cace2" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", + "engine25519-as", "fiat-crypto 0.2.7", - "platforms", + "log", "rustc_version 0.4.0", "subtle", + "utralib 0.1.25", + "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", ] [[package]] name = "curve25519-dalek-derive" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#bef542a781348054c32a9beaf6bd1195814cace2" dependencies = [ "proc-macro2", "quote", @@ -4074,12 +4075,6 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" -[[package]] -name = "platforms" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43467300237085a4f9e864b937cf0bc012cef7740be12be1a48b10d2c8a3701" - [[package]] name = "plotters" version = "0.3.5" diff --git a/services/bao-console/src/cmds.rs b/services/bao-console/src/cmds.rs index 76ff189e0..e93af6b59 100644 --- a/services/bao-console/src/cmds.rs +++ b/services/bao-console/src/cmds.rs @@ -91,8 +91,8 @@ use usb::*; mod pddb; #[cfg(feature = "with-pddb")] use pddb::*; -mod cute; -use cute::*; +mod i2cdetect; +use i2cdetect:*; pub struct CmdEnv { common_env: CommonEnv, @@ -140,14 +140,14 @@ impl CmdEnv { let mut echo_cmd = Echo {}; // this command has no persistent storage, so we can "create" it every time we call dispatch (but it's a zero-cost absraction so this doesn't actually create any instructions) let mut ver_cmd = Ver {}; let mut console_cmd = Test {}; - let mut cute_cmd = Cute{}; + let mut i2cdetect_cmd = I2cdetect{}; let commands: &mut [&mut dyn ShellCmdApi] = &mut [ ///// 4. add your command to this array, so that it can be looked up and dispatched &mut echo_cmd, &mut ver_cmd, &mut self.trng_cmd, - &mut cute_cmd, + &mut i2cdetect_cmd, &mut console_cmd, #[cfg(feature = "usb")] &mut self.usb, diff --git a/services/bao-console/src/cmds/cute.rs b/services/bao-console/src/cmds/i2cdetect.rs similarity index 95% rename from services/bao-console/src/cmds/cute.rs rename to services/bao-console/src/cmds/i2cdetect.rs index 277a96022..d8a861024 100644 --- a/services/bao-console/src/cmds/cute.rs +++ b/services/bao-console/src/cmds/i2cdetect.rs @@ -3,18 +3,18 @@ use String; use crate::{CommonEnv, ShellCmdApi}; #[derive(Debug)] -pub struct Cute {} +pub struct I2cDetect {} -impl<'a> ShellCmdApi<'a> for Cute { - cmd_api!(cute); +impl<'a> ShellCmdApi<'a> for I2cDetect { + cmd_api!(cui; fn process(&mut self, args: String, _env: &mut CommonEnv) -> Result, xous::Error> { use core::fmt::Write; let mut ret = String::new(); let helpstring = "Usage: - cute cat - prints cat ascii art - cute bread - prints bread ascii art - cute breadcat - prints breadcat ascii art"; + i2cdetect cat - prints cat ascii art + i2cdetect bread - prints bread ascii art + i2cdetect breadcat - prints breadcat ascii art"; let mut tokens = args.split_whitespace(); From b0b29f7d78c5b435c6e015dedc263c36a3338248 Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Fri, 6 Jun 2025 17:39:59 +0800 Subject: [PATCH 03/14] reestablishing devenv --- Cargo.lock | 17 +++++++++++------ services/bao-console/src/cmds.rs | 4 ++-- services/bao-console/src/cmds/i2cdetect.rs | 8 ++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12cb31635..32211957c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1308,26 +1308,25 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "4.1.2" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#bef542a781348054c32a9beaf6bd1195814cace2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", - "engine25519-as", "fiat-crypto 0.2.7", - "log", + "platforms", "rustc_version 0.4.0", "subtle", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", ] [[package]] name = "curve25519-dalek-derive" version = "0.1.1" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#bef542a781348054c32a9beaf6bd1195814cace2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", @@ -4075,6 +4074,12 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +[[package]] +name = "platforms" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b02ffed1bc8c2234bb6f8e760e34613776c5102a041f25330b869a78153a68c" + [[package]] name = "plotters" version = "0.3.5" diff --git a/services/bao-console/src/cmds.rs b/services/bao-console/src/cmds.rs index e93af6b59..f425055ce 100644 --- a/services/bao-console/src/cmds.rs +++ b/services/bao-console/src/cmds.rs @@ -92,7 +92,7 @@ mod pddb; #[cfg(feature = "with-pddb")] use pddb::*; mod i2cdetect; -use i2cdetect:*; +use i2cdetect::*; pub struct CmdEnv { common_env: CommonEnv, @@ -140,7 +140,7 @@ impl CmdEnv { let mut echo_cmd = Echo {}; // this command has no persistent storage, so we can "create" it every time we call dispatch (but it's a zero-cost absraction so this doesn't actually create any instructions) let mut ver_cmd = Ver {}; let mut console_cmd = Test {}; - let mut i2cdetect_cmd = I2cdetect{}; + let mut i2cdetect_cmd = I2cDetect{}; let commands: &mut [&mut dyn ShellCmdApi] = &mut [ ///// 4. add your command to this array, so that it can be looked up and dispatched diff --git a/services/bao-console/src/cmds/i2cdetect.rs b/services/bao-console/src/cmds/i2cdetect.rs index d8a861024..2a2c5ff97 100644 --- a/services/bao-console/src/cmds/i2cdetect.rs +++ b/services/bao-console/src/cmds/i2cdetect.rs @@ -6,15 +6,15 @@ use crate::{CommonEnv, ShellCmdApi}; pub struct I2cDetect {} impl<'a> ShellCmdApi<'a> for I2cDetect { - cmd_api!(cui; + cmd_api!(i2cdetect); fn process(&mut self, args: String, _env: &mut CommonEnv) -> Result, xous::Error> { use core::fmt::Write; let mut ret = String::new(); let helpstring = "Usage: - i2cdetect cat - prints cat ascii art - i2cdetect bread - prints bread ascii art - i2cdetect breadcat - prints breadcat ascii art"; + i2cdetect cat - prints cat ascii art + i2cdetect bread - prints bread ascii art + i2cdetect breadcat - prints breadcat ascii art"; let mut tokens = args.split_whitespace(); From b35f9cad33cd878f71e538b2ef81d3526290799b Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Sat, 7 Jun 2025 11:17:00 +0800 Subject: [PATCH 04/14] working read --- services/bao-console/src/cmds/i2cdetect.rs | 160 ++++++++++++++------- 1 file changed, 112 insertions(+), 48 deletions(-) diff --git a/services/bao-console/src/cmds/i2cdetect.rs b/services/bao-console/src/cmds/i2cdetect.rs index 2a2c5ff97..cd67de50e 100644 --- a/services/bao-console/src/cmds/i2cdetect.rs +++ b/services/bao-console/src/cmds/i2cdetect.rs @@ -1,4 +1,8 @@ use String; +use cramium_api::I2cApi; +use cram_hal_service::I2c; +use std::thread::sleep; +use std::time::Duration; use crate::{CommonEnv, ShellCmdApi}; @@ -14,69 +18,129 @@ impl<'a> ShellCmdApi<'a> for I2cDetect { let helpstring = "Usage: i2cdetect cat - prints cat ascii art i2cdetect bread - prints bread ascii art - i2cdetect breadcat - prints breadcat ascii art"; + i2cdetect breadcat - prints breadcat ascii art + i2cdetect probe - probes a single I2C address (e.g. 34) + i2cdetect bmptemp - reads raw temperature from BMP180"; let mut tokens = args.split_whitespace(); if let Some(sub_cmd) = tokens.next() { match sub_cmd { "cat" => { - let cat_art = r#" -⠀⠀⠀⠀⢀⠠⠤⠀⢀⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠐⠀⠐⠀⠀⢀⣾⣿⡇⠀⠀⠀⠀⠀⢀⣼⡇⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⣸⣿⣿⣿⠀⠀⠀⠀⣴⣿⣿⠇⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⠀⠀⢀⣾⣿⣿⣿⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠐⠀⡀ -⠀⠀⠀⠀⢰⡿⠉⠀⡜⣿⣿⣿⡿⠿⢿⣿⣿⡃⠀⠀⠂⠄⠀ -⠀⠀⠒⠒⠸⣿⣄⡘⣃⣿⣿⡟⢰⠃⠀⢹⣿⡇⠀⠀⠀⠀⠀ -⠀⠀⠚⠉⠀⠊⠻⣿⣿⣿⣿⣿⣮⣤⣤⣿⡟⠁⠘⠠⠁⠀⠀ -⠀⠀⠀⠀⠀⠠⠀⠀⠈⠙⠛⠛⠛⠛⠛⠁⠀⠒⠤⠀⠀⠀⠀ -⠨⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠀⠀⠀⠀⠀⠀ -⠁⠃⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -"#; + let cat_art = r#"f + ⠀⠀⠀⠀⢀⠠⠤⠀⢀⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠐⠀⠐⠀⠀⢀⣾⣿⡇⠀⠀⠀⠀⠀⢀⣼⡇⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⣸⣿⣿⣿⠀⠀⠀⠀⣴⣿⣿⠇⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⠀⠀⢀⣾⣿⣿⣿⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠐⠀⡀ + ⠀⠀⠀⠀⢰⡿⠉⠀⡜⣿⣿⣿⡿⠿⢿⣿⣿⡃⠀⠀⠂⠄⠀ + ⠀⠀⠒⠒⠸⣿⣄⡘⣃⣿⣿⡟⢰⠃⠀⢹⣿⡇⠀⠀⠀⠀⠀ + ⠀⠀⠚⠉⠀⠊⠻⣿⣿⣿⣿⣿⣮⣤⣤⣿⡟⠁⠘⠠⠁⠀⠀ + ⠀⠀⠀⠀⠀⠠⠀⠀⠈⠙⠛⠛⠛⠛⠛⠁⠀⠒⠤⠀⠀⠀⠀ + ⠨⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠀⠀⠀⠀⠀⠀ + ⠁⠃⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + "#; write!(ret, "{}", cat_art).unwrap(); } "bread" => { let bread_art = r#" -⠀⠀⠀⠀⣀⣠⣤⣤⣤⣤⣤⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⣴⣿⣿⠿⠛⣉⣁⣠⣤⣤⣤⣬⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⢸⣿⣿⣿⣿⣿⣿⡿⠛⣉⣁⣠⣤⣤⣤⣬⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⢸⣿⣿⣿⣿⣿⣵⣾⣿⡿⠟⠛⠉⣉⣉⣉⣉⠉⠓⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⢸⣿⣿⣿⣿⣿⣿⡟⢁⣤⣶⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⢸⣿⣿⣿⣿⣿⣿⠀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀ -⠀⢿⣿⣿⣿⣿⣿⣿⡄⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠈⠻⣿⣿⣿⣿⣿⣷⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠈⠻⣿⣿⣿⣿⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠙⢿⣿⠇⢰⣿⣿⣿⣿⡿⠛⢉⣩⣉⡉⠛⠻⠇⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠙⠀⠸⠿⠿⠟⢉⣠⣾⣿⣿⣿⣿⣷⣶⣦⣤⣄⣀⣀⡀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡷⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣉⣉⠉⠛⠛⠻⠿⣿⣿⣿⣿⣿⣿⣿⠿⠋⣀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⠛⠛⠛⠻⠶⣶⣤⣈⣉⣉⣉⣁⣤⣴⠾⠛⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠙⠛⠉⠉⠉⠀⠀⠀⠀ -"#; + ⠀⠀⠀⠀⣀⣠⣤⣤⣤⣤⣤⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⣴⣿⣿⠿⠛⣉⣁⣠⣤⣤⣤⣬⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⢸⣿⣿⣿⣿⣿⣿⡿⠛⣉⣁⣠⣤⣤⣤⣬⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⢸⣿⣿⣿⣿⣿⣵⣾⣿⡿⠟⠛⠉⣉⣉⣉⣉⠉⠓⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⢸⣿⣿⣿⣿⣿⣿⡟⢁⣤⣶⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⢸⣿⣿⣿⣿⣿⣿⠀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀ + ⠀⢿⣿⣿⣿⣿⣿⣿⡄⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠈⠻⣿⣿⣿⣿⣿⣷⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠈⠻⣿⣿⣿⣿⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠙⢿⣿⠇⢰⣿⣿⣿⣿⡿⠛⢉⣩⣉⡉⠛⠻⠇⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠙⠀⠸⠿⠿⠟⢉⣠⣾⣿⣿⣿⣿⣷⣶⣦⣤⣄⣀⣀⡀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡷⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣉⣉⠉⠛⠛⠻⠿⣿⣿⣿⣿⣿⣿⣿⠿⠋⣀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⠛⠛⠛⠻⠶⣶⣤⣈⣉⣉⣉⣁⣤⣴⠾⠛⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠙⠛⠉⠉⠉⠀⠀⠀⠀ + "#; write!(ret, "{}", bread_art).unwrap(); } "breadcat" => { let breadcat_art = r#" -⠀⠀⠀⠰⣦⣤⣤⣀⠀⠀⡀⠀⠀⠀⠀⣀⣀⠀⠠⢤⣶⣶⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⢿⣿⢋⣵⣾⣿⣿⡿⣥⣮⢻⣿⣿⣿⣿⣶⣌⢿⣿⢰⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠘⢡⣿⣿⣿⣿⣿⣷⡹⠟⣵⣿⣿⣿⣿⣿⣿⣦⢃⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⢺⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢨⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⣿⡟⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠙⣿⣷⣬⣿⣿⣿⣿⣿⣿⣿⡼⣿⣿⡟⣱⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⣿⣧⣠⣿⣿⣿⣿⣿⣿⣿⣀⣾⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣅⣽⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠛⠙⠋⠋⠋⠋⠋⠋⠋⠋⠛⠙⠙⠁⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⢿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⣴⣶⣉⢿⣿⣿⣿⡟⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣆⡻⣿⣷⠜⣿⣏⣾⣿⣿⡿⠁⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⣿⣿⣽⣿⣿⣿⠿⠋⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿⣿⠿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -"#; + ⠀⠀⠀⠰⣦⣤⣤⣀⠀⠀⡀⠀⠀⠀⠀⣀⣀⠀⠠⢤⣶⣶⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⢿⣿⢋⣵⣾⣿⣿⡿⣥⣮⢻⣿⣿⣿⣿⣶⣌⢿⣿⢰⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠘⢡⣿⣿⣿⣿⣿⣷⡹⠟⣵⣿⣿⣿⣿⣿⣿⣦⢃⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⢺⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢨⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⣿⡟⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠙⣿⣷⣬⣿⣿⣿⣿⣿⣿⣿⡼⣿⣿⡟⣱⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⣿⣧⣠⣿⣿⣿⣿⣿⣿⣿⣀⣾⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣅⣽⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠛⠙⠋⠋⠋⠋⠋⠋⠋⠋⠛⠙⠙⠁⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⢿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⣴⣶⣉⢿⣿⣿⣿⡟⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣆⡻⣿⣷⠜⣿⣏⣾⣿⣿⡿⠁⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⣿⣿⣽⣿⣿⣿⠿⠋⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿⣿⠿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + "#; write!(ret, "{}", breadcat_art).unwrap(); } + + "probe" => { + if let Some(addr_str) = tokens.next() { + match u8::from_str_radix(addr_str, 16) { + Ok(addr) => { + let mut i2c = I2c::new(); + let mut buf = [0u8; 1]; + match i2c.i2c_read(addr, 0x00, &mut buf, false) { + Ok(_) => { + write!(ret, "Device found at address {:02X} (via read)\n", addr).unwrap(); + } + Err(xous::Error::InternalError) => { + write!(ret, "No device found at address {:02X}\n", addr).unwrap(); + } + Err(e) => { + write!(ret, "Error probing address {:02X}: {:?}\n", addr, e).unwrap(); + } + } + } + Err(_) => { + write!(ret, "Invalid hex address '{}'. Example: i2cdetect probe 3C\n", addr_str).unwrap(); + } + } + } else { + write!(ret, "Usage: i2cdetect probe \n").unwrap(); + } + } + + "bmptemp" => { + const BMP180_ADDR: u8 = 0x77; + const REG_CTRL: u8 = 0xF4; + const REG_DATA_START: u8 = 0xF6; + const CMD_READ_TEMP: u8 = 0x2E; + + let mut i2c = I2c::new(); + + match i2c.i2c_write(BMP180_ADDR, REG_CTRL, &[CMD_READ_TEMP]) { + Ok(_) => { + sleep(Duration::from_millis(5)); + + + let mut temp_buffer = [0u8; 2]; + match i2c.i2c_read(BMP180_ADDR, REG_DATA_START, &mut temp_buffer, true) { + Ok(_) => { + let uncalibrated_temp = i16::from_be_bytes(temp_buffer); + write!(ret, "BMP180 raw temp: {}\n", uncalibrated_temp).unwrap(); + } + Err(e) => { + write!(ret, "Failed to read temp data: {:?}\n", e).unwrap(); + } + } + } + Err(e) => { + write!(ret, "Failed to write command to BMP180 (is it connected @ 0x77?): {:?}\n", e).unwrap(); + } + } + } + _ => { write!(ret, "{}\n", helpstring).unwrap(); } @@ -86,7 +150,7 @@ impl<'a> ShellCmdApi<'a> for I2cDetect { } Ok(Some(ret)) -} + } } \ No newline at end of file From 916c93e2769526c324e4a4f357c322afb0aa68c3 Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Sat, 7 Jun 2025 11:55:14 +0800 Subject: [PATCH 05/14] now with SI units --- services/bao-console/src/cmds/i2cdetect.rs | 68 ++++++++++++++++------ 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/services/bao-console/src/cmds/i2cdetect.rs b/services/bao-console/src/cmds/i2cdetect.rs index cd67de50e..d949582a4 100644 --- a/services/bao-console/src/cmds/i2cdetect.rs +++ b/services/bao-console/src/cmds/i2cdetect.rs @@ -7,7 +7,14 @@ use std::time::Duration; use crate::{CommonEnv, ShellCmdApi}; #[derive(Debug)] + pub struct I2cDetect {} +struct Bmp180Calibration { + ac1: i16, ac2: i16, ac3: i16, + ac4: u16, ac5: u16, ac6: u16, + b1: i16, b2: i16, + mb: i16, mc: i16, md: i16, +} impl<'a> ShellCmdApi<'a> for I2cDetect { cmd_api!(i2cdetect); @@ -113,32 +120,55 @@ impl<'a> ShellCmdApi<'a> for I2cDetect { "bmptemp" => { const BMP180_ADDR: u8 = 0x77; + const REG_CALIB_START: u8 = 0xAA; const REG_CTRL: u8 = 0xF4; const REG_DATA_START: u8 = 0xF6; const CMD_READ_TEMP: u8 = 0x2E; let mut i2c = I2c::new(); - match i2c.i2c_write(BMP180_ADDR, REG_CTRL, &[CMD_READ_TEMP]) { - Ok(_) => { - sleep(Duration::from_millis(5)); - - - let mut temp_buffer = [0u8; 2]; - match i2c.i2c_read(BMP180_ADDR, REG_DATA_START, &mut temp_buffer, true) { - Ok(_) => { - let uncalibrated_temp = i16::from_be_bytes(temp_buffer); - write!(ret, "BMP180 raw temp: {}\n", uncalibrated_temp).unwrap(); - } - Err(e) => { - write!(ret, "Failed to read temp data: {:?}\n", e).unwrap(); - } - } - } - Err(e) => { - write!(ret, "Failed to write command to BMP180 (is it connected @ 0x77?): {:?}\n", e).unwrap(); - } + let mut cal_buf = [0u8; 22]; + if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_CALIB_START, &mut cal_buf, true) { + write!(ret, "Failed to read calibration data: {:?}\n", e).unwrap(); + return Ok(Some(ret)); } + + // note: calibration data is Big Endian, hence the from_be_bytes + let cal = Bmp180Calibration { + ac1: i16::from_be_bytes([cal_buf[0], cal_buf[1]]), + ac2: i16::from_be_bytes([cal_buf[2], cal_buf[3]]), + ac3: i16::from_be_bytes([cal_buf[4], cal_buf[5]]), + ac4: u16::from_be_bytes([cal_buf[6], cal_buf[7]]), + ac5: u16::from_be_bytes([cal_buf[8], cal_buf[9]]), + ac6: u16::from_be_bytes([cal_buf[10], cal_buf[11]]), + b1: i16::from_be_bytes([cal_buf[12], cal_buf[13]]), + b2: i16::from_be_bytes([cal_buf[14], cal_buf[15]]), + mb: i16::from_be_bytes([cal_buf[16], cal_buf[17]]), + mc: i16::from_be_bytes([cal_buf[18], cal_buf[19]]), + md: i16::from_be_bytes([cal_buf[20], cal_buf[21]]), + }; + + + if let Err(e) = i2c.i2c_write(BMP180_ADDR, REG_CTRL, &[CMD_READ_TEMP]) { + write!(ret, "Failed to start temp measurement: {:?}\n", e).unwrap(); + return Ok(Some(ret)); + } + + sleep(Duration::from_millis(5)); + + let mut temp_buffer = [0u8; 2]; + if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_DATA_START, &mut temp_buffer, true) { + write!(ret, "Failed to read temp data: {:?}\n", e).unwrap(); + return Ok(Some(ret)); + } + let ut = i16::from_be_bytes(temp_buffer) as i32; + + let x1 = (ut - cal.ac6 as i32) * cal.ac5 as i32 >> 15; + let x2 = (cal.mc as i32 * 2048) / (x1 + cal.md as i32); + let b5 = x1 + x2; + let temp = ((b5 + 8) >> 4) as f32 / 10.0; + + write!(ret, "BMP180 Temperature: {:.1}°C\n", temp).unwrap(); } _ => { From 1b8554b8f2c11a40808390c33ee201437a898cf9 Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Mon, 9 Jun 2025 16:10:42 +0800 Subject: [PATCH 06/14] removing the BMP180 code --- services/bao-console/src/cmds/i2cdetect.rs | 195 ++++++--------------- services/bao-console/src/main.rs | 10 +- 2 files changed, 59 insertions(+), 146 deletions(-) diff --git a/services/bao-console/src/cmds/i2cdetect.rs b/services/bao-console/src/cmds/i2cdetect.rs index d949582a4..32e3cf139 100644 --- a/services/bao-console/src/cmds/i2cdetect.rs +++ b/services/bao-console/src/cmds/i2cdetect.rs @@ -1,21 +1,31 @@ use String; use cramium_api::I2cApi; +use cramium_api::I2cResult; use cram_hal_service::I2c; -use std::thread::sleep; -use std::time::Duration; use crate::{CommonEnv, ShellCmdApi}; #[derive(Debug)] -pub struct I2cDetect {} -struct Bmp180Calibration { - ac1: i16, ac2: i16, ac3: i16, - ac4: u16, ac5: u16, ac6: u16, - b1: i16, b2: i16, - mb: i16, mc: i16, md: i16, +enum ProbeStatus { + Ack, + Nack, } +fn probe_address(i2c: &mut I2c, addr: u8) -> ProbeStatus { + let mut buf = [0u8; 1]; + match i2c.i2c_read(addr, 0x00, &mut buf, false) { + Ok(I2cResult::Ack(_)) => ProbeStatus::Ack, + Ok(I2cResult::Nack) => ProbeStatus::Nack, + Ok(I2cResult::Pending) => panic!("Unexpected I2cResult::Pending: this operation should be blocking."), + Ok(I2cResult::InternalError) => panic!("Unexpected Ok(I2cResult::InternalError)."), + Err(e) => panic!("I2C bus error while probing address 0x{:02X}: {:?}", addr, e), + } +} + + +pub struct I2cDetect {} + impl<'a> ShellCmdApi<'a> for I2cDetect { cmd_api!(i2cdetect); @@ -23,154 +33,57 @@ impl<'a> ShellCmdApi<'a> for I2cDetect { use core::fmt::Write; let mut ret = String::new(); let helpstring = "Usage: - i2cdetect cat - prints cat ascii art - i2cdetect bread - prints bread ascii art - i2cdetect breadcat - prints breadcat ascii art - i2cdetect probe - probes a single I2C address (e.g. 34) - i2cdetect bmptemp - reads raw temperature from BMP180"; + i2cdetect probe - probes a single I2C address (e.g. 34) + i2cdetect scan - reads + i2cdetect bmp180_temp - reads raw temperature from BMP180"; let mut tokens = args.split_whitespace(); if let Some(sub_cmd) = tokens.next() { match sub_cmd { - "cat" => { - let cat_art = r#"f - ⠀⠀⠀⠀⢀⠠⠤⠀⢀⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠐⠀⠐⠀⠀⢀⣾⣿⡇⠀⠀⠀⠀⠀⢀⣼⡇⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⣸⣿⣿⣿⠀⠀⠀⠀⣴⣿⣿⠇⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⠀⠀⢀⣾⣿⣿⣿⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠐⠀⡀ - ⠀⠀⠀⠀⢰⡿⠉⠀⡜⣿⣿⣿⡿⠿⢿⣿⣿⡃⠀⠀⠂⠄⠀ - ⠀⠀⠒⠒⠸⣿⣄⡘⣃⣿⣿⡟⢰⠃⠀⢹⣿⡇⠀⠀⠀⠀⠀ - ⠀⠀⠚⠉⠀⠊⠻⣿⣿⣿⣿⣿⣮⣤⣤⣿⡟⠁⠘⠠⠁⠀⠀ - ⠀⠀⠀⠀⠀⠠⠀⠀⠈⠙⠛⠛⠛⠛⠛⠁⠀⠒⠤⠀⠀⠀⠀ - ⠨⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠀⠀⠀⠀⠀⠀ - ⠁⠃⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - "#; - write!(ret, "{}", cat_art).unwrap(); - } - "bread" => { - let bread_art = r#" - ⠀⠀⠀⠀⣀⣠⣤⣤⣤⣤⣤⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⣴⣿⣿⠿⠛⣉⣁⣠⣤⣤⣤⣬⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⢸⣿⣿⣿⣿⣿⣿⡿⠛⣉⣁⣠⣤⣤⣤⣬⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⢸⣿⣿⣿⣿⣿⣵⣾⣿⡿⠟⠛⠉⣉⣉⣉⣉⠉⠓⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⢸⣿⣿⣿⣿⣿⣿⡟⢁⣤⣶⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⢸⣿⣿⣿⣿⣿⣿⠀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀ - ⠀⢿⣿⣿⣿⣿⣿⣿⡄⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠈⠻⣿⣿⣿⣿⣿⣷⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠈⠻⣿⣿⣿⣿⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠙⢿⣿⠇⢰⣿⣿⣿⣿⡿⠛⢉⣩⣉⡉⠛⠻⠇⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠙⠀⠸⠿⠿⠟⢉⣠⣾⣿⣿⣿⣿⣷⣶⣦⣤⣄⣀⣀⡀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡷⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣉⣉⠉⠛⠛⠻⠿⣿⣿⣿⣿⣿⣿⣿⠿⠋⣀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⠛⠛⠛⠻⠶⣶⣤⣈⣉⣉⣉⣁⣤⣴⠾⠛⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠙⠛⠉⠉⠉⠀⠀⠀⠀ - "#; - write!(ret, "{}", bread_art).unwrap(); - } - "breadcat" => { - let breadcat_art = r#" - ⠀⠀⠀⠰⣦⣤⣤⣀⠀⠀⡀⠀⠀⠀⠀⣀⣀⠀⠠⢤⣶⣶⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⢿⣿⢋⣵⣾⣿⣿⡿⣥⣮⢻⣿⣿⣿⣿⣶⣌⢿⣿⢰⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠘⢡⣿⣿⣿⣿⣿⣷⡹⠟⣵⣿⣿⣿⣿⣿⣿⣦⢃⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⢺⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢨⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⣿⡟⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠙⣿⣷⣬⣿⣿⣿⣿⣿⣿⣿⡼⣿⣿⡟⣱⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⣿⣧⣠⣿⣿⣿⣿⣿⣿⣿⣀⣾⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣅⣽⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠛⠙⠋⠋⠋⠋⠋⠋⠋⠋⠛⠙⠙⠁⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⢿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⣴⣶⣉⢿⣿⣿⣿⡟⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣆⡻⣿⣷⠜⣿⣏⣾⣿⣿⡿⠁⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⣿⣿⣽⣿⣿⣿⠿⠋⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿⣿⠿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - "#; - write!(ret, "{}", breadcat_art).unwrap(); - } - "probe" => { - if let Some(addr_str) = tokens.next() { - match u8::from_str_radix(addr_str, 16) { - Ok(addr) => { - let mut i2c = I2c::new(); - let mut buf = [0u8; 1]; - match i2c.i2c_read(addr, 0x00, &mut buf, false) { - Ok(_) => { - write!(ret, "Device found at address {:02X} (via read)\n", addr).unwrap(); - } - Err(xous::Error::InternalError) => { - write!(ret, "No device found at address {:02X}\n", addr).unwrap(); - } - Err(e) => { - write!(ret, "Error probing address {:02X}: {:?}\n", addr, e).unwrap(); - } + if let Some(addr_str) = tokens.next() { + match u8::from_str_radix(addr_str, 16) { + Ok(addr) => { + let mut i2c = I2c::new(); + let status = probe_address(&mut i2c, addr); + match status { + ProbeStatus::Ack => write!(ret, "Device found at address {:02X}\n", addr).unwrap(), + ProbeStatus::Nack => write!(ret, "Device at address {:02X} responded with NACK\n", addr).unwrap(), + }; + } + Err(_) => { + write!(ret, "Invalid hex address '{}'. Example: i2cdetect probe 3C\n", addr_str).unwrap(); } } - Err(_) => { - write!(ret, "Invalid hex address '{}'. Example: i2cdetect probe 3C\n", addr_str).unwrap(); - } + } else { + write!(ret, "Usage: i2cdetect probe \n").unwrap(); } - } else { - write!(ret, "Usage: i2cdetect probe \n").unwrap(); } - } - - "bmptemp" => { - const BMP180_ADDR: u8 = 0x77; - const REG_CALIB_START: u8 = 0xAA; - const REG_CTRL: u8 = 0xF4; - const REG_DATA_START: u8 = 0xF6; - const CMD_READ_TEMP: u8 = 0x2E; + "scan" => { let mut i2c = I2c::new(); - - let mut cal_buf = [0u8; 22]; - if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_CALIB_START, &mut cal_buf, true) { - write!(ret, "Failed to read calibration data: {:?}\n", e).unwrap(); - return Ok(Some(ret)); + writeln!(&mut ret, " 0 1 2 3 4 5 6 7 8 9 a b c d e f").unwrap(); + for row in 0..8 { + write!(&mut ret, "{:02x}: ", row * 16).unwrap(); + for col in 0..16 { + let addr = (row * 16 + col) as u8; + if addr < 0x03 || addr > 0x77 { + write!(&mut ret, " ").unwrap(); + } else { + let status = probe_address(&mut i2c, addr); + match status { + ProbeStatus::Ack => write!(&mut ret, "{:02x} ", addr).unwrap(), + ProbeStatus::Nack => write!(&mut ret, "-- ").unwrap(), + }; + } + } + writeln!(&mut ret).unwrap(); } - - // note: calibration data is Big Endian, hence the from_be_bytes - let cal = Bmp180Calibration { - ac1: i16::from_be_bytes([cal_buf[0], cal_buf[1]]), - ac2: i16::from_be_bytes([cal_buf[2], cal_buf[3]]), - ac3: i16::from_be_bytes([cal_buf[4], cal_buf[5]]), - ac4: u16::from_be_bytes([cal_buf[6], cal_buf[7]]), - ac5: u16::from_be_bytes([cal_buf[8], cal_buf[9]]), - ac6: u16::from_be_bytes([cal_buf[10], cal_buf[11]]), - b1: i16::from_be_bytes([cal_buf[12], cal_buf[13]]), - b2: i16::from_be_bytes([cal_buf[14], cal_buf[15]]), - mb: i16::from_be_bytes([cal_buf[16], cal_buf[17]]), - mc: i16::from_be_bytes([cal_buf[18], cal_buf[19]]), - md: i16::from_be_bytes([cal_buf[20], cal_buf[21]]), - }; - - - if let Err(e) = i2c.i2c_write(BMP180_ADDR, REG_CTRL, &[CMD_READ_TEMP]) { - write!(ret, "Failed to start temp measurement: {:?}\n", e).unwrap(); - return Ok(Some(ret)); - } - - sleep(Duration::from_millis(5)); - - let mut temp_buffer = [0u8; 2]; - if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_DATA_START, &mut temp_buffer, true) { - write!(ret, "Failed to read temp data: {:?}\n", e).unwrap(); - return Ok(Some(ret)); - } - let ut = i16::from_be_bytes(temp_buffer) as i32; - - let x1 = (ut - cal.ac6 as i32) * cal.ac5 as i32 >> 15; - let x2 = (cal.mc as i32 * 2048) / (x1 + cal.md as i32); - let b5 = x1 + x2; - let temp = ((b5 + 8) >> 4) as f32 / 10.0; - - write!(ret, "BMP180 Temperature: {:.1}°C\n", temp).unwrap(); } + + _ => { write!(ret, "{}\n", helpstring).unwrap(); } diff --git a/services/bao-console/src/main.rs b/services/bao-console/src/main.rs index 40b635705..4f40e6079 100644 --- a/services/bao-console/src/main.rs +++ b/services/bao-console/src/main.rs @@ -110,11 +110,11 @@ fn main() { #[cfg(feature = "battery-readout")] { - use cramium_api::I2cApi; - let mut i2c = cram_hal_service::I2c::new(); - use cramium_hal::axp2101::*; - let measurements = [("VBAT", REG_VBAT_H), ("VBUS", REG_VBUS_H), ("VSYS", REG_VSYS_H)]; - let mut buf = [0u8, 0u8]; + // use cramium_api::I2cApi; + // let mut i2c = cram_hal_service::I2c::new(); + // use cramium_hal::axp2101::*; + // let measurements = [("VBAT", REG_VBAT_H), ("VBUS", REG_VBUS_H), ("VSYS", REG_VSYS_H)]; + // let mut buf = [0u8, 0u8]; loop { tt.sleep_ms(2_000).ok(); // for (name, offset) in measurements { From e5cdeaf2ca74a85db02077cc367824ea3095d9f0 Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Mon, 9 Jun 2025 16:18:56 +0800 Subject: [PATCH 07/14] adding some cute command line arguments --- services/bao-console/src/cmds.rs | 4 ++ services/bao-console/src/cmds/cute.rs | 92 +++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 services/bao-console/src/cmds/cute.rs diff --git a/services/bao-console/src/cmds.rs b/services/bao-console/src/cmds.rs index f425055ce..c73fa4c98 100644 --- a/services/bao-console/src/cmds.rs +++ b/services/bao-console/src/cmds.rs @@ -93,6 +93,8 @@ mod pddb; use pddb::*; mod i2cdetect; use i2cdetect::*; +mod cute; +use cute::*; pub struct CmdEnv { common_env: CommonEnv, @@ -141,6 +143,7 @@ impl CmdEnv { let mut ver_cmd = Ver {}; let mut console_cmd = Test {}; let mut i2cdetect_cmd = I2cDetect{}; + let mut cute_cmd = Cute{}; let commands: &mut [&mut dyn ShellCmdApi] = &mut [ ///// 4. add your command to this array, so that it can be looked up and dispatched @@ -148,6 +151,7 @@ impl CmdEnv { &mut ver_cmd, &mut self.trng_cmd, &mut i2cdetect_cmd, + &mut cute_cmd, &mut console_cmd, #[cfg(feature = "usb")] &mut self.usb, diff --git a/services/bao-console/src/cmds/cute.rs b/services/bao-console/src/cmds/cute.rs new file mode 100644 index 000000000..277a96022 --- /dev/null +++ b/services/bao-console/src/cmds/cute.rs @@ -0,0 +1,92 @@ +use String; + +use crate::{CommonEnv, ShellCmdApi}; + +#[derive(Debug)] +pub struct Cute {} + +impl<'a> ShellCmdApi<'a> for Cute { + cmd_api!(cute); + + fn process(&mut self, args: String, _env: &mut CommonEnv) -> Result, xous::Error> { + use core::fmt::Write; + let mut ret = String::new(); + let helpstring = "Usage: + cute cat - prints cat ascii art + cute bread - prints bread ascii art + cute breadcat - prints breadcat ascii art"; + + let mut tokens = args.split_whitespace(); + + if let Some(sub_cmd) = tokens.next() { + match sub_cmd { + "cat" => { + let cat_art = r#" +⠀⠀⠀⠀⢀⠠⠤⠀⢀⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠐⠀⠐⠀⠀⢀⣾⣿⡇⠀⠀⠀⠀⠀⢀⣼⡇⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⣸⣿⣿⣿⠀⠀⠀⠀⣴⣿⣿⠇⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⠀⠀⢀⣾⣿⣿⣿⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠐⠀⡀ +⠀⠀⠀⠀⢰⡿⠉⠀⡜⣿⣿⣿⡿⠿⢿⣿⣿⡃⠀⠀⠂⠄⠀ +⠀⠀⠒⠒⠸⣿⣄⡘⣃⣿⣿⡟⢰⠃⠀⢹⣿⡇⠀⠀⠀⠀⠀ +⠀⠀⠚⠉⠀⠊⠻⣿⣿⣿⣿⣿⣮⣤⣤⣿⡟⠁⠘⠠⠁⠀⠀ +⠀⠀⠀⠀⠀⠠⠀⠀⠈⠙⠛⠛⠛⠛⠛⠁⠀⠒⠤⠀⠀⠀⠀ +⠨⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠀⠀⠀⠀⠀⠀ +⠁⠃⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +"#; + write!(ret, "{}", cat_art).unwrap(); + } + "bread" => { + let bread_art = r#" +⠀⠀⠀⠀⣀⣠⣤⣤⣤⣤⣤⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⣴⣿⣿⠿⠛⣉⣁⣠⣤⣤⣤⣬⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⣿⣿⣿⣿⣿⣿⡿⠛⣉⣁⣠⣤⣤⣤⣬⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⣿⣿⣿⣿⣿⣵⣾⣿⡿⠟⠛⠉⣉⣉⣉⣉⠉⠓⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⣿⣿⣿⣿⣿⣿⡟⢁⣤⣶⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⣿⣿⣿⣿⣿⣿⠀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀ +⠀⢿⣿⣿⣿⣿⣿⣿⡄⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠈⠻⣿⣿⣿⣿⣿⣷⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠈⠻⣿⣿⣿⣿⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠙⢿⣿⠇⢰⣿⣿⣿⣿⡿⠛⢉⣩⣉⡉⠛⠻⠇⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠙⠀⠸⠿⠿⠟⢉⣠⣾⣿⣿⣿⣿⣷⣶⣦⣤⣄⣀⣀⡀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡷⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣉⣉⠉⠛⠛⠻⠿⣿⣿⣿⣿⣿⣿⣿⠿⠋⣀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⠛⠛⠛⠻⠶⣶⣤⣈⣉⣉⣉⣁⣤⣴⠾⠛⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠙⠛⠉⠉⠉⠀⠀⠀⠀ +"#; + write!(ret, "{}", bread_art).unwrap(); + } + "breadcat" => { + let breadcat_art = r#" +⠀⠀⠀⠰⣦⣤⣤⣀⠀⠀⡀⠀⠀⠀⠀⣀⣀⠀⠠⢤⣶⣶⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⢿⣿⢋⣵⣾⣿⣿⡿⣥⣮⢻⣿⣿⣿⣿⣶⣌⢿⣿⢰⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠘⢡⣿⣿⣿⣿⣿⣷⡹⠟⣵⣿⣿⣿⣿⣿⣿⣦⢃⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⢺⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢨⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⣿⡟⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠙⣿⣷⣬⣿⣿⣿⣿⣿⣿⣿⡼⣿⣿⡟⣱⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⣧⣠⣿⣿⣿⣿⣿⣿⣿⣀⣾⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣅⣽⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠛⠙⠋⠋⠋⠋⠋⠋⠋⠋⠛⠙⠙⠁⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⢿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢈⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⣴⣶⣉⢿⣿⣿⣿⡟⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣆⡻⣿⣷⠜⣿⣏⣾⣿⣿⡿⠁⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⣿⣿⣇⣿⣿⣽⣿⣿⣿⠿⠋⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿⣿⠿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +"#; + write!(ret, "{}", breadcat_art).unwrap(); + } + _ => { + write!(ret, "{}\n", helpstring).unwrap(); + } + } + } else { + write!(ret, "{}\n", helpstring).unwrap(); + } + + Ok(Some(ret)) +} + + +} \ No newline at end of file From c291b6a11f0f56540b37367b0948f6a913e1c420 Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Mon, 9 Jun 2025 16:27:34 +0800 Subject: [PATCH 08/14] now passing the linter --- services/bao-console/src/cmds.rs | 4 +- services/bao-console/src/cmds/cute.rs | 52 ++++++++++----------- services/bao-console/src/cmds/i2cdetect.rs | 53 ++++++++++++---------- xtask/src/main.rs | 3 +- 4 files changed, 58 insertions(+), 54 deletions(-) diff --git a/services/bao-console/src/cmds.rs b/services/bao-console/src/cmds.rs index c73fa4c98..741f9e8d7 100644 --- a/services/bao-console/src/cmds.rs +++ b/services/bao-console/src/cmds.rs @@ -142,8 +142,8 @@ impl CmdEnv { let mut echo_cmd = Echo {}; // this command has no persistent storage, so we can "create" it every time we call dispatch (but it's a zero-cost absraction so this doesn't actually create any instructions) let mut ver_cmd = Ver {}; let mut console_cmd = Test {}; - let mut i2cdetect_cmd = I2cDetect{}; - let mut cute_cmd = Cute{}; + let mut i2cdetect_cmd = I2cDetect {}; + let mut cute_cmd = Cute {}; let commands: &mut [&mut dyn ShellCmdApi] = &mut [ ///// 4. add your command to this array, so that it can be looked up and dispatched diff --git a/services/bao-console/src/cmds/cute.rs b/services/bao-console/src/cmds/cute.rs index 277a96022..9577cc1de 100644 --- a/services/bao-console/src/cmds/cute.rs +++ b/services/bao-console/src/cmds/cute.rs @@ -9,19 +9,19 @@ impl<'a> ShellCmdApi<'a> for Cute { cmd_api!(cute); fn process(&mut self, args: String, _env: &mut CommonEnv) -> Result, xous::Error> { - use core::fmt::Write; - let mut ret = String::new(); - let helpstring = "Usage: + use core::fmt::Write; + let mut ret = String::new(); + let helpstring = "Usage: cute cat - prints cat ascii art cute bread - prints bread ascii art cute breadcat - prints breadcat ascii art"; - let mut tokens = args.split_whitespace(); + let mut tokens = args.split_whitespace(); - if let Some(sub_cmd) = tokens.next() { - match sub_cmd { - "cat" => { - let cat_art = r#" + if let Some(sub_cmd) = tokens.next() { + match sub_cmd { + "cat" => { + let cat_art = r#" ⠀⠀⠀⠀⢀⠠⠤⠀⢀⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠐⠀⠐⠀⠀⢀⣾⣿⡇⠀⠀⠀⠀⠀⢀⣼⡇⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⣸⣿⣿⣿⠀⠀⠀⠀⣴⣿⣿⠇⠀⠀⠀⠀ @@ -34,10 +34,10 @@ impl<'a> ShellCmdApi<'a> for Cute { ⠨⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠀⠀⠀⠀⠀⠀ ⠁⠃⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ "#; - write!(ret, "{}", cat_art).unwrap(); - } - "bread" => { - let bread_art = r#" + write!(ret, "{}", cat_art).unwrap(); + } + "bread" => { + let bread_art = r#" ⠀⠀⠀⠀⣀⣠⣤⣤⣤⣤⣤⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⣴⣿⣿⠿⠛⣉⣁⣠⣤⣤⣤⣬⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⢸⣿⣿⣿⣿⣿⣿⡿⠛⣉⣁⣠⣤⣤⣤⣬⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ @@ -54,10 +54,10 @@ impl<'a> ShellCmdApi<'a> for Cute { ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⠛⠛⠛⠻⠶⣶⣤⣈⣉⣉⣉⣁⣤⣴⠾⠛⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠙⠛⠉⠉⠉⠀⠀⠀⠀ "#; - write!(ret, "{}", bread_art).unwrap(); - } - "breadcat" => { - let breadcat_art = r#" + write!(ret, "{}", bread_art).unwrap(); + } + "breadcat" => { + let breadcat_art = r#" ⠀⠀⠀⠰⣦⣤⣤⣀⠀⠀⡀⠀⠀⠀⠀⣀⣀⠀⠠⢤⣶⣶⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⢿⣿⢋⣵⣾⣿⣿⡿⣥⣮⢻⣿⣿⣿⣿⣶⣌⢿⣿⢰⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠘⢡⣿⣿⣿⣿⣿⣷⡹⠟⣵⣿⣿⣿⣿⣿⣿⣦⢃⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀ @@ -75,18 +75,16 @@ impl<'a> ShellCmdApi<'a> for Cute { ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿⣿⠿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ "#; - write!(ret, "{}", breadcat_art).unwrap(); - } - _ => { - write!(ret, "{}\n", helpstring).unwrap(); + write!(ret, "{}", breadcat_art).unwrap(); + } + _ => { + write!(ret, "{}\n", helpstring).unwrap(); + } } + } else { + write!(ret, "{}\n", helpstring).unwrap(); } - } else { - write!(ret, "{}\n", helpstring).unwrap(); + + Ok(Some(ret)) } - - Ok(Some(ret)) } - - -} \ No newline at end of file diff --git a/services/bao-console/src/cmds/i2cdetect.rs b/services/bao-console/src/cmds/i2cdetect.rs index 32e3cf139..4fd3e8cef 100644 --- a/services/bao-console/src/cmds/i2cdetect.rs +++ b/services/bao-console/src/cmds/i2cdetect.rs @@ -1,7 +1,7 @@ use String; +use cram_hal_service::I2c; use cramium_api::I2cApi; use cramium_api::I2cResult; -use cram_hal_service::I2c; use crate::{CommonEnv, ShellCmdApi}; @@ -23,37 +23,46 @@ fn probe_address(i2c: &mut I2c, addr: u8) -> ProbeStatus { } } - pub struct I2cDetect {} impl<'a> ShellCmdApi<'a> for I2cDetect { cmd_api!(i2cdetect); fn process(&mut self, args: String, _env: &mut CommonEnv) -> Result, xous::Error> { - use core::fmt::Write; - let mut ret = String::new(); - let helpstring = "Usage: + use core::fmt::Write; + let mut ret = String::new(); + let helpstring = "Usage: i2cdetect probe - probes a single I2C address (e.g. 34) i2cdetect scan - reads i2cdetect bmp180_temp - reads raw temperature from BMP180"; - let mut tokens = args.split_whitespace(); + let mut tokens = args.split_whitespace(); - if let Some(sub_cmd) = tokens.next() { - match sub_cmd { - "probe" => { + if let Some(sub_cmd) = tokens.next() { + match sub_cmd { + "probe" => { if let Some(addr_str) = tokens.next() { match u8::from_str_radix(addr_str, 16) { Ok(addr) => { let mut i2c = I2c::new(); let status = probe_address(&mut i2c, addr); match status { - ProbeStatus::Ack => write!(ret, "Device found at address {:02X}\n", addr).unwrap(), - ProbeStatus::Nack => write!(ret, "Device at address {:02X} responded with NACK\n", addr).unwrap(), + ProbeStatus::Ack => { + write!(ret, "Device found at address {:02X}\n", addr).unwrap() + } + ProbeStatus::Nack => { + write!(ret, "Device at address {:02X} responded with NACK\n", addr) + .unwrap() + } }; } Err(_) => { - write!(ret, "Invalid hex address '{}'. Example: i2cdetect probe 3C\n", addr_str).unwrap(); + write!( + ret, + "Invalid hex address '{}'. Example: i2cdetect probe 3C\n", + addr_str + ) + .unwrap(); } } } else { @@ -82,18 +91,14 @@ impl<'a> ShellCmdApi<'a> for I2cDetect { } } - - - _ => { - write!(ret, "{}\n", helpstring).unwrap(); + _ => { + write!(ret, "{}\n", helpstring).unwrap(); + } } + } else { + write!(ret, "{}\n", helpstring).unwrap(); } - } else { - write!(ret, "{}\n", helpstring).unwrap(); + + Ok(Some(ret)) } - - Ok(Some(ret)) - } - - -} \ No newline at end of file +} diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 79b617517..3e84266df 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -612,7 +612,8 @@ fn main() -> Result<(), Box> { // - [planned] vault application let bao_rram_pkgs = ["xous-ticktimer", "xous-log", "xous-names", "keystore" /* "usb-cramium" */].to_vec(); /* "usb-cramium" */ - let bao_swap_pkgs = ["cram-hal-service", "bao-console", /*"modals", "pddb", "bao-video"*/].to_vec(); /* "bao-video" */ + let bao_swap_pkgs = + ["cram-hal-service", "bao-console" /* "modals", "pddb", "bao-video" */].to_vec(); /* "bao-video" */ if !builder.is_swap_set() { builder.set_swap(0, 8 * 1024 * 1024); } From d1b5a41e820783e94f8a8e019317d20ce712432e Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Mon, 9 Jun 2025 16:32:42 +0800 Subject: [PATCH 09/14] fixing help text --- services/bao-console/src/cmds/i2cdetect.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/bao-console/src/cmds/i2cdetect.rs b/services/bao-console/src/cmds/i2cdetect.rs index 4fd3e8cef..c491e33e0 100644 --- a/services/bao-console/src/cmds/i2cdetect.rs +++ b/services/bao-console/src/cmds/i2cdetect.rs @@ -33,8 +33,7 @@ impl<'a> ShellCmdApi<'a> for I2cDetect { let mut ret = String::new(); let helpstring = "Usage: i2cdetect probe - probes a single I2C address (e.g. 34) - i2cdetect scan - reads - i2cdetect bmp180_temp - reads raw temperature from BMP180"; + i2cdetect scan - reads all addresses on the bus (use with caution!)" let mut tokens = args.split_whitespace(); From 90d88820dd590e07c71af5e04a5c4e8e0a8e8cfa Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Mon, 9 Jun 2025 17:04:32 +0800 Subject: [PATCH 10/14] dropped a ; --- libs/cramium-hal/src/bmp180.rs | 64 ++++++++++++++++++++++ services/bao-console/src/cmds/i2cdetect.rs | 2 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 libs/cramium-hal/src/bmp180.rs diff --git a/libs/cramium-hal/src/bmp180.rs b/libs/cramium-hal/src/bmp180.rs new file mode 100644 index 000000000..dd4cd7870 --- /dev/null +++ b/libs/cramium-hal/src/bmp180.rs @@ -0,0 +1,64 @@ +use cramium_api::I2cApi; +use cramium_api::I2cResult; +use cram_hal_service::I2c; +use std::thread::sleep; +use std::time::Duration; + +struct Bmp180Calibration { + ac1: i16, ac2: i16, ac3: i16, + ac4: u16, ac5: u16, ac6: u16, + b1: i16, b2: i16, + mb: i16, mc: i16, md: i16, +} + "bmp180_temp" => { + const BMP180_ADDR: u8 = 0x77; + const REG_CALIB_START: u8 = 0xAA; + const REG_CTRL: u8 = 0xF4; + const REG_DATA_START: u8 = 0xF6; + const CMD_READ_TEMP: u8 = 0x2E; + + let mut i2c = I2c::new(); + + let mut cal_buf = [0u8; 22]; + if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_CALIB_START, &mut cal_buf, true) { + write!(ret, "Failed to read calibration data: {:?}\n", e).unwrap(); + return Ok(Some(ret)); + } + + // note: calibration data is Big Endian, hence the from_be_bytes + let cal = Bmp180Calibration { + ac1: i16::from_be_bytes([cal_buf[0], cal_buf[1]]), + ac2: i16::from_be_bytes([cal_buf[2], cal_buf[3]]), + ac3: i16::from_be_bytes([cal_buf[4], cal_buf[5]]), + ac4: u16::from_be_bytes([cal_buf[6], cal_buf[7]]), + ac5: u16::from_be_bytes([cal_buf[8], cal_buf[9]]), + ac6: u16::from_be_bytes([cal_buf[10], cal_buf[11]]), + b1: i16::from_be_bytes([cal_buf[12], cal_buf[13]]), + b2: i16::from_be_bytes([cal_buf[14], cal_buf[15]]), + mb: i16::from_be_bytes([cal_buf[16], cal_buf[17]]), + mc: i16::from_be_bytes([cal_buf[18], cal_buf[19]]), + md: i16::from_be_bytes([cal_buf[20], cal_buf[21]]), + }; + + + if let Err(e) = i2c.i2c_write(BMP180_ADDR, REG_CTRL, &[CMD_READ_TEMP]) { + write!(ret, "Failed to start temp measurement: {:?}\n", e).unwrap(); + return Ok(Some(ret)); + } + + sleep(Duration::from_millis(5)); + + let mut temp_buffer = [0u8; 2]; + if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_DATA_START, &mut temp_buffer, true) { + write!(ret, "Failed to read temp data: {:?}\n", e).unwrap(); + return Ok(Some(ret)); + } + let ut = i16::from_be_bytes(temp_buffer) as i32; + + let x1 = (ut - cal.ac6 as i32) * cal.ac5 as i32 >> 15; + let x2 = (cal.mc as i32 * 2048) / (x1 + cal.md as i32); + let b5 = x1 + x2; + let temp = ((b5 + 8) >> 4) as f32 / 10.0; + + write!(ret, "BMP180 Temperature: {:.1}°C\n", temp).unwrap(); + } \ No newline at end of file diff --git a/services/bao-console/src/cmds/i2cdetect.rs b/services/bao-console/src/cmds/i2cdetect.rs index c491e33e0..a3aa598e1 100644 --- a/services/bao-console/src/cmds/i2cdetect.rs +++ b/services/bao-console/src/cmds/i2cdetect.rs @@ -33,7 +33,7 @@ impl<'a> ShellCmdApi<'a> for I2cDetect { let mut ret = String::new(); let helpstring = "Usage: i2cdetect probe - probes a single I2C address (e.g. 34) - i2cdetect scan - reads all addresses on the bus (use with caution!)" + i2cdetect scan - reads all addresses on the bus (use with caution!)"; let mut tokens = args.split_whitespace(); From e7ac82161f0e735160c1d0eeff83db7425a9a06c Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Mon, 9 Jun 2025 17:22:55 +0800 Subject: [PATCH 11/14] removing bmp180 which should be its own PR --- libs/cramium-hal/src/bmp180.rs | 64 ---------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 libs/cramium-hal/src/bmp180.rs diff --git a/libs/cramium-hal/src/bmp180.rs b/libs/cramium-hal/src/bmp180.rs deleted file mode 100644 index dd4cd7870..000000000 --- a/libs/cramium-hal/src/bmp180.rs +++ /dev/null @@ -1,64 +0,0 @@ -use cramium_api::I2cApi; -use cramium_api::I2cResult; -use cram_hal_service::I2c; -use std::thread::sleep; -use std::time::Duration; - -struct Bmp180Calibration { - ac1: i16, ac2: i16, ac3: i16, - ac4: u16, ac5: u16, ac6: u16, - b1: i16, b2: i16, - mb: i16, mc: i16, md: i16, -} - "bmp180_temp" => { - const BMP180_ADDR: u8 = 0x77; - const REG_CALIB_START: u8 = 0xAA; - const REG_CTRL: u8 = 0xF4; - const REG_DATA_START: u8 = 0xF6; - const CMD_READ_TEMP: u8 = 0x2E; - - let mut i2c = I2c::new(); - - let mut cal_buf = [0u8; 22]; - if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_CALIB_START, &mut cal_buf, true) { - write!(ret, "Failed to read calibration data: {:?}\n", e).unwrap(); - return Ok(Some(ret)); - } - - // note: calibration data is Big Endian, hence the from_be_bytes - let cal = Bmp180Calibration { - ac1: i16::from_be_bytes([cal_buf[0], cal_buf[1]]), - ac2: i16::from_be_bytes([cal_buf[2], cal_buf[3]]), - ac3: i16::from_be_bytes([cal_buf[4], cal_buf[5]]), - ac4: u16::from_be_bytes([cal_buf[6], cal_buf[7]]), - ac5: u16::from_be_bytes([cal_buf[8], cal_buf[9]]), - ac6: u16::from_be_bytes([cal_buf[10], cal_buf[11]]), - b1: i16::from_be_bytes([cal_buf[12], cal_buf[13]]), - b2: i16::from_be_bytes([cal_buf[14], cal_buf[15]]), - mb: i16::from_be_bytes([cal_buf[16], cal_buf[17]]), - mc: i16::from_be_bytes([cal_buf[18], cal_buf[19]]), - md: i16::from_be_bytes([cal_buf[20], cal_buf[21]]), - }; - - - if let Err(e) = i2c.i2c_write(BMP180_ADDR, REG_CTRL, &[CMD_READ_TEMP]) { - write!(ret, "Failed to start temp measurement: {:?}\n", e).unwrap(); - return Ok(Some(ret)); - } - - sleep(Duration::from_millis(5)); - - let mut temp_buffer = [0u8; 2]; - if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_DATA_START, &mut temp_buffer, true) { - write!(ret, "Failed to read temp data: {:?}\n", e).unwrap(); - return Ok(Some(ret)); - } - let ut = i16::from_be_bytes(temp_buffer) as i32; - - let x1 = (ut - cal.ac6 as i32) * cal.ac5 as i32 >> 15; - let x2 = (cal.mc as i32 * 2048) / (x1 + cal.md as i32); - let b5 = x1 + x2; - let temp = ((b5 + 8) >> 4) as f32 / 10.0; - - write!(ret, "BMP180 Temperature: {:.1}°C\n", temp).unwrap(); - } \ No newline at end of file From a25f20d0459acbae7f47fd16e2431a995a60cdaf Mon Sep 17 00:00:00 2001 From: Sam Chin Date: Mon, 9 Jun 2025 17:47:00 +0800 Subject: [PATCH 12/14] making console flags happy --- services/bao-console/src/main.rs | 24 ++++++++++++------------ xtask/src/main.rs | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/services/bao-console/src/main.rs b/services/bao-console/src/main.rs index 4f40e6079..cfc282e35 100644 --- a/services/bao-console/src/main.rs +++ b/services/bao-console/src/main.rs @@ -110,20 +110,20 @@ fn main() { #[cfg(feature = "battery-readout")] { - // use cramium_api::I2cApi; - // let mut i2c = cram_hal_service::I2c::new(); - // use cramium_hal::axp2101::*; - // let measurements = [("VBAT", REG_VBAT_H), ("VBUS", REG_VBUS_H), ("VSYS", REG_VSYS_H)]; - // let mut buf = [0u8, 0u8]; + use cramium_api::I2cApi; + let mut i2c = cram_hal_service::I2c::new(); + use cramium_hal::axp2101::*; + let measurements = [("VBAT", REG_VBAT_H), ("VBUS", REG_VBUS_H), ("VSYS", REG_VSYS_H)]; + let mut buf = [0u8, 0u8]; loop { tt.sleep_ms(2_000).ok(); - // for (name, offset) in measurements { - // i2c.i2c_read(AXP2101_DEV, offset, &mut buf, false).unwrap(); - // let v: u32 = (((buf[0] as u32) & 0x3F) << 8) | buf[1] as u32; - // log::info!("{}: {:0.3}V", name, v as f32 / 1000.0); - // i2c.i2c_read(AXP2101_DEV, REG_SOC, &mut buf[0..1], false).unwrap(); - // log::info!("SOC: {}%", buf[0]); - // } + for (name, offset) in measurements { + i2c.i2c_read(AXP2101_DEV, offset, &mut buf, false).unwrap(); + let v: u32 = (((buf[0] as u32) & 0x3F) << 8) | buf[1] as u32; + log::info!("{}: {:0.3}V", name, v as f32 / 1000.0); + i2c.i2c_read(AXP2101_DEV, REG_SOC, &mut buf[0..1], false).unwrap(); + log::info!("SOC: {}%", buf[0]); + } } } #[cfg(any(feature = "hosted-baosec", not(feature = "battery-readout")))] diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 3e84266df..790edf3b2 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -620,7 +620,6 @@ fn main() -> Result<(), Box> { builder.add_loader_feature("swap"); builder.add_kernel_feature("swap"); builder.add_feature("swap"); - // builder.add_feature("autotest"); builder.add_loader_feature("debug-print"); // the following feature needs to be uncommented if we also enable From 59db16aa99157fc2d55b6b652a4244d254679c07 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 9 Jun 2025 18:49:28 +0800 Subject: [PATCH 13/14] remove debug message --- services/bao-console/src/cmds/pddb.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/services/bao-console/src/cmds/pddb.rs b/services/bao-console/src/cmds/pddb.rs index 6c06637be..0945ee357 100644 --- a/services/bao-console/src/cmds/pddb.rs +++ b/services/bao-console/src/cmds/pddb.rs @@ -15,7 +15,6 @@ pub struct PddbCmd { } impl PddbCmd { pub fn new() -> Self { - log::info!("here"); let pddb = pddb::Pddb::new(); log::info!("PDDB mount result: {:?}", pddb.try_mount()); PddbCmd { pddb } From 7d23064d08aa9a4710572d52dde9c94350ee7c1b Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 9 Jun 2025 18:50:46 +0800 Subject: [PATCH 14/14] Leave in bao-video I think we can leave in the bao-video package without breaking the size of the swap.img file... --- xtask/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 790edf3b2..d80e1e8ec 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -613,7 +613,7 @@ fn main() -> Result<(), Box> { let bao_rram_pkgs = ["xous-ticktimer", "xous-log", "xous-names", "keystore" /* "usb-cramium" */].to_vec(); /* "usb-cramium" */ let bao_swap_pkgs = - ["cram-hal-service", "bao-console" /* "modals", "pddb", "bao-video" */].to_vec(); /* "bao-video" */ + ["cram-hal-service", "bao-console", /* "modals", "pddb", */ "bao-video"].to_vec(); /* "bao-video" */ if !builder.is_swap_set() { builder.set_swap(0, 8 * 1024 * 1024); }