Skip to content

Commit

Permalink
Remove panic_probe dependency from examples and add test-parser-macros
Browse files Browse the repository at this point in the history
dependency
  • Loading branch information
tullom committed Jan 23, 2025
1 parent 3a87161 commit 7226df4
Show file tree
Hide file tree
Showing 16 changed files with 22 additions and 16 deletions.
4 changes: 4 additions & 0 deletions examples/rt685s-evk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ futures = { version = "0.3.30", default-features = false, features = [
] }
mimxrt600-fcb = "0.1.0"
rand = { version = "0.8.5", default-features = false }
test-parser-macros = { path = "../../../test-parser/test-parser-macros" }

[profile.release]
lto = true # better optimizations

[features]
test-parser = []
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/clocks-blinky.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use embassy_executor::Spawner;
use embassy_imxrt::iopctl::IopctlPin;
use embassy_imxrt::{clocks, gpio};
use embassy_time::Timer;
use {defmt_rtt as _, embassy_imxrt as _, panic_probe as _};
use {defmt_rtt as _, embassy_imxrt as _};

#[embassy_executor::main]
async fn main(_spawner: Spawner) {
Expand Down
1 change: 0 additions & 1 deletion examples/rt685s-evk/src/bin/crc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ extern crate embassy_imxrt_examples;
use defmt::*;
use embassy_executor::Spawner;
use embassy_imxrt::crc::{Config, Crc, Polynomial};
use {defmt_rtt as _, panic_probe as _};

#[embassy_executor::main]
async fn main(_spawner: Spawner) {
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/dma-mem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#![no_main]

use defmt::*;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::dma::channel::Channel;
use embassy_imxrt::dma::transfer::{Priority, Transfer, TransferOptions, Width};
use embassy_imxrt::dma::Dma;
use embassy_imxrt::peripherals::*;
use {defmt_rtt as _, panic_probe as _};

const TEST_LEN: usize = 16;

Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/gpio-async-input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
extern crate embassy_imxrt_examples;

use defmt::*;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::gpio;
use embassy_time::{Duration, Ticker};
use {defmt_rtt as _, panic_probe as _};

#[embassy_executor::task]
async fn monitor_task(mut monitor: gpio::Input<'static>) {
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/hello-world.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
extern crate embassy_imxrt_examples;

use defmt::info;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};

#[embassy_executor::main]
async fn main(_spawner: Spawner) {
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/i2c-master.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
extern crate embassy_imxrt_examples;

use defmt::{error, info};
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::i2c;
use embassy_time::Timer;
use embedded_hal_1::i2c::I2c;
use {defmt_rtt as _, panic_probe as _};

const ACC_ADDR: u8 = 0x1E;

Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/rng.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
extern crate embassy_imxrt_examples;

use defmt::*;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::rng::Rng;
use embassy_imxrt::{bind_interrupts, peripherals, rng};
use rand::RngCore;
use {defmt_rtt as _, panic_probe as _};

bind_interrupts!(struct Irqs {
RNG => rng::InterruptHandler<peripherals::RNG>;
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/rtc-time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
extern crate embassy_imxrt_examples;

use defmt::info;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::time_driver::*;
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};

#[embassy_executor::main]
async fn main(_spawner: Spawner) {
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/sha256-async.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#![no_main]

use defmt::*;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::hashcrypt::{hasher, Hashcrypt};
use {defmt_rtt as _, panic_probe as _};

#[embassy_executor::main]
async fn main(_spawner: Spawner) {
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/sha256.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#![no_main]

use defmt::*;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::hashcrypt::{hasher, Hashcrypt};
use {defmt_rtt as _, panic_probe as _};

#[embassy_executor::main]
async fn main(_spawner: Spawner) {
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/time-driver-blinky.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use defmt::info;
use embassy_executor::Spawner;
use embassy_imxrt::gpio;
use embassy_time::Timer;
use {defmt_rtt as _, embassy_imxrt as _, panic_probe as _};
use {defmt_rtt as _, embassy_imxrt as _};

#[embassy_executor::main]
async fn main(_spawner: Spawner) -> ! {
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/uart-async.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
extern crate embassy_imxrt_examples;

use defmt::info;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::uart::{Async, Uart};
use embassy_imxrt::{bind_interrupts, peripherals, uart};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};

bind_interrupts!(struct Irqs {
FLEXCOMM2 => uart::InterruptHandler<peripherals::FLEXCOMM2>;
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/uart.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
extern crate embassy_imxrt_examples;

use defmt::info;
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::uart::{Blocking, Uart, UartRx, UartTx};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};

#[embassy_executor::task]
async fn usart4_task(mut uart: UartRx<'static, Blocking>) {
Expand Down
2 changes: 1 addition & 1 deletion examples/rt685s-evk/src/bin/wwdt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ extern crate embassy_imxrt_examples;

use cortex_m::peripheral::NVIC;
use defmt::{info, warn};
use defmt_rtt as _;
use embassy_executor::Spawner;
use embassy_imxrt::pac::{interrupt, Interrupt};
use embassy_imxrt::wwdt::WindowedWatchdog;
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};

#[embassy_executor::main]
async fn main(_spawner: Spawner) {
Expand Down
7 changes: 5 additions & 2 deletions examples/rt685s-evk/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#![no_std]

use defmt_rtt as _;
use mimxrt600_fcb::FlexSPIFlashConfigurationBlock;
use {defmt_rtt as _, panic_probe as _};

#[cfg(not(feature = "test-parser"))]
use panic_probe as _;
#[cfg(feature = "test-parser")]
use test_parser_macros as _;
// auto-generated version information from Cargo.toml
include!(concat!(env!("OUT_DIR"), "/biv.rs"));

Expand Down

0 comments on commit 7226df4

Please sign in to comment.