Skip to content

ccgx: derive Ord for AppVersion and BaseVersion #175

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.

Sign up for GitHub

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

Merged
JohnAZoidberg merged 1 commit into from
Jun 15, 2025
Merged

ccgx: derive Ord for AppVersion and BaseVersion #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions framework_lib/src/ccgx/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub enum SiliconId {
Ccg8 = 0x3580,
}

#[derive(Debug, PartialEq, Copy, Clone)]
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
pub struct BaseVersion {
/// Major part of the version. X of X.Y.Z.BB
pub major: u8,
Expand Down Expand Up @@ -154,15 +154,15 @@ impl From<u32> for BaseVersion {
}
}

#[derive(Debug, PartialEq, Copy, Clone)]
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
pub enum Application {
Notebook,
Monitor,
AA,
Invalid,
}

#[derive(Debug, PartialEq, Copy, Clone)]
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
pub struct AppVersion {
pub application: Application,
/// Major part of the version. X of X.Y.Z
Expand Down Expand Up @@ -309,3 +309,42 @@ fn parse_metadata_cyacd2(buffer: &[u8]) -> Option<(u32, u32)> {
None
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
// Make sure deriving does what I expect, properly comparing with multiple fields
fn derive_ord() {
let v0_0_0 = AppVersion {
application: Application::Notebook,
major: 0,
minor: 0,
circuit: 0,
};
let v1_0_1 = AppVersion {
application: Application::Notebook,
major: 1,
minor: 0,
circuit: 1,
};
let v0_1_0 = AppVersion {
application: Application::Notebook,
major: 0,
minor: 1,
circuit: 0,
};
let v1_1_1 = AppVersion {
application: Application::Notebook,
major: 1,
minor: 1,
circuit: 1,
};
assert_eq!(v0_0_0, v0_0_0.clone());
assert!(v0_0_0 < v1_0_1);
assert!(v0_1_0 < v1_0_1);
assert!(v1_0_1 < v1_1_1);
assert!(v1_1_1 > v1_0_1);
}
}
Loading