Finilazing EPR support

.github/ci/build.sh

@@ -1,19 +1,21 @@
 #!/bin/bash
 set -euo pipefail
 
-for dir in usbpd usbpd-traits examples/embassy-nucleo-h563zi examples/embassy-stm32-g431cb;
+export RUSTFLAGS="-D warnings"
+
+for dir in usbpd usbpd-traits examples/embassy-nucleo-h563zi examples/embassy-stm32-g431cb examples/embassy-stm32-g431cb-epr;
 do
     pushd $dir
     cargo +nightly fmt --check
-    cargo clippy -- -D warnings
+    cargo clippy
     cargo build --release
     popd
 done
 
 for dir in usbpd usbpd-traits
 do
     pushd $dir
-    cargo clippy --features defmt -- -D warnings
+    cargo clippy --features defmt
     popd
 done
 

.github/workflows/ci.yml

@@ -26,6 +26,7 @@ jobs:
             usbpd
             examples/embassy-nucleo-h563zi
             examples/embassy-stm32-g431cb
+            examples/embassy-stm32-g431cb-epr
 
       - name: Build
         run: bash .github/ci/build.sh

examples/embassy-nucleo-h563zi/Cargo.toml

@@ -26,7 +26,6 @@ embassy-time = { path = "../../embassy/embassy-time", features = [
     "defmt-timestamp-uptime",
     "tick-hz-32_768",
 ] }
-
 embassy-futures = { path = "../../embassy/embassy-futures" }
 
 defmt = "1.0.1"

examples/embassy-nucleo-h563zi/src/main.rs

@@ -32,6 +32,6 @@ async fn main(spawner: Spawner) {
             led_yellow,
             led_red,
         };
-        unwrap!(spawner.spawn(power::ucpd_task(ucpd_resources)));
+        spawner.spawn(unwrap!(power::ucpd_task(ucpd_resources)));
     }
 }

examples/embassy-nucleo-h563zi/src/power.rs

@@ -7,12 +7,12 @@ use embassy_stm32::ucpd::{self, CcPhy, CcPull, CcSel, CcVState, PdPhy, Ucpd};
 use embassy_stm32::{Peri, bind_interrupts, peripherals};
 use embassy_time::{Duration, Ticker, Timer, with_timeout};
 use uom::si::electric_potential;
-use usbpd::protocol_layer::message::pdo::SourceCapabilities;
-use usbpd::protocol_layer::message::request::{self, CurrentRequest, VoltageRequest};
-use usbpd::protocol_layer::message::units::ElectricPotential;
+use usbpd::protocol_layer::message::data::request::{self, CurrentRequest, VoltageRequest};
+use usbpd::protocol_layer::message::data::source_capabilities::SourceCapabilities;
 use usbpd::sink::device_policy_manager::{DevicePolicyManager, Event};
 use usbpd::sink::policy_engine::Sink;
 use usbpd::timers::Timer as SinkTimer;
+use usbpd::units::ElectricPotential;
 use usbpd_traits::Driver as SinkDriver;
 use {defmt_rtt as _, panic_probe as _};
 
@@ -128,21 +128,31 @@ enum TestCapabilities {
     Safe5V,
     Pps3V6,
     Pps4V2,
+    RequestEprSourceCapabilities,
 }
 
 struct Device<'d> {
     ticker: Ticker,
     test_capabilities: TestCapabilities,
     led: &'d mut Output<'static>,
+    source_capabilities: Option<SourceCapabilities>,
 }
 
 impl DevicePolicyManager for Device<'_> {
