feat(orb-mcu-util): print new diamond evt version #381
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,28 +1,77 @@ | ||||||
| use orb_mcu_interface::orb_messages; | ||||||
| use std::fmt::{Display, Formatter}; | ||||||
|
|
||||||
| #[derive(Clone, Debug, Default)] | ||||||
| pub struct OrbRevision(pub orb_messages::Hardware); | ||||||
|
|
||||||
| trait OrbVersionFromInt { | ||||||
| fn from_version_i32(value: i32) -> Self; | ||||||
| } | ||||||
| impl OrbVersionFromInt for orb_messages::hardware::OrbVersion { | ||||||
| fn from_version_i32(value: i32) -> Self { | ||||||
| match value { | ||||||
| 1 => orb_messages::hardware::OrbVersion::HwVersionPearlEv1, | ||||||
| 2 => orb_messages::hardware::OrbVersion::HwVersionPearlEv2, | ||||||
| 3 => orb_messages::hardware::OrbVersion::HwVersionPearlEv3, | ||||||
| 4 => orb_messages::hardware::OrbVersion::HwVersionPearlEv4, | ||||||
| 5 => orb_messages::hardware::OrbVersion::HwVersionPearlEv5, | ||||||
| 6 => orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1, | ||||||
| 7 => orb_messages::hardware::OrbVersion::HwVersionDiamondPoc2, | ||||||
| 8 => orb_messages::hardware::OrbVersion::HwVersionDiamondB3, | ||||||
| 9 => orb_messages::hardware::OrbVersion::HwVersionDiamondEvt, | ||||||
| _ => orb_messages::hardware::OrbVersion::HwVersionUnknown, | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| impl Display for OrbRevision { | ||||||
| fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||||||
| match orb_messages::hardware::OrbVersion::from_version_i32(self.0.version) { | ||||||
| orb_messages::hardware::OrbVersion::HwVersionUnknown => { | ||||||
| // from_version_i32 returned unknown but the version might not be 0 | ||||||
| // meaning it's known by the firmware but not by the current binary | ||||||
| if self.0.version | ||||||
| == orb_messages::hardware::OrbVersion::HwVersionUnknown as i32 | ||||||
| { | ||||||
| return write!(f, "unknown"); | ||||||
| } | ||||||
|
|
||||||
| tracing::error!( | ||||||
| "A new orb revision might not be implemented by that binary: {:?}.", | ||||||
| self.0.version | ||||||
| ); | ||||||
|
|
||||||
| // let's write if it's a pearl or diamond orb, guessing by the version number | ||||||
| if self.0.version | ||||||
| < orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1 as i32 | ||||||
| { | ||||||
| write!(f, "Pearl_unknown") | ||||||
| } else { | ||||||
| write!(f, "Diamond_unknown") | ||||||
| } | ||||||
| } | ||||||
| orb_messages::hardware::OrbVersion::HwVersionPearlEv1 | ||||||
| | orb_messages::hardware::OrbVersion::HwVersionPearlEv2 | ||||||
| | orb_messages::hardware::OrbVersion::HwVersionPearlEv3 | ||||||
| | orb_messages::hardware::OrbVersion::HwVersionPearlEv4 | ||||||
| | orb_messages::hardware::OrbVersion::HwVersionPearlEv5 => { | ||||||
| write!(f, "EVT{:?}", self.0.version) | ||||||
|
There was a problem hiding this comment.
Suggested change
I'd prefer verbose unless any tools depend on it There was a problem hiding this comment. i would prefer too but indeed, this would break things |
||||||
| } | ||||||
| orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1 | ||||||
| | orb_messages::hardware::OrbVersion::HwVersionDiamondPoc2 | ||||||
| | orb_messages::hardware::OrbVersion::HwVersionDiamondB3 => { | ||||||
| write!( | ||||||
| f, | ||||||
| "Diamond_B{:?}", | ||||||
| self.0.version | ||||||
| - orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1 | ||||||
| as i32 | ||||||
| + 1 | ||||||
| ) | ||||||
| } | ||||||
| orb_messages::hardware::OrbVersion::HwVersionDiamondEvt => { | ||||||
| write!(f, "Diamond_EVT") | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
interesting... is this
consta new thing?what does it bring?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
its like constexpr in c++ - evaluation is done at compile-time. Const functions have been around for a long time (possibly since 1.0?). But they are more useful nowadays, and especially after the
inline_constfeature was stabilized last year: rust-lang/rust#104087.constmostly gets used in places where assignment to aconstor astaticvariable is necessary.