Skip to content

Commit

Permalink
Adds a defmt 0.3 proxy, and bumps most crates to 1.0.0-alpha.
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanpallant committed Dec 3, 2024
1 parent a34dbcb commit 6d552eb
Show file tree
Hide file tree
Showing 16 changed files with 431 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
exclude = ["firmware/*"]
exclude = ["firmware/*", "defmt-03"]
members = [
"decoder",
"decoder/defmt-json-schema",
Expand Down
4 changes: 2 additions & 2 deletions decoder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ license = "MIT OR Apache-2.0"
name = "defmt-decoder"
readme = "README.md"
repository = "https://github.com/knurling-rs/defmt"
version = "0.4.0"
version = "1.0.0-alpha"

[dependencies]
byteorder = "1"
colored = "2"
defmt-parser = { version = "=0.4.1", path = "../parser" }
defmt-parser = { version = "=1.0.0-alpha", path = "../parser" }
ryu = "1"
nom = "7"

Expand Down
50 changes: 50 additions & 0 deletions defmt-03/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[package]
authors = [ "The Knurling-rs developers" ]
categories = [
"embedded",
"no-std",
"development-tools::debugging",
"value-formatting",
]
description = "A highly efficient logging framework that targets resource-constrained devices, like microcontrollers"
edition = "2021"
keywords = [ "knurling", "logging", "logger", "formatting", "formatter" ]
license = "MIT OR Apache-2.0"
name = "defmt"
readme = "README.md"
repository = "https://github.com/knurling-rs/defmt"
homepage = "https://knurling.ferrous-systems.com/"
version = "0.3.100"

[dependencies]
defmt10 = { package = "defmt", version = "1.0.0-alpha", path = "../defmt" }

[features]
alloc = ["defmt10/alloc"]
avoid-default-panic = ["defmt10/avoid-default-panic"]
ip_in_core = ["defmt10/ip_in_core"]

# Encoding feature flags. These should only be set by end-user crates, not by library crates.
#
# If no encoding is selected, `defmt` will assume the encoding is "don't care" and
# will pick a default one. The current default is `encoding-rzcobs`. The default may change
# in minor releases, changing it is not considered a breaking change since all encodings
# are guaranteed to be supported by the corresponding `defmt-decoder` version.

# Raw encoding: All log frames are concatenated and sent over the wire with no framing or compression.
# This is the fastest CPU-wise, but may end up being slower if the limiting factor is wire speed.
encoding-raw = ["defmt10/encoding-raw"]

# rzCOBS encoding: Performs framing on the log frames using reverse-COBS, additionally applying a
# light compression for data known to contain many zero bytes, like defmt streams.
# The framing allows the decoder to recover from missing or corrupted data, and start decoding
# in the middle of a stream, for example when attaching to an already-running device.
encoding-rzcobs = ["defmt10/encoding-rzcobs"]

# WARNING: for internal use only, not covered by semver guarantees
unstable-test = [ "defmt10/unstable-test" ]

[package.metadata.docs.rs]
features = [ "alloc" ]
rustdoc-args = [ "--cfg=docsrs" ]
targets = [ "thumbv6m-none-eabi", "thumbv7em-none-eabihf" ]
Loading

0 comments on commit 6d552eb

Please sign in to comment.