+    async fn inform(&mut self, source_capabilities: &SourceCapabilities) {
+        info!("New caps received {}", source_capabilities);
+
+        self.source_capabilities = Some(source_capabilities.clone());
+    }
+
     async fn get_event(&mut self, source_capabilities: &SourceCapabilities) -> Event {
         // Periodically request another power level.
         self.ticker.next().await;
         self.led.toggle();
+        self.source_capabilities = Some(source_capabilities.clone());
 
         info!("Test capabilities: {}", self.test_capabilities);
+
         let (power_source, new_test_capabilties) = match self.test_capabilities {
             TestCapabilities::Safe5V => (
                 request::PowerSource::new_fixed(CurrentRequest::Highest, VoltageRequest::Safe5V, source_capabilities),
@@ -162,8 +172,12 @@ impl DevicePolicyManager for Device<'_> {
                     ElectricPotential::new::<electric_potential::millivolt>(4200),
                     source_capabilities,
                 ),
-                TestCapabilities::Safe5V,
+                TestCapabilities::RequestEprSourceCapabilities,
             ),
+            TestCapabilities::RequestEprSourceCapabilities => {
+                self.test_capabilities = TestCapabilities::Safe5V;
+                return Event::RequestEprSourceCapabilities;
+            }
         };
 
         let event = if let Ok(power_source) = power_source {
@@ -220,7 +234,8 @@ pub async fn ucpd_task(mut ucpd_resources: UcpdResources) {
 
         let driver = UcpdSinkDriver::new(pd_phy);
         let device = Device {
-            ticker: Ticker::every(Duration::from_secs(8)),
+            source_capabilities: None,
+            ticker: Ticker::every(Duration::from_secs(3)),
             test_capabilities: TestCapabilities::Safe5V,
             led: &mut ucpd_resources.led_red,
         };

examples/embassy-stm32-g431cb-epr/.cargo/config.toml

@@ -0,0 +1,8 @@
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
+runner = 'probe-rs run --chip STM32G431CBTx --connect-under-reset'
+
+[build]
+target = "thumbv7em-none-eabihf"
+
+[env]
+DEFMT_LOG = "info"

examples/embassy-stm32-g431cb-epr/Cargo.toml

@@ -0,0 +1,67 @@
+[package]
+edition = "2024"
+name = "usbpd-epr-example"
+version = "0.1.0"
+license = "MIT"
+
+[dependencies]
+embassy-stm32 = { path = "../../embassy/embassy-stm32", features = [
+    "defmt",
+    "time-driver-any",
+    "memory-x",
+    "unstable-pac",
+    "exti",
+] }
+embassy-sync = { path = "../../embassy/embassy-sync", features = ["defmt"] }
+embassy-executor = { path = "../../embassy/embassy-executor", features = [
+    "arch-cortex-m",
+    "executor-thread",
+    "defmt",
+] }
+embassy-time = { path = "../../embassy/embassy-time", features = [
+    "defmt",
+    "defmt-timestamp-uptime",
+    "tick-hz-100_000",
+] }
+embassy-futures = { path = "../../embassy/embassy-futures" }
+
+defmt = "1.0.1"
+defmt-rtt = "1.0.0"
+
+cortex-m = { version = "0.7", features = ["critical-section-single-core"] }
+cortex-m-rt = "0.7"
+embedded-hal = "1"
+panic-probe = { version = "1.0.0", features = ["print-defmt"] }
+heapless = { version = "0.9.1", default-features = false }
+static_cell = "2.1.1"
+micromath = "2.1.0"
+
+uom = { version = "0.36.0", default-features = false, features = ["si"] }
+usbpd = { path = "../../usbpd", features = ["defmt"] }
+usbpd-traits = { path = "../../usbpd-traits", features = ["defmt"] }
+
+# cargo build/run
+[profile.dev]
+codegen-units = 1
+debug = 2
+debug-assertions = true # <-
+incremental = false
+opt-level = 3           # <-
+overflow-checks = true  # <-
+
+# cargo build/run --release
+[profile.release]
+codegen-units = 1
+debug = 2
+debug-assertions = false # <-
+incremental = false
+lto = 'fat'
+opt-level = 3            # <-
+overflow-checks = false  # <-
+
+[features]
+default = ["stm32g431cb"]
+
+stm32g431cb = ["embassy-stm32/stm32g431cb"]
+# Enable AVS (Adjustable Voltage Supply) instead of Fixed EPR mode
+avs = []

examples/embassy-stm32-g431cb-epr/README.md

@@ -0,0 +1,19 @@
+# Embassy EPR Example
+
+Demonstrates USB PD Extended Power Range (EPR) negotiation using the [embassy](https://embassy.dev/) framework.
+It targets an STM32G431 microcontroller and makes use of its UCPD peripheral.
+
+## Features
+
+This example demonstrates:
+- Initial SPR power negotiation
+- Automatic EPR mode entry when source is EPR capable
+- Requesting 28V @ 4A (112W) EPR power
+- Printing source capabilities with PDO details
+
+## Configuration
+
+The target power can be configured via constants in `power.rs`:
+- `TARGET_EPR_VOLTAGE_RAW`: Target voltage (default: 28V)
+- `TARGET_EPR_CURRENT_RAW`: Target current (default: 4A)
+- `OPERATIONAL_PDP_WATTS`: Operational PDP for EPR mode entry (default: 112W)

examples/embassy-stm32-g431cb-epr/build.rs

@@ -0,0 +1,5 @@
+fn main() {
+    println!("cargo:rustc-link-arg-bins=--nmagic");
+    println!("cargo:rustc-link-arg-bins=-Tlink.x");
+    println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
+}

examples/embassy-stm32-g431cb-epr/src/lib.rs

@@ -0,0 +1,2 @@
+#![no_std]
+pub mod power;

examples/embassy-stm32-g431cb-epr/src/main.rs

@@ -0,0 +1,27 @@
+#![no_std]
+#![no_main]
+
+use defmt::info;
+use embassy_executor::Spawner;
+use usbpd_epr_example::power::{self, UcpdResources};
+use {defmt_rtt as _, panic_probe as _};
+
+#[embassy_executor::main]
+async fn main(spawner: Spawner) {
+    let mut stm32_config = embassy_stm32::Config::default();
+    // HSI must be enabled for UCPD
+    stm32_config.rcc.hsi = true;
+
+    let p = embassy_stm32::init(stm32_config);
+
+    info!("USB PD EPR Example");
+
+    let ucpd_resources = UcpdResources {
+        pin_cc1: p.PB6,
+        pin_cc2: p.PB4,
+        ucpd: p.UCPD1,
+        rx_dma: p.DMA1_CH1,
+        tx_dma: p.DMA1_CH2,
+    };
+    spawner.spawn(power::ucpd_task(ucpd_resources).unwrap());
+}