Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(d1): put back missing serial-trace feature #278

Merged
merged 2 commits into from
Sep 16, 2023
Merged

Conversation

hawkw
Copy link
Contributor

@hawkw hawkw commented Sep 16, 2023

Looks like the feature flag was lost in #271, so the D1 binaries no
longer emit traceproto output. I believe this happened when combining
the mnemos-d1 crate (which used to enable the feature) with the
mnemos-d1-core crate (which didn't enable the feature).

This commit puts it back. :)

I've also modified the Just recipes for building D1 images to allow
passing additional args to Cargo. This way, users of the Just recipes
can now pass --no-default-features --features ... to pick which features
are enabled when building. This was necessary for testing what happened
when the board config had a serial-trace section but the feature flag was
disabled. But, passing extra cargo args may also be useful in other
situations.

Looks like the feature flag was lost in #271, so the D1 binaries no
longer emit traceproto output. I believe this happened when combining
the `mnemos-d1` crate (which used to enable the feature) with the
`mnemos-d1-core` crate (which didn't enable the feature).

This commit puts it back. :)
@@ -130,30 +130,33 @@ fmt:
{{ _cargo }} fmt --package {{ _mn_pkg }}

# build a Mnemos binary for the Allwinner D1
build-d1 board='mq-pro': (_get-cargo-command "objcopy" "cargo-binutils")
build-d1 board='mq-pro' *CARGO_ARGS='': (_get-cargo-command "objcopy" "cargo-binutils")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at some point we may just want to start turning these just recipes into proper cargo xtasks with mn, so that we can pass more complex CLI args to them...but i didn't want to do that as part of this change.

@hawkw hawkw enabled auto-merge (squash) September 16, 2023 19:04
@hawkw hawkw merged commit d02b73f into main Sep 16, 2023
10 checks passed
@hawkw hawkw deleted the eliza/fix-traceproto branch September 16, 2023 19:21
hawkw added a commit that referenced this pull request Sep 16, 2023
Depends on #278.

This commit makes a very small change to how the crowtty traceproto
output formats an event's `message` field. The message is now printed
first, and (when the terminal supports ANSI formatting escapes), it's
bolded, so that it stands out a bit from other fields and metadata.
Also, I've changed `crowtty` so that the message field is always printed
first, rather than ordering it alphabetically by field name. This should
improve the consistency of log lines and hopefully make them a bit
easier to read.

For example:

![image](https://github.com/tosc-rs/mnemos/assets/2796466/34e309f7-7f4f-4ac3-b3ea-247ff879ce54)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant