sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added icsneo_message_get_type and icsneo_message_get_bus_type

David Rebbe 2024-12-04 00:24:26 -05:00
parent 55f90f5602
commit a7738f192f
2 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api/icsneo/icsneo.cpp
View File

@ -327,6 +327,7 @@ ICSNEO_API icsneo_error_t icsneo_get_messages(icsneo_device_t* device, icsneo_me
if (!device || !messages || !messages_count) {
return icsneo_error_invalid_parameters;
}
// TODO: Check if device is valid
auto dev = device->device;
// Wait for messages
auto start_time = std::chrono::steady_clock::now();
@ -366,9 +367,10 @@ ICSNEO_API icsneo_error_t icsneo_get_messages(icsneo_device_t* device, icsneo_me
}
ICSNEO_API icsneo_error_t icsneo_is_message_valid(icsneo_device_t* device, icsneo_message_t* message, bool* is_valid) {
if (!message || !is_valid) {
if (!device || !message || !is_valid) {
return icsneo_error_invalid_parameters;
}
// TODO: Check if device is valid
*is_valid = std::find_if(device->messages.begin(), device->messages.end(), [&](const auto& msg) {
return msg->message == message->message;
}) == device->messages.end();
@ -376,20 +378,31 @@ ICSNEO_API icsneo_error_t icsneo_is_message_valid(icsneo_device_t* device, icsne
return icsneo_error_success;
}
ICSNEO_API icsneo_error_t icsneo_message_get_type(icsneo_device_t* device, icsneo_message_t* message, uint32_t* type) {
if (!message || !type) {
ICSNEO_API icsneo_error_t icsneo_message_get_type(icsneo_device_t* device, icsneo_message_t* message, icsneo_msg_type_t* msg_type) {
if (!device || !message || !msg_type) {
return icsneo_error_invalid_parameters;
}
// TODO: Fix this in the core so we actually get the message type from the message
if (dynamic_cast<CANMessage*>(message->message.get())) {
return 100;
} else if (dynamic_cast<LINMessage*>(message->message.get())) {
return 200;
} else if (dynamic_cast<EthernetMessage*>(message->message.get())) {
return 300;
} else {
return 999;
}
// TODO: Check if message is valid
// Assign the message type
*msg_type = message->message->getMsgType();
return icsneo_error_success;
}
ICSNEO_API icsneo_error_t icsneo_message_get_bus_type(icsneo_device_t* device, icsneo_message_t* message, icsneo_msg_bus_type_t* bus_type) {
if (!device || !message || !bus_type) {
return icsneo_error_invalid_parameters;
}
// TODO: Check if message is valid
// Make sure the message is a bus message
if (message->message->getMsgType() != icsneo_msg_type_bus) {
return icsneo_error_invalid_type;
}
// We can static cast here because we are relying on the type being correct at this point
auto bus_message = static_cast<BusMessage*>(message->message.get());
*bus_type = bus_message->getBusType();
return icsneo_error_success;
}

26
include/icsneo/icsneo.h
View File

@ -65,6 +65,8 @@ typedef enum _icsneo_error_t {
icsneo_error_sync_rtc_failed,
// Error getting messages.
icsneo_error_get_messages_failed,
// Generic invalid type error
icsneo_error_invalid_type,
} _icsneo_error_t;
/** @brief Integer representation of _icsneo_error_t enum.
@ -286,7 +288,29 @@ ICSNEO_API icsneo_error_t icsneo_get_messages(icsneo_device_t* device, icsneo_me
*/
ICSNEO_API icsneo_error_t icsneo_is_message_valid(icsneo_device_t* device, icsneo_message_t* message, bool* is_valid);
ICSNEO_API icsneo_error_t icsneo_message_get_type(icsneo_device_t* device, icsneo_message_t* message, uint32_t* type);
/** @brief Get the type of a message
*
* @param[in] icsneo_device_t* device The device to check against.
* @param[in] icsneo_message_t* message The message to check.
* @param[out] icsneo_msg_type_t* msg_type Pointer to a icsneo_msg_type_t to copy the type of the value into.
*
* @return icsneo_error_t icsneo_error_success if successful, icsneo_error_invalid_parameters otherwise.
*
* @see icsneo_msg_type_t
*/
ICSNEO_API icsneo_error_t icsneo_message_get_type(icsneo_device_t* device, icsneo_message_t* message, icsneo_msg_type_t* msg_type);
/** @brief Get the type of a bus message
*
* @param[in] icsneo_device_t* device The device to check against.
* @param[in] icsneo_message_t* message The message to check.
* @param[out] icsneo_msg_type_t* msg_type Pointer to a icsneo_msg_type_t to copy the type of the value into.
*
* @return icsneo_error_t icsneo_error_success if successful, icsneo_error_invalid_parameters or icsneo_error_invalid_type otherwise.
*
* @see icsneo_msg_bus_type_t
*/
ICSNEO_API icsneo_error_t icsneo_message_get_bus_type(icsneo_device_t* device, icsneo_message_t* message, icsneo_msg_bus_type_t* bus_type);
#ifdef __cplusplus
}