Skip to content

Add time of day type as ByteField with 6 bytes. #34

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

Closed
nathanaelg wants to merge 1 commit into from
Closed

Add time of day type as ByteField with 6 bytes. #34

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion zencan-build/src/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ fn get_storage_type(data_type: DCDataType) -> (syn::Type, usize) {
),
DCDataType::OctetString(n) => (syn::parse_str(&format!("ByteField::<{}>", n)).unwrap(), n),
DCDataType::Domain => (syn::parse_quote!(CallbackSubObject), 0),
DCDataType::TimeOfDay => (syn::parse_str("ByteField::<6>").unwrap(), 6),
_ => panic!("Unsupported data type {:?}", data_type),
}
}
Expand All @@ -60,6 +61,7 @@ fn get_rust_type_and_size(data_type: DCDataType) -> (syn::Type, usize) {
| DCDataType::OctetString(n)
| DCDataType::UnicodeString(n) => (syn::parse_str(&format!("[u8; {}]", n)).unwrap(), n),
DCDataType::Domain => (syn::parse_quote!(None), 0),
DCDataType::TimeOfDay => (syn::parse_str("[u8; 6]").unwrap(), 6),
_ => panic!("Unsupported data type {:?}", data_type),
}
}
Expand Down Expand Up @@ -238,7 +240,10 @@ fn get_default_tokens(
}
let byte_lit = string_to_byte_literal_tokens(s, data_type.size())?;
// OctetStrings are always the exact length
if matches!(data_type, DCDataType::OctetString(_)) {
if matches!(
data_type,
DCDataType::OctetString(_) | DCDataType::TimeOfDay
) {
Ok(quote!(ByteField::new(#byte_lit)))
} else {
Ok(quote!(NullTermByteField::new(#byte_lit)))
Expand Down
9 changes: 6 additions & 3 deletions zencan-common/src/device_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,10 @@ impl DataType {
pub fn is_str(&self) -> bool {
matches!(
self,
DataType::VisibleString(_) | DataType::OctetString(_) | DataType::UnicodeString(_)
DataType::VisibleString(_)
| DataType::OctetString(_)
| DataType::UnicodeString(_)
| DataType::TimeOfDay
)
}

Expand All @@ -924,8 +927,8 @@ impl DataType {
DataType::VisibleString(size) => *size,
DataType::OctetString(size) => *size,
DataType::UnicodeString(size) => *size,
DataType::TimeOfDay => 4,
DataType::TimeDifference => 4,
DataType::TimeOfDay => 6,
DataType::TimeDifference => 6,
DataType::Domain => 0, // Domain size is variable
}
}
Expand Down