Thread enhancements

.cargo/config.toml

@@ -1,6 +1,7 @@
 [build]
 target = "riscv32imc-esp-espidf"
-# target = "xtensa-esp32-espidf"
+#target = "riscv32imac-esp-espidf"
+#target = "xtensa-esp32-espidf"
 
 [target.xtensa-esp32-espidf]
 linker = "ldproxy"
@@ -25,6 +26,9 @@ rustflags = ["--cfg", "espidf_time64"]
 [env]
 ESP_IDF_SDKCONFIG_DEFAULTS = ".github/configs/sdkconfig.defaults"
 ESP_IDF_VERSION = "v5.3.2"
+#ESP_IDF_VERSION = "release/v5.3" Necessary for `Thread::stop`
+#MCU = "esp32c3"
+#MCU = "esp32c6"
 
 [unstable]
 build-std = ["std", "panic_abort"]

CHANGELOG.md

@@ -10,6 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Breaking
 - Implement MQTT outbox limit and get_outbox_size()
 - Added argument `subprotocol_list` to `ws_handler` to allow subprotocols to be supported by WebSockets
+- Thread enhancements (#592). Specifically:
+ - Thread SRP (Thread-specific mDNS) is now supported and has a new API so that the user can register/unregister SRP services
+ - Option to start/stop the Thread stack (methods `Thread::start` / `Thread::stop` in place of the previous `Thread::run`)
+ - Several callbacks where actually unsound, as they were not `Send + 'static`. Now fixed
+ - Simplifications:
+  - `Thread::init` and `Thread::deinit` are now gone
+  - No option to swap the Thread Netif with a custom one, as it complicates the implementation, and I don't see the use-case (unlike with Wifi)
 
 ### Fixed
 - Fix wrong conversion from `ScanType` to `u32` in Wi-Fi configuration

Cargo.toml

@@ -13,7 +13,7 @@ readme = "README.md"
 links = "esp_idf_svc"
 build = "build.rs"
 documentation = "https://docs.esp-rs.org/esp-idf-svc/"
-rust-version = "1.77"
+rust-version = "1.82"
 
 [patch.crates-io]
 esp-idf-sys = { git = "https://github.com/esp-rs/esp-idf-sys" }

examples/thread.rs

@@ -50,13 +50,14 @@ mod example {
         let mut thread =
             EspThread::new(peripherals.modem, sys_loop.clone(), nvs, mounted_event_fs)?;
 
-        thread.init()?;
-
         info!("Thread initialized, now running...");
 
-        thread.run()?;
+        thread.start()?;
 
-        Ok(())
+        loop {
+            // Keep the main thread alive to allow the Thread Border Router to run
+            std::thread::sleep(std::time::Duration::from_secs(2));
+        }
     }
 
     fn log_thread_sysloop(

examples/thread_br.rs

@@ -141,18 +141,19 @@ mod example {
             wifi.wifi().sta_netif(),
         )?;
 
-        thread.init()?;
-
         #[cfg(esp32c6)]
         thread.init_coex()?;
 
         thread.set_tod_from_cfg()?;
 
         info!("Thread Border Router initialized, now running...");
 
-        thread.run()?;
+        thread.start()?;
 
-        Ok(())
+        loop {
+            // Keep the main thread alive to allow the Thread Border Router to run
+            std::thread::sleep(std::time::Duration::from_secs(2));
+        }
     }
 
     fn connect_wifi(wifi: &mut BlockingWifi<EspWifi<'static>>) -> anyhow::Result<()> {

examples/thread_rcp.rs

@@ -60,13 +60,14 @@ mod example {
             mounted_event_fs,
         )?;
 
-        thread.init()?;
-
         info!("Thread RCP initialized, now running...");
 
-        thread.run()?;
+        thread.start()?;
 
-        Ok(())
+        loop {
+            // Keep the main thread alive to allow the Thread Border Router to run
+            std::thread::sleep(std::time::Duration::from_secs(2));
+        }
     }
 
     fn log_thread_sysloop(

src/bt/ble/gatt/server.rs

@@ -269,7 +269,7 @@ impl<'a> From<(esp_gatts_cb_event_t, &'a esp_ble_gatts_cb_param_t)> for GattsEve
                     conn_id: param.exec_write.conn_id,
                     addr: param.exec_write.bda.into(),
                     trans_id: param.exec_write.trans_id,
-                    canceled: param.exec_write.exec_write_flag == ESP_GATT_PREP_WRITE_CANCEL as _,
+                    canceled: param.exec_write.exec_write_flag == ESP_GATT_PREP_WRITE_CANCEL as u8,
                 }
             },
             esp_gatts_cb_event_t_ESP_GATTS_MTU_EVT => unsafe {

src/netif.rs

@@ -468,8 +468,13 @@ impl EspNetif {
         Ok(netif)
     }
 
+    pub fn is_netif_up(&self) -> Result<bool, EspError> {
+        Ok(unsafe { esp_netif_is_netif_up(self.handle) })
+    }
+
+    // TODO: Rename to `is_up_ipv4`
     pub fn is_up(&self) -> Result<bool, EspError> {
-        if !unsafe { esp_netif_is_netif_up(self.handle) } {
+        if !self.is_netif_up()? {
             Ok(false)
         } else {
             let mut ip_info = Default::default();