Adopt new dependencies, Rust 2024

Drivers have dropped their type states, so we do the same. Without the
type states, we don't need the aliases anymore.

Given the LPSPI change, we have to manually configure the hardware chip
select. I'm doing that directly in the example.

Author: mciantyre

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+**BREAKING** Adopt new imxrt-rs dependencies, including
+
+- imxrt-hal 0.6
+- imxrt-iomuxc 0.3
+- imxrt-ral 0.6
+
+Adoption changes the representation of drivers. See the imxrt-hal changelog for
+more information.
+
+**BREAKING** Adopt Rust 2024 throghout all packages.
+
 Add USDHC1 clock configuration and expose the USDHC1 peripheral instance in
 board resources. The BSP configures the USDHC1 root clock and publishes the
 frequency as `USDHC1_FREQUENCY`. Pin muxing and driver initialization are left

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "teensy4-bsp"
-version = "0.5.2"
+version = "0.6.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -15,7 +15,7 @@ autoexamples = false
 
 [workspace.package]
 authors = ["Ian McIntyre <ianpmcintyre@gmail.com>"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/mciantyre/teensy4-rs"
 categories = [
@@ -35,7 +35,7 @@ features = ["critical-section-single-core"]
 
 [dependencies.teensy4-fcb]
 path = "teensy4-fcb"
-version = "0.4"
+version = "0.5"
 
 [dependencies.imxrt-ral]
 workspace = true
@@ -52,7 +52,7 @@ workspace = true
 optional = true
 
 [dependencies.teensy4-pins]
-version = "0.3.1"
+version = "0.4"
 path = "teensy4-pins"
 
 [workspace]
@@ -64,11 +64,11 @@ members = [
 ]
 
 [workspace.dependencies]
-imxrt-boot-gen = { version = "0.3.0", features = ["imxrt1060"] }
-imxrt-hal = { version = "0.5.3", features = ["imxrt1060"] }
-imxrt-iomuxc = { version = "0.2.0", features = ["imxrt1060"] }
-imxrt-log = { version = "0.1" }
-imxrt-ral = { version = "0.5", features = ["imxrt1062"] }
+imxrt-boot-gen = { version = "0.4.0" }
+imxrt-hal = { version = "0.6.0", features = ["imxrt1060"] }
+imxrt-iomuxc = { version = "0.3.0", features = ["imxrt1060"] }
+imxrt-log = { version = "0.2.0", default-features = false }
+imxrt-ral = { version = "0.6.0", features = ["imxrt1062"] }
 imxrt-rt = { version = "0.1.4", features = ["device"] }
 
 [features]
@@ -88,21 +88,21 @@ rustdoc-args = ["--cfg", "docsrs"]
 default-target = "thumbv7em-none-eabihf"
 
 [dev-dependencies.teensy4-panic]
-version = "0.2"
+version = "0.3"
 path = "teensy4-panic"
 features = ["log"]
 
 [dev-dependencies]
-defmt = "0.3"
+defmt = "1.0"
 defmt-bbq = "0.1"
 embedded-hal = "0.2"
-imxrt-log = { workspace = true, default-features = false, features = ["usbd", "log"] }
+imxrt-log = { workspace = true, features = ["usbd", "log"] }
 log = "0.4"
 nb = "1"
 rtic = { version = "2", features = ["thumbv7-backend"] }
 rtic-monotonics = { version = "1", default-features = false, features = ["cortex-m-systick"] }
-usb-device = "0.2"
-usbd-serial = "0.1"
+usb-device = "0.3"
+usbd-serial = "0.2"
 
 [[example]]
 name = "blocking_gpt"
@@ -151,3 +151,9 @@ required-features = ["rt"]
 [[example]]
 name = "rtic_usb_log"
 required-features = ["rt"]
+
+[patch.crates-io.imxrt-hal]
+git = "https://github.com/mciantyre/imxrt-hal"
+
+[patch.crates-io.imxrt-log]
+git = "https://github.com/mciantyre/imxrt-hal"

examples/blocking_gpt.rs

@@ -22,7 +22,7 @@ const GPT_DIVIDER: u32 = 8;
 /// ...the GPT frequency is
 const GPT_FREQUENCY: u32 = board::PERCLK_FREQUENCY / GPT_DIVIDER;
 
-fn init_gpt<const N: u8>(gpt: &mut gpt::Gpt<N>) {
+fn init_gpt(gpt: &mut gpt::Gpt) {
     gpt.set_clock_source(GPT_CLOCK_SOURCE);
     gpt.set_divider(GPT_DIVIDER);
 }

examples/blocking_pit.rs

@@ -21,7 +21,8 @@ fn main() -> ! {
         ..
     } = board::t40(board::instances());
     let led = board::led(&mut gpio2, pins.p13);
-    let mut delay = Blocking::<_, { board::PERCLK_FREQUENCY }>::from_pit(pit.0);
+    let mut delay =
+        Blocking::<_, { board::PERCLK_FREQUENCY }>::from_pit(pit, bsp::hal::pit::Channel::Chan0);
     loop {
         delay.block_ms(500);
         led.toggle();

examples/blocking_uart.rs

@@ -30,7 +30,7 @@ fn main() -> ! {
     } = board::t40(board::instances());
     let led = board::led(&mut gpio2, pins.p13);
 
-    let mut lpuart2: board::Lpuart2 = board::lpuart(lpuart2, pins.p14, pins.p15, 115200);
+    let mut lpuart2: board::Lpuart = board::lpuart(lpuart2, pins.p14, pins.p15, 115200);
     loop {
         led.toggle();
         let byte = nb::block!(lpuart2.read()).unwrap();

examples/rtic_configure_pin.rs

@@ -10,13 +10,10 @@ use teensy4_panic as _;
 #[rtic::app(device = teensy4_bsp, peripherals = true)]
 mod app {
     use bsp::board;
-    use bsp::{
-        hal::{gpio, iomuxc},
-        pins,
-    };
+    use bsp::hal::{gpio, iomuxc};
     use teensy4_bsp as bsp;
 
-    type Input = gpio::Input<pins::t40::P7>;
+    type Input = gpio::Input;
 
     const PIN_CONFIG: iomuxc::Config =
         iomuxc::Config::zero().set_pull_keeper(Some(iomuxc::PullKeeper::Pulldown100k));
@@ -40,7 +37,7 @@ mod app {
         let led = board::led(&mut gpio2, pins.p13);
 
         iomuxc::configure(&mut pins.p7, PIN_CONFIG);
-        let input = gpio2.input(pins.p7);
+        let input = gpio2.input(pins.p7).expect("P7 is a GPIO2 pin");
 
         (Shared {}, Local { led, input })
     }

examples/rtic_defmt_usb_log.rs

@@ -49,15 +49,16 @@ mod app {
     use bsp::{
         board,
         hal::usbd::{
-            gpt::{Instance::Gpt0, Mode},
             BusAdapter, EndpointMemory, EndpointState, Speed,
+            gpt::{Instance::Gpt0, Mode},
         },
     };
     use teensy4_bsp as bsp;
 
     use usb_device::{
+        LangID,
         bus::UsbBusAllocator,
-        device::{UsbDevice, UsbDeviceBuilder, UsbDeviceState, UsbVidPid},
+        device::{StringDescriptors, UsbDevice, UsbDeviceBuilder, UsbDeviceState, UsbVidPid},
     };
     use usbd_serial::SerialPort;
 
@@ -131,7 +132,8 @@ mod app {
         let usb_bus = cx.local.usb_bus.insert(UsbBusAllocator::new(bus_adapter));
         let usb_class = SerialPort::new(usb_bus);
         let usb_device = UsbDeviceBuilder::new(usb_bus, VID_PID)
-            .product(PRODUCT)
+            .strings(&[StringDescriptors::new(LangID::EN_US).product(PRODUCT)])
+            .expect("Failed to set string descriptors")
             .device_class(usbd_serial::USB_CLASS_CDC)
             .build();
 

examples/rtic_gpt.rs

@@ -27,11 +27,11 @@ mod app {
     #[shared]
     struct Shared {
         led: board::Led,
-        gpt1: hal::gpt::Gpt1,
-        gpt2: hal::gpt::Gpt2,
+        gpt1: hal::gpt::Gpt,
+        gpt2: hal::gpt::Gpt,
     }
 
-    fn init_gpt<const N: u8>(gpt: &mut hal::gpt::Gpt<N>) {
+    fn init_gpt(gpt: &mut hal::gpt::Gpt) {
         gpt.set_clock_source(GPT_CLOCK_SOURCE);
         gpt.set_divider(GPT_DIVIDER);
         gpt.set_output_compare_count(OCR, GPT_DELAY_MS);

examples/rtic_lpspi.rs

@@ -22,6 +22,7 @@ use teensy4_panic as _;
 #[rtic::app(device = teensy4_bsp, peripherals = true, dispatchers = [KPP])]
 mod app {
     use bsp::board;
+    use bsp::hal::iomuxc;
     use teensy4_bsp as bsp;
 
     use imxrt_log as logging;
@@ -35,10 +36,10 @@ mod app {
     /// These resources are local to individual tasks.
     #[local]
     struct Local {
-        lpspi3: board::Lpspi3<teensy4_bsp::pins::common::P1, teensy4_bsp::pins::common::P0>,
+        lpspi3: board::Lpspi,
 
         /// Note: lpspi4 SCK is on pin 13 which collides with the Teensy 4/4.1 LED
-        lpspi4: board::Lpspi4,
+        lpspi4: board::Lpspi,
 
         /// A poller to control USB logging.
         poller: logging::Poller,
@@ -49,7 +50,7 @@ mod app {
         // Specify 't40', 't41', or 'tmm' (for MicroMod) depending on
         // which board you're using.
         let board::Resources {
-            pins,
+            mut pins,
             usb,
             lpspi3,
             lpspi4,
@@ -58,13 +59,15 @@ mod app {
 
         let poller = logging::log::usbd(usb, logging::Interrupts::Enabled).unwrap();
 
+        // Prepare the hardware chip select until the
+        // HAL can help us out.
+        iomuxc::lpspi::prepare(&mut pins.p0);
         let mut lpspi3 = board::lpspi(
             lpspi3,
             board::LpspiPins {
                 sdo: pins.p26,
                 sdi: pins.p1,
                 sck: pins.p27,
-                pcs0: pins.p0,
             },
             1_000_000,
         );
@@ -73,13 +76,14 @@ mod app {
             spi.set_peripheral_enable(true);
         });
 
-        let lpspi4: board::Lpspi4 = board::lpspi(
+        // See note above about preparing chip selects.
+        iomuxc::lpspi::prepare(&mut pins.p10);
+        let lpspi4: board::Lpspi = board::lpspi(
             lpspi4,
             board::LpspiPins {
                 sdo: pins.p11,
                 sdi: pins.p12,
                 sck: pins.p13,
-                pcs0: pins.p10,
             },
             1_000_000,
         );

examples/rtic_pit.rs

@@ -18,21 +18,22 @@ mod app {
     #[local]
     struct Local {
         led: board::Led,
-        pit: bsp::hal::pit::Pit<2>,
+        pit: bsp::hal::pit::Pit,
     }
 
     #[init]
     fn init(cx: init::Context) -> (Shared, Local) {
         let board::Resources {
             pins,
-            pit: (_, _, mut pit, _),
+            mut pit,
             mut gpio2,
             ..
         } = board::t40(cx.device);
         let led = board::led(&mut gpio2, pins.p13);
-        pit.set_interrupt_enable(true);
-        pit.set_load_timer_value(PIT_DELAY_MS);
-        pit.enable();
+        use bsp::hal::pit::Channel;
+        pit.set_interrupt_enable(Channel::Chan2, true);
+        pit.set_load_timer_value(Channel::Chan2, PIT_DELAY_MS);
+        pit.enable(Channel::Chan2);
         (Shared {}, Local { led, pit })
     }
 
@@ -48,9 +49,10 @@ mod app {
         let pit = cx.local.pit;
         let led = cx.local.led;
 
+        use bsp::hal::pit::Channel;
         led.toggle();
-        while pit.is_elapsed() {
-            pit.clear_elapsed();
+        while pit.is_elapsed(Channel::Chan2) {
+            pit.clear_elapsed(Channel::Chan2);
         }
     }
 }