shaunrd0/klips
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Shaun Reed
2025-11-01 09:32:33 -04:00
parent c087c2446a
commit dce3e3600d
7 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
esp/rust/04_no-std-aht20/Cargo.toml
View File

@@ -5,7 +5,7 @@ authors = ["Shaun Reed <shaunrd0@gmail.com>"]
edition = "2021"
resolver = "2"
rust-version = "1.77"
description = "test"
description = "Reading from AHT20 sensor and drawing to OLED display"
publish = false
[[bin]]
@@ -27,8 +27,6 @@ esp32 = [
"esp-bootloader-esp-idf/esp32",
]
#experimental = ["esp-idf-svc/experimental"]
[dependencies]
log = "0.4"
embedded-hal = "1.0.0"
@@ -36,29 +34,6 @@ esp-backtrace = { version = "0.17.0", features = ["esp32", "println", "panic-han
esp-hal = { version = "1.0.0-rc.0", features = ["esp32", "unstable"] }
esp-println = { version = "0.15.0", features = ["auto", "log-04"] }
esp-bootloader-esp-idf = { version = "0.2.0", default-features = false, features = ["esp-rom-sys", "log-04", "esp32"] }
#esp-rom-sys = { version = "0.1.1", features = ["esp32"] }
#esp-idf-svc = { version = "0.51", features = [""], default-features = false}
#esp-idf-hal = "0.45.2"
#anyhow = "1.0.98"
#fugit = "0.3.7"
#esp-rom-sys = { version = "0.1.1", features = ["esp32"] }
# --- Optional Embassy Integration ---
# esp-idf-svc = { version = "0.51", features = ["critical-section", "embassy-time-driver", "embassy-sync"] }
# If you enable embassy-time-driver, you MUST also add one of:
# a) Standalone Embassy libs ( embassy-time, embassy-sync etc) with a foreign async runtime:
# embassy-time = { version = "0.4.0", features = ["generic-queue-8"] } # NOTE: any generic-queue variant will work
# b) With embassy-executor:
# embassy-executor = { version = "0.7", features = ["executor-thread", "arch-std"] }
# NOTE: if you use embassy-time with embassy-executor you don't need the generic-queue-8 feature
# --- Temporary workaround for embassy-executor < 0.8 ---
# esp-idf-svc = { version = "0.51", features = ["embassy-time-driver", "embassy-sync"] }
# critical-section = { version = "1.1", features = ["std"], default-features = false }
[build-dependencies]
embuild = "0.33"

48
esp/rust/04_no-std-aht20/src/main.rs
View File

@@ -1,12 +1,10 @@
#![no_std]
#![no_main]
use embedded_hal::i2c::ErrorType;
use embedded_hal::{delay::DelayNs, i2c::I2c as I2cEmbedded};
use esp_backtrace as _;
use esp_hal::{
delay::Delay,
xtensa_lx_rt::entry,
};
use esp_hal::{delay::Delay, xtensa_lx_rt::entry};
/// Represents a reading from the sensor.
pub struct SensorReading<T> {
@@ -14,14 +12,6 @@ pub struct SensorReading<T> {
pub temperature: T,
}
/// Possible errors when interacting with the sensor.
#[derive(Debug)]
pub enum SensorError {
ChecksumMismatch,
Timeout,
PinError,
}
pub struct Dht20<I: I2cEmbedded, D: DelayNs> {
pub i2c: I,
pub delay: D,
@@ -34,31 +24,30 @@ impl<I: I2cEmbedded, D: DelayNs> Dht20<I, D> {
Self { i2c, delay }
}
pub fn read(&mut self) -> Result<SensorReading<f32>, SensorError> {
// Check status
pub fn read(&mut self) -> Result<SensorReading<f32>, <I as ErrorType>::Error> {
log::info!("Checking status");
let mut status_response: [u8; 1] = [0; 1];
let _ = self
.i2c
.write_read(Self::SENSOR_ADDRESS, &[0x71], &mut status_response);
self.i2c
.write_read(Self::SENSOR_ADDRESS, &[0x71], &mut status_response)?;
// Calibration if needed
if status_response[0] & 0x18 != 0x18 {
let _ = self.i2c.write(Self::SENSOR_ADDRESS, &[0x1B, 0, 0]);
let _ = self.i2c.write(Self::SENSOR_ADDRESS, &[0x1C, 0, 0]);
let _ = self.i2c.write(Self::SENSOR_ADDRESS, &[0x1E, 0, 0]);
log::info!("Calibrating sensor {:?}", status_response);
for b in [0x1B, 0x1C, 0x1E] {
self.i2c.write(Self::SENSOR_ADDRESS, &[b, 0, 0])?;
}
}
// Trigger the measurement
self.delay.delay_ms(10);
let _ = self.i2c.write(Self::SENSOR_ADDRESS, &[0xAC, 0x33, 0x00]);
self.i2c.write(Self::SENSOR_ADDRESS, &[0xAC, 0x33, 0x00])?;
// Read the measurement status
self.delay.delay_ms(80);
loop {
let mut measurement_status_response: [u8; 1] = [0; 1];
let _ = self
.i2c
.read(Self::SENSOR_ADDRESS, &mut measurement_status_response);
self.i2c
.read(Self::SENSOR_ADDRESS, &mut measurement_status_response)?;
let status_word = measurement_status_response[0];
if status_word & 0b1000_0000 == 0 {
break;
@@ -68,28 +57,30 @@ impl<I: I2cEmbedded, D: DelayNs> Dht20<I, D> {
// Read the measurement (1 status + 5 data + 1 crc)
let mut measurement_response: [u8; 7] = [0; 7];
let _ = self
.i2c
.read(Self::SENSOR_ADDRESS, &mut measurement_response);
self.i2c
.read(Self::SENSOR_ADDRESS, &mut measurement_response)?;
// Humidity 20 bits (8 + 8 + 4)
let mut raw_humidity = measurement_response[1] as u32;
// log::info!("Raw Humidity: {:#018b}", raw_humidity);
raw_humidity = (raw_humidity << 8) + measurement_response[2] as u32;
raw_humidity = (raw_humidity << 4) + (measurement_response[3] >> 4) as u32;
let humidity_percentage = (raw_humidity as f32 / ((1 << 20) as f32)) * 100.0;
// Temperature 20 bits
let mut raw_temperature = (measurement_response[3] & 0b1111) as u32;
// log::info!("Raw Temperature: {:#018b}", raw_temperature);
raw_temperature = (raw_temperature << 8) + measurement_response[4] as u32;
raw_temperature = (raw_temperature << 8) + measurement_response[5] as u32;
let temperature_percentage = (raw_temperature as f32 / ((1 << 20) as f32)) * 200.0 - 50.0;
// TODO: Do we even need to do this? I think hal handles the checksum in the write / read
// Compare the calculated CRC with the received CRC
let data = &measurement_response[..6];
let received_crc = measurement_response[6];
let calculated_crc = Self::calculate_crc(data);
if received_crc != calculated_crc {
return Err(SensorError::ChecksumMismatch);
log::error!("Calculated CRC {:#018b}", received_crc);
}
Ok(SensorReading {
@@ -126,7 +117,6 @@ impl<I: I2cEmbedded, D: DelayNs> Dht20<I, D> {
esp_bootloader_esp_idf::esp_app_desc!();
#[entry]
fn main() -> ! {
let peripherals = esp_hal::init(esp_hal::Config::default());
esp_println::logger::init_logger_from_env();
let mut delay = Delay::new();