Merge branch 'main' of https://github.com/AdinAck/cargo-embassy

Cargo.toml

@@ -12,5 +12,5 @@ Inflector = "0.11.4"
 clap = { version = "4.4.11", features = ["derive"] }
 indicatif = "0.17.7"
 open = "5.0.1"
-probe-rs = "0.21.1"
+probe-rs = "0.24.0"
 termimad = "0.29.1"

README.md

@@ -3,7 +3,7 @@
 Get up and running with Embassy in seconds.
 
 # Features
-- Supports STM32* and NRF*
+- Supports STM32*, NRF*, and ESP32(C3/S3)
 - Generates project structure
   - Toolchain
   - Probing
@@ -57,3 +57,8 @@ cargo embassy init my_project --chip nrf52840
 ```sh
 cargo embassy init my_project --chip nrf52832_xxAA --softdevice s132
 ```
+
+**Create a new Embassy project for the ESP32S3**
+```sh
+cargo embassy init my_project --chip esp32s3
+```

src/chip.rs

@@ -1,6 +1,8 @@
 pub mod family;
 pub mod target;
 
+use family::esp::Variant;
+
 use crate::error::{Error, InvalidChip};
 use std::str::FromStr;
 
@@ -29,25 +31,28 @@ impl FromStr for Chip {
             ("nrf52840", (NRF(MemRegion::NRF52840), Thumbv7f)),
             // TODO: nrf53x and nrf91x
             // STM
-            ("stm32c0", (STM32, Thumbv6)),
-            ("stm32f0", (STM32, Thumbv6)),
-            ("stm32f1", (STM32, Thumbv7)),
-            ("stm32f2", (STM32, Thumbv7)),
-            ("stm32f3", (STM32, Thumbv7e)),
-            ("stm32f4", (STM32, Thumbv7e)),
-            ("stm32f7", (STM32, Thumbv7e)),
-            ("stm32g0", (STM32, Thumbv6)),
-            ("stm32g4", (STM32, Thumbv7e)),
-            ("stm32h5", (STM32, Thumbv8)),
-            ("stm32h7", (STM32, Thumbv7e)),
-            ("stm32l0", (STM32, Thumbv6)),
-            ("stm32l1", (STM32, Thumbv7)),
-            ("stm32l4", (STM32, Thumbv7e)),
-            ("stm32l5", (STM32, Thumbv8)),
-            ("stm32u5", (STM32, Thumbv8)),
-            ("stm32wb", (STM32, Thumbv7e)),
-            ("stm32wba", (STM32, Thumbv8)),
-            ("stm32wl", (STM32, Thumbv7e)),
+            ("stm32c0", (STM, Thumbv6)),
+            ("stm32f0", (STM, Thumbv6)),
+            ("stm32f1", (STM, Thumbv7)),
+            ("stm32f2", (STM, Thumbv7)),
+            ("stm32f3", (STM, Thumbv7e)),
+            ("stm32f4", (STM, Thumbv7e)),
+            ("stm32f7", (STM, Thumbv7e)),
+            ("stm32g0", (STM, Thumbv6)),
+            ("stm32g4", (STM, Thumbv7e)),
+            ("stm32h5", (STM, Thumbv8)),
+            ("stm32h7", (STM, Thumbv7e)),
+            ("stm32l0", (STM, Thumbv6)),
+            ("stm32l1", (STM, Thumbv7)),
+            ("stm32l4", (STM, Thumbv7e)),
+            ("stm32l5", (STM, Thumbv8)),
+            ("stm32u5", (STM, Thumbv8)),
+            ("stm32wb", (STM, Thumbv7e)),
+            ("stm32wba", (STM, Thumbv8)),
+            ("stm32wl", (STM, Thumbv7e)),
+            // ESP32
+            ("esp32c3", (ESP(Variant::C3), Risc32Imc)),
+            ("esp32s3", (ESP(Variant::S3), XTensaS3)),
         ];
 
         let (family, target) = chips
@@ -59,10 +64,11 @@ impl FromStr for Chip {
             })?;
 
         Ok(Self {
-            name: match family {
-                STM32 => chip.to_string(),
+            name: match &family {
+                STM => chip.to_string(),
                 // FRAGILE: "_" is used to coerce probe-rs chip search
                 NRF(_) => chip.split('_').next().unwrap().to_string(),
+                ESP(variant) => variant.to_string(),
             },
             family,
             target,

src/chip/family.rs

@@ -1,20 +1,24 @@
+pub mod esp;
 pub mod mem_region;
 
+use esp::Variant;
 use mem_region::MemRegion;
 use std::fmt::Display;
 
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Debug, Clone)]
 pub enum Family {
-    STM32,
+    STM,
     NRF(MemRegion),
+    ESP(Variant),
 }
 
 impl Display for Family {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(match self {
-            Self::STM32 => "stm32",
+            Self::STM => "stm32",
             Self::NRF(_) => "nrf",
+            Self::ESP(_) => "esp",
         })
     }
 }

src/chip/family/esp.rs

@@ -0,0 +1,16 @@
+use std::fmt::Display;
+
+#[derive(Clone, Debug)]
+pub enum Variant {
+    C3,
+    S3,
+}
+
+impl Display for Variant {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(match self {
+            Self::C3 => "esp32c3",
+            Self::S3 => "esp32s3",
+        })
+    }
+}

src/chip/target.rs

@@ -1,14 +1,14 @@
-use clap::ValueEnum;
 use std::fmt::Display;
 
-#[derive(Debug, Clone, ValueEnum)]
-#[value()]
+#[derive(Debug, Clone)]
 pub enum Target {
     Thumbv6,
     Thumbv7,
     Thumbv7e,
     Thumbv7f,
     Thumbv8,
+    XTensaS3,
+    Risc32Imc,
 }
 
 impl Display for Target {
@@ -19,6 +19,8 @@ impl Display for Target {
             Self::Thumbv7e => "thumbv7em-none-eabi",
             Self::Thumbv7f => "thumbv7em-none-eabihf",
             Self::Thumbv8 => "thumbv8m.main-none-eabihf",
+            Self::XTensaS3 => "xtensa-esp32s3-none-elf",
+            Self::Risc32Imc => "riscv32imc-unknown-none-elf",
         })
     }
 }

src/cli/init_args/panic_handler.rs

@@ -1,6 +1,6 @@
 use clap::ValueEnum;
 
-#[derive(Debug, Clone, Default, ValueEnum)]
+#[derive(Debug, Clone, Default, PartialEq, ValueEnum)]
 #[value()]
 pub enum PanicHandler {
     #[default]

src/error.rs

@@ -6,6 +6,7 @@ pub enum Error {
     CreateFile(String),
     CreateFolder(String),
     ErroneousSoftdevice,
+    ErroneousPanicHandler,
     InvalidChip(InvalidChip),
 }