Replace homegrown "time" with embedded-time

Author: nickray

CHANGELOG.md

@@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add INPUTMUX and PINT peripherals
 - Add example using PINT + INPUTMUX to make an external interrupt on a pin
 
+## [v0.2.0] - 2021-05-02
+Bump lpc55-pac and cipher
+Replace homegrown "time" with embedded-time
+
 ## [v0.1.1] - 2021-04-23
 USB fix
 

Cargo.toml

@@ -21,6 +21,7 @@ cipher = "0.3"
 cortex-m = "0.7"
 digest = "0.9"
 embedded-hal = { version = "0.2", features = ["unproven"] }
+embedded-time = "0.10.1"
 generic-array = "0.14.2"
 lpc55-pac = "0.4"
 nb = "1"
@@ -43,6 +44,7 @@ cortex-m-semihosting = "0.3"
 heapless = "0.6"
 panic-halt  = "0.2"
 panic-semihosting = { version = "0.5", features = ["jlink-quirks"] }
+rtt-target = { version = "0.3", features = ["cortex-m"] }
 sha2 = { version = "0.9", default-features = false }
 ssd1306 = "0.3"
 sha-1 = { version = "0.9", default-features = false }

examples/adc.rs

@@ -50,7 +50,7 @@ fn main() -> ! {
     let mut hal = hal::new();
 
     let _clocks = hal::ClockRequirements::default()
-        .system_frequency(12.mhz())
+        .system_frequency(12.MHz())
         .configure(&mut hal.anactrl, &mut hal.pmc, &mut hal.syscon)
         .unwrap();
 

examples/aes.rs

@@ -15,6 +15,7 @@ use hal::prelude::*;
 use lpc55_hal as hal;
 
 use aes_soft::cipher::{BlockCipher, NewBlockCipher};
+use hal::traits::cipher::{BlockDecrypt, BlockEncrypt};
 
 use generic_array::GenericArray;
 

examples/ctimer.rs

@@ -29,7 +29,7 @@ fn main() -> ! {
     let mut hal = hal::new();
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(12.mhz())
+        .system_frequency(12.MHz())
         .configure(&mut hal.anactrl, &mut hal.pmc, &mut hal.syscon)
         .unwrap();
 
@@ -39,10 +39,10 @@ fn main() -> ! {
     heprintln!("looping 1 Hz").unwrap();
     let mut c = 0;
     loop {
-        cdriver.start(1.s());
+        cdriver.start(1_000_000.microseconds());
         dbg!(c * 1_000_000);
         dbg!(cdriver.lap().0);
         c += 1;
         block!(cdriver.wait()).unwrap(); // blocks for 1 second
     }
-}
+}

examples/external_interrupts.rs

@@ -34,7 +34,7 @@ fn main() -> ! {
     let mut hal = hal::new();
 
     let _clocks = hal::ClockRequirements::default()
-        .system_frequency(12.mhz())
+        .system_frequency(12.MHz())
         .configure(&mut hal.anactrl, &mut hal.pmc, &mut hal.syscon)
         .unwrap();
 

examples/flash.rs

@@ -42,7 +42,7 @@ fn main() -> ! {
     let mut syscon = hal.syscon;
 
     hal::ClockRequirements::default()
-        .system_frequency(12.mhz())
+        .system_frequency(12.MHz())
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
 

examples/i2c.rs

@@ -1,6 +1,7 @@
 #![no_main]
 #![no_std]
 
+use core::convert::TryFrom;
 // extern crate panic_semihosting;
 extern crate panic_halt;
 use cortex_m_rt::entry;
@@ -14,6 +15,7 @@ use hal::{
         Pins,
         I2cMaster,
     },
+    time::Hertz,
 };
 
 use ssd1306;
@@ -31,7 +33,7 @@ fn main() -> ! {
     let mut iocon = hal.iocon.enabled(&mut syscon);
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(50.mhz())
+        .system_frequency(50.MHz())
         // .support_flexcomm()
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
@@ -47,7 +49,7 @@ fn main() -> ! {
     let sda = pins.pio1_21.into_i2c4_sda_pin(&mut iocon);
 
     // let i2c = I2cMaster::new(i2c, (scl, sda), 400.khz());
-    let i2c = I2cMaster::new(i2c, (scl, sda), 1.mhz());
+    let i2c = I2cMaster::new(i2c, (scl, sda), Hertz::try_from(1_u32.MHz()).unwrap());
 
     // OLED
     let mut display: TerminalMode<_> = ssd1306::Builder::new()

examples/itm.rs

@@ -58,7 +58,7 @@ fn main() -> ! {
 
     hal::ClockRequirements::default()
         // .support_usbfs()
-        .system_frequency(12.mhz())
+        .system_frequency(12.MHz())
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
 

examples/jump-to-bootloader.rs

@@ -6,18 +6,17 @@ extern crate panic_halt; // 672 bytes
 
 use cortex_m_rt::entry;
 
-use hal::{drivers::pins::Level, prelude::*};
 use lpc55_hal as hal;
 
 #[entry]
 fn main() -> ! {
     let hal = hal::new();
 
     let mut syscon = hal.syscon;
-    let mut iocon = hal.iocon.enabled(&mut syscon).release();
+    let iocon = hal.iocon.enabled(&mut syscon).release();
 
     // Conor's trick: make the bootloader think ISP0 is asserted,
     // even though it's not!
-    iocon.pio0_5.modify(|r, w| w.invert().set_bit());
+    iocon.pio0_5.modify(|_, w| w.invert().set_bit());
     unsafe { cortex_m::asm::bootload(0x03000000 as *const u32); }
 }

examples/measure_frequency.rs

@@ -40,7 +40,7 @@ fn main() -> ! {
     let mut syscon = hal.syscon;
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(150.mhz())
+        .system_frequency(150.MHz())
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
 
@@ -50,7 +50,7 @@ fn main() -> ! {
 
     loop {
 
-        timer.start(1.s());
+        timer.start(1_000_000.microseconds());
 
         delay_cycles(10_000_000);
 

examples/pfr.rs

@@ -60,7 +60,7 @@ fn main() -> ! {
 
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(96.mhz())
+        .system_frequency(96.MHz())
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
 

examples/prince.rs

@@ -35,7 +35,7 @@ fn main() -> ! {
     const DATA_ADDR: usize = 0x00080000 + 0;
 
     let _clocks = hal::ClockRequirements::default()
-        .system_frequency(12.mhz())
+        .system_frequency(12.MHz())
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
 

examples/pwm.rs

@@ -47,7 +47,7 @@ fn main() -> ! {
     let mut hal = hal::new();
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(96.mhz())
+        .system_frequency(96.MHz())
         .configure(&mut hal.anactrl, &mut hal.pmc, &mut hal.syscon)
         .unwrap();
 
@@ -87,7 +87,7 @@ fn main() -> ! {
 
     loop {
 
-        delay_timer.start(5.ms());
+        delay_timer.start(5_000.microseconds());
         block!(delay_timer.wait()).unwrap();
 
         for i in 0..3 {
@@ -116,4 +116,4 @@ fn main() -> ! {
         }
 
     }
-}
+}

examples/rtc.rs

@@ -33,7 +33,7 @@ fn main() -> ! {
     let mut syscon = hal.syscon;
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(96.mhz())
+        .system_frequency(96.MHz())
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
 

examples/rtt.rs

@@ -0,0 +1,45 @@
+#![no_main]
+#![no_std]
+
+// extern crate panic_semihosting;  // 4004 bytes
+extern crate panic_halt; // 672 bytes
+
+use cortex_m_rt::entry;
+use rtt_target::{rtt_init_print, rprintln};
+
+use hal::{drivers::pins::Level, prelude::*};
+use lpc55_hal as hal;
+
+// pub type RedLedPin = pins::Pio1_4;
+// pub type GreenLedPin = pins::Pio1_7;
+// pub type BlueLedPin = pins::Pio1_6;
+
+#[entry]
+fn main() -> ! {
+    let hal = hal::new();
+    rtt_init_print!();
+
+    let mut syscon = hal.syscon;
+    let mut gpio = hal.gpio.enabled(&mut syscon);
+    let mut iocon = hal.iocon.enabled(&mut syscon);
+
+    let pins = hal::Pins::take().unwrap();
+
+    // R = pio1_6 (for lpcxpresso)
+    let mut red = pins
+        .pio1_6
+        .into_gpio_pin(&mut iocon, &mut gpio)
+        // on = low, off = high
+        .into_output(Level::High);
+
+    loop {
+        for _ in 0..50_000 {
+            red.set_low().unwrap();
+        }
+        for _ in 0..50_000 {
+            red.set_high().unwrap();
+        }
+
+        rprintln!("toggled LED");
+    }
+}

examples/serial.rs

@@ -31,7 +31,7 @@ fn main() -> ! {
     let mut iocon = hal.iocon.enabled(&mut syscon);
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(50.mhz())
+        .system_frequency(50.MHz())
         // .support_flexcomm()
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
@@ -48,7 +48,7 @@ fn main() -> ! {
     let rx = pins.pio1_24.into_usart2_rx_pin(&mut iocon);
 
     let config = hal::drivers::serial::config::Config::default()
-        .speed(19_200.hz());
+        .speed(19_200.Hz());
     hprintln!("config = {:?}", config).ok();
 
     let serial = Serial::new(usart, (tx, rx), config);

examples/spi.rs

@@ -4,9 +4,8 @@
 // extern crate panic_semihosting;
 extern crate panic_halt;
 use cortex_m_rt::entry;
-use core::fmt::Write;
+use core::{convert::TryFrom, fmt::Write};
 
-use hal::prelude::*;
 use lpc55_hal as hal;
 
 use hal::{
@@ -20,6 +19,7 @@ use hal::{
             NoCs,
         },
     },
+    time::{Hertz, RateExtensions},
     traits::wg::spi::{
         Mode,
         Phase,
@@ -74,7 +74,7 @@ fn main() -> ! {
         phase: Phase::CaptureOnFirstTransition,
     };
 
-    let spi = SpiMaster::new(spi, spi_pins, 100.khz(), spi_mode);
+    let spi = SpiMaster::new(spi, spi_pins, Hertz::try_from(100_u32.kHz()).unwrap(), spi_mode);
 
     let dc = pins.pio1_5.into_gpio_pin(&mut iocon, &mut gpio).into_output_high();
 

examples/touch.rs

@@ -36,7 +36,7 @@ fn main() -> ! {
     let mut hal = hal::new();
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(96.mhz())
+        .system_frequency(96.MHz())
         .configure(&mut hal.anactrl, &mut hal.pmc, &mut hal.syscon)
         .unwrap();
     let fro_token = clocks.support_1mhz_fro_token().unwrap();
@@ -102,7 +102,7 @@ fn main() -> ! {
         }
     }
 
-    delay_timer.start(300.ms());
+    delay_timer.start(300_000.microseconds());
     block!(delay_timer.wait()).unwrap();
 
     loop {

examples/usb.rs

@@ -11,8 +11,6 @@ use hal::prelude::*;
 #[allow(unused_imports)]
 use lpc55_hal as hal;
 
-// use hal::{reg_read, reg_modify};
-
 use usbd_serial::{CdcAcmClass, /*SerialPort*/};
 use usb_device::device::{UsbDeviceBuilder, UsbVidPid};
 use hal::drivers::{
@@ -46,7 +44,7 @@ fn main() -> ! {
     let clocks = hal::ClockRequirements::default()
         // .system_frequency(24.mhz())
         // .system_frequency(72.mhz())
-        .system_frequency(96.mhz())
+        .system_frequency(96.MHz())
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .unwrap();
 

examples/usb_test_class.rs

@@ -32,7 +32,7 @@ fn main() -> ! {
     iocon.disabled(&mut syscon); // perfectionist ;)
 
     let clocks = hal::ClockRequirements::default()
-        .system_frequency(96.mhz())
+        .system_frequency(96.MHz())
         .configure(&mut anactrl, &mut pmc, &mut syscon)
         .expect("Clock configuration failed");