From 6e184a91a785e9119c0a14b90c52f351bceb1593 Mon Sep 17 00:00:00 2001
From: 9names <60134748+9names@users.noreply.github.com>
Date: Sat, 4 Dec 2021 17:39:32 +1100
Subject: [PATCH] Replace hal::timer::Timer with hal::Timer or Timer

---
 boards/itsy_bitsy_rp2040/examples/itsy_bitsy_rainbow.rs | 6 +++---
 boards/pico/examples/pico_countdown_blinky.rs           | 2 +-
 boards/pico/examples/pico_usb_serial.rs                 | 2 +-
 boards/qt_py_rp2040/examples/qt_py_rainbow.rs           | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/boards/itsy_bitsy_rp2040/examples/itsy_bitsy_rainbow.rs b/boards/itsy_bitsy_rp2040/examples/itsy_bitsy_rainbow.rs
index 9446354..b640e14 100644
--- a/boards/itsy_bitsy_rp2040/examples/itsy_bitsy_rainbow.rs
+++ b/boards/itsy_bitsy_rp2040/examples/itsy_bitsy_rainbow.rs
@@ -8,7 +8,6 @@ use embedded_hal::digital::v2::OutputPin;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
 use panic_halt as _;
-use rp2040_hal::pio::PIOExt;
 use smart_leds::{brightness, SmartLedsWrite, RGB8};
 use ws2812_pio::Ws2812;
 
@@ -16,8 +15,9 @@ use itsy_bitsy_rp2040::{
     hal::{
         clocks::{init_clocks_and_plls, Clock},
         pac,
+        pio::PIOExt,
         watchdog::Watchdog,
-        Sio,
+        Sio, Timer,
     },
     Pins, XOSC_CRYSTAL_FREQ,
 };
@@ -59,7 +59,7 @@ fn main() -> ! {
         .set_high()
         .unwrap();
 
-    let timer = rp2040_hal::timer::Timer::new(pac.TIMER, &mut pac.RESETS);
+    let timer = Timer::new(pac.TIMER, &mut pac.RESETS);
     let mut delay = timer.count_down();
 
     let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS);
diff --git a/boards/pico/examples/pico_countdown_blinky.rs b/boards/pico/examples/pico_countdown_blinky.rs
index 531d3ed..13666f5 100644
--- a/boards/pico/examples/pico_countdown_blinky.rs
+++ b/boards/pico/examples/pico_countdown_blinky.rs
@@ -61,7 +61,7 @@ fn main() -> ! {
     .unwrap();
 
     // Configure the Timer peripheral in count-down mode
-    let timer = hal::timer::Timer::new(pac.TIMER, &mut pac.RESETS);
+    let timer = hal::Timer::new(pac.TIMER, &mut pac.RESETS);
     let mut count_down = timer.count_down();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/boards/pico/examples/pico_usb_serial.rs b/boards/pico/examples/pico_usb_serial.rs
index 8b18e73..154f073 100644
--- a/boards/pico/examples/pico_usb_serial.rs
+++ b/boards/pico/examples/pico_usb_serial.rs
@@ -89,7 +89,7 @@ fn main() -> ! {
         .device_class(2) // from: https://www.usb.org/defined-class-codes
         .build();
 
-    let timer = hal::timer::Timer::new(pac.TIMER, &mut pac.RESETS);
+    let timer = hal::Timer::new(pac.TIMER, &mut pac.RESETS);
     let mut said_hello = false;
     loop {
         // A welcome message at the beginning
diff --git a/boards/qt_py_rp2040/examples/qt_py_rainbow.rs b/boards/qt_py_rp2040/examples/qt_py_rainbow.rs
index 1cdd702..8045871 100644
--- a/boards/qt_py_rp2040/examples/qt_py_rainbow.rs
+++ b/boards/qt_py_rp2040/examples/qt_py_rainbow.rs
@@ -8,7 +8,6 @@ use embedded_hal::digital::v2::OutputPin;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
 use panic_halt as _;
-use rp2040_hal::pio::PIOExt;
 use smart_leds::{brightness, SmartLedsWrite, RGB8};
 use ws2812_pio::Ws2812;
 
@@ -16,8 +15,9 @@ use qt_py_rp2040::{
     hal::{
         clocks::{init_clocks_and_plls, Clock},
         pac,
+        pio::PIOExt,
         watchdog::Watchdog,
-        Sio,
+        Sio, Timer,
     },
     Pins, XOSC_CRYSTAL_FREQ,
 };
@@ -59,7 +59,7 @@ fn main() -> ! {
         .set_high()
         .unwrap();
 
-    let timer = rp2040_hal::timer::Timer::new(pac.TIMER, &mut pac.RESETS);
+    let timer = Timer::new(pac.TIMER, &mut pac.RESETS);
     let mut delay = timer.count_down();
 
     let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS);