Update itsybitsy_m0 and itsybitsy_m4 to HAL 0.17

boards/itsybitsy_m0/CHANGELOG.md

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

boards/itsybitsy_m0/Cargo.toml

@@ -13,29 +13,30 @@ edition = "2021"
 [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.14"
+version = "0.17"
 default-features = false
 
 [dependencies.usb-device]
-version = "0.2"
+version = "0.3.1"
 optional = true
 
 [dependencies.embedded-sdmmc]
 version = "0.3"
 optional = true
 
 [dev-dependencies]
-cortex-m-rtic = "0.6.0-rc.4"
-cortex-m = "0.7"
-usbd-serial = "0.1"
-usbd-hid = "0.4"
+cortex-m-rtic = "1.0"
+cortex-m = {version = "0.7", features = ["critical-section-single-core"]}
+usbd-serial = "0.2.2"
+usbd-hid = "0.8.2"
 cortex-m-semihosting = "0.3"
 ssd1306 = "0.7"
 embedded-graphics = "0.7.1"
@@ -47,9 +48,8 @@ panic-semihosting = "0.5"
 
 [features]
 # ask the HAL to enable atsamd21g support
-default = ["rt", "atsamd-hal/samd21g", "atsamd-hal/unproven"]
+default = ["rt", "atsamd-hal/samd21g"]
 rt = ["cortex-m-rt", "atsamd-hal/samd21g-rt"]
-unproven = ["atsamd-hal/unproven"]
 use_rtt = ["atsamd-hal/use_rtt"]
 usb = ["atsamd-hal/usb", "usb-device"]
 dma = ["atsamd-hal/dma"]

boards/itsybitsy_m0/examples/blinky_rtic.rs

@@ -11,7 +11,6 @@ use itsybitsy_m0 as bsp;
 use panic_halt as _;
 #[cfg(feature = "use_semihosting")]
 use panic_semihosting as _;
-use rtic;
 
 #[rtic::app(device = bsp::pac, peripherals = true, dispatchers = [EVSYS])]
 mod app {

boards/itsybitsy_m0/examples/clock.rs

@@ -70,9 +70,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_m0/examples/dotstar_flashing.rs

@@ -16,7 +16,7 @@ use hal::{
     delay::Delay,
     pac::{CorePeripherals, Peripherals},
     prelude::*,
-    time::MegaHertz,
+    time::Hertz,
     timer::TimerCounter,
 };
 
@@ -43,7 +43,7 @@ fn main() -> ! {
     // instantiate a timer objec for the TC4 peripheral
     let mut timer = TimerCounter::tc4_(tc45, peripherals.TC4, &mut peripherals.PM);
     // start a 4 MHz timer
-    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_m0/examples/dotstar_rainbow.rs

@@ -14,7 +14,7 @@ use hal::clock::GenericClockController;
 use hal::delay::Delay;
 use hal::pac::{CorePeripherals, Peripherals};
 use hal::prelude::*;
-use hal::time::MegaHertz;
+use hal::time::Hertz;
 use hal::timer::TimerCounter;
 
 use smart_leds::{hsv::RGB8, SmartLedsWrite};
@@ -66,7 +66,7 @@ fn main() -> ! {
     // instantiate a timer objec for the TC4 peripheral
     let mut timer = TimerCounter::tc4_(tc45, peripherals.TC4, &mut peripherals.PM);
     // start a 4 MHz timer
-    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_m0/examples/eic.rs

@@ -19,7 +19,7 @@ use hal::clock::GenericClockController;
 use hal::delay::Delay;
 use hal::eic::pin::{ExtInt2, Sense};
 use hal::eic::EIC;
-use hal::gpio::v2::{Pin, PullUpInterrupt};
+use hal::gpio::{Pin, PullUpInterrupt};
 use hal::prelude::*;
 use pac::{interrupt, CorePeripherals, Peripherals};
 

boards/itsybitsy_m0/examples/pwm.rs

@@ -37,7 +37,7 @@ fn main() -> ! {
     let gclk0 = clocks.gclk0();
     let mut pwm3 = Pwm3::new(
         &clocks.tcc2_tc3(&gclk0).unwrap(),
-        1.khz(),
+        1.kHz(),
         peripherals.TC3,
         &mut peripherals.PM,
     );

boards/itsybitsy_m0/examples/ssd1306_graphicsmode_128x64_i2c.rs

@@ -78,7 +78,6 @@ use bsp::entry;
 use hal::clock::GenericClockController;
 use hal::delay::Delay;
 use hal::prelude::*;
-use hal::time::KiloHertz;
 use pac::{CorePeripherals, Peripherals};
 
 #[entry]
@@ -98,7 +97,7 @@ fn main() -> ! {
     let i2c_sercom: bsp::I2cSercom = peripherals.SERCOM3;
     let i2c = bsp::i2c_master(
         &mut clocks,
-        KiloHertz(400),
+        400.kHz(),
         i2c_sercom,
         &mut peripherals.PM,
         pins.sda,

boards/itsybitsy_m0/examples/ssd1306_graphicsmode_128x64_spi.rs

@@ -67,7 +67,6 @@ use bsp::entry;
 use hal::clock::GenericClockController;
 use hal::delay::Delay;
 use hal::prelude::*;
-use hal::time::MegaHertz;
 use pac::{CorePeripherals, Peripherals};
 
 #[entry]
@@ -87,7 +86,7 @@ fn main() -> ! {
     let spi_sercom: bsp::SpiSercom = peripherals.SERCOM4;
     let spi = bsp::spi_master(
         &mut clocks,
-        MegaHertz(10),
+        10.MHz(),
         spi_sercom,
         &mut peripherals.PM,
         pins.sclk,

boards/itsybitsy_m0/examples/ssd1306_terminalmode_128x64_i2c.rs

@@ -77,7 +77,6 @@ use bsp::entry;
 use hal::clock::GenericClockController;
 use hal::delay::Delay;
 use hal::prelude::*;
-use hal::time::KiloHertz;
 use pac::{CorePeripherals, Peripherals};
 
 #[entry]
@@ -97,7 +96,7 @@ fn main() -> ! {
     let i2c_sercom: bsp::I2cSercom = peripherals.SERCOM3;
     let i2c = bsp::i2c_master(
         &mut clocks,
-        KiloHertz(400),
+        400.kHz(),
         i2c_sercom,
         &mut peripherals.PM,
         pins.sda,

boards/itsybitsy_m0/examples/ssd1306_terminalmode_128x64_spi.rs

@@ -61,7 +61,6 @@ use bsp::entry;
 use hal::clock::GenericClockController;
 use hal::delay::Delay;
 use hal::prelude::*;
-use hal::time::MegaHertz;
 use pac::{CorePeripherals, Peripherals};
 
 use ssd1306::{prelude::*, Ssd1306};
@@ -84,7 +83,7 @@ fn main() -> ! {
     let spi_sercom: bsp::SpiSercom = peripherals.SERCOM4;
     let spi = bsp::spi_master(
         &mut clocks,
-        MegaHertz(10),
+        10.MHz(),
         spi_sercom,
         &mut peripherals.PM,
         pins.sclk,

boards/itsybitsy_m0/examples/timers.rs

@@ -12,8 +12,11 @@ use itsybitsy_m0 as bsp;
 
 use bsp::entry;
 use hal::clock::GenericClockController;
-use hal::prelude::*;
+use hal::ehal::digital::OutputPin;
+use hal::nb;
+use hal::time::Hertz;
 use hal::timer::TimerCounter;
+use hal::timer_traits::InterruptDrivenTimer;
 use pac::Peripherals;
 
 #[entry]
@@ -35,7 +38,7 @@ fn main() -> ! {
     // instantiate a timer objec for the TC4 peripheral
     let mut timer = TimerCounter::tc4_(tc45, peripherals.TC4, &mut peripherals.PM);
     // start a 5Hz timer
-    timer.start(5.hz());
+    timer.start(Hertz::Hz(5).into_duration());
 
     // toggle the red LED at the frequency set by the timer
     loop {

boards/itsybitsy_m0/examples/twitching_usb_mouse.rs

@@ -54,9 +54,11 @@ fn main() -> ! {
         USB_HID = Some(HIDClass::new(bus_allocator, MouseReport::desc(), 60));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Twitchy Mousey")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Twitchy Mousey")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .build(),
         );
     }
@@ -72,6 +74,8 @@ fn main() -> ! {
             x: 0,
             y: 4,
             buttons: 0,
+            pan: 0,
+            wheel: 0,
         })
         .ok()
         .unwrap_or(0);
@@ -80,6 +84,8 @@ fn main() -> ! {
             x: 0,
             y: -4,
             buttons: 0,
+            pan: 0,
+            wheel: 0,
         })
         .ok()
         .unwrap_or(0);

boards/itsybitsy_m0/examples/uart.rs

@@ -16,6 +16,7 @@ use itsybitsy_m0 as bsp;
 use bsp::entry;
 use hal::clock::GenericClockController;
 use hal::dmac::{DmaController, PriorityLevel};
+use hal::nb;
 use hal::prelude::*;
 
 use pac::Peripherals;
@@ -49,7 +50,7 @@ fn main() -> ! {
     // Setup UART peripheral
     let uart = bsp::uart(
         &mut clocks,
-        9600.hz(),
+        9600.Hz(),
         uart_sercom,
         &mut pm,
         uart_rx,

boards/itsybitsy_m0/examples/usb_echo.rs

@@ -50,9 +50,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_m0/src/lib.rs

@@ -7,14 +7,12 @@ pub use atsamd_hal as hal;
 pub use hal::ehal;
 pub use hal::pac;
 
+use embedded_hal_02::timer::{CountDown, Periodic};
 use hal::clock::GenericClockController;
-use hal::ehal::timer::{CountDown, Periodic};
 use hal::sercom::{
-    v2::{
-        spi,
-        uart::{self, BaudMode, Oversampling},
-    },
-    I2CMaster3,
+    i2c, spi,
+    uart::{self, BaudMode, Oversampling},
+    Sercom3,
 };
 use hal::time::Hertz;
 use pac::{SERCOM0, SERCOM3, SERCOM4};
@@ -254,30 +252,39 @@ pub fn spi_master(
     let (miso, mosi, sclk) = (miso.into(), mosi.into(), sclk.into());
     let pads = spi::Pads::default().data_in(miso).data_out(mosi).sclk(sclk);
     spi::Config::new(pm, sercom, pads, freq)
-        .baud(baud)
+        .baud(baud.into())
         .spi_mode(spi::MODE_0)
         .enable()
 }
 
-/// I2C master for the labelled SDA & SCL pins
-pub type I2C = I2CMaster3<Sda, Scl>;
+/// I2C pads for the labelled I2C peripheral
+///
+/// You can use these pads with other, user-defined [`i2c::Config`]urations.
+pub type I2cPads = i2c::Pads<Sercom3, Sda, Scl>;
+
+/// I2C master for the labelled I2C peripheral
+///
+/// This type implements [`Read`](ehal::blocking::i2c::Read),
+/// [`Write`](ehal::blocking::i2c::Write) and
+/// [`WriteRead`](ehal::blocking::i2c::WriteRead).
+pub type I2c = i2c::I2c<i2c::Config<I2cPads>>;
 
 /// Convenience for setting up the labelled SDA, SCL pins to
 /// operate as an I2C master running at the specified frequency.
 pub fn i2c_master(
     clocks: &mut GenericClockController,
     baud: impl Into<Hertz>,
-    sercom: I2cSercom,
+    sercom: Sercom3,
     pm: &mut pac::PM,
     sda: impl Into<Sda>,
     scl: impl Into<Scl>,
-) -> I2C {
+) -> I2c {
     let gclk0 = clocks.gclk0();
     let clock = &clocks.sercom3_core(&gclk0).unwrap();
+    let freq = clock.freq();
     let baud = baud.into();
-    let sda = sda.into();
-    let scl = scl.into();
-    I2CMaster3::new(clock, baud, sercom, pm, sda, scl)
+    let pads = i2c::Pads::new(sda.into(), scl.into());
+    i2c::Config::new(pm, sercom, pads, freq).baud(baud).enable()
 }
 
 /// UART pads for the labelled RX & TX pins

boards/itsybitsy_m4/CHANGELOG.md

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