esp-rs · MabezDev · May 24, 2024 · Feb 2, 2023 · Feb 2, 2023 · Feb 2, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,6 +47,12 @@ jobs:
   esp-hal:
     name: esp-hal (${{ matrix.device.soc }})
     runs-on: ubuntu-latest
+    env:
+      SSID: SSID
+      PASSWORD: PASSWORD
+      STATIC_IP: 1.1.1.1 
+      GATEWAY_IP: 1.1.1.1
+      HOST_IP: 1.1.1.1
 
     strategy:
       fail-fast: false

diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,9 @@ exclude  = [
     "esp-metadata",
     "esp-println",
     "esp-riscv-rt",
+    "esp-wifi",
     "examples",
+    "extras/bench-server",
+    "extras/esp-wifishark",
     "hil-test",
 ]
diff --git a/esp-hal/src/reg_access.rs b/esp-hal/src/reg_access.rs
@@ -14,6 +14,7 @@ pub(crate) trait EndianessConverter {
 }
 
 /// Always use native endianess
+#[allow(unused)] // only used in AES driver for now
 pub(crate) struct NativeEndianess;
 
 impl EndianessConverter for NativeEndianess {

diff --git a/esp-hal/src/soc/esp32/mod.rs b/esp-hal/src/soc/esp32/mod.rs
@@ -18,13 +18,15 @@ pub mod peripherals;
 pub mod psram;
 pub mod radio_clocks;
 
+/// The name of the chip ("esp32") as `&str`
+#[macro_export]
 macro_rules! chip {
     () => {
         "esp32"
     };
 }
 
-pub(crate) use chip;
+pub use chip;
 
 pub(crate) mod constants {
     pub const I2S_SCLK: u32 = 160_000_000;

diff --git a/esp-hal/src/soc/esp32c2/mod.rs b/esp-hal/src/soc/esp32c2/mod.rs
@@ -13,13 +13,15 @@ pub mod gpio;
 pub mod peripherals;
 pub mod radio_clocks;
 
+/// The name of the chip ("esp32c2") as `&str`
+#[macro_export]
 macro_rules! chip {
     () => {
         "esp32c2"
     };
 }
 
-pub(crate) use chip;
+pub use chip;
 
 #[allow(unused)]
 pub(crate) mod registers {

diff --git a/esp-hal/src/soc/esp32c3/mod.rs b/esp-hal/src/soc/esp32c3/mod.rs
@@ -17,13 +17,15 @@ pub mod gpio;
 pub mod peripherals;
 pub mod radio_clocks;
 
+/// The name of the chip ("esp32c3") as `&str`
+#[macro_export]
 macro_rules! chip {
     () => {
-        "esp32c2"
+        "esp32c3"
     };
 }
 
-pub(crate) use chip;
+pub use chip;
 
 #[allow(unused)]
 pub(crate) mod registers {

diff --git a/esp-hal/src/soc/esp32c6/mod.rs b/esp-hal/src/soc/esp32c6/mod.rs
@@ -19,13 +19,15 @@ pub mod lp_core;
 pub mod peripherals;
 pub mod radio_clocks;
 
+/// The name of the chip ("esp32c6") as `&str`
+#[macro_export]
 macro_rules! chip {
     () => {
         "esp32c6"
     };
 }
 
-pub(crate) use chip;
+pub use chip;
 
 #[allow(unused)]
 pub(crate) mod registers {

diff --git a/esp-hal/src/soc/esp32h2/mod.rs b/esp-hal/src/soc/esp32h2/mod.rs
@@ -18,13 +18,15 @@ pub mod gpio;
 pub mod peripherals;
 pub mod radio_clocks;
 
+/// The name of the chip ("esp32h2") as `&str`
+#[macro_export]
 macro_rules! chip {
     () => {
         "esp32h2"
     };
 }
 
-pub(crate) use chip;
+pub use chip;
 
 #[allow(unused)]
 pub(crate) mod registers {

diff --git a/esp-hal/src/soc/esp32s2/mod.rs b/esp-hal/src/soc/esp32s2/mod.rs
@@ -23,13 +23,15 @@ pub mod radio_clocks;
 
 pub mod ulp_core;
 
+/// The name of the chip ("esp32s2") as `&str`
+#[macro_export]
 macro_rules! chip {
     () => {
         "esp32s2"
     };
 }
 
-pub(crate) use chip;
+pub use chip;
 
 pub(crate) mod constants {
     pub const I2S_SCLK: u32 = 160_000_000;

diff --git a/esp-hal/src/soc/esp32s3/mod.rs b/esp-hal/src/soc/esp32s3/mod.rs
@@ -24,13 +24,15 @@ pub mod radio_clocks;
 
 pub mod ulp_core;
 
+/// The name of the chip ("esp32s3") as `&str`
+#[macro_export]
 macro_rules! chip {
     () => {
         "esp32s3"
     };
 }
 
-pub(crate) use chip;
+pub use chip;
 
 pub(crate) mod constants {
     pub const I2S_SCLK: u32 = 160_000_000;

diff --git a/esp-wifi/CHANGELOG.md b/esp-wifi/CHANGELOG.md
@@ -0,0 +1,71 @@
+# Changelog
+
+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).
+
+## [Unreleased]
+
+### Added
+
+### Fixed
+
+### Changed
+
+### Removed
+- Removed embedded-hal v0.2 dependency
+
+## [0.5.1] - 2024-04-22
+
+Patch release to fix docs.rs build
+
+## [0.5.0] - 2024-04-19
+
+### Added
+
+### Fixed
+- Fix compile error when using smoltcp `DNS_MAX_RESULT_COUNT` values other than 1
+
+### Changed
+
+### Removed
+
+## [0.4.0] - 2024-03-12
+
+### Added
+
+### Fixed
+
+### Changed
+- Users don't need embedded-svc to control wifi anymore. The wifi trait is optionally implemented now. (#429)
+- Better network performance by forced yielding of the task when buffers are full / empty. (#430)
+- Depend on esp-hal 0.16.1, update other dependencies
+
+### Removed
+
+## [0.3.0] - 2024-01-29
+
+### Added
+
+- Include coex in list of enabled features for docs.rs (#405)
+
+### Fixed
+
+- Small correction to coex warning message (#404)
+- Use a random local port when initializing the wifi stack. (#414)
+
+### Changed
+
+- Update driver blobs (#410)
+- Update dependencies to fit `embedded-hal` `1.0`
+
+### Removed
+
+## [0.2.0] - 2024-01-05
+
+Initial release supporting WiFi on ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C2, ESP32-C6, supporting BLE on WiFi on ESP32, ESP32-S3, ESP32-C3, ESP32-C2, ESP32-C6, ESP32-H2
+
+## [0.1.0] - 2023-11-27
+
+Initial release supporting WiFi on ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C2, ESP32-C6, supporting BLE on WiFi on ESP32, ESP32-S3, ESP32-C3, ESP32-C2, ESP32-C6
diff --git a/esp-wifi/Cargo.toml b/esp-wifi/Cargo.toml
@@ -0,0 +1,142 @@
+[package]
+name = "esp-wifi"
+version = "0.5.1"
+edition = "2021"
+authors = ["The ESP-RS team"]
+description = "A WiFi, Bluetooth and ESP-NOW driver for use with Espressif chips and bare-metal Rust"
+repository = "https://github.com/esp-rs/esp-wifi"
+license = "MIT OR Apache-2.0"
+
+keywords = ["wifi", "bluetooth", "esp", "no-std"]
+categories = ["embedded", "hardware-support", "no-std"]
+
+[dependencies]
+defmt = { version = "0.3.6", optional = true }
+esp-hal = { version = "0.17.0", path = "../esp-hal", default-features = false }
+smoltcp = { version = "0.11.0", default-features = false, features = [
+  "medium-ethernet",
+  "socket-raw",
+], optional = true }
+critical-section = "1.1.1"
+log = { version = "0.4.20", optional = true }
+embedded-svc = { version = "0.27.0", default-features = false, features = [
+], optional = true }
+enumset = { version = "1.1.3", default-features = false, optional = true }
+linked_list_allocator = { version = "0.10.5", default-features = false, features = [
+  "const_mut_refs",
+] }
+embedded-io = { version = "0.6.1", default-features = false }
+embedded-io-async = { version = "0.6.0", optional = true }
+fugit = "0.3.7"
+heapless = { version = "0.8", default-features = false, features = [
+  "portable-atomic",
+] }
+num-derive = { version = "0.4" }
+num-traits = { version = "0.2", default-features = false }
+no-std-net = { version = "0.6.0", optional = true }
+esp-wifi-sys = { version = "0.3.0" }
+embassy-sync = { version = "0.5.0", optional = true }
+embassy-futures = { version = "0.1.0", optional = true }
+embassy-net-driver = { version = "0.2", optional = true }
+toml-cfg = "0.2.0"
+libm = "0.2.7"
+cfg-if = "1.0.0"
+portable-atomic = { version = "1.5", default-features = false }
+portable_atomic_enum = { version = "0.3.0", features = ["portable-atomic"] }
+
+futures-util = { version = "0.3.28", default-features = false, features = [
+  "portable-atomic",
+] }
+atomic-waker = { version = "1.1.2", default-features = false, features = [
+  "portable-atomic",
+] }
+
+[build-dependencies]
+toml-cfg = "0.2.0"
+esp-build = { version = "0.1.0", path = "../esp-build" }
+
+[features]
+default = ["log"]
+
+# chip features
+esp32c2 = [
+  "esp-hal/esp32c2",
+  "esp-wifi-sys/esp32c2",
+]
+esp32c3 = [
+  "esp-hal/esp32c3",
+  "esp-wifi-sys/esp32c3",
+]
+esp32c6 = [
+  "esp-hal/esp32c6",
+  "esp-wifi-sys/esp32c6",
+]
+esp32h2 = [
+  "esp-hal/esp32h2",
+  "esp-wifi-sys/esp32h2",
+]
+esp32 = [
+  "esp-hal/esp32",
+  "esp-wifi-sys/esp32",
+]
+esp32s2 = [
+  "esp-hal/esp32s2",
+  "esp-wifi-sys/esp32s2",
+]
+esp32s3 = [
+  "esp-hal/esp32s3",
+  "esp-wifi-sys/esp32s3",
+]
+
+# async features
+async = [
+  "dep:embassy-sync",
+  "dep:embassy-futures",
+  "dep:embedded-io-async",
+  "esp-hal/embassy",
+  "esp-hal/async",
+]
+
+embassy-net = ["dep:embassy-net-driver", "async"]
+
+# misc features
+coex = []
+wifi-logs = []
+dump-packets = []
+smoltcp = ["dep:smoltcp"]
+utils = ["smoltcp"]
+enumset = []
+wifi = ["dep:enumset", "dep:no-std-net"]
+embedded-svc = ["dep:embedded-svc"]
+ble = ["esp-hal/bluetooth"]
+phy-enable-usb = []
+ps-min-modem = []
+ps-max-modem = []
+esp-now = ["wifi"]
+ipv6 = ["wifi", "utils", "smoltcp?/proto-ipv6"]
+ipv4 = ["wifi", "utils", "smoltcp?/proto-ipv4"]
+tcp = ["ipv4", "smoltcp?/socket-tcp"]
+udp = ["ipv4", "smoltcp?/socket-udp"]
+icmp = ["ipv4", "smoltcp?/socket-icmp"]
+igmp = ["ipv4", "smoltcp?/proto-igmp"]
+dns = ["udp", "smoltcp?/proto-dns", "smoltcp?/socket-dns"]
+dhcpv4 = ["wifi", "utils", "smoltcp?/proto-dhcpv4", "smoltcp?/socket-dhcpv4"]
+wifi-default = ["ipv4", "tcp", "udp", "icmp", "igmp", "dns", "dhcpv4"]
+defmt = ["dep:defmt", "smoltcp?/defmt", "esp-hal/defmt"]
+log = ["dep:log", "esp-hal/log"]
+
+[package.metadata.docs.rs]
+features = [
+  "esp32c3",
+  "wifi",
+  "ble",
+  "coex",
+  "async",
+  "embassy-net",
+  "esp-hal/embassy-time-timg0",
+  "esp-hal/default",
+]
+default-target = "riscv32imc-unknown-none-elf"
+
+[lints.rust]
+unexpected_cfgs = "allow"