nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-25 16:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to defmt 3.0ish.

Browse Source 
Lots of gitrevs deps.
This commit is contained in:
Bob McWhirter 2021-11-15 11:08:51 -05:00
parent 4e0a0f27fe
commit c2da498263
14 changed files with 37 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
embassy-hal-common/Cargo.toml
View File

@ -5,16 +5,11 @@ authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018" edition = "2018"
[features] [features]
defmt-trace = [ ]
defmt-debug = [ ]
defmt-info = [ ]
defmt-warn = [ ]
defmt-error = [ ]
[dependencies] [dependencies]
embassy = { version = "0.1.0", path = "../embassy" } embassy = { version = "0.1.0", path = "../embassy" }
defmt = { version = "0.2.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }
cortex-m = "0.7.3" cortex-m = "0.7.3"
usb-device = "0.2.8" usb-device = "0.2.8"

8
embassy-lora/Cargo.toml
View File

@ -11,15 +11,9 @@ sx127x = []
stm32wl = ["embassy-stm32", "embassy-stm32/subghz"] stm32wl = ["embassy-stm32", "embassy-stm32/subghz"]
time = [] time = []
defmt-trace = []
defmt-debug = []
defmt-info = []
defmt-warn = []
defmt-error = []
[dependencies] [dependencies]
defmt = { version = "0.2.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }
embassy = { version = "0.1.0", path = "../embassy", default-features = false } embassy = { version = "0.1.0", path = "../embassy", default-features = false }

11
embassy-net/Cargo.toml
View File

@ -7,11 +7,6 @@ edition = "2018"
[features] [features]
default = ["pool-4"] default = ["pool-4"]
std = [] std = []
defmt-trace = []
defmt-debug = []
defmt-info = []
defmt-warn = []
defmt-error = []
tcp = ["smoltcp/socket-tcp"] tcp = ["smoltcp/socket-tcp"]
dhcpv4 = ["medium-ethernet", "smoltcp/socket-dhcpv4"] dhcpv4 = ["medium-ethernet", "smoltcp/socket-dhcpv4"]
@ -25,7 +20,7 @@ pool-32 = []
[dependencies] [dependencies]
defmt = { version = "0.2.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }
embassy = { version = "0.1.0", path = "../embassy" } embassy = { version = "0.1.0", path = "../embassy" }
@ -39,8 +34,8 @@ futures = { version = "0.3.17", default-features = false, features =
atomic-pool = "0.2.1" atomic-pool = "0.2.1"
[dependencies.smoltcp] [dependencies.smoltcp]
git = "https://github.com/smoltcp-rs/smoltcp" git = "https://github.com/bobmcwhirter/smoltcp"
rev = "e4241510337e095b9d21136c5f58b2eaa1b78479" rev = "faf81d21daae16b650b16e59a8422a8283e8a302"
default-features = false default-features = false
features = [ features = [
"proto-ipv4", "proto-ipv4",

8
embassy-nrf/Cargo.toml
View File

@ -12,12 +12,6 @@ edition = "2018"
# There are no plans to make this stable. # There are no plans to make this stable.
unstable-pac = [] unstable-pac = []
defmt-trace = [ ]
defmt-debug = [ ]
defmt-info = [ ]
defmt-warn = [ ]
defmt-error = [ ]
nrf52805 = ["nrf52805-pac", "_ppi"] nrf52805 = ["nrf52805-pac", "_ppi"]
nrf52810 = ["nrf52810-pac", "_ppi"] nrf52810 = ["nrf52810-pac", "_ppi"]
nrf52811 = ["nrf52811-pac", "_ppi"] nrf52811 = ["nrf52811-pac", "_ppi"]
@ -53,7 +47,7 @@ embassy = { version = "0.1.0", path = "../embassy" }
embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["nrf"]} embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["nrf"]}
embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" } embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
defmt = { version = "0.2.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }
cortex-m-rt = ">=0.6.15,<0.8" cortex-m-rt = ">=0.6.15,<0.8"
cortex-m = "0.7.3" cortex-m = "0.7.3"

8
embassy-rp/Cargo.toml
View File

@ -12,18 +12,12 @@ edition = "2018"
# There are no plans to make this stable. # There are no plans to make this stable.
unstable-pac = [] unstable-pac = []
defmt-trace = [ ]
defmt-debug = [ ]
defmt-info = [ ]
defmt-warn = [ ]
defmt-error = [ ]
[dependencies] [dependencies]
embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] } embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] }
embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" } embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]} embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]}
atomic-polyfill = "0.1.5" atomic-polyfill = "0.1.5"
defmt = { version = "0.2.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }
cortex-m-rt = ">=0.6.15,<0.8" cortex-m-rt = ">=0.6.15,<0.8"
cortex-m = "0.7.3" cortex-m = "0.7.3"

10
embassy-stm32/Cargo.toml
View File

@ -12,7 +12,7 @@ embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
embassy-traits = {version = "0.1.0", path = "../embassy-traits" } embassy-traits = {version = "0.1.0", path = "../embassy-traits" }
embassy-net = { version = "0.1.0", path = "../embassy-net", default-features = false, optional = true } embassy-net = { version = "0.1.0", path = "../embassy-net", default-features = false, optional = true }
defmt = { version = "0.2.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }
cortex-m-rt = ">=0.6.15,<0.8" cortex-m-rt = ">=0.6.15,<0.8"
cortex-m = "0.7.3" cortex-m = "0.7.3"
@ -26,7 +26,8 @@ bare-metal = "1.0.0"
atomic-polyfill = "0.1.5" atomic-polyfill = "0.1.5"
stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] } stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] }
vcell = { version = "0.1.3", optional = true } vcell = { version = "0.1.3", optional = true }
bxcan = "0.5.1" bxcan = { git = "https://github.com/bobmcwhirter/bxcan.git", rev="8e011c6e1ecec318da5b8e13ac743ce34e969de9" }
seq-macro = "0.2.2" seq-macro = "0.2.2"
cfg-if = "1.0.0" cfg-if = "1.0.0"
@ -37,11 +38,6 @@ serde = { version = "1.0.130", features = [ "derive" ] }
serde_yaml = "0.8.21" serde_yaml = "0.8.21"
[features] [features]
defmt-trace = [ ]
defmt-debug = [ ]
defmt-info = [ ]
defmt-warn = [ ]
defmt-error = [ ]
sdmmc-rs = ["embedded-sdmmc"] sdmmc-rs = ["embedded-sdmmc"]
net = ["embassy-net", "vcell"] net = ["embassy-net", "vcell"]
memory-x = ["stm32-metapac/memory-x"] memory-x = ["stm32-metapac/memory-x"]

