summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <dirbaio@dirbaio.net>2020-12-03 20:43:26 +0100
committerDario Nieuwenhuis <dirbaio@dirbaio.net>2020-12-03 20:43:26 +0100
commitaf8a6b1cfa5d952f283ec29272aba4dfcc275d9c (patch)
treec8edca372a4d89980a95368e415d4b33e43d57fc
parent787543583ecb5ea7c0df1f10d6723fb76de16593 (diff)
downloadnrf-softdevice-af8a6b1cfa5d952f283ec29272aba4dfcc275d9c.zip
Switch to released defmt version.
-rw-r--r--Cargo.lock14
-rw-r--r--Cargo.toml3
-rw-r--r--examples/Cargo.toml2
-rw-r--r--nrf-softdevice-defmt-rtt/Cargo.toml2
-rw-r--r--nrf-softdevice/Cargo.toml2
5 files changed, 12 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 166b52f..5763d11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -193,17 +193,20 @@ dependencies = [
[[package]]
name = "defmt"
-version = "0.1.1"
-source = "git+https://github.com/Dirbaio/defmt?rev=23b2cfd9fe5481d6845f848f86b4ca0b5cfdb827#23b2cfd9fe5481d6845f848f86b4ca0b5cfdb827"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4160ab978165ef486b79dca2156cf91f28156e696600c158bac179e957c0f618"
dependencies = [
"defmt-macros",
+ "heapless",
"semver 0.11.0",
]
[[package]]
name = "defmt-macros"
-version = "0.1.0"
-source = "git+https://github.com/Dirbaio/defmt?rev=23b2cfd9fe5481d6845f848f86b4ca0b5cfdb827#23b2cfd9fe5481d6845f848f86b4ca0b5cfdb827"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925bb4a9cfaee4555fa533582032be2b121a11c1c203bc0dd17065497738ffb3"
dependencies = [
"defmt-parser",
"proc-macro2",
@@ -214,7 +217,8 @@ dependencies = [
[[package]]
name = "defmt-parser"
version = "0.1.0"
-source = "git+https://github.com/Dirbaio/defmt?rev=23b2cfd9fe5481d6845f848f86b4ca0b5cfdb827#23b2cfd9fe5481d6845f848f86b4ca0b5cfdb827"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812b30ff14930407c86a23e256ac050b8e6913f597adcc88e29d40517f7a16de"
[[package]]
name = "derivative"
diff --git a/Cargo.toml b/Cargo.toml
index c68c24a..a00e7f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,12 +21,9 @@ exclude = [
]
[patch.crates-io]
-anyfmt = { git = "https://github.com/akiles/embassy" }
embassy = { git = "https://github.com/akiles/embassy" }
embassy-nrf = { git = "https://github.com/akiles/embassy" }
embassy-macros = { git = "https://github.com/akiles/embassy" }
-defmt = { git = "https://github.com/Dirbaio/defmt", rev="23b2cfd9fe5481d6845f848f86b4ca0b5cfdb827" }
-defmt-macros = { git = "https://github.com/Dirbaio/defmt", rev="23b2cfd9fe5481d6845f848f86b4ca0b5cfdb827" }
[profile.dev]
codegen-units = 1
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index e670266..a818bc9 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -28,7 +28,7 @@ embassy-nrf = { version = "0.1.0", features = [ "defmt", "52840" ]}
cortex-m = { version = "0.6.4" }
cortex-m-rt = "0.6.13"
cortex-m-rtic = { version = "0.5.5", optional = true }
-defmt = "0.1.0"
+defmt = "0.1.3"
nrf-softdevice-defmt-rtt = { path = "../nrf-softdevice-defmt-rtt", version = "0.1.0" }
panic-probe = "0.1.0"
nrf52840-hal = { version = "0.11.0" }
diff --git a/nrf-softdevice-defmt-rtt/Cargo.toml b/nrf-softdevice-defmt-rtt/Cargo.toml
index 1871db2..8773554 100644
--- a/nrf-softdevice-defmt-rtt/Cargo.toml
+++ b/nrf-softdevice-defmt-rtt/Cargo.toml
@@ -11,6 +11,6 @@ repository = "https://github.com/knurling-rs/defmt"
version = "0.1.0"
[dependencies]
-defmt = { version = "0.1.0" }
+defmt = { version = "0.1.3" }
nrf-softdevice = { path = "../nrf-softdevice", version = "0.1.0" }
cortex-m = "0.6.4"
diff --git a/nrf-softdevice/Cargo.toml b/nrf-softdevice/Cargo.toml
index 0d7fe75..5ebb945 100644
--- a/nrf-softdevice/Cargo.toml
+++ b/nrf-softdevice/Cargo.toml
@@ -36,7 +36,7 @@ embassy = { version = "0.1.0" }
cortex-m = "0.6.4"
cortex-m-rt = "0.6.13"
heapless = "0.5.6"
-defmt = "0.1.1"
+defmt = "0.1.3"
fixed = "1.5.0"
nrf52810-pac = { version = "0.9.0", features = ["rt"], optional = true }