From efb822064652793af9bddc7c8dbe5a415d5460a2 Mon Sep 17 00:00:00 2001 From: Finomnis Date: Thu, 30 May 2024 12:36:28 +0200 Subject: [PATCH 01/17] Update to eh-1; minor rework --- Cargo.toml | 13 ++++--------- src/lib.rs | 9 ++++----- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9968867..00b82d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,21 +16,16 @@ exclude = ["/.gitignore", "/.github/", "/.vscode/"] default = [] # Do not use; internally required for Github CI -github_ci = ["teensy4-bsp", "teensy4-panic"] +_ci = ["imxrt-ral/imxrt1062"] [dependencies] -imxrt-hal = { version = "0.5.3", default-features = false } +imxrt-hal = { version = "0.5.5", default-features = false } imxrt-ral = "0.5.3" cortex-m = "0.7.7" -nb = "1.1.0" -embedded-hal = "0.2.7" - -# Additional CI dependencies -teensy4-bsp = { version = "0.4", optional = true } -teensy4-panic = { version = "0.2", default-features = false, optional = true } +embedded-io = "0.6.1" [dev-dependencies] -teensy4-bsp = { version = "0.4.4", features = ["rt"] } +teensy4-bsp = { version = "0.5.0", features = ["rt"] } teensy4-panic = { version = "0.2.3", default-features = false } rtic = { version = "2.0.1", features = ["thumbv7-backend"] } imxrt-log = { version = "0.1.1", default-features = false, features = [ diff --git a/src/lib.rs b/src/lib.rs index 8a37b50..d71080b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,7 +11,6 @@ pub mod _deps { pub use embedded_hal; pub use imxrt_hal; pub use imxrt_ral; - pub use nb; } /// Registers the UART panic handler. @@ -31,10 +30,9 @@ macro_rules! register { fn panic(info: &::core::panic::PanicInfo) -> ! { use ::core::fmt::Write as _; - use $crate::_deps::embedded_hal::serial::Write as _; + use $crate::_deps::embedded_io::Write as _; use $crate::_deps::imxrt_hal as hal; use $crate::_deps::imxrt_ral as ral; - use $crate::_deps::nb::block; use hal::ccm; use hal::lpuart::{Baud, Direction, Lpuart, Pins, Watermark}; @@ -75,10 +73,11 @@ macro_rules! register { fn write_str(&mut self, s: &str) -> ::core::fmt::Result { for &b in s.as_bytes() { if b == b'\n' { - let _ = block!(self.uart.write(b'\r')); + let _ = self.uart.write(b'\r'); } - let _ = block!(self.uart.write(b)); + let _ = self.uart.write(b); } + self.uart.flush(); Ok(()) } } From d41b6f08d807ee411382b1e2907521a8efa21762 Mon Sep 17 00:00:00 2001 From: Finomnis Date: Thu, 30 May 2024 12:40:55 +0200 Subject: [PATCH 02/17] Attempt to fix src --- src/lib.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index d71080b..84c952f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,7 @@ #[doc(hidden)] pub mod _deps { pub use cortex_m; - pub use embedded_hal; + pub use embedded_io; pub use imxrt_hal; pub use imxrt_ral; } @@ -73,11 +73,10 @@ macro_rules! register { fn write_str(&mut self, s: &str) -> ::core::fmt::Result { for &b in s.as_bytes() { if b == b'\n' { - let _ = self.uart.write(b'\r'); + let _ = self.uart.write(b"\r"); } - let _ = self.uart.write(b); + let _ = self.uart.write(core::slice::from_ref(&b)); } - self.uart.flush(); Ok(()) } } @@ -88,7 +87,7 @@ macro_rules! register { ::core::writeln!(uart, "{}", info).ok(); ::core::writeln!(uart).ok(); - let _ = block!(uart.uart.flush()); + let _ = uart.uart.flush(); $idle_func(); } From 50d07d9a60e5876cae09cb154f58585fac3f12c9 Mon Sep 17 00:00:00 2001 From: Finomnis Date: Thu, 30 May 2024 12:52:42 +0200 Subject: [PATCH 03/17] Another fix --- Cargo.toml | 2 +- examples/with-logging-and-sos.rs | 17 +++++++++-------- src/lib.rs | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 00b82d1..2443439 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ embedded-io = "0.6.1" [dev-dependencies] teensy4-bsp = { version = "0.5.0", features = ["rt"] } teensy4-panic = { version = "0.2.3", default-features = false } -rtic = { version = "2.0.1", features = ["thumbv7-backend"] } +rtic = { version = "2.1.1", features = ["thumbv7-backend"] } imxrt-log = { version = "0.1.1", default-features = false, features = [ "log", "lpuart", diff --git a/examples/with-logging-and-sos.rs b/examples/with-logging-and-sos.rs index 03ed561..4474dc3 100644 --- a/examples/with-logging-and-sos.rs +++ b/examples/with-logging-and-sos.rs @@ -16,11 +16,10 @@ mod app { use bsp::board; use bsp::hal; - use bsp::logging; use hal::gpt; - use embedded_hal::serial::Write; + use embedded_io::Write; const LOG_POLL_INTERVAL: u32 = board::PERCLK_FREQUENCY / 100; const LOG_DMA_CHANNEL: usize = 0; @@ -28,7 +27,7 @@ mod app { #[local] struct Local { poll_log: hal::pit::Pit3, - log_poller: logging::Poller, + log_poller: imxrt_log::Poller, gpt1: hal::gpt::Gpt1, } @@ -49,12 +48,14 @@ mod app { // Logging let log_dma = dma[LOG_DMA_CHANNEL].take().unwrap(); let mut log_uart = board::lpuart(lpuart6, pins.p1, pins.p0, 115200); - for &ch in "\r\n===== i.MX RT UART Panic Example =====\r\n\r\n".as_bytes() { - nb::block!(log_uart.write(ch)).unwrap(); - } - nb::block!(log_uart.flush()).unwrap(); + + log_uart + .write_all(b"\r\n===== i.MX RT UART Panic Example =====\r\n\r\n") + .unwrap(); + log_uart.flush().unwrap(); + let log_poller = - logging::log::lpuart(log_uart, log_dma, logging::Interrupts::Enabled).unwrap(); + imxrt_log::log::lpuart(log_uart, log_dma, imxrt_log::Interrupts::Enabled).unwrap(); poll_log.set_interrupt_enable(true); poll_log.set_load_timer_value(LOG_POLL_INTERVAL); poll_log.enable(); diff --git a/src/lib.rs b/src/lib.rs index 84c952f..ec315bf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -73,9 +73,9 @@ macro_rules! register { fn write_str(&mut self, s: &str) -> ::core::fmt::Result { for &b in s.as_bytes() { if b == b'\n' { - let _ = self.uart.write(b"\r"); + let _ = self.uart.write_all(b"\r"); } - let _ = self.uart.write(core::slice::from_ref(&b)); + let _ = self.uart.write_all(core::slice::from_ref(&b)); } Ok(()) } From 9eb2c4392f072c0ed7aadea509dae1ff19c9711e Mon Sep 17 00:00:00 2001 From: Finomnis Date: Thu, 30 May 2024 13:04:59 +0200 Subject: [PATCH 04/17] Fix docs --- src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index ec315bf..20bdfea 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,11 +18,11 @@ pub mod _deps { /// # Arguments /// /// - `uart`: A peripheral defined in [`imxrt_ral::lpuart`]. -/// - `tx_pin`: The UART tx pin. Usually defined in the bsp, such as [`teensy4_bsp::pins::common`]. -/// - `rx_pin`: The UART rx pin. Usually defined in the bsp, such as [`teensy4_bsp::pins::common`]. +/// - `tx_pin`: The UART tx pin. Usually defined in the bsp, such as [`teensy4_bsp::pins::common`](https://docs.rs/teensy4-pins/0.3.2/teensy4_pins/common). +/// - `rx_pin`: The UART rx pin. Usually defined in the bsp, such as [`teensy4_bsp::pins::common`](https://docs.rs/teensy4-pins/0.3.2/teensy4_pins/common). /// - `baud`: The UART baud rate. Most common ones are `9600` and `115200`. /// - `idle_func`: Optional. Specifies what function to enter in the end. Default is [`cortex_m::asm::udf`], but this could -/// for example be used to enter [`teensy4_panic::sos`]. +/// for example be used to enter [`teensy4_panic::sos`](https://docs.rs/teensy4-panic/0.2.3/teensy4_panic/fn.sos.html). #[macro_export] macro_rules! register { ($uart: ident, $tx_pin: ident, $rx_pin: ident, $baud: expr, $idle_func: expr) => { From 4ab37527c7094677a698e3a5d52ca9773b29dcdb Mon Sep 17 00:00:00 2001 From: Finomnis Date: Thu, 30 May 2024 13:16:48 +0200 Subject: [PATCH 05/17] Attemt to find msrv --- .github/workflows/ci.yml | 52 +++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97c3ed5..4693aac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,12 +9,13 @@ on: name: CI +env: + RUSTFLAGS: "-D warnings" + jobs: build_examples: name: Build examples runs-on: ubuntu-latest - env: - RUSTFLAGS: "-D warnings" steps: - name: Checkout sources uses: actions/checkout@v3 @@ -30,8 +31,6 @@ jobs: build_examples_release: name: Build examples (release) runs-on: ubuntu-latest - env: - RUSTFLAGS: "-D warnings" steps: - name: Checkout sources uses: actions/checkout@v3 @@ -61,7 +60,7 @@ jobs: run: cargo fmt --all -- --check - name: Run cargo clippy - run: cargo clippy --all-features --examples -- -D warnings + run: cargo clippy --all-features --examples --libs --bin -- -D warnings docs: name: Documentation @@ -80,12 +79,53 @@ jobs: RUSTDOCFLAGS: "-Dwarnings" run: cargo doc --no-deps --examples --all-features + + msrv: + name: Minimum Supported Rust Version + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Install cargo-binstall + uses: taiki-e/install-action@v2 + with: + tool: cargo-binstall + + - name: Install cargo-msrv + run: cargo binstall --version 0.16.0-beta.20 --no-confirm cargo-msrv + + #- uses: Swatinem/rust-cache@v1 + + - name: Check MSRV + run: cargo msrv --output-format json --all-features --target=thumbv7em-none-eabihf -- cargo check --examples + #run: cargo msrv --log-target=stdout --log-level debug --output-format json --all-features --target=thumbv7em-none-eabihf verify -- cargo check --examples + #run: cargo msrv --output-format json --all-features --target=thumbv7em-none-eabihf verify -- cargo check --examples + + semver: + name: Semantic Versioning + runs-on: ubuntu-latest + env: + # No idea why this fixes the check. + RUSTFLAGS: "--cap-lints=warn" + steps: + - name: Checkout sources + uses: actions/checkout@v4 + - name: Install stable toolchain + uses: dtolnay/rust-toolchain@stable + with: + targets: thumbv7em-none-eabihf + - name: Check semver + uses: obi1kenobi/cargo-semver-checks-action@v2 + with: + feature-group: all-features + release: name: Publish version runs-on: ubuntu-latest environment: production if: github.event_name == 'release' - needs: [build_examples, build_examples_release, lints, docs] + needs: [build_examples, build_examples_release, lints, docs, msrv, semver] steps: - name: Checkout sources uses: actions/checkout@v3 From e8f900e299dda8132e21d857534d4352c9c837fc Mon Sep 17 00:00:00 2001 From: Finomnis Date: Thu, 30 May 2024 13:21:52 +0200 Subject: [PATCH 06/17] Add MSRV 1.68 --- .github/workflows/ci.yml | 6 +++--- Cargo.toml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4693aac..450dce7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: run: cargo fmt --all -- --check - name: Run cargo clippy - run: cargo clippy --all-features --examples --libs --bin -- -D warnings + run: cargo clippy --all-features --examples --lib --bins -- -D warnings docs: name: Documentation @@ -98,9 +98,9 @@ jobs: #- uses: Swatinem/rust-cache@v1 - name: Check MSRV - run: cargo msrv --output-format json --all-features --target=thumbv7em-none-eabihf -- cargo check --examples + #run: cargo msrv --output-format json --all-features --target=thumbv7em-none-eabihf -- cargo check --examples #run: cargo msrv --log-target=stdout --log-level debug --output-format json --all-features --target=thumbv7em-none-eabihf verify -- cargo check --examples - #run: cargo msrv --output-format json --all-features --target=thumbv7em-none-eabihf verify -- cargo check --examples + run: cargo msrv --output-format json --all-features --target=thumbv7em-none-eabihf verify -- cargo check --examples semver: name: Semantic Versioning diff --git a/Cargo.toml b/Cargo.toml index 2443439..26ea917 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ name = "imxrt-uart-panic" authors = ["Finomnis "] version = "0.1.2" +rust-version = "1.68" edition = "2021" license = "MIT OR Apache-2.0" readme = "README.md" From 1def210011ccd5f9ad027adf296a3676c2ef100f Mon Sep 17 00:00:00 2001 From: Finomnis Date: Thu, 30 May 2024 13:26:57 +0200 Subject: [PATCH 07/17] Add min-versions check --- .github/workflows/ci.yml | 60 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 450dce7..a038a07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,12 +120,70 @@ jobs: with: feature-group: all-features + min-versions: + name: Minimal Dependency Versions + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Install nightly toolchain + uses: dtolnay/rust-toolchain@nightly + + - name: Install cargo-hack + uses: taiki-e/install-action@cargo-hack + - name: Install cargo-minimal-versions + uses: taiki-e/install-action@cargo-minimal-versions + + - name: Check with minimal versions + run: cargo minimal-versions check --all-features --workspace --ignore-private + + - name: Build examples with minimal versions + run: cargo minimal-versions build --all-features --examples + + min-versions-msrv: + name: Minimal Dependency Versions (MSRV) + runs-on: ubuntu-latest + needs: [lints, docs] + env: + RUSTFLAGS: "-D warnings" + steps: + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Install nightly toolchain + uses: dtolnay/rust-toolchain@nightly + + - name: Install cargo-binstall + uses: taiki-e/install-action@cargo-binstall + - name: Install cargo-msrv + run: cargo binstall --version 0.16.0-beta.20 --no-confirm cargo-msrv + - name: Install cargo-hack + uses: taiki-e/install-action@cargo-hack + - name: Install cargo-minimal-versions + uses: taiki-e/install-action@cargo-minimal-versions + + - name: Determine MSRV + run: echo "MSRV=$(cargo msrv show --output-format=minimal)" >> $GITHUB_ENV + + - name: Show MSRV + run: echo $MSRV + + - name: Install MSRV Rust version + run: rustup toolchain install $MSRV + + - name: Check with minimal versions + run: cargo +$MSRV minimal-versions check --all-features --workspace --ignore-private + + - name: Build examples with minimal versions + run: cargo +$MSRV minimal-versions build --all-features --examples + release: name: Publish version runs-on: ubuntu-latest environment: production if: github.event_name == 'release' - needs: [build_examples, build_examples_release, lints, docs, msrv, semver] + needs: [build_examples, build_examples_release, lints, docs, msrv, semver, min-versions, min-versions-msrv] steps: - name: Checkout sources uses: actions/checkout@v3 From 1fc4ff525083063afd915217fb534aba092fcb0b Mon Sep 17 00:00:00 2001 From: Finomnis Date: Thu, 30 May 2024 13:28:54 +0200 Subject: [PATCH 08/17] Attempt to fix min-versions check --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a038a07..e8959c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,6 +129,8 @@ jobs: - name: Install nightly toolchain uses: dtolnay/rust-toolchain@nightly + with: + targets: thumbv7em-none-eabihf - name: Install cargo-hack uses: taiki-e/install-action@cargo-hack @@ -153,6 +155,8 @@ jobs: - name: Install nightly toolchain uses: dtolnay/rust-toolchain@nightly + with: + targets: thumbv7em-none-eabihf - name: Install cargo-binstall uses: taiki-e/install-action@cargo-binstall From d454d1e7e53e7a436b18e98092bc08a8713bc65f Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 14:38:41 +0200 Subject: [PATCH 09/17] Fix msrv check --- .github/workflows/ci.yml | 103 ++++++++++----------------------------- 1 file changed, 27 insertions(+), 76 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8959c4..cfadfd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,28 +79,41 @@ jobs: RUSTDOCFLAGS: "-Dwarnings" run: cargo doc --no-deps --examples --all-features - msrv: - name: Minimum Supported Rust Version + name: Minimum Supported Rust Version, based on min dependency versions runs-on: ubuntu-latest steps: - - name: Checkout sources - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Install cargo-binstall + - name: Install nightly toolchain + uses: dtolnay/rust-toolchain@nightly + + - name: Install dependencies uses: taiki-e/install-action@v2 with: - tool: cargo-binstall + tool: cargo-hack, cargo-minimal-versions, cargo-binstall - name: Install cargo-msrv - run: cargo binstall --version 0.16.0-beta.20 --no-confirm cargo-msrv + run: cargo binstall --version 0.16.0-beta.22 --no-confirm cargo-msrv + + # TODO: Revert to this, once https://github.com/foresterre/cargo-msrv/issues/936 is fixed. + # - name: Check with minimal versions + # # To find out the current MSRV, remove the `rust-version` entry from `Cargo.toml` and run: + # # run: cargo minimal-versions msrv --output-format json --all-features --target=thumbv7em-none-eabihf --log-target=stdout --log-level debug + # run: cargo minimal-versions msrv --output-format json --all-features --target thumbv7em-none-eabihf verify - #- uses: Swatinem/rust-cache@v1 + # WORKAROUND: + - name: Determine MSRV + run: echo "MSRV=$(cargo msrv show --output-format=minimal)" >> $GITHUB_ENV - - name: Check MSRV - #run: cargo msrv --output-format json --all-features --target=thumbv7em-none-eabihf -- cargo check --examples - #run: cargo msrv --log-target=stdout --log-level debug --output-format json --all-features --target=thumbv7em-none-eabihf verify -- cargo check --examples - run: cargo msrv --output-format json --all-features --target=thumbv7em-none-eabihf verify -- cargo check --examples + - name: Show MSRV + run: echo $MSRV + + - name: Install MSRV Rust version + run: rustup toolchain install $MSRV --target thumbv7em-none-eabihf + + - name: Check with minimal versions + run: cargo +${MSRV} minimal-versions check --target thumbv7em-none-eabihf --all-features semver: name: Semantic Versioning @@ -118,76 +131,14 @@ jobs: - name: Check semver uses: obi1kenobi/cargo-semver-checks-action@v2 with: - feature-group: all-features - - min-versions: - name: Minimal Dependency Versions - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Install nightly toolchain - uses: dtolnay/rust-toolchain@nightly - with: - targets: thumbv7em-none-eabihf - - - name: Install cargo-hack - uses: taiki-e/install-action@cargo-hack - - name: Install cargo-minimal-versions - uses: taiki-e/install-action@cargo-minimal-versions - - - name: Check with minimal versions - run: cargo minimal-versions check --all-features --workspace --ignore-private - - - name: Build examples with minimal versions - run: cargo minimal-versions build --all-features --examples - - min-versions-msrv: - name: Minimal Dependency Versions (MSRV) - runs-on: ubuntu-latest - needs: [lints, docs] - env: - RUSTFLAGS: "-D warnings" - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Install nightly toolchain - uses: dtolnay/rust-toolchain@nightly - with: - targets: thumbv7em-none-eabihf - - - name: Install cargo-binstall - uses: taiki-e/install-action@cargo-binstall - - name: Install cargo-msrv - run: cargo binstall --version 0.16.0-beta.20 --no-confirm cargo-msrv - - name: Install cargo-hack - uses: taiki-e/install-action@cargo-hack - - name: Install cargo-minimal-versions - uses: taiki-e/install-action@cargo-minimal-versions - - - name: Determine MSRV - run: echo "MSRV=$(cargo msrv show --output-format=minimal)" >> $GITHUB_ENV - - - name: Show MSRV - run: echo $MSRV - - - name: Install MSRV Rust version - run: rustup toolchain install $MSRV - - - name: Check with minimal versions - run: cargo +$MSRV minimal-versions check --all-features --workspace --ignore-private - - - name: Build examples with minimal versions - run: cargo +$MSRV minimal-versions build --all-features --examples + feature-group: "all-features" release: name: Publish version runs-on: ubuntu-latest environment: production if: github.event_name == 'release' - needs: [build_examples, build_examples_release, lints, docs, msrv, semver, min-versions, min-versions-msrv] + needs: [build_examples, build_examples_release, lints, docs, msrv, semver] steps: - name: Checkout sources uses: actions/checkout@v3 From 62662d1188d8c683df94a741982740c6bf10df0b Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 14:43:50 +0200 Subject: [PATCH 10/17] Attempt to fix min-versions --- Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 26ea917..e8d3d1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,10 @@ imxrt-ral = "0.5.3" cortex-m = "0.7.7" embedded-io = "0.6.1" +# Fix for min-versions. +# TODO: remove once unnecessary. +ral-registers = ">= 0.1.3" + [dev-dependencies] teensy4-bsp = { version = "0.5.0", features = ["rt"] } teensy4-panic = { version = "0.2.3", default-features = false } From cca2a702bdf47a67ba8685fe7d6766148dd5d045 Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 14:53:20 +0200 Subject: [PATCH 11/17] Attempt to fix min-versions --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index e8d3d1c..bd2b426 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,7 @@ embedded-io = "0.6.1" # Fix for min-versions. # TODO: remove once unnecessary. ral-registers = ">= 0.1.3" +eh-old = { package = "embedded-hal", version = "0.2.6" } [dev-dependencies] teensy4-bsp = { version = "0.5.0", features = ["rt"] } From f4b2f2aeef5b19dc29e6915af4c3e3a244b1b2d8 Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 15:01:22 +0200 Subject: [PATCH 12/17] Attempt to fix min-version --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index bd2b426..20329a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,6 +29,7 @@ embedded-io = "0.6.1" # TODO: remove once unnecessary. ral-registers = ">= 0.1.3" eh-old = { package = "embedded-hal", version = "0.2.6" } +bitflags = ">= 1.3" [dev-dependencies] teensy4-bsp = { version = "0.5.0", features = ["rt"] } From 7bbe7f4fe27861537e927a23764c95203c1d7274 Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 15:04:00 +0200 Subject: [PATCH 13/17] Attempt to fix min-version --- Cargo.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 20329a1..6080c77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,9 +27,8 @@ embedded-io = "0.6.1" # Fix for min-versions. # TODO: remove once unnecessary. -ral-registers = ">= 0.1.3" eh-old = { package = "embedded-hal", version = "0.2.6" } -bitflags = ">= 1.3" +bitflags = "1.3" [dev-dependencies] teensy4-bsp = { version = "0.5.0", features = ["rt"] } From 109ec26332fa4bdb31dde1c11ed821bdaaf5f29c Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 15:06:40 +0200 Subject: [PATCH 14/17] Attempt to fix min-version --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 6080c77..428b6e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ embedded-io = "0.6.1" # Fix for min-versions. # TODO: remove once unnecessary. +ral-registers = "0.1.3" eh-old = { package = "embedded-hal", version = "0.2.6" } bitflags = "1.3" From 3df526062589f667337524d7fbc6ed41846a57ae Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 15:14:14 +0200 Subject: [PATCH 15/17] Attempt to fix min-version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 428b6e9..df3dbac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ embedded-io = "0.6.1" # Fix for min-versions. # TODO: remove once unnecessary. -ral-registers = "0.1.3" +ral-registers = "0.1.2" eh-old = { package = "embedded-hal", version = "0.2.6" } bitflags = "1.3" From f9f02c82260801c4754fd0558c4834501e5abdd7 Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 15:15:22 +0200 Subject: [PATCH 16/17] Bump to 0.2.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index df3dbac..5eeee04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "imxrt-uart-panic" authors = ["Finomnis "] -version = "0.1.2" +version = "0.2.0" rust-version = "1.68" edition = "2021" license = "MIT OR Apache-2.0" From 9fdf648b935472df3500a6a2592f0036aebf416c Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sun, 23 Jun 2024 21:01:12 +0200 Subject: [PATCH 17/17] Minor beautification --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5eeee04..1e91a27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ embedded-io = "0.6.1" # TODO: remove once unnecessary. ral-registers = "0.1.2" eh-old = { package = "embedded-hal", version = "0.2.6" } -bitflags = "1.3" +bitflags-old = { package = "bitflags", version = "1.3" } [dev-dependencies] teensy4-bsp = { version = "0.5.0", features = ["rt"] }