2
embassy-stm32/src/can/bxcan.rs
View File

@ -35,7 +35,7 @@ impl<'d, T: Instance + bxcan::Instance> Can<'d, T> {
Self { Self {
phantom: PhantomData, phantom: PhantomData,
can: bxcan::Can::new(peri), can: bxcan::Can::builder(peri).enable(),
} }
} }
} }

2
embassy-traits/Cargo.toml
View File

@ -8,5 +8,5 @@ edition = "2018"
std = [] std = []
[dependencies] [dependencies]
defmt = { version = "0.2.3", optional = true } defmt = { version = "0.3", optional = true }
embedded-hal = { version = "0.2.6", features = ["unproven"] } embedded-hal = { version = "0.2.6", features = ["unproven"] }

8
embassy/Cargo.toml
View File

@ -23,16 +23,10 @@ time-tick-32768hz = ["time"]
time-tick-1000hz = ["time"] time-tick-1000hz = ["time"]
time-tick-1mhz = ["time"] time-tick-1mhz = ["time"]
defmt-trace = []
defmt-debug = []
defmt-info = []
defmt-warn = []
defmt-error = []
executor-agnostic = [] executor-agnostic = []
[dependencies] [dependencies]
defmt = { version = "0.2.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }
cortex-m = "0.7.3" cortex-m = "0.7.3"

25
examples/stm32h7/Cargo.toml
View File

@ -6,31 +6,22 @@ version = "0.1.0"
resolver = "2" resolver = "2"
[features] [features]
default = [
"defmt-default",
]
defmt-default = []
defmt-trace = []
defmt-debug = []
defmt-info = []
defmt-warn = []
defmt-error = []
[dependencies] [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-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-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" } embassy-macros = { path = "../../embassy-macros" }
defmt = "0.2.3" defmt = "0.3"
defmt-rtt = "0.2.0" defmt-rtt = "0.3"
cortex-m = "0.7.3" cortex-m = "0.7.3"
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
embedded-hal = "0.2.6" 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"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] } rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false } heapless = { version = "0.7.5", default-features = false }
@ -40,8 +31,8 @@ critical-section = "0.2.5"
micromath = "2.0.0" micromath = "2.0.0"
[dependencies.smoltcp] [dependencies.smoltcp]
git = "https://github.com/smoltcp-rs/smoltcp" git = "https://github.com/bobmcwhirter/smoltcp"
rev = "e4241510337e095b9d21136c5f58b2eaa1b78479" rev = "faf81d21daae16b650b16e59a8422a8283e8a302"
default-features = false default-features = false
features = [ features = [
"proto-ipv4", "proto-ipv4",

19
examples/stm32l4/Cargo.toml
View File

@ -6,29 +6,20 @@ version = "0.1.0"
resolver = "2" resolver = "2"
[features] [features]
default = [
"defmt-default",
]
defmt-default = []
defmt-trace = []
defmt-debug = []
defmt-info = []
defmt-warn = []
defmt-error = []
[dependencies] [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-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" } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
defmt = "0.2.3" defmt = "0.3"
defmt-rtt = "0.2.0" defmt-rtt = "0.3"
cortex-m = "0.7.3" cortex-m = "0.7.3"
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
embedded-hal = "0.2.6" 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"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] } rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false } heapless = { version = "0.7.5", default-features = false }

4
examples/stm32u5/.cargo/config.toml
View File

@ -1,7 +1,9 @@
[target.'cfg(all(target_arch = "arm", target_os = "none"))'] [target.'cfg(all(target_arch = "arm", target_os = "none"))']
# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips` # replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
#runner = "probe-run --chip STM32U585AIIx" #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] [build]
target = "thumbv7em-none-eabi" target = "thumbv7em-none-eabi"

19
examples/stm32u5/Cargo.toml
View File

@ -6,29 +6,20 @@ version = "0.1.0"
resolver = "2" resolver = "2"
[features] [features]
default = [
"defmt-default",
]
defmt-default = []
defmt-trace = []
defmt-debug = []
defmt-info = []
defmt-warn = []
defmt-error = []
[dependencies] [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-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" } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
defmt = "0.2" defmt = "0.3"
defmt-rtt = "0.2" defmt-rtt = "0.3"
cortex-m = "0.7.3" cortex-m = "0.7.3"
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
embedded-hal = "0.2.6" 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"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] } rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false } heapless = { version = "0.7.5", default-features = false }

4
examples/stm32u5/src/bin/boot.rs
View File

@ -12,5 +12,7 @@ use embassy_stm32 as _;
fn main() -> ! { fn main() -> ! {
info!("Hello World!"); info!("Hello World!");
loop {} loop {
//defmt::info!("loop!");
}
} }