aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoi Bachynskyi <[email protected]>2025-07-21 10:47:21 +0300
committerRoi Bachynskyi <[email protected]>2025-07-21 10:47:21 +0300
commit0fc1ab290fed27301b455a039c2ae9c16ce7c30c (patch)
tree3cab09f54b7418768f9ab5e02b088fa7bd2c672e
parent6d79c4c81187d5f2704e2d2f72a3deba05ca449a (diff)
Revert "feat: added log-to-defmt feature"
This reverts commit 6d79c4c81187d5f2704e2d2f72a3deba05ca449a.
-rwxr-xr-xci.sh1
-rw-r--r--embassy-nxp/Cargo.toml4
-rw-r--r--embassy-nxp/src/lib.rs5
-rw-r--r--examples/lpc55s69/Cargo.toml4
-rw-r--r--examples/lpc55s69/src/bin/log_to_defmt.rs18
5 files changed, 2 insertions, 30 deletions
diff --git a/ci.sh b/ci.sh
index 4f8845158..842215a6b 100755
--- a/ci.sh
+++ b/ci.sh
@@ -264,7 +264,6 @@ cargo batch \
264 --- build --release --manifest-path examples/stm32wba/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/stm32wba \ 264 --- build --release --manifest-path examples/stm32wba/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/stm32wba \
265 --- build --release --manifest-path examples/stm32wl/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/stm32wl \ 265 --- build --release --manifest-path examples/stm32wl/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/stm32wl \
266 --- build --release --manifest-path examples/lpc55s69/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/lpc55s69 \ 266 --- build --release --manifest-path examples/lpc55s69/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/lpc55s69 \
267 --- build --release --manifest-path examples/lpc55s69/Cargo.toml --target thumbv8m.main-none-eabihf --features embassy-nxp/log-to-defmt --artifact-dir out/examples/lpc55s69 \
268 --- build --release --manifest-path examples/mspm0g3507/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0g3507 \ 267 --- build --release --manifest-path examples/mspm0g3507/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0g3507 \
269 --- build --release --manifest-path examples/mspm0g3519/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0g3519 \ 268 --- build --release --manifest-path examples/mspm0g3519/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0g3519 \
270 --- build --release --manifest-path examples/mspm0l1306/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0l1306 \ 269 --- build --release --manifest-path examples/mspm0l1306/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0l1306 \
diff --git a/embassy-nxp/Cargo.toml b/embassy-nxp/Cargo.toml
index 9eb48be17..01f57c4e2 100644
--- a/embassy-nxp/Cargo.toml
+++ b/embassy-nxp/Cargo.toml
@@ -10,8 +10,6 @@ critical-section = "1.1.2"
10embassy-hal-internal = { version = "0.3.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-2"] } 10embassy-hal-internal = { version = "0.3.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-2"] }
11embassy-sync = { version = "0.7.0", path = "../embassy-sync" } 11embassy-sync = { version = "0.7.0", path = "../embassy-sync" }
12defmt = { version = "1", optional = true } 12defmt = { version = "1", optional = true }
13log = "0.4.27"
14log-to-defmt = { version = "0.1.0", optional = true}
15 13
16## Chip dependencies 14## Chip dependencies
17lpc55-pac = { version = "0.5.0", optional = true } 15lpc55-pac = { version = "0.5.0", optional = true }
@@ -32,5 +30,3 @@ unstable-pac = []
32 30
33#! ### Chip selection features 31#! ### Chip selection features
34lpc55 = ["lpc55-pac"] 32lpc55 = ["lpc55-pac"]
35## Enable debug logs
36log-to-defmt = ["dep:log-to-defmt"]
diff --git a/embassy-nxp/src/lib.rs b/embassy-nxp/src/lib.rs
index 79c66e7f6..433aca9e0 100644
--- a/embassy-nxp/src/lib.rs
+++ b/embassy-nxp/src/lib.rs
@@ -3,6 +3,7 @@
3pub mod gpio; 3pub mod gpio;
4#[cfg(feature = "lpc55")] 4#[cfg(feature = "lpc55")]
5pub mod pint; 5pub mod pint;
6
6// This mod MUST go last, so that it sees all the `impl_foo!` macros 7// This mod MUST go last, so that it sees all the `impl_foo!` macros
7#[cfg_attr(feature = "lpc55", path = "chips/lpc55.rs")] 8#[cfg_attr(feature = "lpc55", path = "chips/lpc55.rs")]
8mod chip; 9mod chip;
@@ -24,10 +25,8 @@ pub fn init(_config: config::Config) -> Peripherals {
24 { 25 {
25 gpio::init(); 26 gpio::init();
26 pint::init(); 27 pint::init();
27 #[cfg(feature = "log-to-defmt")]
28 log_to_defmt::setup();
29 log::info!("Initialization complete");
30 } 28 }
29
31 crate::Peripherals::take() 30 crate::Peripherals::take()
32} 31}
33 32
diff --git a/examples/lpc55s69/Cargo.toml b/examples/lpc55s69/Cargo.toml
index 7e3b82432..6ec6e51a8 100644
--- a/examples/lpc55s69/Cargo.toml
+++ b/examples/lpc55s69/Cargo.toml
@@ -18,9 +18,5 @@ defmt-rtt = "1.0.0"
18panic-probe = { version = "1.0.0", features = ["print-defmt"] } 18panic-probe = { version = "1.0.0", features = ["print-defmt"] }
19panic-semihosting = "0.6.0" 19panic-semihosting = "0.6.0"
20 20
21[features]
22## To test all-logs mode
23log-to-defmt = ["embassy-nxp/log-to-defmt"]
24
25[profile.release] 21[profile.release]
26debug = 2 22debug = 2
diff --git a/examples/lpc55s69/src/bin/log_to_defmt.rs b/examples/lpc55s69/src/bin/log_to_defmt.rs
deleted file mode 100644
index 7aaab5e54..000000000
--- a/examples/lpc55s69/src/bin/log_to_defmt.rs
+++ /dev/null
@@ -1,18 +0,0 @@
1/// To test log-to-defmt feature, you have to run the binary file with the corresponding flag
2/// Example: cargo run --bin <file> --feature log-to-defmt
3
4
5#![no_std]
6#![no_main]
7
8use log::*;
9use embassy_executor::Spawner;
10use {defmt_rtt as _, panic_halt as _};
11
12#[embassy_executor::main]
13async fn main(_spawner: Spawner) {
14 info!("Hello World");
15 loop{
16 info!("Another test");
17 }
18}