Update all examples to reflect changes to Timer API

esp32-hal/examples/blinky.rs

@@ -19,7 +19,7 @@ fn main() -> ! {
     let system = peripherals.DPORT.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
     // Disable MWDT and RWDT (Watchdog) flash boot protection

esp32-hal/examples/gpio_interrupt.rs

@@ -32,7 +32,7 @@ fn main() -> ! {
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     // Disable the TIMG watchdog timer.
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 

esp32-hal/examples/hello_rgb.rs

@@ -41,7 +41,7 @@ fn main() -> ! {
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
     // Disable MWDT and RWDT (Watchdog) flash boot protection

esp32-hal/examples/hello_world.rs

@@ -3,7 +3,7 @@
 
 use core::fmt::Write;
 
-use esp32_hal::{pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
+use esp32_hal::{clock::ClockControl, pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
 use nb::block;
 use panic_halt as _;
 use xtensa_lx_rt::entry;
@@ -11,8 +11,10 @@ use xtensa_lx_rt::entry;
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.DPORT.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
@@ -20,7 +22,7 @@ fn main() -> ! {
     timer0.disable();
     rtc_cntl.set_wdt_global_enable(false);
 
-    timer0.start(10_000_000u64);
+    timer0.start(1u64.secs());
 
     loop {
         writeln!(serial0, "Hello world!").unwrap();

esp32-hal/examples/i2c_display.rs

@@ -42,7 +42,7 @@ fn main() -> ! {
     let mut system = peripherals.DPORT.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
@@ -67,7 +67,7 @@ fn main() -> ! {
     .unwrap();
 
     // Start timer (5 second interval)
-    timer0.start(50_000_000u64);
+    timer0.start(5u64.secs());
 
     writeln!(serial0, "Starting timer!").unwrap();
 

esp32-hal/examples/ram.rs

@@ -4,6 +4,7 @@
 use core::fmt::Write;
 
 use esp32_hal::{
+    clock::ClockControl,
     pac::{Peripherals, UART0},
     prelude::*,
     ram,
@@ -26,8 +27,10 @@ static mut SOME_ZEROED_DATA: [u8; 8] = [0; 8];
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.DPORT.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     // Disable MWDT flash boot protection
@@ -35,7 +38,7 @@ fn main() -> ! {
     // The RWDT flash boot protection remains enabled and it being triggered is part
     // of the example
 
-    timer0.start(10_000_000u64);
+    timer0.start(1u64.secs());
 
     writeln!(
         serial0,

esp32-hal/examples/read_efuse.rs

@@ -3,15 +3,25 @@
 
 use core::fmt::Write;
 
-use esp32_hal::{efuse::Efuse, pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
+use esp32_hal::{
+    clock::ClockControl,
+    efuse::Efuse,
+    pac::Peripherals,
+    prelude::*,
+    RtcCntl,
+    Serial,
+    Timer,
+};
 use panic_halt as _;
 use xtensa_lx_rt::entry;
 
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.DPORT.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 

esp32-hal/examples/spi_loopback.rs

@@ -41,7 +41,7 @@ fn main() -> ! {
     // Disable the watchdog timers. For the ESP32-C3, this includes the Super WDT,
     // the RTC WDT, and the TIMG WDTs.
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     timer0.disable();

esp32-hal/examples/timer_interrupt.rs

@@ -4,6 +4,7 @@
 use core::{cell::RefCell, fmt::Write};
 
 use esp32_hal::{
+    clock::ClockControl,
     interrupt,
     pac::{self, Peripherals, TIMG0, TIMG1, UART0},
     prelude::*,
@@ -26,10 +27,12 @@ static mut TIMER1: SpinLockMutex<RefCell<Option<Timer<TIMG1>>>> =
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.DPORT.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     // Disable the TIMG watchdog timer.
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
@@ -43,7 +46,7 @@ fn main() -> ! {
         pac::Interrupt::TG0_T0_LEVEL,
         interrupt::CpuInterrupt::Interrupt20LevelPriority2,
     );
-    timer0.start(50_000_000u64);
+    timer0.start(500u64.millis());
     timer0.listen();
 
     interrupt::enable(
@@ -51,7 +54,7 @@ fn main() -> ! {
         pac::Interrupt::TG1_T0_LEVEL,
         interrupt::CpuInterrupt::Interrupt23LevelPriority3,
     );
-    timer1.start(100_000_000u64);
+    timer1.start(1u64.secs());
     timer1.listen();
 
     unsafe {
@@ -89,7 +92,7 @@ pub fn level2_interrupt() {
             let mut timer0 = data.borrow_mut();
             let timer0 = timer0.as_mut().unwrap();
             timer0.clear_interrupt();
-            timer0.start(50_000_000u64);
+            timer0.start(500u64.millis());
         });
     }
 }
@@ -114,7 +117,7 @@ pub fn level3_interrupt() {
             let mut timer1 = data.borrow_mut();
             let timer1 = timer1.as_mut().unwrap();
             timer1.clear_interrupt();
-            timer1.start(100_000_000u64);
+            timer1.start(1u64.secs());
         });
     }
 }

esp32c3-hal/examples/blinky.rs

@@ -23,8 +23,8 @@ fn main() -> ! {
     // Disable the watchdog timers. For the ESP32-C3, this includes the Super WDT,
     // the RTC WDT, and the TIMG WDTs.
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
 
     rtc_cntl.set_super_wdt_enable(false);
     rtc_cntl.set_wdt_enable(false);

esp32c3-hal/examples/gpio_interrupt.rs

@@ -32,8 +32,8 @@ fn main() -> ! {
     // Disable the watchdog timers. For the ESP32-C3, this includes the Super WDT,
     // the RTC WDT, and the TIMG WDTs.
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
 
     rtc_cntl.set_super_wdt_enable(false);

esp32c3-hal/examples/hello_rgb.rs

@@ -40,7 +40,7 @@ fn main() -> ! {
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
     // Disable watchdogs

esp32c3-hal/examples/hello_world.rs

@@ -3,7 +3,7 @@
 
 use core::fmt::Write;
 
-use esp32c3_hal::{pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
+use esp32c3_hal::{clock::ClockControl, pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
 use nb::block;
 use panic_halt as _;
 use riscv_rt::entry;
@@ -11,11 +11,13 @@ use riscv_rt::entry;
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
 
     // Disable watchdog timers
     rtc_cntl.set_super_wdt_enable(false);
@@ -23,7 +25,7 @@ fn main() -> ! {
     timer0.disable();
     timer1.disable();
 
-    timer0.start(10_000_000u64);
+    timer0.start(1u64.secs());
 
     loop {
         writeln!(serial0, "Hello world!").unwrap();

esp32c3-hal/examples/i2c_display.rs

@@ -40,8 +40,8 @@ fn main() -> ! {
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
 
     // Disable watchdog timers
     rtc_cntl.set_super_wdt_enable(false);
@@ -64,7 +64,7 @@ fn main() -> ! {
     .unwrap();
 
     // Start timer (5 second interval)
-    timer0.start(50_000_000u64);
+    timer0.start(5u64.secs());
 
     // Initialize display
     let interface = I2CDisplayInterface::new(i2c);

esp32c3-hal/examples/ram.rs

@@ -4,7 +4,8 @@
 use core::fmt::Write;
 
 use esp32c3_hal::{
-    pac::{self, UART0},
+    clock::ClockControl,
+    pac::{Peripherals, UART0},
     prelude::*,
     ram,
     Serial,
@@ -25,8 +26,11 @@ static mut SOME_ZEROED_DATA: [u8; 8] = [0; 8];
 
 #[entry]
 fn main() -> ! {
-    let peripherals = pac::Peripherals::take().unwrap();
+    let peripherals = Peripherals::take().unwrap();
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
+
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     // Disable MWDT flash boot protection
@@ -34,7 +38,7 @@ fn main() -> ! {
     // The RWDT flash boot protection remains enabled and it being triggered is part
     // of the example
 
-    timer0.start(10_000_000u64);
+    timer0.start(1u64.secs());
 
     writeln!(
         serial0,

esp32c3-hal/examples/read_efuse.rs

@@ -3,18 +3,28 @@
 
 use core::fmt::Write;
 
-use esp32c3_hal::{efuse::Efuse, pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
+use esp32c3_hal::{
+    clock::ClockControl,
+    efuse::Efuse,
+    pac::Peripherals,
+    prelude::*,
+    RtcCntl,
+    Serial,
+    Timer,
+};
 use panic_halt as _;
 use riscv_rt::entry;
 
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
 
     // Disable watchdog timers
     rtc_cntl.set_super_wdt_enable(false);

esp32c3-hal/examples/spi_loopback.rs

@@ -41,8 +41,8 @@ fn main() -> ! {
     // Disable the watchdog timers. For the ESP32-C3, this includes the Super WDT,
     // the RTC WDT, and the TIMG WDTs.
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     rtc_cntl.set_super_wdt_enable(false);

esp32c3-hal/examples/systimer.rs

@@ -5,6 +5,7 @@ use core::{cell::RefCell, fmt::Write};
 
 use bare_metal::Mutex;
 use esp32c3_hal::{
+    clock::ClockControl,
     interrupt,
     pac::{self, Peripherals, UART0},
     prelude::*,
@@ -25,12 +26,14 @@ static mut ALARM2: Mutex<RefCell<Option<Alarm<Target, 2>>>> = Mutex::new(RefCell
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     // Disable the watchdog timers. For the ESP32-C3, this includes the Super WDT,
     // the RTC WDT, and the TIMG WDTs.
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     rtc_cntl.set_super_wdt_enable(false);

esp32c3-hal/examples/timer_interrupt.rs

@@ -5,6 +5,7 @@ use core::{cell::RefCell, fmt::Write};
 
 use bare_metal::Mutex;
 use esp32c3_hal::{
+    clock::ClockControl,
     interrupt,
     pac::{self, Peripherals, TIMG0, TIMG1, UART0},
     prelude::*,
@@ -23,12 +24,14 @@ static mut TIMER1: Mutex<RefCell<Option<Timer<TIMG1>>>> = Mutex::new(RefCell::ne
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     // Disable the watchdog timers. For the ESP32-C3, this includes the Super WDT,
     // the RTC WDT, and the TIMG WDTs.
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
 
     rtc_cntl.set_super_wdt_enable(false);
@@ -52,7 +55,7 @@ fn main() -> ! {
         interrupt::Priority::Priority1,
     );
 
-    timer0.start(10_000_000u64);
+    timer0.start(500u64.millis());
     timer0.listen();
 
     interrupt::enable(
@@ -71,7 +74,7 @@ fn main() -> ! {
         interrupt::Priority::Priority1,
     );
 
-    timer1.start(20_000_000u64);
+    timer1.start(1u64.secs());
     timer1.listen();
 
     riscv::interrupt::free(|_cs| unsafe {
@@ -100,7 +103,7 @@ pub fn interrupt1() {
         interrupt::clear(Cpu::ProCpu, interrupt::CpuInterrupt::Interrupt1);
         timer0.clear_interrupt();
 
-        timer0.start(10_000_000u64);
+        timer0.start(500u64.millis());
     });
 }
 
@@ -117,6 +120,6 @@ pub fn interrupt11() {
         interrupt::clear(Cpu::ProCpu, interrupt::CpuInterrupt::Interrupt11);
         timer1.clear_interrupt();
 
-        timer1.start(20_000_000u64);
+        timer1.start(1u64.secs());
     });
 }

esp32c3-hal/examples/usb_serial_jtag.rs

@@ -23,8 +23,8 @@ fn main() -> ! {
 
     let mut delay = Delay::new(&clocks);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
 
     // Disable watchdog timers
     rtc_cntl.set_super_wdt_enable(false);

esp32s2-hal/examples/blinky.rs

@@ -19,7 +19,7 @@ fn main() -> ! {
     let system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
     // Disable MWDT and RWDT (Watchdog) flash boot protection

esp32s2-hal/examples/gpio_interrupt.rs

@@ -31,7 +31,7 @@ fn main() -> ! {
     let system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
 

esp32s2-hal/examples/hello_rgb.rs

@@ -39,7 +39,7 @@ fn main() -> ! {
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
     // Disable MWDT and RWDT (Watchdog) flash boot protection

esp32s2-hal/examples/hello_world.rs

@@ -3,7 +3,7 @@
 
 use core::fmt::Write;
 
-use esp32s2_hal::{pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
+use esp32s2_hal::{clock::ClockControl, pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
 use nb::block;
 use panic_halt as _;
 use xtensa_lx_rt::entry;
@@ -11,8 +11,10 @@ use xtensa_lx_rt::entry;
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
@@ -20,7 +22,7 @@ fn main() -> ! {
     timer0.disable();
     rtc_cntl.set_wdt_global_enable(false);
 
-    timer0.start(40_000_000u64);
+    timer0.start(1u64.secs());
 
     loop {
         writeln!(serial0, "Hello world!").unwrap();

esp32s2-hal/examples/i2c_display.rs

@@ -42,7 +42,7 @@ fn main() -> ! {
     let mut system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
@@ -67,7 +67,7 @@ fn main() -> ! {
     .unwrap();
 
     // Start timer (5 second interval)
-    timer0.start(50_000_000u64);
+    timer0.start(5u64.secs());
 
     writeln!(serial0, "Starting timer!").unwrap();
 

esp32s2-hal/examples/ram.rs

@@ -4,6 +4,7 @@
 use core::fmt::Write;
 
 use esp32s2_hal::{
+    clock::ClockControl,
     pac::{Peripherals, UART0},
     prelude::*,
     ram,
@@ -26,8 +27,10 @@ static mut SOME_ZEROED_DATA: [u8; 8] = [0; 8];
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     // Disable MWDT flash boot protection
@@ -35,7 +38,7 @@ fn main() -> ! {
     // The RWDT flash boot protection remains enabled and it being triggered is part
     // of the example
 
-    timer0.start(10_000_000u64);
+    timer0.start(1u64.secs());
 
     writeln!(
         serial0,

esp32s2-hal/examples/read_efuse.rs

@@ -3,15 +3,25 @@
 
 use core::fmt::Write;
 
-use esp32s2_hal::{efuse::Efuse, pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
+use esp32s2_hal::{
+    clock::ClockControl,
+    efuse::Efuse,
+    pac::Peripherals,
+    prelude::*,
+    RtcCntl,
+    Serial,
+    Timer,
+};
 use panic_halt as _;
 use xtensa_lx_rt::entry;
 
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 

esp32s2-hal/examples/spi_loopback.rs

@@ -41,7 +41,7 @@ fn main() -> ! {
     // Disable the watchdog timers. For the ESP32-C3, this includes the Super WDT,
     // the RTC WDT, and the TIMG WDTs.
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     timer0.disable();

esp32s2-hal/examples/systimer.rs

@@ -34,7 +34,7 @@ fn main() -> ! {
     let system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 

esp32s2-hal/examples/timer_interrupt.rs

@@ -4,6 +4,7 @@
 use core::{cell::RefCell, fmt::Write};
 
 use esp32s2_hal::{
+    clock::ClockControl,
     interrupt,
     pac::{self, Peripherals, TIMG0, TIMG1, UART0},
     prelude::*,
@@ -26,10 +27,12 @@ static mut TIMER1: CriticalSectionMutex<RefCell<Option<Timer<TIMG1>>>> =
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     // Disable the TIMG watchdog timer.
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
@@ -43,7 +46,7 @@ fn main() -> ! {
         pac::Interrupt::TG0_T0_LEVEL,
         interrupt::CpuInterrupt::Interrupt20LevelPriority2,
     );
-    timer0.start(50_000_000u64);
+    timer0.start(500u64.millis());
     timer0.listen();
 
     interrupt::enable(
@@ -51,7 +54,7 @@ fn main() -> ! {
         pac::Interrupt::TG1_T0_LEVEL,
         interrupt::CpuInterrupt::Interrupt23LevelPriority3,
     );
-    timer1.start(100_000_000u64);
+    timer1.start(1u64.secs());
     timer1.listen();
 
     unsafe {
@@ -89,7 +92,7 @@ pub fn level2_interrupt() {
             let mut timer0 = data.borrow_mut();
             let timer0 = timer0.as_mut().unwrap();
             timer0.clear_interrupt();
-            timer0.start(50_000_000u64);
+            timer0.start(500u64.millis());
         });
     }
 }
@@ -114,7 +117,7 @@ pub fn level3_interrupt() {
             let mut timer1 = data.borrow_mut();
             let timer1 = timer1.as_mut().unwrap();
             timer1.clear_interrupt();
-            timer1.start(100_000_000u64);
+            timer1.start(1u64.secs());
         });
     }
 }

esp32s3-hal/examples/blinky.rs

@@ -19,7 +19,7 @@ fn main() -> ! {
     let system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
     // Disable MWDT and RWDT (Watchdog) flash boot protection

esp32s3-hal/examples/gpio_interrupt.rs

@@ -31,7 +31,7 @@ fn main() -> ! {
     let system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
 

esp32s3-hal/examples/hello_rgb.rs

@@ -40,7 +40,7 @@ fn main() -> ! {
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
     // Disable MWDT and RWDT (Watchdog) flash boot protection

esp32s3-hal/examples/hello_world.rs

@@ -3,7 +3,7 @@
 
 use core::fmt::Write;
 
-use esp32s3_hal::{pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
+use esp32s3_hal::{clock::ClockControl, pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
 use nb::block;
 use panic_halt as _;
 use xtensa_lx_rt::entry;
@@ -11,8 +11,10 @@ use xtensa_lx_rt::entry;
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
@@ -20,7 +22,7 @@ fn main() -> ! {
     timer0.disable();
     rtc_cntl.set_wdt_global_enable(false);
 
-    timer0.start(40_000_000u64);
+    timer0.start(1u64.secs());
 
     loop {
         writeln!(serial0, "Hello world!").unwrap();

esp32s3-hal/examples/i2c_display.rs

@@ -42,7 +42,7 @@ fn main() -> ! {
     let mut system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
@@ -67,7 +67,7 @@ fn main() -> ! {
     .unwrap();
 
     // Start timer (5 second interval)
-    timer0.start(50_000_000u64);
+    timer0.start(5u64.secs());
 
     writeln!(serial0, "Starting timer!").unwrap();
 

esp32s3-hal/examples/ram.rs

@@ -4,6 +4,7 @@
 use core::fmt::Write;
 
 use esp32s3_hal::{
+    clock::ClockControl,
     pac::{Peripherals, UART0},
     prelude::*,
     ram,
@@ -26,8 +27,10 @@ static mut SOME_ZEROED_DATA: [u8; 8] = [0; 8];
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     // Disable MWDT flash boot protection
@@ -35,7 +38,7 @@ fn main() -> ! {
     // The RWDT flash boot protection remains enabled and it being triggered is part
     // of the example
 
-    timer0.start(10_000_000u64);
+    timer0.start(1u64.secs());
 
     writeln!(
         serial0,

esp32s3-hal/examples/read_efuse.rs

@@ -3,15 +3,25 @@
 
 use core::fmt::Write;
 
-use esp32s3_hal::{efuse::Efuse, pac::Peripherals, prelude::*, RtcCntl, Serial, Timer};
+use esp32s3_hal::{
+    clock::ClockControl,
+    efuse::Efuse,
+    pac::Peripherals,
+    prelude::*,
+    RtcCntl,
+    Serial,
+    Timer,
+};
 use panic_halt as _;
 use xtensa_lx_rt::entry;
 
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 

esp32s3-hal/examples/spi_loopback.rs

@@ -41,7 +41,7 @@ fn main() -> ! {
     // Disable the watchdog timers. For the ESP32-C3, this includes the Super WDT,
     // the RTC WDT, and the TIMG WDTs.
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut serial0 = Serial::new(peripherals.UART0).unwrap();
 
     timer0.disable();

esp32s3-hal/examples/systimer.rs

@@ -34,7 +34,7 @@ fn main() -> ! {
     let system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
 

esp32s3-hal/examples/timer_interrupt.rs

@@ -4,6 +4,7 @@
 use core::{cell::RefCell, fmt::Write};
 
 use esp32s3_hal::{
+    clock::ClockControl,
     interrupt,
     pac::{self, Peripherals, TIMG0, TIMG1, UART0},
     prelude::*,
@@ -26,10 +27,12 @@ static mut TIMER1: SpinLockMutex<RefCell<Option<Timer<TIMG1>>>> =
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take().unwrap();
+    let system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
     // Disable the TIMG watchdog timer.
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
-    let mut timer1 = Timer::new(peripherals.TIMG1);
+    let mut timer1 = Timer::new(peripherals.TIMG1, clocks.apb_clock);
     let serial0 = Serial::new(peripherals.UART0).unwrap();
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
 
@@ -43,7 +46,7 @@ fn main() -> ! {
         pac::Interrupt::TG0_T0_LEVEL,
         interrupt::CpuInterrupt::Interrupt20LevelPriority2,
     );
-    timer0.start(50_000_000u64);
+    timer0.start(500u64.millis());
     timer0.listen();
 
     interrupt::enable(
@@ -51,7 +54,7 @@ fn main() -> ! {
         pac::Interrupt::TG1_T0_LEVEL,
         interrupt::CpuInterrupt::Interrupt23LevelPriority3,
     );
-    timer1.start(100_000_000u64);
+    timer1.start(1u64.secs());
     timer1.listen();
 
     unsafe {
@@ -89,7 +92,7 @@ pub fn level2_interrupt() {
             let mut timer0 = data.borrow_mut();
             let timer0 = timer0.as_mut().unwrap();
             timer0.clear_interrupt();
-            timer0.start(50_000_000u64);
+            timer0.start(500u64.millis());
         });
     }
 }
@@ -114,7 +117,7 @@ pub fn level3_interrupt() {
             let mut timer1 = data.borrow_mut();
             let timer1 = timer1.as_mut().unwrap();
             timer1.clear_interrupt();
-            timer1.start(100_000_000u64);
+            timer1.start(1u64.secs());
         });
     }
 }

esp32s3-hal/examples/usb_serial_jtag.rs

@@ -23,7 +23,7 @@ fn main() -> ! {
 
     let mut delay = Delay::new(&clocks);
     let mut rtc_cntl = RtcCntl::new(peripherals.RTC_CNTL);
-    let mut timer0 = Timer::new(peripherals.TIMG0);
+    let mut timer0 = Timer::new(peripherals.TIMG0, clocks.apb_clock);
 
     // Disable MWDT and RWDT (Watchdog) flash boot protection
     timer0.disable();