esp/rust/02_esp-gen-no-std/.cargo/config.toml

@@ -2,7 +2,6 @@
 runner = "espflash flash --monitor --chip esp32"
 
 [env]
-ESP_LOG = "info"
 
 [build]
 rustflags = [

esp/rust/02_esp-gen-no-std/Cargo.lock

@@ -268,15 +268,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "esp-gen-no-std"
+name = "esp-gen-test"
 version = "0.1.0"
 dependencies = [
  "critical-section",
  "esp-bootloader-esp-idf",
  "esp-hal",
- "esp-println",
- "fugit",
- "log",
 ]
 
 [[package]]
@@ -359,19 +356,6 @@ dependencies = [
  "esp-metadata",
 ]
 
-[[package]]
-name = "esp-println"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e7e3ab41e96093d7fd307e93bfc88bd646a8ff23036ebf809e116b18869f719"
-dependencies = [
- "critical-section",
- "document-features",
- "esp-metadata-generated",
- "log",
- "portable-atomic",
-]
-
 [[package]]
 name = "esp-riscv-rt"
 version = "0.12.0"

esp/rust/02_esp-gen-no-std/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 edition      = "2021"
-name         = "esp-gen-no-std"
+name         = "esp-gen-test"
 rust-version = "1.86"
 version      = "0.1.0"
 
 [[bin]]
-name = "blinky-i2c-scanner"
+name = "esp-gen-test"
 path = "./src/bin/main.rs"
 
 [dependencies]
@@ -13,9 +13,6 @@ esp-bootloader-esp-idf = { version = "0.2.0", features = ["esp32"] }
 esp-hal                = { version = "=1.0.0-rc.0", features = ["esp32"] }
 
 critical-section = "1.2.0"
-esp-println = { version = "0.15.0", features = ["esp32", "log-04"] }
-log = "0.4.28"
-fugit = "0.3.7"
 
 
 [profile.dev]

esp/rust/02_esp-gen-no-std/src/bin/main.rs

@@ -6,14 +6,12 @@
     holding buffers for the duration of a data transfer."
 )]
 
-use esp_hal::i2c::master::BusTimeout;
 use esp_hal::{
     clock::CpuClock,
     gpio::{Level, Output, OutputConfig},
     main,
-    time::{Duration, Instant},
+    time::{Duration, Instant}
 };
-use fugit::RateExtU32;
 
 #[panic_handler]
 fn panic(_: &core::panic::PanicInfo) -> ! {
@@ -27,29 +25,11 @@ esp_bootloader_esp_idf::esp_app_desc!();
 #[main]
 fn main() -> ! {
     // generator version: 0.5.0
-    esp_println::logger::init_logger_from_env();
     let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
     let peripherals = esp_hal::init(config);
-    let i2c_config = esp_hal::i2c::master::Config::default().with_timeout(BusTimeout::Maximum);
-    let mut i2c = esp_hal::i2c::master::I2c::new(peripherals.I2C0, i2c_config)
-        .unwrap()
-        .with_sda(peripherals.GPIO21)
-        .with_scl(peripherals.GPIO22);
 
     let mut led = Output::new(peripherals.GPIO2, Level::High, OutputConfig::default());
     loop {
-        log::info!("Scanning for I2C devices..");
-        for i in 0..=127u8 {
-            let res = i2c.read(i, &mut [0]);
-            match res {
-                Ok(_) => {
-                    log::info!("Device found at address: {}", i);
-                }
-                Err(err) => {
-                    log::warn!("Failed to read device address: {:?}", err);
-                }
-            }
-        }
         led.toggle();
         let delay_start = Instant::now();
         while delay_start.elapsed() < Duration::from_millis(500) {}

esp/rust/03_no-std-lcd/src/main.rs

@@ -5,7 +5,6 @@ use esp_idf_hal::prelude::*;
 
 const SSD1306_ADDRESS: u8 = 0x3c;
 
-// TODO: This is not no-std; This is using ESP-IDF-HAL, which uses std
 fn main() -> anyhow::Result<()> {
   esp_idf_hal::sys::link_patches();
 

esp/rust/04_no-std-aht20/.cargo/config.toml

@@ -1,16 +1,16 @@
-[target.xtensa-esp32-none-elf]
-runner = "espflash flash --monitor --chip esp32"
-
-[env]
-ESP_LOG = "info"
-
 [build]
-rustflags = [
-    "-C", "link-arg=-Wl,-Tlinkall.x",
-    "-C", "link-arg=-nostartfiles",
-]
+target = "xtensa-esp32-espidf"
 
-target = "xtensa-esp32-none-elf"
+[target.xtensa-esp32-espidf]
+linker = "ldproxy"
+runner = "espflash flash --monitor"
+rustflags = [ "--cfg",  "espidf_time64"]
 
 [unstable]
-build-std = ["core"]
+build-std = ["std", "panic_abort"]
+
+[env]
+MCU="esp32"
+# Note: this variable is not used by the pio builder (`cargo build --features pio`)
+ESP_IDF_VERSION = "v5.3.3"
+

esp/rust/04_no-std-aht20/Cargo.toml

@@ -1,12 +1,10 @@
 [package]
 name = "aht20"
 version = "0.1.0"
-authors = ["Shaun Reed <shaunrd0@gmail.com>"]
+authors = ["shaun"]
 edition = "2021"
 resolver = "2"
 rust-version = "1.77"
-description = "Reading from AHT20 sensor and drawing to OLED display"
-publish = false
 
 [[bin]]
 name = "aht20"
@@ -21,19 +19,34 @@ opt-level = "z"
 
 [features]
 default = []
-esp32 = [
-    "esp-backtrace/esp32",
-    "esp-hal/esp32",
-    "esp-bootloader-esp-idf/esp32",
-]
+
+experimental = ["esp-idf-svc/experimental"]
 
 [dependencies]
 log = "0.4"
+esp-idf-svc = "0.51"
 embedded-hal = "1.0.0"
-esp-backtrace = { version = "0.17.0", features = ["esp32", "println", "panic-handler"] }
-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-backtrace = "0.17.0"
+esp-hal = { version = "1.0.0-rc.0", features = ["unstable"] }
+fugit = "0.3.7"
+esp-println = { version = "0.15.0", features = ["log-04"] }
+
+# --- 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"

esp/rust/04_no-std-aht20/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    embuild::espidf::sysenv::output();
+}

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

@@ -1,17 +1,20 @@
 #![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};
-
 /// Represents a reading from the sensor.
 pub struct SensorReading<T> {
     pub humidity: 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,
@@ -24,30 +27,31 @@ impl<I: I2cEmbedded, D: DelayNs> Dht20<I, D> {
         Self { i2c, delay }
     }
 
-    pub fn read(&mut self) -> Result<SensorReading<f32>, <I as ErrorType>::Error> {
-        log::info!("Checking status");
+    pub fn read(&mut self) -> Result<SensorReading<f32>, SensorError> {
+        // Check status
         let mut status_response: [u8; 1] = [0; 1];
-        self.i2c
-            .write_read(Self::SENSOR_ADDRESS, &[0x71], &mut status_response)?;
+        let _ = self
+            .i2c
+            .write_read(Self::SENSOR_ADDRESS, &[0x71], &mut status_response);
 
         // Calibration if needed
         if status_response[0] & 0x18 != 0x18 {
-            log::info!("Calibrating sensor {:?}", status_response);
-            for b in [0x1B, 0x1C, 0x1E] {
-                self.i2c.write(Self::SENSOR_ADDRESS, &[b, 0, 0])?;
-            }
+            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]);
         }
 
         // Trigger the measurement
         self.delay.delay_ms(10);
-        self.i2c.write(Self::SENSOR_ADDRESS, &[0xAC, 0x33, 0x00])?;
+        let _ = 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];
-            self.i2c
-                .read(Self::SENSOR_ADDRESS, &mut measurement_status_response)?;
+            let _ = self
+                .i2c
+                .read(Self::SENSOR_ADDRESS, &mut measurement_status_response);
             let status_word = measurement_status_response[0];
             if status_word & 0b1000_0000 == 0 {
                 break;
@@ -57,30 +61,28 @@ 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];
-        self.i2c
-            .read(Self::SENSOR_ADDRESS, &mut measurement_response)?;
+        let _ = 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 {
-            log::error!("Calculated CRC {:#018b}", received_crc);
+            return Err(SensorError::ChecksumMismatch);
         }
 
         Ok(SensorReading {
@@ -109,12 +111,17 @@ impl<I: I2cEmbedded, D: DelayNs> Dht20<I, D> {
     }
 }
 
-// #[panic_handler]
-// fn panic(_: &core::panic::PanicInfo) -> ! {
-//     loop {}
-// }
+use embedded_hal::{delay::DelayNs, i2c::I2c as I2cEmbedded};
+use esp_backtrace as _;
+use esp_hal::{
+    clock::CpuClock,
+    delay::Delay,
+    gpio::{Level, Pull},
+    i2c::master::I2c,
+    xtensa_lx_rt::entry,
+};
+use fugit::{ExtU64, HertzU32};
 
-esp_bootloader_esp_idf::esp_app_desc!();
 #[entry]
 fn main() -> ! {
     let peripherals = esp_hal::init(esp_hal::Config::default());
@@ -125,8 +132,8 @@ fn main() -> ! {
     let i2c_for_dht20 =
         esp_hal::i2c::master::I2c::new(peripherals.I2C0, esp_hal::i2c::master::Config::default())
             .unwrap()
-            .with_sda(peripherals.GPIO21)
-            .with_scl(peripherals.GPIO22);
+            .with_sda(peripherals.pins.gpio21)
+            .with_scl(peripherals.pins.gpio22);
     let mut dht20 = Dht20::new(i2c_for_dht20, delay);
 
     loop {