Skip to content

Remove IdType, replace with u32 #6

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
LelsersLasers merged 2 commits into from
Oct 15, 2025
Merged

Remove IdType, replace with u32 #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fe47ca
Remove IdType, replace with u32
LelsersLasers Oct 15, 2025
3f54736
fmt
LelsersLasers Oct 15, 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
16 changes: 7 additions & 9 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
//! # }
//! ```

/// Type alias for CAN message identifiers.
pub type IdType = u32;

/// A decoded CAN message containing signal values.
///
/// This structure represents a fully decoded CAN message with all its signals
Expand All @@ -47,7 +44,7 @@ pub struct DecodedMessage {
/// The name of the message as defined in the DBC file
pub name: String,
/// The CAN message ID
pub msg_id: IdType,
pub msg_id: u32,
/// Whether this is an extended (29-bit) CAN ID
pub is_extended: bool,
/// Map of signal names to their decoded values
Expand Down Expand Up @@ -92,7 +89,8 @@ pub struct DecodedSignal {
/// # }
/// ```
pub struct Parser {
msg_defs: std::collections::HashMap<IdType, can_dbc::Message>,
/// Map of message ID to message definitions
msg_defs: std::collections::HashMap<u32, can_dbc::Message>,
}

impl Parser {
Expand Down Expand Up @@ -269,7 +267,7 @@ impl Parser {
/// # Ok(())
/// # }
/// ```
pub fn decode_msg(&self, msg_id: IdType, data: &[u8]) -> Option<DecodedMessage> {
pub fn decode_msg(&self, msg_id: u32, data: &[u8]) -> Option<DecodedMessage> {
// Grab msg metadata and then for every signal in the message, decode it and add
// to the decoded message
let msg_def = self.msg_defs.get(&msg_id)?;
Expand Down Expand Up @@ -436,7 +434,7 @@ impl Parser {
/// # Ok(())
/// # }
/// ```
pub fn signals_for_msg(&self, msg_id: IdType) -> Option<Vec<can_dbc::Signal>> {
pub fn signals_for_msg(&self, msg_id: u32) -> Option<Vec<can_dbc::Signal>> {
let msg_def = self.msg_defs.get(&msg_id)?;
Some(msg_def.signals().to_vec())
}
Expand All @@ -458,7 +456,7 @@ impl Parser {
/// let parser = Parser::from_dbc_file(Path::new("my_database.dbc"))?;
///
/// for msg in parser.msg_defs() {
/// println!("Message: {} (ID: {:#X})", msg.message_name(),
/// println!("Message: {} (ID: {:#X})", msg.message_name(),
/// match msg.message_id() {
/// can_dbc::MessageId::Standard(id) => *id as u32,
/// can_dbc::MessageId::Extended(id) => *id,
Expand Down Expand Up @@ -493,4 +491,4 @@ impl Default for Parser {
fn default() -> Self {
Self::new()
}
}
}