New release

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.33.4] - 2023-10-27
+* The `MCU` environment variable was failing the `pio` build if the MCU was not uppercased
+* Better error message for the `native` build in case the MCU was not recognized
+
 ## [0.33.3] - 2023-10-17
 * Support for ESP IDF Component Manager - check the documentation in BUILD-OPTIONS.md
 * ESP32H2 and ESP32C5 now properly assigned to the `riscv32imac-esp-espidf`

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "esp-idf-sys"
-version = "0.33.3"
+version = "0.33.4"
 authors = ["Alexey Arbuzov <[email protected]>", "sapir <[email protected]>", "Ivan Markov <[email protected]>", "Dominik Gschwind <[email protected]>"]
 edition = "2021"
 resolver = "2"

build/build.rs

@@ -71,12 +71,15 @@ fn main() -> anyhow::Result<()> {
             .collect(),
     };
 
-    let mcu = cfg_args.get("esp_idf_idf_target").ok_or_else(|| {
-        anyhow!(
-            "Failed to get IDF_TARGET from kconfig. cfgs:\n{:?}",
-            cfg_args.args
-        )
-    })?;
+    let mcu = cfg_args
+        .get("esp_idf_idf_target")
+        .ok_or_else(|| {
+            anyhow!(
+                "Failed to get IDF_TARGET from kconfig. cfgs:\n{:?}",
+                cfg_args.args
+            )
+        })?
+        .to_lowercase();
 
     let manifest_dir = manifest_dir()?;
 

build/native/cargo_driver.rs

@@ -15,6 +15,8 @@ use embuild::fs::copy_file_if_different;
 use embuild::utils::{OsStrExt, PathExt};
 use embuild::{bindgen, build, cargo, cmake, espidf, git, kconfig, path_buf};
 
+use strum::IntoEnumIterator;
+
 use self::chip::Chip;
 use crate::common::{
     self, list_specific_sdkconfigs, manifest_dir, sanitize_c_env_vars, sanitize_project_path,
@@ -44,16 +46,24 @@ pub fn build() -> Result<EspIdfBuildOutput> {
     let supported_chips = Chip::detect(&target)?;
 
     let chip = if let Some(mcu) = &config.mcu {
-        let chip = Chip::from_str(mcu)?;
+        if let Ok(chip) = Chip::from_str(mcu) {
+            if !supported_chips.iter().any(|sc| *sc == chip) {
+                bail!(
+                    "Specified MCU '{chip}' is not amongst the MCUs ([{}]) supported by the build target ('{target}')", 
+                    supported_chips.iter().map(|chip| format!("{chip}")).collect::<Vec<_>>().join(", ")
+                );
+            }
 
-        if !supported_chips.iter().any(|sc| *sc == chip) {
+            chip
+        } else {
             bail!(
-                "Specified MCU '{chip}' is not amongst the MCUs ([{}]) supported by the build target ('{target}')", 
-                supported_chips.iter().map(|chip| format!("{chip}")).collect::<Vec<_>>().join(", ")
+                "Specified MCU '{mcu}' is not recognized as a valid Espressif MCU amongst [{}]",
+                Chip::iter()
+                    .map(|chip| chip.to_string())
+                    .collect::<Vec<_>>()
+                    .join(", ")
             );
         }
-
-        chip
     } else {
         if supported_chips.len() > 1 {
             println!(

build/native/cargo_driver/chip.rs

@@ -1,11 +1,11 @@
 //! ESP32 chip variants support.
 
 use anyhow::{bail, Result};
-use strum::{Display, EnumString};
+use strum::{Display, EnumIter, EnumString};
 
 use embuild::espidf::EspIdfVersion;
 
-#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, EnumString)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, EnumString, EnumIter)]
 #[repr(u32)]
 pub enum Chip {
     /// Xtensa LX6 based dual core

build/pio.rs

@@ -83,7 +83,7 @@ pub fn build() -> Result<EspIdfBuildOutput> {
                 .params(pio::ResolutionParams {
                     platform: Some("espressif32".into()),
                     frameworks: vec!["espidf".into()],
-                    mcu: config.mcu.clone(),
+                    mcu: config.mcu.clone().map(|mcu| mcu.to_uppercase()), // MCU always uppercase in PlatformIO
                     target: Some(env::var("TARGET")?),
                     ..Default::default()
                 })