mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
removing the BMP180 code
This commit is contained in:
parent
916c93e276
commit
1b8554b8f2
2 changed files with 59 additions and 146 deletions
|
|
@ -1,21 +1,31 @@
|
||||||
use String;
|
use String;
|
||||||
use cramium_api::I2cApi;
|
use cramium_api::I2cApi;
|
||||||
|
use cramium_api::I2cResult;
|
||||||
use cram_hal_service::I2c;
|
use cram_hal_service::I2c;
|
||||||
use std::thread::sleep;
|
|
||||||
use std::time::Duration;
|
|
||||||
|
|
||||||
use crate::{CommonEnv, ShellCmdApi};
|
use crate::{CommonEnv, ShellCmdApi};
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|
||||||
pub struct I2cDetect {}
|
enum ProbeStatus {
|
||||||
struct Bmp180Calibration {
|
Ack,
|
||||||
ac1: i16, ac2: i16, ac3: i16,
|
Nack,
|
||||||
ac4: u16, ac5: u16, ac6: u16,
|
|
||||||
b1: i16, b2: i16,
|
|
||||||
mb: i16, mc: i16, md: i16,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 {
|
impl<'a> ShellCmdApi<'a> for I2cDetect {
|
||||||
cmd_api!(i2cdetect);
|
cmd_api!(i2cdetect);
|
||||||
|
|
||||||
|
|
@ -23,154 +33,57 @@ impl<'a> ShellCmdApi<'a> for I2cDetect {
|
||||||
use core::fmt::Write;
|
use core::fmt::Write;
|
||||||
let mut ret = String::new();
|
let mut ret = String::new();
|
||||||
let helpstring = "Usage:
|
let helpstring = "Usage:
|
||||||
i2cdetect cat - prints cat ascii art
|
i2cdetect probe <hex> - probes a single I2C address (e.g. 34)
|
||||||
i2cdetect bread - prints bread ascii art
|
i2cdetect scan - reads
|
||||||
i2cdetect breadcat - prints breadcat ascii art
|
i2cdetect bmp180_temp - reads raw temperature from BMP180";
|
||||||
i2cdetect probe <hex> - probes a single I2C address (e.g. 34)
|
|
||||||
i2cdetect bmptemp - reads raw temperature from BMP180";
|
|
||||||
|
|
||||||
let mut tokens = args.split_whitespace();
|
let mut tokens = args.split_whitespace();
|
||||||
|
|
||||||
if let Some(sub_cmd) = tokens.next() {
|
if let Some(sub_cmd) = tokens.next() {
|
||||||
match sub_cmd {
|
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" => {
|
"probe" => {
|
||||||
if let Some(addr_str) = tokens.next() {
|
if let Some(addr_str) = tokens.next() {
|
||||||
match u8::from_str_radix(addr_str, 16) {
|
match u8::from_str_radix(addr_str, 16) {
|
||||||
Ok(addr) => {
|
Ok(addr) => {
|
||||||
let mut i2c = I2c::new();
|
let mut i2c = I2c::new();
|
||||||
let mut buf = [0u8; 1];
|
let status = probe_address(&mut i2c, addr);
|
||||||
match i2c.i2c_read(addr, 0x00, &mut buf, false) {
|
match status {
|
||||||
Ok(_) => {
|
ProbeStatus::Ack => write!(ret, "Device found at address {:02X}\n", addr).unwrap(),
|
||||||
write!(ret, "Device found at address {:02X} (via read)\n", addr).unwrap();
|
ProbeStatus::Nack => write!(ret, "Device at address {:02X} responded with NACK\n", addr).unwrap(),
|
||||||
}
|
};
|
||||||
Err(xous::Error::InternalError) => {
|
}
|
||||||
write!(ret, "No device found at address {:02X}\n", addr).unwrap();
|
Err(_) => {
|
||||||
}
|
write!(ret, "Invalid hex address '{}'. Example: i2cdetect probe 3C\n", addr_str).unwrap();
|
||||||
Err(e) => {
|
|
||||||
write!(ret, "Error probing address {:02X}: {:?}\n", addr, e).unwrap();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(_) => {
|
} else {
|
||||||
write!(ret, "Invalid hex address '{}'. Example: i2cdetect probe 3C\n", addr_str).unwrap();
|
write!(ret, "Usage: i2cdetect probe <hexaddr>\n").unwrap();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
write!(ret, "Usage: i2cdetect probe <hexaddr>\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 i2c = I2c::new();
|
||||||
|
writeln!(&mut ret, " 0 1 2 3 4 5 6 7 8 9 a b c d e f").unwrap();
|
||||||
let mut cal_buf = [0u8; 22];
|
for row in 0..8 {
|
||||||
if let Err(e) = i2c.i2c_read(BMP180_ADDR, REG_CALIB_START, &mut cal_buf, true) {
|
write!(&mut ret, "{:02x}: ", row * 16).unwrap();
|
||||||
write!(ret, "Failed to read calibration data: {:?}\n", e).unwrap();
|
for col in 0..16 {
|
||||||
return Ok(Some(ret));
|
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();
|
write!(ret, "{}\n", helpstring).unwrap();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -110,11 +110,11 @@ fn main() {
|
||||||
|
|
||||||
#[cfg(feature = "battery-readout")]
|
#[cfg(feature = "battery-readout")]
|
||||||
{
|
{
|
||||||
use cramium_api::I2cApi;
|
// use cramium_api::I2cApi;
|
||||||
let mut i2c = cram_hal_service::I2c::new();
|
// let mut i2c = cram_hal_service::I2c::new();
|
||||||
use cramium_hal::axp2101::*;
|
// use cramium_hal::axp2101::*;
|
||||||
let measurements = [("VBAT", REG_VBAT_H), ("VBUS", REG_VBUS_H), ("VSYS", REG_VSYS_H)];
|
// let measurements = [("VBAT", REG_VBAT_H), ("VBUS", REG_VBUS_H), ("VSYS", REG_VSYS_H)];
|
||||||
let mut buf = [0u8, 0u8];
|
// let mut buf = [0u8, 0u8];
|
||||||
loop {
|
loop {
|
||||||
tt.sleep_ms(2_000).ok();
|
tt.sleep_ms(2_000).ok();
|
||||||
// for (name, offset) in measurements {
|
// for (name, offset) in measurements {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue