Skip to content
Open
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
207 changes: 25 additions & 182 deletions platform/dev-imxrt/Cargo.lock

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions platform/dev-mcxa/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 8 additions & 15 deletions platform/dev-mcxa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ embassy-executor = { version = "0.10.0", default-features = false, features = [
"executor-interrupt",
"defmt",
] }
embassy-mcxa = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a", features = [
embassy-mcxa = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944", features = [
"defmt",
"unstable-pac",
"mcxa2xx",
Expand All @@ -59,13 +59,6 @@ uart-service = { git = "https://github.com/OpenDevicePartnership/embedded-servic
] }
static_cell = "2.1.0"
platform-common = { path = "../platform-common", features = ["mock"] }
# uart-service (v0.2.0 branch) depends on embedded-io-async 0.6, but
# embassy-mcxa upstream uses 0.7. We bring in 0.6 explicitly so we can adapt
# the Lpuart driver to the older trait surface required by uart-service.
# TODO: once uart-service is updated to use embedded-io-async 0.7, remove this dependency.
embedded-io-async-6 = { version = "0.6", package = "embedded-io-async" }
embedded-io-6 = { version = "0.6", package = "embedded-io" }

panic-probe = { version = "1.0.0", features = ["print-defmt"] }

[package.metadata.cargo-machete]
Expand All @@ -76,10 +69,10 @@ ignored = ["cortex-m", "cortex-m-rt"]
# embassy-time/embassy-time-driver from crates.io, which would cause a duplicate
# `links` conflict. Force everyone to use the git versions.
[patch.crates-io]
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" }
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" }
embassy-time-queue-utils = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" }
embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" }
embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" }
embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" }
embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" }
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" }
embassy-time-queue-utils = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" }
embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" }
embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" }
embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" }
embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" }
7 changes: 3 additions & 4 deletions platform/dev-mcxa/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@

mod board;
mod clocks;
mod uart_adapter;

use board::Board;
use defmt::info;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_mcxa::lpuart;
use panic_probe as _;
use platform_common::board::BoardIo;
use platform_common::mock::MockOdpRelayHandler;
use static_cell::StaticCell;
use uart_adapter::UartAdapter;

#[embassy_executor::task]
async fn uart_service(uart: UartAdapter, relay: MockOdpRelayHandler) {
async fn uart_service(uart: lpuart::LpuartBbq, relay: MockOdpRelayHandler) {
info!("Starting uart service");
static UART_SERVICE: StaticCell<uart_service::Service<MockOdpRelayHandler>> = StaticCell::new();
let uart_service = uart_service::Service::new(relay).unwrap();
Expand All @@ -36,5 +35,5 @@ async fn main(spawner: Spawner) {
info!("Hello world from MCXA!");

let relay = platform_common::mock::init(spawner).await;
spawner.spawn(uart_service(UartAdapter(board.uart), relay).expect("Failed to spawn UART service task"));
spawner.spawn(uart_service(board.uart, relay).expect("Failed to spawn UART service task"));
}
44 changes: 0 additions & 44 deletions platform/dev-mcxa/src/uart_adapter.rs

This file was deleted.

Loading
Loading