itsybitsy_m4: Update HAL 0.15->0.17

Author: ianrrees

boards/itsybitsy_m4/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 
+- update hal dependency to v0.17
 - update path of Cargo config
 
 # 0.8.0

boards/itsybitsy_m4/Cargo.toml

@@ -16,33 +16,34 @@ readme = "README.md"
 [dependencies]
 bitbang-hal = "0.3"
 apa102-spi = "0.3"
+embedded-hal-02 = {package = "embedded-hal", version = "0.2", features = ["unproven"]}
 smart-leds = "0.3"
 
 [dependencies.cortex-m-rt]
 version = "0.7"
 optional = true
 
 [dependencies.atsamd-hal]
-version = "0.15"
+version = "0.17"
 default-features = false
 
 [dependencies.usb-device]
-version = "0.2"
+version = "0.3.1"
 optional = true
 
 [dev-dependencies]
-cortex-m = "0.7"
-usbd-serial = "0.1"
+cortex-m = {version = "0.7", features = ["critical-section-single-core"]}
+usbd-serial = "0.2.2"
 panic-halt = "0.2"
 panic-semihosting = "0.6"
 
 [features]
 # ask the HAL to enable atsamd51g support
-default = ["rt", "atsamd-hal/samd51g", "atsamd-hal/unproven"]
+default = ["rt", "atsamd-hal/samd51g"]
 rt = ["cortex-m-rt", "atsamd-hal/samd51g-rt"]
-unproven = ["atsamd-hal/unproven"]
 usb = ["atsamd-hal/usb", "usb-device"]
 use_rtt = ["atsamd-hal/use_rtt"]
+use_semihosting = []
 
 [profile.dev]
 incremental = false

boards/itsybitsy_m4/examples/dotstar.rs

@@ -16,7 +16,7 @@ use hal::{
     delay::Delay,
     pac::{CorePeripherals, Peripherals},
     prelude::*,
-    time::MegaHertz,
+    time::Hertz,
     timer::TimerCounter,
 };
 
