Updated examples

Author: arjanmels

examples/multicore.rs

@@ -89,20 +89,6 @@ fn main() -> ! {
 
     writeln!(uart0, "Stack Pointer Core 0: {:08x?}", get_stack_pointer()).unwrap();
 
-    // register callback which is called when the clock is switched
-    clock_control_config
-        .add_callback(&|| {
-            let clock_control_config = ClockControlConfig {};
-            dprintln!(
-                "  Change Clock: CPU: {}, PLL: {}, APB: {}, REF: {}",
-                clock_control_config.cpu_frequency(),
-                clock_control_config.pll_frequency(),
-                clock_control_config.apb_frequency(),
-                clock_control_config.ref_frequency(),
-            )
-        })
-        .unwrap();
-
     // uncomment next line to test panic exit
     // panic!("panic test");
 

examples/rtccntl.rs

@@ -6,7 +6,7 @@ use core::panic::PanicInfo;
 
 use esp32_hal::prelude::*;
 
-use esp32_hal::clock_control::{sleep, CPUSource, ClockControl, ClockControlConfig};
+use esp32_hal::clock_control::{sleep, CPUSource, ClockControl};
 use esp32_hal::dport::Split;
 use esp32_hal::dprintln;
 use esp32_hal::serial::{config::Config, Serial};
@@ -88,15 +88,21 @@ fn main() -> ! {
 
     // register callback which is called when the clock is switched
     clock_control_config
-        .add_callback(&|| {
-            let clock_control_config = ClockControlConfig {};
+        .add_callback(&|before_source,
+                        before_freq,
+                        before_apb_freq,
+                        after_source,
+                        after_freq,
+                        after_apb_freq| {
             dprintln!(
-                "  Change Clock: CPU: {}, PLL: {}, APB: {}, REF: {}",
-                clock_control_config.cpu_frequency(),
-                clock_control_config.pll_frequency(),
-                clock_control_config.apb_frequency(),
-                clock_control_config.ref_frequency(),
-            )
+                "  Before: Source: {:?}, CPU: {}, APB: {},    After: Source: {:?}, CPU: {}, APB: {}",
+                before_source,
+                before_freq,
+                before_apb_freq,
+                after_source,
+                after_freq,
+                after_apb_freq
+            );
         })
         .unwrap();