From a770fc77c907c50fd2c4a7f6ce934eb45974ae55 Mon Sep 17 00:00:00 2001 From: Bob McWhirter Date: Mon, 15 Nov 2021 11:19:19 -0500 Subject: [PATCH] Adjust all examples to defmt 0.3. --- examples/nrf/Cargo.toml | 19 ++++--------------- examples/rp/Cargo.toml | 21 +++++---------------- examples/stm32f0/Cargo.toml | 16 +++------------- examples/stm32f1/Cargo.toml | 21 +++++---------------- examples/stm32f4/Cargo.toml | 20 +++++--------------- examples/stm32f7/Cargo.toml | 23 ++++++----------------- examples/stm32g0/Cargo.toml | 21 +++++---------------- examples/stm32l0/Cargo.toml | 21 +++++---------------- examples/stm32l1/Cargo.toml | 21 +++++---------------- examples/stm32u5/Cargo.toml | 2 -- examples/stm32wb55/Cargo.toml | 21 +++++---------------- examples/stm32wl55/Cargo.toml | 21 +++++---------------- 12 files changed, 53 insertions(+), 174 deletions(-) diff --git a/examples/nrf/Cargo.toml b/examples/nrf/Cargo.toml index b89aa513..f7c0f85e 100644 --- a/examples/nrf/Cargo.toml +++ b/examples/nrf/Cargo.toml @@ -4,30 +4,19 @@ edition = "2018" name = "embassy-nrf-examples" version = "0.1.0" -[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-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } -embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "defmt-trace", "nrf52840", "time-driver-rtc1", "gpiote"] } +embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote"] } -defmt = "0.2.3" -defmt-rtt = "0.2.0" +defmt = "0.3" +defmt-rtt = "0.3" cortex-m = { version = "0.7.3", features = ["inline-asm"] } 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"] } rand = { version = "0.8.4", default-features = false } embedded-storage = "0.2.0" diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml index 9caa3717..37f41b8e 100644 --- a/examples/rp/Cargo.toml +++ b/examples/rp/Cargo.toml @@ -4,30 +4,19 @@ edition = "2018" name = "embassy-rp-examples" version = "0.1.0" -[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-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "defmt-trace"] } +embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] } +embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt"] } atomic-polyfill = "0.1.5" -defmt = "0.2.3" -defmt-rtt = "0.2.0" +defmt = "0.3" +defmt-rtt = "0.3" cortex-m = { version = "0.7.3", features = ["inline-asm"] } 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", "cfg-target-has-atomic", "unstable"] } display-interface-spi = "0.4.1" embedded-graphics = "0.7.1" diff --git a/examples/stm32f0/Cargo.toml b/examples/stm32f0/Cargo.toml index e586748a..dcc2e206 100644 --- a/examples/stm32f0/Cargo.toml +++ b/examples/stm32f0/Cargo.toml @@ -10,20 +10,10 @@ resolver = "2" [dependencies] cortex-m = { version = "0.7.3", features = ["inline-asm"] } cortex-m-rt = "0.7.0" -defmt = "0.2.3" -defmt-rtt = "0.2.0" -panic-probe = "0.2.0" +defmt = "0.3" +defmt-rtt = "0.3" +panic-probe = "0.3" rtt-target = { version = "0.3.1", features = ["cortex-m"] } embassy = { path = "../../embassy", features = ["defmt"] } embassy-stm32 = { path = "../../embassy-stm32", features = ["defmt", "memory-x", "stm32f030f4", "time-driver-tim3"] } -[features] -default = [ - "defmt-default", -] -defmt-default = [] -defmt-trace = [] -defmt-debug = [] -defmt-info = [] -defmt-warn = [] -defmt-error = [] diff --git a/examples/stm32f1/Cargo.toml b/examples/stm32f1/Cargo.toml index 9b4e831e..0edfacd9 100644 --- a/examples/stm32f1/Cargo.toml +++ b/examples/stm32f1/Cargo.toml @@ -5,30 +5,19 @@ name = "embassy-stm32f1-examples" 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", "stm32f103c8", "unstable-pac", "memory-x", "time-driver-tim2"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32f103c8", "unstable-pac", "memory-x", "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/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml index ce3a26bb..ef57acf0 100644 --- a/examples/stm32f4/Cargo.toml +++ b/examples/stm32f4/Cargo.toml @@ -5,30 +5,20 @@ name = "embassy-stm32f4-examples" 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", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-tim2"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32f429zi", "unstable-pac", "memory-x", "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/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml index f49a23e3..ac46cd86 100644 --- a/examples/stm32f7/Cargo.toml +++ b/examples/stm32f7/Cargo.toml @@ -5,32 +5,21 @@ name = "embassy-stm32f7-examples" 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", "net", "stm32f767zi", "unstable-pac", "time-driver-tim2"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "net", "stm32f767zi", "unstable-pac", "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 } diff --git a/examples/stm32g0/Cargo.toml b/examples/stm32g0/Cargo.toml index 58a62f7b..c7f5d41b 100644 --- a/examples/stm32g0/Cargo.toml +++ b/examples/stm32g0/Cargo.toml @@ -5,30 +5,19 @@ name = "embassy-stm32g0-examples" 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", "time-driver-tim2", "stm32g071rb", "unstable-pac"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "time-driver-tim2", "stm32g071rb", "unstable-pac"] } 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/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml index c9d94496..70493b46 100644 --- a/examples/stm32l0/Cargo.toml +++ b/examples/stm32l0/Cargo.toml @@ -5,21 +5,10 @@ name = "embassy-stm32l0-examples" 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", "stm32l072cz", "time-driver-tim3"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l072cz", "time-driver-tim3"] } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } embassy-macros = { path = "../../embassy-macros" } @@ -27,13 +16,13 @@ embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["sx lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "4bff2e0021103adfbccedcbf49dbcd0474adc4b2", default-features = false, features = ["async"] } lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "4bff2e0021103adfbccedcbf49dbcd0474adc4b2", default-features = false, features = ["default-crypto"] } -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/stm32l1/Cargo.toml b/examples/stm32l1/Cargo.toml index e4dd7186..f9d3b29e 100644 --- a/examples/stm32l1/Cargo.toml +++ b/examples/stm32l1/Cargo.toml @@ -5,31 +5,20 @@ name = "embassy-stm32l1-examples" 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", "stm32l151cb-a", "time-driver-tim2", "memory-x"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l151cb-a", "time-driver-tim2", "memory-x"] } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } 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 } diff --git a/examples/stm32u5/Cargo.toml b/examples/stm32u5/Cargo.toml index a0138e1a..1a5facda 100644 --- a/examples/stm32u5/Cargo.toml +++ b/examples/stm32u5/Cargo.toml @@ -5,8 +5,6 @@ name = "embassy-stm32u5-examples" version = "0.1.0" resolver = "2" -[features] - [dependencies] embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] } embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } diff --git a/examples/stm32wb55/Cargo.toml b/examples/stm32wb55/Cargo.toml index 3a6f63ba..1b03bd48 100644 --- a/examples/stm32wb55/Cargo.toml +++ b/examples/stm32wb55/Cargo.toml @@ -5,30 +5,19 @@ name = "embassy-stm32wb55-examples" 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", "stm32wb55cc", "time-driver-tim2"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32wb55cc", "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/stm32wl55/Cargo.toml b/examples/stm32wl55/Cargo.toml index d92f7aa0..00b46696 100644 --- a/examples/stm32wl55/Cargo.toml +++ b/examples/stm32wl55/Cargo.toml @@ -5,34 +5,23 @@ name = "embassy-stm32wl55-examples" 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", "stm32wl55jc_cm4", "time-driver-tim2", "memory-x", "subghz", "unstable-pac"] } +embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32wl55jc_cm4", "time-driver-tim2", "memory-x", "subghz", "unstable-pac"] } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time"] } lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "4bff2e0021103adfbccedcbf49dbcd0474adc4b2", default-features = false, features = ["async"] } lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "4bff2e0021103adfbccedcbf49dbcd0474adc4b2", default-features = false, features = ["default-crypto"] } -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 }