diff options
author | Bob McWhirter <bmcwhirt@redhat.com> | 2021-11-15 11:08:51 -0500 |
---|---|---|
committer | Bob McWhirter <bmcwhirt@redhat.com> | 2021-11-15 11:09:08 -0500 |
commit | c2da49826345e82e7539fce3e96cce203253dc56 (patch) | |
tree | 952c7117c7d103c0247a85c2776556c378eeefd8 /examples | |
parent | 4e0a0f27febfb00c9b4ec42275ac6b83c98436ea (diff) | |
download | embassy-c2da49826345e82e7539fce3e96cce203253dc56.zip |
Update to defmt 3.0ish.
Lots of gitrevs deps.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/stm32h7/Cargo.toml | 25 | ||||
-rw-r--r-- | examples/stm32l4/Cargo.toml | 19 | ||||
-rw-r--r-- | examples/stm32u5/.cargo/config.toml | 4 | ||||
-rw-r--r-- | examples/stm32u5/Cargo.toml | 19 | ||||
-rw-r--r-- | examples/stm32u5/src/bin/boot.rs | 4 |
5 files changed, 24 insertions, 47 deletions
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml index e83ee358..6b51f2ab 100644 --- a/examples/stm32h7/Cargo.toml +++ b/examples/stm32h7/Cargo.toml @@ -6,31 +6,22 @@ version = "0.1.0" resolver = "2" [features] -default = [ - "defmt-default", -] -defmt-default = [] -defmt-trace = [] -defmt-debug = [] -defmt-info = [] -defmt-warn = [] -defmt-error = [] [dependencies] -embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } +embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] } embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } -embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "time-driver-tim2"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32h743zi", "net", "time-driver-tim2"] } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } -embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] } +embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt", "tcp", "medium-ethernet", "pool-16"] } embassy-macros = { path = "../../embassy-macros" } -defmt = "0.2.3" -defmt-rtt = "0.2.0" +defmt = "0.3" +defmt-rtt = "0.3" cortex-m = "0.7.3" cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" -panic-probe = { version = "0.2.0", features = ["print-defmt"] } +panic-probe = { version = "0.3", features = ["print-defmt"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] } rtt-target = { version = "0.3.1", features = ["cortex-m"] } heapless = { version = "0.7.5", default-features = false } @@ -40,8 +31,8 @@ critical-section = "0.2.5" micromath = "2.0.0" [dependencies.smoltcp] -git = "https://github.com/smoltcp-rs/smoltcp" -rev = "e4241510337e095b9d21136c5f58b2eaa1b78479" +git = "https://github.com/bobmcwhirter/smoltcp" +rev = "faf81d21daae16b650b16e59a8422a8283e8a302" default-features = false features = [ "proto-ipv4", diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml index 26d4cae4..c6862b21 100644 --- a/examples/stm32l4/Cargo.toml +++ b/examples/stm32l4/Cargo.toml @@ -6,29 +6,20 @@ version = "0.1.0" resolver = "2" [features] -default = [ - "defmt-default", -] -defmt-default = [] -defmt-trace = [] -defmt-debug = [] -defmt-info = [] -defmt-warn = [] -defmt-error = [] [dependencies] -embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } +embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt" ] } embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } -embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "unstable-pac", "stm32l4s5vi", "time-driver-tim2"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "unstable-pac", "stm32l4s5vi", "time-driver-tim2"] } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } -defmt = "0.2.3" -defmt-rtt = "0.2.0" +defmt = "0.3" +defmt-rtt = "0.3" cortex-m = "0.7.3" cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" -panic-probe = { version = "0.2.0", features = ["print-defmt"] } +panic-probe = { version = "0.3", features = ["print-defmt"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] } rtt-target = { version = "0.3.1", features = ["cortex-m"] } heapless = { version = "0.7.5", default-features = false } diff --git a/examples/stm32u5/.cargo/config.toml b/examples/stm32u5/.cargo/config.toml index 9f5e1480..826fd33f 100644 --- a/examples/stm32u5/.cargo/config.toml +++ b/examples/stm32u5/.cargo/config.toml @@ -1,7 +1,9 @@ [target.'cfg(all(target_arch = "arm", target_os = "none"))'] # replace STM32F429ZITx with your chip as listed in `probe-run --list-chips` #runner = "probe-run --chip STM32U585AIIx" -runner = "/Users/bob/outboard-repos/probe-run/target/debug/probe-run-rp --chip STM32U585AIIx" +#runner = "/Users/bob/outboard-repos/probe-run/target/debug/probe-run-rp --chip STM32U585AIIx" +#runner = "/Users/bob/repos/probe-run/target/debug/probe-run --chip STM32U585AIIx" +runner = "probe-run --chip STM32U585AIIx" [build] target = "thumbv7em-none-eabi" diff --git a/examples/stm32u5/Cargo.toml b/examples/stm32u5/Cargo.toml index e84e1992..a0138e1a 100644 --- a/examples/stm32u5/Cargo.toml +++ b/examples/stm32u5/Cargo.toml @@ -6,29 +6,20 @@ version = "0.1.0" resolver = "2" [features] -default = [ - "defmt-default", -] -defmt-default = [] -defmt-trace = [] -defmt-debug = [] -defmt-info = [] -defmt-warn = [] -defmt-error = [] [dependencies] -embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } +embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] } embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } -embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "unstable-pac", "stm32u585ai", "memory-x" ] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "unstable-pac", "stm32u585ai", "memory-x" ] } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } -defmt = "0.2" -defmt-rtt = "0.2" +defmt = "0.3" +defmt-rtt = "0.3" cortex-m = "0.7.3" cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" -panic-probe = { version = "0.2.0", features = ["print-defmt"] } +panic-probe = { version = "0.3", features = ["print-defmt"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] } rtt-target = { version = "0.3.1", features = ["cortex-m"] } heapless = { version = "0.7.5", default-features = false } diff --git a/examples/stm32u5/src/bin/boot.rs b/examples/stm32u5/src/bin/boot.rs index 91eff735..23cfc306 100644 --- a/examples/stm32u5/src/bin/boot.rs +++ b/examples/stm32u5/src/bin/boot.rs @@ -12,5 +12,7 @@ use embassy_stm32 as _; fn main() -> ! { info!("Hello World!"); - loop {} + loop { + //defmt::info!("loop!"); + } } |