@@ -39,7 +39,7 @@ fn main() -> ! {
     let gclk0 = clocks.gclk0();
     let tc2_3 = clocks.tc2_tc3(&gclk0).unwrap();
     let mut timer = TimerCounter::tc3_(&tc2_3, peripherals.TC3, &mut peripherals.MCLK);
-    timer.start(MegaHertz(4));
+    InterruptDrivenTimer::start(&mut timer, Hertz::MHz(4).into_duration());
     let mut rgb = bsp::dotstar_bitbang(
         pins.dotstar_miso.into(),
         pins.dotstar_mosi.into(),

boards/itsybitsy_m4/examples/sercom_interrupt.rs

@@ -4,6 +4,7 @@
 //! The idea of this example is to show two different things
 //! - How to manually configure SERCOM for a desired mode (UART in this case)
 //! - How to enable an use SERCOM interrupts
+//!
 //! The second one is particularly handy because some drivers will give
 //! you a `poll()` or `update()` function, and you are expected to call it  
 //! on the receive interrupt of the peripheral i.e. SERCOM UART RXC
@@ -17,9 +18,9 @@
 //! - RX - A4
 //! - TX - A5
 //!
-//! > In the ATSAMX5x MCUs SERCOM UART configuration requires at least
+//! In the ATSAMX5x MCUs SERCOM UART configuration requires at least
 //! two pins from the same IOSET. You can find more info about this in
-//! the hal documentation or in the MCU datasheet at:
+//! the HAL documentation or in the MCU datasheet at:
 //! <https://www.microchip.com/en-us/product/ATSAMD51G19A>
 
 use itsybitsy_m4 as bsp;
@@ -35,8 +36,8 @@ use cortex_m::{interrupt::Mutex, peripheral::NVIC};
 use bsp::hal::{
     clock::GenericClockController,
     delay::Delay,
-    ehal::blocking::delay::DelayMs,
     gpio::{Pin, PushPullOutput, PA22},
+    nb,
     pac::{self, interrupt, CorePeripherals, Peripherals},
     prelude::*,
     sercom::{
@@ -92,7 +93,7 @@ fn main() -> ! {
     // custom sercom uart configuration
     let mut serial_sercom0 = uart0(
         &mut clocks,
-        Hertz(115200),
+        115200.Hz(),
         dp.SERCOM0,
         &mut dp.MCLK,
         pins.a5,
@@ -102,7 +103,7 @@ fn main() -> ! {
     // labeled "default" uart
     let mut serial_sercom3 = bsp::uart(
         &mut clocks,
-        Hertz(115200),
+        115200.Hz(),
         dp.SERCOM3,
         &mut dp.MCLK,
         pins.d0_rx,

boards/itsybitsy_m4/examples/spi.rs

@@ -19,13 +19,9 @@ use bsp::{
     hal::{
         clock::GenericClockController,
         delay::Delay,
-        ehal::{
-            blocking::{delay::DelayMs, spi::Transfer},
-            serial::Write,
-        },
+        nb,
         pac::{CorePeripherals, Peripherals},
         prelude::*,
-        time::{Hertz, MegaHertz},
     },
     spi_master,
 };
@@ -45,15 +41,15 @@ fn main() -> ! {
     let mut delay = Delay::new(core.SYST, &mut clocks);
     let mut serial = bsp::uart(
         &mut clocks,
-        Hertz(115200),
+        115200.Hz(),
         peripherals.SERCOM3,
         &mut peripherals.MCLK,
         pins.d0_rx,
         pins.d1_tx,
     );
     let mut spi1 = spi_master(
         &mut clocks,
-        MegaHertz(4),
+        4.MHz(),
         peripherals.SERCOM1,
         &mut peripherals.MCLK,
         pins.sck,

boards/itsybitsy_m4/examples/usb_serial.rs

@@ -24,10 +24,10 @@ use cortex_m::peripheral::NVIC;
 use hal::{
     clock::GenericClockController,
     dbgprint,
-    ehal::timer::CountDown,
     pac::{interrupt, CorePeripherals, Peripherals},
-    time::MegaHertz,
+    time::Hertz,
     timer::TimerCounter,
+    timer_traits::InterruptDrivenTimer,
     usb::UsbBus,
 };
 use smart_leds::{hsv::RGB8, SmartLedsWrite};
@@ -49,7 +49,7 @@ fn main() -> ! {
     let gclk0 = clocks.gclk0();
     let tc2_3 = clocks.tc2_tc3(&gclk0).unwrap();
     let mut timer = TimerCounter::tc3_(&tc2_3, peripherals.TC3, &mut peripherals.MCLK);
-    timer.start(MegaHertz(4));
+    timer.start(Hertz::MHz(4).into_duration());
     let mut rgb = bsp::dotstar_bitbang(
         pins.dotstar_miso.into(),
         pins.dotstar_mosi.into(),
@@ -83,9 +83,11 @@ fn main() -> ! {
         USB_SERIAL = Some(SerialPort::new(bus_allocator));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Serial port")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .device_class(USB_CLASS_CDC)
                 .build(),
         );

boards/itsybitsy_m4/src/lib.rs

@@ -4,15 +4,13 @@
 #[cfg(feature = "rt")]
 pub use cortex_m_rt::entry;
 
-use crate::ehal::timer::CountDown;
 pub use atsamd_hal as hal;
+use embedded_hal_02::timer::{CountDown, Periodic};
 pub use hal::ehal;
 
 pub use hal::{
     clock::GenericClockController,
-    dbgprint,
-    ehal::timer::Periodic,
-    pac,
+    dbgprint, pac,
     qspi::{OneShot, Qspi},
     sercom::{
         i2c, spi,
@@ -354,10 +352,10 @@ pub fn usb_allocator(
     dm: impl Into<UsbDm>,
     dp: impl Into<UsbDp>,
 ) -> UsbBusAllocator<UsbBus> {
-    use pac::gclk::{genctrl::SRC_A, pchctrl::GEN_A};
+    use pac::gclk::{genctrl::SRCSELECT_A, pchctrl::GENSELECT_A};
 
-    clocks.configure_gclk_divider_and_source(GEN_A::GCLK2, 1, SRC_A::DFLL, false);
-    let usb_gclk = clocks.get_gclk(GEN_A::GCLK2).unwrap();
+    clocks.configure_gclk_divider_and_source(GENSELECT_A::GCLK2, 1, SRCSELECT_A::DFLL, false);
+    let usb_gclk = clocks.get_gclk(GENSELECT_A::GCLK2).unwrap();
     let usb_clock = &clocks.usb(&usb_gclk).unwrap();
     let (dm, dp) = (dm.into(), dp.into());
     UsbBusAllocator::new(UsbBus::new(usb_clock, mclk, dm, dp, usb))
@@ -404,7 +402,7 @@ pub fn spi_master(
     let (miso, mosi, sck) = (miso.into(), mosi.into(), sck.into());
     let pads = spi::Pads::default().data_in(miso).data_out(mosi).sclk(sck);
     spi::Config::new(mclk, sercom1, pads, freq)
-        .baud(baud)
+        .baud(baud.into())
         .spi_mode(spi::MODE_0)
         .enable()
 }