Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- New GPTimer API
- esp32p4 pins and core command added.
- Support for esp32c5 and esp32c61
- Removed the modem peripheral for esp32p4
- Made the modem peripheral for esp32p4 dependent on esp_wifi_remote
- LDO support for esp32p4
- Support for `PLL_F48M` UART clock source on ESP32-H2
- LCD driver support; DSI peripheral support with the LCD driver for esp32p4
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub mod ldo;
pub mod ledc;
#[cfg(any(all(esp32, esp_idf_eth_use_esp32_emac), esp_idf_eth_use_openeth))]
pub mod mac;
#[cfg(not(esp32p4))]
#[cfg(any(not(esp32p4), esp_idf_comp_espressif__esp_wifi_remote_enabled))]
pub mod modem;
#[cfg(all(
esp_idf_soc_rmt_supported,
Expand Down
6 changes: 3 additions & 3 deletions src/modem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ impl_peripheral!(Modem);

#[allow(clippy::needless_lifetimes)]
impl<'d> Modem<'d> {
#[cfg(not(any(esp32s2, esp32h2, esp32h4, esp32c5, esp32c6, esp32c61)))]
#[cfg(not(any(esp32s2, esp32h2, esp32h4, esp32c5, esp32c6, esp32c61, esp32p4)))]
pub fn split(self) -> (WifiModem<'d>, BluetoothModem<'d>) {
unsafe { (WifiModem::steal(), BluetoothModem::steal()) }
}

#[cfg(not(any(esp32s2, esp32h2, esp32h4, esp32c5, esp32c6, esp32c61)))]
#[cfg(not(any(esp32s2, esp32h2, esp32h4, esp32c5, esp32c6, esp32c61, esp32p4)))]
pub fn split_reborrow(&mut self) -> (WifiModem<'_>, BluetoothModem<'_>) {
unsafe { (WifiModem::steal(), BluetoothModem::steal()) }
}
Expand Down Expand Up @@ -65,7 +65,7 @@ impl WifiModemPeripheral for Modem<'_> {}
#[cfg(any(esp32h2, esp32c5, esp32c6, esp32c61))]
impl ThreadModemPeripheral for Modem<'_> {}

#[cfg(not(esp32s2))]
#[cfg(not(any(esp32s2, esp32p4)))]
impl BluetoothModemPeripheral for Modem<'_> {}

#[cfg(not(esp32s2))]
Expand Down
6 changes: 3 additions & 3 deletions src/peripherals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::ldo;
use crate::ledc;
#[cfg(any(all(esp32, esp_idf_eth_use_esp32_emac), esp_idf_eth_use_openeth))]
use crate::mac;
#[cfg(not(esp32p4))]
#[cfg(any(not(esp32p4), esp_idf_comp_espressif__esp_wifi_remote_enabled))]
use crate::modem;
#[cfg(not(esp_idf_version_at_least_6_0_0))]
#[cfg(all(
Expand Down Expand Up @@ -125,7 +125,7 @@ pub struct Peripherals {
pub ulp: ulp::ULP<'static>,
#[cfg(any(all(esp32, esp_idf_eth_use_esp32_emac), esp_idf_eth_use_openeth))]
pub mac: mac::MAC<'static>,
#[cfg(not(esp32p4))]
#[cfg(any(not(esp32p4), esp_idf_comp_espressif__esp_wifi_remote_enabled))]
pub modem: modem::Modem<'static>,
#[cfg(esp_idf_soc_sdmmc_host_supported)]
pub sdmmc0: sd::mmc::SDMMC0<'static>,
Expand Down Expand Up @@ -264,7 +264,7 @@ impl Peripherals {
ulp: ulp::ULP::steal(),
#[cfg(any(all(esp32, esp_idf_eth_use_esp32_emac), esp_idf_eth_use_openeth))]
mac: mac::MAC::steal(),
#[cfg(not(esp32p4))]
#[cfg(any(not(esp32p4), esp_idf_comp_espressif__esp_wifi_remote_enabled))]
modem: modem::Modem::steal(),
#[cfg(esp_idf_soc_sdmmc_host_supported)]
sdmmc0: sd::mmc::SDMMC0::steal(),
Expand Down