From 3441e805070c7efb7cad20a84d1986e215b4de3d Mon Sep 17 00:00:00 2001
From: 1-rafael-1 <rafael.koch@gmx.net>
Date: Fri, 2 May 2025 23:51:28 +0200
Subject: first batch of changes after review

---
 examples/rp/src/bin/overclock.rs        | 11 +++++------
 examples/rp/src/bin/overclock_manual.rs | 20 +++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'examples/rp/src')

diff --git a/examples/rp/src/bin/overclock.rs b/examples/rp/src/bin/overclock.rs
index e3ac77340..f9a8c94d0 100644
--- a/examples/rp/src/bin/overclock.rs
+++ b/examples/rp/src/bin/overclock.rs
@@ -1,6 +1,6 @@
 //! # Overclocking the RP2040 to 200 MHz
 //!
-//! This example demonstrates how to configure the RP2040 to run at 200 MHz using a higher level API.
+//! This example demonstrates how to configure the RP2040 to run at 200 MHz.
 
 #![no_std]
 #![no_main]
@@ -17,19 +17,18 @@ const COUNT_TO: i64 = 10_000_000;
 
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) -> ! {
-    // Set up for clock frequency of 200 MHz
-    // This will set all the necessary defaults including slightly raised voltage
-    let config = Config::new(ClockConfig::at_sys_frequency_mhz(200));
+    // Set up for clock frequency of 200 MHz, setting all necessary defaults.
+    let config = Config::new(ClockConfig::crystal_freq(200_000_000));
 
     // Show the voltage scale for verification
-    info!("System core voltage: {}", Debug2Format(&config.clocks.voltage_scale));
+    info!("System core voltage: {}", Debug2Format(&config.clocks.core_voltage));
 
     // Initialize the peripherals
     let p = embassy_rp::init(config);
 
     // Show CPU frequency for verification
     let sys_freq = clk_sys_freq();
-    info!("System clock frequency: {} Hz", sys_freq);
+    info!("System clock frequency: {} MHz", sys_freq / 1_000_000);
 
     // LED to indicate the system is running
     let mut led = Output::new(p.PIN_25, Level::Low);
diff --git a/examples/rp/src/bin/overclock_manual.rs b/examples/rp/src/bin/overclock_manual.rs
index ad6abf0e7..35160b250 100644
--- a/examples/rp/src/bin/overclock_manual.rs
+++ b/examples/rp/src/bin/overclock_manual.rs
@@ -8,7 +8,7 @@
 use defmt::*;
 use embassy_executor::Spawner;
 use embassy_rp::clocks;
-use embassy_rp::clocks::{ClockConfig, PllConfig, VoltageScale};
+use embassy_rp::clocks::{ClockConfig, CoreVoltage, PllConfig};
 use embassy_rp::config::Config;
 use embassy_rp::gpio::{Level, Output};
 use embassy_time::{Duration, Instant, Timer};
@@ -16,23 +16,21 @@ use {defmt_rtt as _, panic_probe as _};
 
 const COUNT_TO: i64 = 10_000_000;
 
-/// Configure the RP2040 for 200 MHz operation by manually specifying
-/// all the required parameters instead of using higher-level APIs.
+/// Configure the RP2040 for 200 MHz operation by manually specifying the PLL settings.
 fn configure_manual_overclock() -> Config {
     // Set the PLL configuration manually, starting from default values
     let mut config = Config::default();
 
-    // Set the system clock to 200 MHz using a PLL with a reference frequency of 12 MHz
+    // Set the system clock to 200 MHz
     config.clocks = ClockConfig::manual_pll(
-        12_000_000,
+        12_000_000, // Crystal frequency, 12 MHz is common. If using custom, set to your value.
         PllConfig {
-            refdiv: 1,
-            fbdiv: 100,
-            post_div1: 3,
-            post_div2: 2,
+            refdiv: 1,    // Reference divider
+            fbdiv: 100,   // Feedback divider
+            post_div1: 3, // Post divider 1
+            post_div2: 2, // Post divider 2
         },
-        // For 200 MHz, we need a voltage scale of 1.15V
-        Some(VoltageScale::V1_15),
+        CoreVoltage::V1_15, // Core voltage, should be set to V1_15 for 200 MHz
     );
 
     config
-- 
cgit