From 9c85deef19199ea5a0172deffe721bf4fa199fe4 Mon Sep 17 00:00:00 2001 From: ivmarkov Date: Fri, 22 Sep 2023 13:34:58 +0000 Subject: [PATCH] Wifi/Bt coex conf changed in ESP IDF 5 --- src/modem.rs | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/modem.rs b/src/modem.rs index ae357eebf..d15be7c28 100644 --- a/src/modem.rs +++ b/src/modem.rs @@ -40,22 +40,46 @@ impl Modem { this } - #[cfg(all(not(any(esp32s2, esp32h2)), esp_idf_esp32_wifi_sw_coexist_enable))] + #[cfg(all( + not(any(esp32s2, esp32h2)), + any( + esp_idf_esp32_wifi_sw_coexist_enable, + esp_idf_esp_coex_sw_coexist_enable + ) + ))] pub fn split(self) -> (WifiModem, BluetoothModem) { unsafe { (WifiModem::new(), BluetoothModem::new()) } } - #[cfg(all(not(any(esp32s2, esp32h2)), esp_idf_esp32_wifi_sw_coexist_enable))] + #[cfg(all( + not(any(esp32s2, esp32h2)), + any( + esp_idf_esp32_wifi_sw_coexist_enable, + esp_idf_esp_coex_sw_coexist_enable + ) + ))] pub fn split_ref(&mut self) -> (&mut WifiModem, &mut BluetoothModem) { (&mut self.1, &mut self.2) } - #[cfg(all(esp32h2, esp_idf_esp32_wifi_sw_coexist_enable))] + #[cfg(all( + esp32h2, + any( + esp_idf_esp32_wifi_sw_coexist_enable, + esp_idf_esp_coex_sw_coexist_enable + ) + ))] pub fn split(self) -> (ThreadModem, BluetoothModem) { unsafe { (ThreadModem::new(), BluetoothModem::new()) } } - #[cfg(all(esp32h2, esp_idf_esp32_wifi_sw_coexist_enable))] + #[cfg(all( + esp32h2, + any( + esp_idf_esp32_wifi_sw_coexist_enable, + esp_idf_esp_coex_sw_coexist_enable + ) + ))] pub fn split_ref(&mut self) -> (&mut ThreadModem, &mut BluetoothModem) { (&mut self.1, &mut self.2) }