Use type-level enums for RTC modes (atsamd-rs#412)

* Use type-level enums for RTC modes * [RTC] Fix type in two examples * [RTC] Remove the DisabledMode * [RTC] Cargo fmt
kaizensparc · Mar 25, 2021 · 03df9a8 · 03df9a8
1 parent 51c070a
commit 03df9a8
Show file tree

Hide file tree

Showing 6 changed files with 179 additions and 67 deletions.
diff --git a/boards/feather_m0/.gdbinit b/boards/feather_m0/.gdbinit
@@ -0,0 +1,2 @@
+target remote :3333
+file target/thumbv6m-none-eabi/debug/examples/blinky_rtic
diff --git a/boards/feather_m0/examples/clock.rs b/boards/feather_m0/examples/clock.rs
@@ -45,8 +45,7 @@ fn main() -> ! {
         .unwrap();
     clocks.configure_standby(ClockGenId::GCLK3, true);
     let rtc_clock = clocks.rtc(&timer_clock).unwrap();
-    let mut rtc = rtc::Rtc::new(peripherals.RTC, rtc_clock.freq(), &mut peripherals.PM);
-    rtc.clock_mode();
+    let rtc = rtc::Rtc::clock_mode(peripherals.RTC, rtc_clock.freq(), &mut peripherals.PM);
 
     unsafe {
         RTC = Some(rtc);
@@ -102,7 +101,7 @@ fn main() -> ! {
 static mut USB_ALLOCATOR: Option<UsbBusAllocator<UsbBus>> = None;
 static mut USB_BUS: Option<UsbDevice<UsbBus>> = None;
 static mut USB_SERIAL: Option<SerialPort<UsbBus>> = None;
-static mut RTC: Option<rtc::Rtc> = None;
+static mut RTC: Option<rtc::Rtc<rtc::ClockMode>> = None;
 
 fn write_serial(bytes: &[u8]) {
     unsafe {

diff --git a/boards/feather_m0/examples/sleeping_timer_rtc.rs b/boards/feather_m0/examples/sleeping_timer_rtc.rs
@@ -53,7 +53,7 @@ fn main() -> ! {
         .unwrap();
     clocks.configure_standby(ClockGenId::GCLK1, true);
     let rtc_clock = clocks.rtc(&timer_clock).unwrap();
-    let timer = rtc::Rtc::new(peripherals.RTC, rtc_clock.freq(), &mut peripherals.PM);
+    let timer = rtc::Rtc::count32_mode(peripherals.RTC, rtc_clock.freq(), &mut peripherals.PM);
     let mut sleeping_delay = SleepingDelay::new(timer, &INTERRUPT_FIRED);
 
     // We can use the RTC in standby for maximum power savings

diff --git a/boards/feather_m4/examples/sleeping_timer_rtc.rs b/boards/feather_m4/examples/sleeping_timer_rtc.rs
@@ -37,7 +37,7 @@ fn main() -> ! {
 
     // Configure the RTC. a 1024 Hz clock is configured for us when enabling our
     // main clock
-    let timer = rtc::Rtc::new(peripherals.RTC, 1024.hz(), &mut peripherals.MCLK);
+    let timer = rtc::Rtc::count32_mode(peripherals.RTC, 1024.hz(), &mut peripherals.MCLK);
     let mut sleeping_delay = SleepingDelay::new(timer, &INTERRUPT_FIRED);
 
     // We can use the RTC in standby for maximum power savings

diff --git a/boards/wio_terminal/examples/clock.rs b/boards/wio_terminal/examples/clock.rs
@@ -53,11 +53,11 @@ fn main() -> ! {
     let pins = Pins::new(peripherals.PORT);
     let mut sets: Sets = pins.split();
 
+    // Configure the RTC. a 1024 Hz clock is configured for us when enabling our
+    // main clock
+    let rtc = rtc::Rtc::clock_mode(peripherals.RTC, 1024.hz(), &mut peripherals.MCLK);
+
     unsafe {
-        // Configure the RTC. a 1024 Hz clock is configured for us when enabling our
-        // main clock
-        let mut rtc = rtc::Rtc::new(peripherals.RTC, 1024.hz(), &mut peripherals.MCLK);
-        rtc.clock_mode();
         RTC = Some(rtc);
     }
 
@@ -150,7 +150,7 @@ fn main() -> ! {
 static mut USB_ALLOCATOR: Option<UsbBusAllocator<UsbBus>> = None;
 static mut USB_BUS: Option<UsbDevice<UsbBus>> = None;
 static mut USB_SERIAL: Option<SerialPort<UsbBus>> = None;
-static mut RTC: Option<rtc::Rtc> = None;
+static mut RTC: Option<rtc::Rtc<rtc::ClockMode>> = None;
 
 fn poll_usb() {
     unsafe {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		target remote :3333
		file target/thumbv6m-none-eabi/debug/examples/blinky_rtic