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.

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

add 128 and 16 bit conversions to Uuid #265

Merged
merged 6 commits into from
Jan 25, 2025
Merged

add 128 and 16 bit conversions to Uuid #265

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba5a2ef
add 128 and 16 bit conversions to Uuid
jamessizeland Jan 24, 2025
2be1076
switch endienness of 128bit conversion
jamessizeland Jan 25, 2025
e9d1f8a
Merge branch 'main' into impl-more-into-uuid-types
jamessizeland Jan 25, 2025
6c1b285
rename val to data for consistency
jamessizeland Jan 25, 2025
32ff863
disambiguate u16
jamessizeland Jan 25, 2025
dbbc556
add u128 to gatt_derive test
jamessizeland Jan 25, 2025
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
18 changes: 18 additions & 0 deletions host/src/types/uuid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@ impl From<BluetoothUuid16> for Uuid {
}
}

impl From<u128> for Uuid {
fn from(val: u128) -> Self {
Uuid::Uuid128(val.to_be_bytes())
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be .to_le_bytes(); see https://github.com/embassy-rs/trouble/blob/main/host/src/types/uuid.rs#L76

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I thought so, but then I was following @ivmarkov's type definition here: #248

Copy link
Contributor

Choose a reason for hiding this comment

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

I thought so, but then I was following @ivmarkov's type definition here: #248

Mine was wrong, I corrected it in the meantime.

}
}

impl From<[u8; 16]> for Uuid {
fn from(val: [u8; 16]) -> Self {
Uuid::Uuid128(val)
}
}

impl From<[u8; 2]> for Uuid {
fn from(val: [u8; 2]) -> Self {
Uuid::Uuid16(val)
}
}

impl Uuid {
/// Create a new 16-bit UUID.
pub const fn new_short(val: u16) -> Self {
Expand Down
Loading