From 1338c31510938a8e6fcbd0465dcb9a18a72e2c63 Mon Sep 17 00:00:00 2001
From: Scott Mabin <scott@mabez.dev>
Date: Thu, 7 Nov 2024 11:38:32 +0000
Subject: [PATCH] cfg away ps API

---
 esp-wifi/CHANGELOG.md       | 1 +
 esp-wifi/src/esp_now/mod.rs | 4 +---
 esp-wifi/src/wifi/mod.rs    | 7 +------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/esp-wifi/CHANGELOG.md b/esp-wifi/CHANGELOG.md
index 5174947a718..7351d11a835 100644
--- a/esp-wifi/CHANGELOG.md
+++ b/esp-wifi/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - No need to add `rom_functions.x` manually anymore (#2374)
 - esp-now: Data is now private in `ReceivedData` - use `data()`(#2396)
 - Changed the async APIs to have a `_async` postfix to avoid name collisions (#2446)
+- `phy_enable_usb` is enabled by default (#2446)
 
 ### Fixed
 
diff --git a/esp-wifi/src/esp_now/mod.rs b/esp-wifi/src/esp_now/mod.rs
index adc9e1889a1..7712f05e0f6 100644
--- a/esp-wifi/src/esp_now/mod.rs
+++ b/esp-wifi/src/esp_now/mod.rs
@@ -336,10 +336,8 @@ impl EspNowManager<'_> {
         Ok(())
     }
 
+    #[cfg(coex)]
     /// Configures modem power saving
-    ///
-    /// This is ignored, and set to `PowerSaveMode::Minimum` when `coex` is
-    /// enabled.
     pub fn set_power_saving(&self, ps: PowerSaveMode) -> Result<(), WifiError> {
         crate::wifi::apply_power_saving(ps)
     }
diff --git a/esp-wifi/src/wifi/mod.rs b/esp-wifi/src/wifi/mod.rs
index e43fd83682a..dd82fc671d5 100644
--- a/esp-wifi/src/wifi/mod.rs
+++ b/esp-wifi/src/wifi/mod.rs
@@ -2591,10 +2591,8 @@ impl<'d> WifiController<'d> {
         Ok(())
     }
 
+    #[cfg(coex)]
     /// Configures modem power saving
-    ///
-    /// This is ignored, and set to `PowerSaveMode::Minimum` when `coex` is
-    /// enabled.
     pub fn set_power_saving(&mut self, ps: PowerSaveMode) -> Result<(), WifiError> {
         apply_power_saving(ps)
     }
@@ -3267,9 +3265,6 @@ pub(crate) mod embassy {
 }
 
 pub(crate) fn apply_power_saving(mut ps: PowerSaveMode) -> Result<(), WifiError> {
-    if cfg!(coex) {
-        ps = PowerSaveMode::Minimum;
-    }
     esp_wifi_result!(unsafe { esp_wifi_sys::include::esp_wifi_set_ps(ps.into()) })?;
     Ok(())
 }