Fix examples and clippy warnings

sipeed · Jan 11, 2024 · 8be399f · 8be399f
1 parent f1fc3d5
commit 8be399f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/examples/blinky.rs b/examples/blinky.rs
@@ -2,7 +2,7 @@
 #![no_main]
 
 use bl602_hal as hal;
-use embedded_hal::delay::DelayUs;
+use embedded_hal::delay::DelayNs;
 use embedded_hal::digital::OutputPin;
 use hal::{
     clock::{Strict, SysclkFreq, UART_PLL_FREQ},

diff --git a/examples/i2c_ssd1306.rs b/examples/i2c_ssd1306.rs
@@ -9,6 +9,8 @@ use embedded_graphics::{
     text::{Baseline, Text},
     Drawable,
 };
+use embedded_hal::delay::DelayNs;
+
 use hal::{
     clock::{Strict, SysclkFreq, UART_PLL_FREQ},
     pac,
@@ -57,5 +59,9 @@ fn main() -> ! {
 
     display.flush().unwrap();
 
-    loop {}
+    // Create a blocking delay function based on the current cpu frequency
+    let mut d = bl602_hal::delay::McycleDelay::new(clocks.sysclk().0);
+    loop {
+        d.delay_ms(1000);
+    }
 }
diff --git a/examples/led_timer_interrupt.rs b/examples/led_timer_interrupt.rs
@@ -17,7 +17,7 @@ use bl602_hal as hal;
 use core::cell::RefCell;
 use core::ops::DerefMut;
 use critical_section::{self, Mutex};
-use embedded_hal::digital::{OutputPin, ToggleableOutputPin};
+use embedded_hal::digital::{OutputPin, StatefulOutputPin};
 use embedded_hal_zero::timer::CountDown;
 use embedded_time::{duration::*, rate::*};
 use hal::{

diff --git a/examples/serial.rs b/examples/serial.rs
@@ -3,7 +3,7 @@
 
 use bl602_hal as hal;
 use core::fmt::Write;
-use embedded_hal::delay::DelayUs;
+use embedded_hal::delay::DelayNs;
 use hal::{
     clock::{Strict, SysclkFreq, UART_PLL_FREQ},
     pac,

diff --git a/examples/watchdog_example.rs b/examples/watchdog_example.rs
@@ -25,8 +25,8 @@ use core::cell::RefCell;
 use core::fmt::Write;
 use core::ops::DerefMut;
 use critical_section::{self, Mutex};
-use embedded_hal::delay::DelayUs;
-use embedded_hal::digital::{OutputPin, ToggleableOutputPin};
+use embedded_hal::delay::DelayNs;
+use embedded_hal::digital::{OutputPin, StatefulOutputPin};
 use embedded_hal_zero::watchdog::{Watchdog, WatchdogEnable};
 use embedded_time::{duration::*, rate::*};
 use hal::{
@@ -152,7 +152,7 @@ fn Watchdog(_: &mut TrapFrame) {
     // Toggle the red led whenever the interrupt is triggered:
     critical_section::with(|cs| {
         if let Some(led_pin) = G_INTERRUPT_LED_PIN_R.borrow(cs).borrow_mut().deref_mut() {
-            led_pin.toggle();
+            led_pin.toggle().unwrap();
         }
     });