Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Cargo.lock
/out
/svd/imxrt1062/*
.vscode/
.claude/

# Let developers specify their own configs in non Teensy crates
imxrt1062-fcb-gen/.cargo
Expand Down
28 changes: 21 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,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-rt = { version = "0.1.4", features = ["device"] }
imxrt-hal = { path = "../imxrt-hal", features = ["imxrt1060"] }
imxrt-iomuxc = { version = "0.3.0", features = ["imxrt1060"] }
imxrt-log = { path = "../imxrt-hal/logging", default-features = false }
imxrt-ral = { path = "../imxrt-ral", features = ["imxrt1062"] }
Comment on lines +68 to +71
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the unreleased packages were expressed as [patch] directives pointing to git repositories, we might have an easier time getting this code building in CI / other folk's development environments. The change would look like

Suggested change
imxrt-hal = { path = "../imxrt-hal", features = ["imxrt1060"] }
imxrt-iomuxc = { version = "0.3.0", features = ["imxrt1060"] }
imxrt-log = { path = "../imxrt-hal/logging", default-features = false }
imxrt-ral = { path = "../imxrt-ral", features = ["imxrt1062"] }
imxrt-hal = { version = "0.6.0", features = ["imxrt1060"] }
imxrt-iomuxc = { version = "0.3.0", features = ["imxrt1060"] }
imxrt-log = { version = "0.2" }
imxrt-ral = { version = "0.6", features = ["imxrt1062"] }

with supplements like

[patch.crates-io.imxrt-ral]
git = "https://github.com/imxrt-rs/imxrt-ral"

[patch.crates-io.imxrt-iomuxc]
git = "https://github.com/imxrt-rs/imxrt-iomuxc"

# etc...

imxrt-rt = { version = "0.1.5", features = ["device"] }

[features]
rt = ["dep:imxrt-rt", "imxrt-ral/rt"]
Expand Down Expand Up @@ -101,8 +101,8 @@ 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"
Expand Down Expand Up @@ -151,3 +151,17 @@ required-features = ["rt"]
[[example]]
name = "rtic_usb_log"
required-features = ["rt"]

[[example]]
name = "rtic_sai_dma_tone"
required-features = ["rt"]

[[example]]
name = "rtic_sai_poll_tone"
required-features = ["rt"]

[patch.crates-io.imxrt-ral]
path = "../imxrt-ral"

[patch.crates-io.imxrt-iomuxc]
git = "https://github.com/imxrt-rs/imxrt-iomuxc"
7 changes: 5 additions & 2 deletions examples/rtic_defmt_usb_log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ mod app {

use usb_device::{
bus::UsbBusAllocator,
device::{UsbDevice, UsbDeviceBuilder, UsbDeviceState, UsbVidPid},
device::{
StringDescriptors, UsbDevice, UsbDeviceBuilder, UsbDeviceState, UsbVidPid,
},
};
use usbd_serial::SerialPort;

Expand Down Expand Up @@ -131,7 +133,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::default().product(PRODUCT)])
.unwrap()
.device_class(usbd_serial::USB_CLASS_CDC)
.build();

Expand Down
4 changes: 1 addition & 3 deletions examples/rtic_lpspi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ 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::Lpspi3<teensy4_bsp::pins::common::P1>,

/// Note: lpspi4 SCK is on pin 13 which collides with the Teensy 4/4.1 LED
lpspi4: board::Lpspi4,
Expand Down Expand Up @@ -64,7 +64,6 @@ mod app {
sdo: pins.p26,
sdi: pins.p1,
sck: pins.p27,
pcs0: pins.p0,
},
1_000_000,
);
Expand All @@ -79,7 +78,6 @@ mod app {
sdo: pins.p11,
sdi: pins.p12,
sck: pins.p13,
pcs0: pins.p10,
},
1_000_000,
);
Expand Down
Loading
Loading