Compare commits
5 Commits
9dcee2ae04
...
b0575fe658
| Author | SHA1 | Date |
|---|---|---|
David Rebbe
|
b0575fe658 | |
|
David Rebbe
|
2a63bbf13f | |
|
David Rebbe
|
b514a55749 | |
|
David Rebbe
|
21964fafe4 | |
|
David Rebbe
|
13326d3f02 |
|
|
@ -9,20 +9,42 @@
|
|||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <deque>
|
||||
#include <algorithm>
|
||||
|
||||
using namespace icsneo;
|
||||
|
||||
typedef struct icsneo_device_t {
|
||||
std::shared_ptr<Device> device;
|
||||
// Received messages from the device, we can automatically free them without the user.
|
||||
std::vector<std::shared_ptr<icsneo_message_t>> messages;
|
||||
// Seperate buffer for transmit messages for simplicity. User is responsible for freeing.
|
||||
// This needs to be a deque so that pointers aren't invalidated on push_back.
|
||||
std::deque<std::shared_ptr<icsneo_message_t>> tx_messages;
|
||||
std::vector<icsneo_event_t> events;
|
||||
|
||||
icsneo_open_options_t options;
|
||||
|
||||
icsneo_device_t(std::shared_ptr<Device>& device, icsneo_open_options_t options) : device(device), options(options) {}
|
||||
|
||||
// Take care of cleaning up the device buffers like when closing the device
|
||||
void clean_up() {
|
||||
messages.clear();
|
||||
messages.shrink_to_fit();
|
||||
events.clear();
|
||||
events.shrink_to_fit();
|
||||
tx_messages.clear();
|
||||
tx_messages.shrink_to_fit();
|
||||
}
|
||||
} icsneo_device_t;
|
||||
|
||||
// Any new members to this struct should be initialized in icsneo_device_get_messages()
|
||||
typedef struct icsneo_message_t {
|
||||
std::shared_ptr<Message> message;
|
||||
// Indicates this message is a transmit message and should be in the tx_messages vector
|
||||
bool is_tx;
|
||||
|
||||
icsneo_message_t(std::shared_ptr<Message>& message, bool is_tx) : message(message), is_tx(is_tx) {}
|
||||
} icsneo_message_t;
|
||||
|
||||
typedef struct icsneo_event_t {
|
||||
|
|
@ -38,7 +60,7 @@ ICSNEO_API icsneo_error_t icsneo_get_error_code(icsneo_error_t error_code, const
|
|||
return icsneo_error_invalid_parameters;
|
||||
}
|
||||
|
||||
std::string error;
|
||||
std::string error("Unknown");
|
||||
switch (error_code) {
|
||||
case icsneo_error_success:
|
||||
error = "Success";
|
||||
|
|
@ -64,6 +86,9 @@ ICSNEO_API icsneo_error_t icsneo_get_error_code(icsneo_error_t error_code, const
|
|||
case icsneo_error_set_settings_failure:
|
||||
error = "Setting settings failed";
|
||||
break;
|
||||
case icsneo_error_transmit_messages_failed:
|
||||
error = "Transmitting messages failed";
|
||||
break;
|
||||
// Don't default, let the compiler warn us if we forget to handle an error code
|
||||
}
|
||||
// Find the minimum length of the error string and set value_length
|
||||
|
|
@ -110,10 +135,9 @@ ICSNEO_API icsneo_error_t icsneo_device_find_all(icsneo_device_t** devices, uint
|
|||
[&](const auto& device) {
|
||||
return device->device == found_device;
|
||||
})) {
|
||||
auto device = std::make_shared<icsneo_device_t>();
|
||||
device->device = found_device;
|
||||
device->options = icsneo_open_options_go_online | icsneo_open_options_enable_message_polling | icsneo_open_options_sync_rtc | icsneo_open_options_enable_auto_update;
|
||||
g_devices.push_back(device);
|
||||
auto default_options = icsneo_open_options_go_online | icsneo_open_options_enable_message_polling | icsneo_open_options_sync_rtc | icsneo_open_options_enable_auto_update;
|
||||
auto device = std::make_shared<icsneo_device_t>(found_device, default_options);
|
||||
g_devices.push_back(device);
|
||||
}
|
||||
}
|
||||
// Determine how many we can return to the caller
|
||||
|
|
@ -198,10 +222,7 @@ ICSNEO_API icsneo_error_t icsneo_device_close(icsneo_device_t* device) {
|
|||
}
|
||||
dev->close();
|
||||
// Clear out old messages and events
|
||||
device->messages.clear();
|
||||
device->messages.shrink_to_fit();
|
||||
device->events.clear();
|
||||
device->events.shrink_to_fit();
|
||||
device->clean_up();
|
||||
return icsneo_error_success;
|
||||
}
|
||||
|
||||
|
|
@ -378,8 +399,7 @@ ICSNEO_API icsneo_error_t icsneo_device_get_messages(icsneo_device_t* device, ic
|
|||
// Copy the messages into our device message container
|
||||
device->messages.clear();
|
||||
for (auto& message : queried_messages) {
|
||||
auto message_t = std::make_shared<icsneo_message_t>();
|
||||
message_t->message = message;
|
||||
auto message_t = std::make_shared<icsneo_message_t>(message, false);
|
||||
device->messages.push_back(message_t);
|
||||
}
|
||||
device->messages.shrink_to_fit();
|
||||
|
|
@ -391,6 +411,26 @@ ICSNEO_API icsneo_error_t icsneo_device_get_messages(icsneo_device_t* device, ic
|
|||
return icsneo_error_success;
|
||||
}
|
||||
|
||||
ICSNEO_API icsneo_error_t icsneo_device_transmit_messages(icsneo_device_t* device, icsneo_message_t** messages, uint32_t* messages_count) {
|
||||
if (!device || !messages || !messages_count) {
|
||||
return icsneo_error_invalid_parameters;
|
||||
}
|
||||
// TODO: Check if device is valid
|
||||
auto dev = device->device;
|
||||
uint32_t i = 0;
|
||||
bool success = false;
|
||||
for (;i < *messages_count; i++) {
|
||||
// TODO: Check if message is valid
|
||||
success = dev->transmit(std::static_pointer_cast<icsneo::BusMessage>(messages[i]->message));
|
||||
if (!success) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
*messages_count = i;
|
||||
|
||||
return success ? icsneo_error_success : icsneo_error_transmit_messages_failed;
|
||||
}
|
||||
|
||||
ICSNEO_API icsneo_error_t icsneo_message_is_valid(icsneo_device_t* device, icsneo_message_t* message, bool* is_valid) {
|
||||
if (!device || !message || !is_valid) {
|
||||
return icsneo_error_invalid_parameters;
|
||||
|
|
@ -566,6 +606,23 @@ ICSNEO_API icsneo_error_t icsneo_can_message_get_error_state_indicator(icsneo_de
|
|||
return icsneo_error_success;
|
||||
}
|
||||
|
||||
ICSNEO_API icsneo_error_t icsneo_can_messages_create(icsneo_device_t* device, icsneo_message_t** messages, uint32_t messages_count) {
|
||||
if (!device || !messages) {
|
||||
return icsneo_error_invalid_parameters;
|
||||
}
|
||||
// TODO: Check if device is valid
|
||||
auto dev = device->device;
|
||||
// Get the device messages
|
||||
for (uint32_t i = 0; i < messages_count; i++) {
|
||||
auto can_message = std::static_pointer_cast<Message>(std::make_shared<CANMessage>());
|
||||
auto message = std::make_shared<icsneo_message_t>(can_message, true);
|
||||
device->tx_messages.push_back(message);
|
||||
messages[i] = message.get();
|
||||
}
|
||||
|
||||
return icsneo_error_success;
|
||||
}
|
||||
|
||||
ICSNEO_API icsneo_error_t icsneo_get_events(icsneo_event_t** events, uint32_t* events_count) {
|
||||
if (!events || !events_count) {
|
||||
return icsneo_error_invalid_parameters;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace icsneo {
|
|||
|
||||
void init_messagefilter(pybind11::module_& m) {
|
||||
pybind11::class_<MessageFilter, std::shared_ptr<MessageFilter>>(m, "MessageFilter")
|
||||
.def(pybind11::init<Network::_icsneo_netid_t>());
|
||||
.def(pybind11::init<_icsneo_netid_t>());
|
||||
}
|
||||
|
||||
} // namespace icsneo
|
||||
|
|
|
|||
|
|
@ -9,165 +9,165 @@ namespace icsneo {
|
|||
void init_network(pybind11::module_& m) {
|
||||
pybind11::class_<Network> network(m, "Network");
|
||||
|
||||
pybind11::enum_<Network::_icsneo_netid_t>(network, "_icsneo_netid_t")
|
||||
.value("Device", Network::_icsneo_netid_t::icsneo_netid_device)
|
||||
.value("HSCAN", Network::_icsneo_netid_t::icsneo_netid_hscan)
|
||||
.value("MSCAN", Network::_icsneo_netid_t::icsneo_netid_mscan)
|
||||
.value("SWCAN", Network::_icsneo_netid_t::icsneo_netid_swcan)
|
||||
.value("LSFTCAN", Network::_icsneo_netid_t::icsneo_netid_lsftcan)
|
||||
.value("FordSCP", Network::_icsneo_netid_t::icsneo_netid_fordscp)
|
||||
.value("J1708", Network::_icsneo_netid_t::icsneo_netid_j1708)
|
||||
.value("Aux", Network::_icsneo_netid_t::icsneo_netid_aux)
|
||||
.value("J1850VPW", Network::_icsneo_netid_t::icsneo_netid_j1850vpw)
|
||||
.value("ISO9141", Network::_icsneo_netid_t::icsneo_netid_iso9141)
|
||||
.value("DiskData", Network::_icsneo_netid_t::icsneo_netid_disk_data)
|
||||
.value("Main51", Network::_icsneo_netid_t::icsneo_netid_main51)
|
||||
.value("RED", Network::_icsneo_netid_t::icsneo_netid_red)
|
||||
.value("SCI", Network::_icsneo_netid_t::icsneo_netid_sci)
|
||||
.value("ISO9141_2", Network::_icsneo_netid_t::icsneo_netid_iso9141_2)
|
||||
.value("ISO14230", Network::_icsneo_netid_t::icsneo_netid_iso14230)
|
||||
.value("LIN", Network::_icsneo_netid_t::icsneo_netid_lin)
|
||||
.value("OP_Ethernet1", Network::_icsneo_netid_t::icsneo_netid_op_ethernet1)
|
||||
.value("OP_Ethernet2", Network::_icsneo_netid_t::icsneo_netid_op_ethernet2)
|
||||
.value("OP_Ethernet3", Network::_icsneo_netid_t::icsneo_netid_op_ethernet3)
|
||||
.value("RED_EXT_MEMORYREAD", Network::_icsneo_netid_t::icsneo_netid_red_ext_memoryread)
|
||||
.value("RED_INT_MEMORYREAD", Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread)
|
||||
.value("RED_DFLASH_READ", Network::_icsneo_netid_t::icsneo_netid_red_dflash_read)
|
||||
.value("NeoMemorySDRead", Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread)
|
||||
.value("CAN_ERRBITS", Network::_icsneo_netid_t::icsneo_netid_can_errbits)
|
||||
.value("NeoMemoryWriteDone", Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done)
|
||||
.value("RED_WAVE_CAN1_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_can1_logical)
|
||||
.value("RED_WAVE_CAN2_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_can2_logical)
|
||||
.value("RED_WAVE_LIN1_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin1_logical)
|
||||
.value("RED_WAVE_LIN2_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin2_logical)
|
||||
.value("RED_WAVE_LIN1_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin1_analog)
|
||||
.value("RED_WAVE_LIN2_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin2_analog)
|
||||
.value("RED_WAVE_MISC_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_misc_analog)
|
||||
.value("RED_WAVE_MISCDIO2_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_miscdio2_logical)
|
||||
.value("RED_NETWORK_COM_ENABLE_EX", Network::_icsneo_netid_t::icsneo_netid_red_network_com_enable_ex)
|
||||
.value("RED_NEOVI_NETWORK", Network::_icsneo_netid_t::icsneo_netid_red_neovi_network)
|
||||
.value("RED_READ_BAUD_SETTINGS", Network::_icsneo_netid_t::icsneo_netid_red_read_baud_settings)
|
||||
.value("RED_OLDFORMAT", Network::_icsneo_netid_t::icsneo_netid_red_oldformat)
|
||||
.value("RED_SCOPE_CAPTURE", Network::_icsneo_netid_t::icsneo_netid_red_scope_capture)
|
||||
.value("RED_HARDWARE_EXCEP", Network::_icsneo_netid_t::icsneo_netid_red_hardware_excep)
|
||||
.value("RED_GET_RTC", Network::_icsneo_netid_t::icsneo_netid_red_get_rtc)
|
||||
.value("ISO9141_3", Network::_icsneo_netid_t::icsneo_netid_iso9141_3)
|
||||
.value("HSCAN2", Network::_icsneo_netid_t::icsneo_netid_hscan2)
|
||||
.value("HSCAN3", Network::_icsneo_netid_t::icsneo_netid_hscan3)
|
||||
.value("OP_Ethernet4", Network::_icsneo_netid_t::icsneo_netid_op_ethernet4)
|
||||
.value("OP_Ethernet5", Network::_icsneo_netid_t::icsneo_netid_op_ethernet5)
|
||||
.value("ISO9141_4", Network::_icsneo_netid_t::icsneo_netid_iso9141_4)
|
||||
.value("LIN2", Network::_icsneo_netid_t::icsneo_netid_lin2)
|
||||
.value("LIN3", Network::_icsneo_netid_t::icsneo_netid_lin3)
|
||||
.value("LIN4", Network::_icsneo_netid_t::icsneo_netid_lin4)
|
||||
.value("RED_App_Error", Network::_icsneo_netid_t::icsneo_netid_red_app_error)
|
||||
.value("CGI", Network::_icsneo_netid_t::icsneo_netid_cgi)
|
||||
.value("Reset_Status", Network::_icsneo_netid_t::icsneo_netid_reset_status)
|
||||
.value("FB_Status", Network::_icsneo_netid_t::icsneo_netid_fb_status)
|
||||
.value("App_Signal_Status", Network::_icsneo_netid_t::icsneo_netid_app_signal_status)
|
||||
.value("Read_Datalink_Cm_Tx_Msg", Network::_icsneo_netid_t::icsneo_netid_read_datalink_cm_tx_msg)
|
||||
.value("Read_Datalink_Cm_Rx_Msg", Network::_icsneo_netid_t::icsneo_netid_read_datalink_cm_rx_msg)
|
||||
.value("Logging_Overflow", Network::_icsneo_netid_t::icsneo_netid_logging_overflow)
|
||||
.value("ReadSettings", Network::_icsneo_netid_t::icsneo_netid_read_settings)
|
||||
.value("HSCAN4", Network::_icsneo_netid_t::icsneo_netid_hscan4)
|
||||
.value("HSCAN5", Network::_icsneo_netid_t::icsneo_netid_hscan5)
|
||||
.value("RS232", Network::_icsneo_netid_t::icsneo_netid_rs232)
|
||||
.value("UART", Network::_icsneo_netid_t::icsneo_netid_uart)
|
||||
.value("UART2", Network::_icsneo_netid_t::icsneo_netid_uart2)
|
||||
.value("UART3", Network::_icsneo_netid_t::icsneo_netid_uart3)
|
||||
.value("UART4", Network::_icsneo_netid_t::icsneo_netid_uart4)
|
||||
.value("SWCAN2", Network::_icsneo_netid_t::icsneo_netid_swcan2)
|
||||
.value("Ethernet_DAQ", Network::_icsneo_netid_t::icsneo_netid_ethernet_daq)
|
||||
.value("Data_To_Host", Network::_icsneo_netid_t::icsneo_netid_data_to_host)
|
||||
.value("TextAPI_To_Host", Network::_icsneo_netid_t::icsneo_netid_textapi_to_host)
|
||||
.value("SPI1", Network::_icsneo_netid_t::icsneo_netid_spi1)
|
||||
.value("OP_Ethernet6", Network::_icsneo_netid_t::icsneo_netid_op_ethernet6)
|
||||
.value("Red_VBat", Network::_icsneo_netid_t::icsneo_netid_red_vbat)
|
||||
.value("OP_Ethernet7", Network::_icsneo_netid_t::icsneo_netid_op_ethernet7)
|
||||
.value("OP_Ethernet8", Network::_icsneo_netid_t::icsneo_netid_op_ethernet8)
|
||||
.value("OP_Ethernet9", Network::_icsneo_netid_t::icsneo_netid_op_ethernet9)
|
||||
.value("OP_Ethernet10", Network::_icsneo_netid_t::icsneo_netid_op_ethernet10)
|
||||
.value("OP_Ethernet11", Network::_icsneo_netid_t::icsneo_netid_op_ethernet11)
|
||||
.value("FlexRay1a", Network::_icsneo_netid_t::icsneo_netid_flexray1a)
|
||||
.value("FlexRay1b", Network::_icsneo_netid_t::icsneo_netid_flexray1b)
|
||||
.value("FlexRay2a", Network::_icsneo_netid_t::icsneo_netid_flexray2a)
|
||||
.value("FlexRay2b", Network::_icsneo_netid_t::icsneo_netid_flexray2b)
|
||||
.value("LIN5", Network::_icsneo_netid_t::icsneo_netid_lin5)
|
||||
.value("FlexRay", Network::_icsneo_netid_t::icsneo_netid_flexray)
|
||||
.value("FlexRay2", Network::_icsneo_netid_t::icsneo_netid_flexray2)
|
||||
.value("OP_Ethernet12", Network::_icsneo_netid_t::icsneo_netid_op_ethernet12)
|
||||
.value("I2C", Network::_icsneo_netid_t::icsneo_netid_i2c)
|
||||
.value("MOST25", Network::_icsneo_netid_t::icsneo_netid_most25)
|
||||
.value("MOST50", Network::_icsneo_netid_t::icsneo_netid_most50)
|
||||
.value("MOST150", Network::_icsneo_netid_t::icsneo_netid_most150)
|
||||
.value("Ethernet", Network::_icsneo_netid_t::icsneo_netid_ethernet)
|
||||
.value("GMFSA", Network::_icsneo_netid_t::icsneo_netid_gmfsa)
|
||||
.value("TCP", Network::_icsneo_netid_t::icsneo_netid_tcp)
|
||||
.value("HSCAN6", Network::_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
.value("HSCAN7", Network::_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
.value("LIN6", Network::_icsneo_netid_t::icsneo_netid_lin6)
|
||||
.value("LSFTCAN2", Network::_icsneo_netid_t::icsneo_netid_lsftcan2)
|
||||
.value("LogicalDiskInfo", Network::_icsneo_netid_t::icsneo_netid_logical_disk_info)
|
||||
.value("WiVICommand", Network::_icsneo_netid_t::icsneo_netid_wivi_command)
|
||||
.value("ScriptStatus", Network::_icsneo_netid_t::icsneo_netid_script_status)
|
||||
.value("EthPHYControl", Network::_icsneo_netid_t::icsneo_netid_eth_phy_control)
|
||||
.value("ExtendedCommand", Network::_icsneo_netid_t::icsneo_netid_extended_command)
|
||||
.value("ExtendedData", Network::_icsneo_netid_t::icsneo_netid_extended_data)
|
||||
.value("FlexRayControl", Network::_icsneo_netid_t::icsneo_netid_flexray_control)
|
||||
.value("CoreMiniPreLoad", Network::_icsneo_netid_t::icsneo_netid_coremini_preload)
|
||||
.value("HW_COM_Latency_Test", Network::_icsneo_netid_t::icsneo_netid_hw_com_latency_test)
|
||||
.value("DeviceStatus", Network::_icsneo_netid_t::icsneo_netid_device_status)
|
||||
.value("UDP", Network::_icsneo_netid_t::icsneo_netid_udp)
|
||||
.value("ForwardedMessage", Network::_icsneo_netid_t::icsneo_netid_forwarded_message)
|
||||
.value("I2C2", Network::_icsneo_netid_t::icsneo_netid_i2c2)
|
||||
.value("I2C3", Network::_icsneo_netid_t::icsneo_netid_i2c3)
|
||||
.value("I2C4", Network::_icsneo_netid_t::icsneo_netid_i2c4)
|
||||
.value("Ethernet2", Network::_icsneo_netid_t::icsneo_netid_ethernet2)
|
||||
.value("A2B1", Network::_icsneo_netid_t::icsneo_netid_a2b1)
|
||||
.value("A2B2", Network::_icsneo_netid_t::icsneo_netid_a2b2)
|
||||
.value("Ethernet3", Network::_icsneo_netid_t::icsneo_netid_ethernet3)
|
||||
.value("WBMS", Network::_icsneo_netid_t::icsneo_netid_wbms)
|
||||
.value("DWCAN9", Network::_icsneo_netid_t::icsneo_netid_dwcan9)
|
||||
.value("DWCAN10", Network::_icsneo_netid_t::icsneo_netid_dwcan10)
|
||||
.value("DWCAN11", Network::_icsneo_netid_t::icsneo_netid_dwcan11)
|
||||
.value("DWCAN12", Network::_icsneo_netid_t::icsneo_netid_dwcan12)
|
||||
.value("DWCAN13", Network::_icsneo_netid_t::icsneo_netid_dwcan13)
|
||||
.value("DWCAN14", Network::_icsneo_netid_t::icsneo_netid_dwcan14)
|
||||
.value("DWCAN15", Network::_icsneo_netid_t::icsneo_netid_dwcan15)
|
||||
.value("DWCAN16", Network::_icsneo_netid_t::icsneo_netid_dwcan16)
|
||||
.value("LIN7", Network::_icsneo_netid_t::icsneo_netid_lin7)
|
||||
.value("LIN8", Network::_icsneo_netid_t::icsneo_netid_lin8)
|
||||
.value("SPI2", Network::_icsneo_netid_t::icsneo_netid_spi2)
|
||||
.value("MDIO1", Network::_icsneo_netid_t::icsneo_netid_mdio1)
|
||||
.value("MDIO2", Network::_icsneo_netid_t::icsneo_netid_mdio2)
|
||||
.value("MDIO3", Network::_icsneo_netid_t::icsneo_netid_mdio3)
|
||||
.value("MDIO4", Network::_icsneo_netid_t::icsneo_netid_mdio4)
|
||||
.value("MDIO5", Network::_icsneo_netid_t::icsneo_netid_mdio5)
|
||||
.value("MDIO6", Network::_icsneo_netid_t::icsneo_netid_mdio6)
|
||||
.value("MDIO7", Network::_icsneo_netid_t::icsneo_netid_mdio7)
|
||||
.value("MDIO8", Network::_icsneo_netid_t::icsneo_netid_mdio8)
|
||||
.value("OP_Ethernet13", Network::_icsneo_netid_t::icsneo_netid_op_ethernet13)
|
||||
.value("OP_Ethernet14", Network::_icsneo_netid_t::icsneo_netid_op_ethernet14)
|
||||
.value("OP_Ethernet15", Network::_icsneo_netid_t::icsneo_netid_op_ethernet15)
|
||||
.value("OP_Ethernet16", Network::_icsneo_netid_t::icsneo_netid_op_ethernet16)
|
||||
.value("SPI3", Network::_icsneo_netid_t::icsneo_netid_spi3)
|
||||
.value("SPI4", Network::_icsneo_netid_t::icsneo_netid_spi4)
|
||||
.value("SPI5", Network::_icsneo_netid_t::icsneo_netid_spi5)
|
||||
.value("SPI6", Network::_icsneo_netid_t::icsneo_netid_spi6)
|
||||
.value("SPI7", Network::_icsneo_netid_t::icsneo_netid_spi7)
|
||||
.value("SPI8", Network::_icsneo_netid_t::icsneo_netid_spi8)
|
||||
.value("LIN9", Network::_icsneo_netid_t::icsneo_netid_lin9)
|
||||
.value("LIN10", Network::_icsneo_netid_t::icsneo_netid_lin10)
|
||||
.value("LIN11", Network::_icsneo_netid_t::icsneo_netid_lin11)
|
||||
.value("LIN12", Network::_icsneo_netid_t::icsneo_netid_lin12)
|
||||
.value("LIN13", Network::_icsneo_netid_t::icsneo_netid_lin13)
|
||||
.value("LIN14", Network::_icsneo_netid_t::icsneo_netid_lin14)
|
||||
.value("LIN15", Network::_icsneo_netid_t::icsneo_netid_lin15)
|
||||
.value("LIN16", Network::_icsneo_netid_t::icsneo_netid_lin16)
|
||||
.value("Any", Network::_icsneo_netid_t::icsneo_netid_any)
|
||||
.value("Invalid", Network::_icsneo_netid_t::icsneo_netid_invalid);
|
||||
pybind11::enum_<_icsneo_netid_t>(network, "_icsneo_netid_t")
|
||||
.value("Device", _icsneo_netid_t::icsneo_netid_device)
|
||||
.value("HSCAN", _icsneo_netid_t::icsneo_netid_hscan)
|
||||
.value("MSCAN", _icsneo_netid_t::icsneo_netid_mscan)
|
||||
.value("SWCAN", _icsneo_netid_t::icsneo_netid_swcan)
|
||||
.value("LSFTCAN", _icsneo_netid_t::icsneo_netid_lsftcan)
|
||||
.value("FordSCP", _icsneo_netid_t::icsneo_netid_fordscp)
|
||||
.value("J1708", _icsneo_netid_t::icsneo_netid_j1708)
|
||||
.value("Aux", _icsneo_netid_t::icsneo_netid_aux)
|
||||
.value("J1850VPW", _icsneo_netid_t::icsneo_netid_j1850vpw)
|
||||
.value("ISO9141", _icsneo_netid_t::icsneo_netid_iso9141)
|
||||
.value("DiskData", _icsneo_netid_t::icsneo_netid_disk_data)
|
||||
.value("Main51", _icsneo_netid_t::icsneo_netid_main51)
|
||||
.value("RED", _icsneo_netid_t::icsneo_netid_red)
|
||||
.value("SCI", _icsneo_netid_t::icsneo_netid_sci)
|
||||
.value("ISO9141_2", _icsneo_netid_t::icsneo_netid_iso9141_2)
|
||||
.value("ISO14230", _icsneo_netid_t::icsneo_netid_iso14230)
|
||||
.value("LIN", _icsneo_netid_t::icsneo_netid_lin)
|
||||
.value("OP_Ethernet1", _icsneo_netid_t::icsneo_netid_op_ethernet1)
|
||||
.value("OP_Ethernet2", _icsneo_netid_t::icsneo_netid_op_ethernet2)
|
||||
.value("OP_Ethernet3", _icsneo_netid_t::icsneo_netid_op_ethernet3)
|
||||
.value("RED_EXT_MEMORYREAD", _icsneo_netid_t::icsneo_netid_red_ext_memoryread)
|
||||
.value("RED_INT_MEMORYREAD", _icsneo_netid_t::icsneo_netid_red_int_memoryread)
|
||||
.value("RED_DFLASH_READ", _icsneo_netid_t::icsneo_netid_red_dflash_read)
|
||||
.value("NeoMemorySDRead", _icsneo_netid_t::icsneo_netid_neo_memory_sdread)
|
||||
.value("CAN_ERRBITS", _icsneo_netid_t::icsneo_netid_can_errbits)
|
||||
.value("NeoMemoryWriteDone", _icsneo_netid_t::icsneo_netid_neo_memory_write_done)
|
||||
.value("RED_WAVE_CAN1_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_can1_logical)
|
||||
.value("RED_WAVE_CAN2_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_can2_logical)
|
||||
.value("RED_WAVE_LIN1_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_lin1_logical)
|
||||
.value("RED_WAVE_LIN2_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_lin2_logical)
|
||||
.value("RED_WAVE_LIN1_ANALOG", _icsneo_netid_t::icsneo_netid_red_wave_lin1_analog)
|
||||
.value("RED_WAVE_LIN2_ANALOG", _icsneo_netid_t::icsneo_netid_red_wave_lin2_analog)
|
||||
.value("RED_WAVE_MISC_ANALOG", _icsneo_netid_t::icsneo_netid_red_wave_misc_analog)
|
||||
.value("RED_WAVE_MISCDIO2_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_miscdio2_logical)
|
||||
.value("RED_NETWORK_COM_ENABLE_EX", _icsneo_netid_t::icsneo_netid_red_network_com_enable_ex)
|
||||
.value("RED_NEOVI_NETWORK", _icsneo_netid_t::icsneo_netid_red_neovi_network)
|
||||
.value("RED_READ_BAUD_SETTINGS", _icsneo_netid_t::icsneo_netid_red_read_baud_settings)
|
||||
.value("RED_OLDFORMAT", _icsneo_netid_t::icsneo_netid_red_oldformat)
|
||||
.value("RED_SCOPE_CAPTURE", _icsneo_netid_t::icsneo_netid_red_scope_capture)
|
||||
.value("RED_HARDWARE_EXCEP", _icsneo_netid_t::icsneo_netid_red_hardware_excep)
|
||||
.value("RED_GET_RTC", _icsneo_netid_t::icsneo_netid_red_get_rtc)
|
||||
.value("ISO9141_3", _icsneo_netid_t::icsneo_netid_iso9141_3)
|
||||
.value("HSCAN2", _icsneo_netid_t::icsneo_netid_hscan2)
|
||||
.value("HSCAN3", _icsneo_netid_t::icsneo_netid_hscan3)
|
||||
.value("OP_Ethernet4", _icsneo_netid_t::icsneo_netid_op_ethernet4)
|
||||
.value("OP_Ethernet5", _icsneo_netid_t::icsneo_netid_op_ethernet5)
|
||||
.value("ISO9141_4", _icsneo_netid_t::icsneo_netid_iso9141_4)
|
||||
.value("LIN2", _icsneo_netid_t::icsneo_netid_lin2)
|
||||
.value("LIN3", _icsneo_netid_t::icsneo_netid_lin3)
|
||||
.value("LIN4", _icsneo_netid_t::icsneo_netid_lin4)
|
||||
.value("RED_App_Error", _icsneo_netid_t::icsneo_netid_red_app_error)
|
||||
.value("CGI", _icsneo_netid_t::icsneo_netid_cgi)
|
||||
.value("Reset_Status", _icsneo_netid_t::icsneo_netid_reset_status)
|
||||
.value("FB_Status", _icsneo_netid_t::icsneo_netid_fb_status)
|
||||
.value("App_Signal_Status", _icsneo_netid_t::icsneo_netid_app_signal_status)
|
||||
.value("Read_Datalink_Cm_Tx_Msg", _icsneo_netid_t::icsneo_netid_read_datalink_cm_tx_msg)
|
||||
.value("Read_Datalink_Cm_Rx_Msg", _icsneo_netid_t::icsneo_netid_read_datalink_cm_rx_msg)
|
||||
.value("Logging_Overflow", _icsneo_netid_t::icsneo_netid_logging_overflow)
|
||||
.value("ReadSettings", _icsneo_netid_t::icsneo_netid_read_settings)
|
||||
.value("HSCAN4", _icsneo_netid_t::icsneo_netid_hscan4)
|
||||
.value("HSCAN5", _icsneo_netid_t::icsneo_netid_hscan5)
|
||||
.value("RS232", _icsneo_netid_t::icsneo_netid_rs232)
|
||||
.value("UART", _icsneo_netid_t::icsneo_netid_uart)
|
||||
.value("UART2", _icsneo_netid_t::icsneo_netid_uart2)
|
||||
.value("UART3", _icsneo_netid_t::icsneo_netid_uart3)
|
||||
.value("UART4", _icsneo_netid_t::icsneo_netid_uart4)
|
||||
.value("SWCAN2", _icsneo_netid_t::icsneo_netid_swcan2)
|
||||
.value("Ethernet_DAQ", _icsneo_netid_t::icsneo_netid_ethernet_daq)
|
||||
.value("Data_To_Host", _icsneo_netid_t::icsneo_netid_data_to_host)
|
||||
.value("TextAPI_To_Host", _icsneo_netid_t::icsneo_netid_textapi_to_host)
|
||||
.value("SPI1", _icsneo_netid_t::icsneo_netid_spi1)
|
||||
.value("OP_Ethernet6", _icsneo_netid_t::icsneo_netid_op_ethernet6)
|
||||
.value("Red_VBat", _icsneo_netid_t::icsneo_netid_red_vbat)
|
||||
.value("OP_Ethernet7", _icsneo_netid_t::icsneo_netid_op_ethernet7)
|
||||
.value("OP_Ethernet8", _icsneo_netid_t::icsneo_netid_op_ethernet8)
|
||||
.value("OP_Ethernet9", _icsneo_netid_t::icsneo_netid_op_ethernet9)
|
||||
.value("OP_Ethernet10", _icsneo_netid_t::icsneo_netid_op_ethernet10)
|
||||
.value("OP_Ethernet11", _icsneo_netid_t::icsneo_netid_op_ethernet11)
|
||||
.value("FlexRay1a", _icsneo_netid_t::icsneo_netid_flexray1a)
|
||||
.value("FlexRay1b", _icsneo_netid_t::icsneo_netid_flexray1b)
|
||||
.value("FlexRay2a", _icsneo_netid_t::icsneo_netid_flexray2a)
|
||||
.value("FlexRay2b", _icsneo_netid_t::icsneo_netid_flexray2b)
|
||||
.value("LIN5", _icsneo_netid_t::icsneo_netid_lin5)
|
||||
.value("FlexRay", _icsneo_netid_t::icsneo_netid_flexray)
|
||||
.value("FlexRay2", _icsneo_netid_t::icsneo_netid_flexray2)
|
||||
.value("OP_Ethernet12", _icsneo_netid_t::icsneo_netid_op_ethernet12)
|
||||
.value("I2C", _icsneo_netid_t::icsneo_netid_i2c)
|
||||
.value("MOST25", _icsneo_netid_t::icsneo_netid_most25)
|
||||
.value("MOST50", _icsneo_netid_t::icsneo_netid_most50)
|
||||
.value("MOST150", _icsneo_netid_t::icsneo_netid_most150)
|
||||
.value("Ethernet", _icsneo_netid_t::icsneo_netid_ethernet)
|
||||
.value("GMFSA", _icsneo_netid_t::icsneo_netid_gmfsa)
|
||||
.value("TCP", _icsneo_netid_t::icsneo_netid_tcp)
|
||||
.value("HSCAN6", _icsneo_netid_t::icsneo_netid_hscan6)
|
||||
.value("HSCAN7", _icsneo_netid_t::icsneo_netid_hscan7)
|
||||
.value("LIN6", _icsneo_netid_t::icsneo_netid_lin6)
|
||||
.value("LSFTCAN2", _icsneo_netid_t::icsneo_netid_lsftcan2)
|
||||
.value("LogicalDiskInfo", _icsneo_netid_t::icsneo_netid_logical_disk_info)
|
||||
.value("WiVICommand", _icsneo_netid_t::icsneo_netid_wivi_command)
|
||||
.value("ScriptStatus", _icsneo_netid_t::icsneo_netid_script_status)
|
||||
.value("EthPHYControl", _icsneo_netid_t::icsneo_netid_eth_phy_control)
|
||||
.value("ExtendedCommand", _icsneo_netid_t::icsneo_netid_extended_command)
|
||||
.value("ExtendedData", _icsneo_netid_t::icsneo_netid_extended_data)
|
||||
.value("FlexRayControl", _icsneo_netid_t::icsneo_netid_flexray_control)
|
||||
.value("CoreMiniPreLoad", _icsneo_netid_t::icsneo_netid_coremini_preload)
|
||||
.value("HW_COM_Latency_Test", _icsneo_netid_t::icsneo_netid_hw_com_latency_test)
|
||||
.value("DeviceStatus", _icsneo_netid_t::icsneo_netid_device_status)
|
||||
.value("UDP", _icsneo_netid_t::icsneo_netid_udp)
|
||||
.value("ForwardedMessage", _icsneo_netid_t::icsneo_netid_forwarded_message)
|
||||
.value("I2C2", _icsneo_netid_t::icsneo_netid_i2c2)
|
||||
.value("I2C3", _icsneo_netid_t::icsneo_netid_i2c3)
|
||||
.value("I2C4", _icsneo_netid_t::icsneo_netid_i2c4)
|
||||
.value("Ethernet2", _icsneo_netid_t::icsneo_netid_ethernet2)
|
||||
.value("A2B1", _icsneo_netid_t::icsneo_netid_a2b1)
|
||||
.value("A2B2", _icsneo_netid_t::icsneo_netid_a2b2)
|
||||
.value("Ethernet3", _icsneo_netid_t::icsneo_netid_ethernet3)
|
||||
.value("WBMS", _icsneo_netid_t::icsneo_netid_wbms)
|
||||
.value("DWCAN9", _icsneo_netid_t::icsneo_netid_dwcan9)
|
||||
.value("DWCAN10", _icsneo_netid_t::icsneo_netid_dwcan10)
|
||||
.value("DWCAN11", _icsneo_netid_t::icsneo_netid_dwcan11)
|
||||
.value("DWCAN12", _icsneo_netid_t::icsneo_netid_dwcan12)
|
||||
.value("DWCAN13", _icsneo_netid_t::icsneo_netid_dwcan13)
|
||||
.value("DWCAN14", _icsneo_netid_t::icsneo_netid_dwcan14)
|
||||
.value("DWCAN15", _icsneo_netid_t::icsneo_netid_dwcan15)
|
||||
.value("DWCAN16", _icsneo_netid_t::icsneo_netid_dwcan16)
|
||||
.value("LIN7", _icsneo_netid_t::icsneo_netid_lin7)
|
||||
.value("LIN8", _icsneo_netid_t::icsneo_netid_lin8)
|
||||
.value("SPI2", _icsneo_netid_t::icsneo_netid_spi2)
|
||||
.value("MDIO1", _icsneo_netid_t::icsneo_netid_mdio1)
|
||||
.value("MDIO2", _icsneo_netid_t::icsneo_netid_mdio2)
|
||||
.value("MDIO3", _icsneo_netid_t::icsneo_netid_mdio3)
|
||||
.value("MDIO4", _icsneo_netid_t::icsneo_netid_mdio4)
|
||||
.value("MDIO5", _icsneo_netid_t::icsneo_netid_mdio5)
|
||||
.value("MDIO6", _icsneo_netid_t::icsneo_netid_mdio6)
|
||||
.value("MDIO7", _icsneo_netid_t::icsneo_netid_mdio7)
|
||||
.value("MDIO8", _icsneo_netid_t::icsneo_netid_mdio8)
|
||||
.value("OP_Ethernet13", _icsneo_netid_t::icsneo_netid_op_ethernet13)
|
||||
.value("OP_Ethernet14", _icsneo_netid_t::icsneo_netid_op_ethernet14)
|
||||
.value("OP_Ethernet15", _icsneo_netid_t::icsneo_netid_op_ethernet15)
|
||||
.value("OP_Ethernet16", _icsneo_netid_t::icsneo_netid_op_ethernet16)
|
||||
.value("SPI3", _icsneo_netid_t::icsneo_netid_spi3)
|
||||
.value("SPI4", _icsneo_netid_t::icsneo_netid_spi4)
|
||||
.value("SPI5", _icsneo_netid_t::icsneo_netid_spi5)
|
||||
.value("SPI6", _icsneo_netid_t::icsneo_netid_spi6)
|
||||
.value("SPI7", _icsneo_netid_t::icsneo_netid_spi7)
|
||||
.value("SPI8", _icsneo_netid_t::icsneo_netid_spi8)
|
||||
.value("LIN9", _icsneo_netid_t::icsneo_netid_lin9)
|
||||
.value("LIN10", _icsneo_netid_t::icsneo_netid_lin10)
|
||||
.value("LIN11", _icsneo_netid_t::icsneo_netid_lin11)
|
||||
.value("LIN12", _icsneo_netid_t::icsneo_netid_lin12)
|
||||
.value("LIN13", _icsneo_netid_t::icsneo_netid_lin13)
|
||||
.value("LIN14", _icsneo_netid_t::icsneo_netid_lin14)
|
||||
.value("LIN15", _icsneo_netid_t::icsneo_netid_lin15)
|
||||
.value("LIN16", _icsneo_netid_t::icsneo_netid_lin16)
|
||||
.value("Any", _icsneo_netid_t::icsneo_netid_any)
|
||||
.value("Invalid", _icsneo_netid_t::icsneo_netid_invalid);
|
||||
|
||||
network.def(pybind11::init<Network::_icsneo_netid_t>());
|
||||
network.def(pybind11::init<_icsneo_netid_t>());
|
||||
}
|
||||
|
||||
} // namespace icsneo
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ bool Communication::sendCommand(ExtendedCommand cmd, std::vector<uint8_t> argume
|
|||
}
|
||||
|
||||
bool Communication::getSettingsSync(std::vector<uint8_t>& data, std::chrono::milliseconds timeout) {
|
||||
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_read_settings);
|
||||
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_read_settings);
|
||||
std::shared_ptr<Message> msg = waitForMessageSync([this]() {
|
||||
return sendCommand(Command::ReadSettings, { 0, 0, 0, 1 /* Get Global Settings */, 0, 1 /* Subversion 1 */ });
|
||||
}, filter, timeout);
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
}
|
||||
case icsneo_msg_bus_type_internal: {
|
||||
switch(packet->network.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_reset_status: {
|
||||
case _icsneo_netid_t::icsneo_netid_reset_status: {
|
||||
// We can deal with not having the last two fields (voltage and temperature)
|
||||
if(packet->data.size() < (sizeof(HardwareResetStatusPacket) - (sizeof(uint16_t) * 2))) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
|
||||
|
|
@ -225,12 +225,12 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
result = msg;
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_device: {
|
||||
case _icsneo_netid_t::icsneo_netid_device: {
|
||||
// These are neoVI network messages
|
||||
// They come in as CAN but we will handle them in the device rather than
|
||||
// passing them onto the user.
|
||||
if(packet->data.size() < 24) {
|
||||
auto rawmsg = std::make_shared<InternalMessage>(Network::_icsneo_netid_t::icsneo_netid_device);
|
||||
auto rawmsg = std::make_shared<InternalMessage>(_icsneo_netid_t::icsneo_netid_device);
|
||||
result = rawmsg;
|
||||
rawmsg->data = packet->data;
|
||||
return true;
|
||||
|
|
@ -253,12 +253,12 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
raw->network = packet->network;
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_device_status: {
|
||||
case _icsneo_netid_t::icsneo_netid_device_status: {
|
||||
// Just pass along the data, the device needs to handle this itself
|
||||
result = std::make_shared<InternalMessage>(packet->network, packet->data);
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread: {
|
||||
case _icsneo_netid_t::icsneo_netid_red_int_memoryread: {
|
||||
if(packet->data.size() != 512 + sizeof(uint16_t)) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
|
||||
return false; // Should get enough data for a start address and sector
|
||||
|
|
@ -270,7 +270,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
msg->data.insert(msg->data.end(), packet->data.begin() + 2, packet->data.end());
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread: {
|
||||
case _icsneo_netid_t::icsneo_netid_neo_memory_sdread: {
|
||||
if(packet->data.size() != 512 + sizeof(uint32_t)) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
|
||||
return false; // Should get enough data for a start address and sector
|
||||
|
|
@ -282,7 +282,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
msg->data.insert(msg->data.end(), packet->data.begin() + 4, packet->data.end());
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_extended_command: {
|
||||
case _icsneo_netid_t::icsneo_netid_extended_command: {
|
||||
|
||||
if(packet->data.size() < sizeof(ExtendedResponseMessage::PackedGenericResponse))
|
||||
break; // Handle as a raw message, might not be a generic response
|
||||
|
|
@ -313,7 +313,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
}
|
||||
break;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_extended_data: {
|
||||
case _icsneo_netid_t::icsneo_netid_extended_data: {
|
||||
if(packet->data.size() < sizeof(ExtendedDataMessage::ExtendedDataHeader))
|
||||
break;
|
||||
const auto& header = *reinterpret_cast<ExtendedDataMessage::ExtendedDataHeader*>(packet->data.data());
|
||||
|
|
@ -328,7 +328,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
|
||||
std::copy(packet->data.begin() + sizeof(header), packet->data.begin() + sizeof(header) + numRead, extDataMsg->data.begin());
|
||||
|
||||
extDataMsg->network = Network(static_cast<uint16_t>(Network::_icsneo_netid_t::icsneo_netid_extended_data), false);
|
||||
extDataMsg->network = Network(static_cast<uint16_t>(_icsneo_netid_t::icsneo_netid_extended_data), false);
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
|
|
@ -336,7 +336,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
}
|
||||
break;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_flexray_control: {
|
||||
case _icsneo_netid_t::icsneo_netid_flexray_control: {
|
||||
auto frResult = std::make_shared<FlexRayControlMessage>(*packet);
|
||||
if(!frResult->decoded) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
|
||||
|
|
@ -345,7 +345,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
result = frResult;
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_main51: {
|
||||
case _icsneo_netid_t::icsneo_netid_main51: {
|
||||
switch((Command)packet->data[0]) {
|
||||
case Command::RequestSerialNumber: {
|
||||
auto msg = std::make_shared<SerialNumberMessage>();
|
||||
|
|
@ -397,7 +397,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
return true;
|
||||
}
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_red_oldformat: {
|
||||
case _icsneo_netid_t::icsneo_netid_red_oldformat: {
|
||||
/* So-called "old format" messages are a "new style, long format" wrapper around the old short messages.
|
||||
* They consist of a 16-bit LE length first, then the 8-bit length and netid combo byte, then the payload
|
||||
* with no checksum. The upper-nibble length of the combo byte should be ignored completely, using the
|
||||
|
|
@ -412,7 +412,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
packet->data.resize(length);
|
||||
return decode(result, packet);
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_red_app_error: {
|
||||
case _icsneo_netid_t::icsneo_netid_red_app_error: {
|
||||
result = AppErrorMessage::DecodeToMessage(packet->data, report);
|
||||
if(!result) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
|
||||
|
|
@ -420,7 +420,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
}
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_read_settings: {
|
||||
case _icsneo_netid_t::icsneo_netid_read_settings: {
|
||||
auto msg = std::make_shared<ReadSettingsMessage>();
|
||||
msg->response = ReadSettingsMessage::Response(packet->data[0]);
|
||||
|
||||
|
|
@ -439,7 +439,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
result = msg;
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_logical_disk_info: {
|
||||
case _icsneo_netid_t::icsneo_netid_logical_disk_info: {
|
||||
result = LogicalDiskInfoPacket::DecodeToMessage(packet->data);
|
||||
if(!result) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
|
||||
|
|
@ -447,7 +447,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
}
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_wivi_command: {
|
||||
case _icsneo_netid_t::icsneo_netid_wivi_command: {
|
||||
result = WiVI::CommandPacket::DecodeToMessage(packet->data);
|
||||
if(!result) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
|
||||
|
|
@ -455,7 +455,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
}
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_eth_phy_control: {
|
||||
case _icsneo_netid_t::icsneo_netid_eth_phy_control: {
|
||||
result = HardwareEthernetPhyRegisterPacket::DecodeToMessage(packet->data, report);
|
||||
if(!result) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
|
||||
|
|
@ -463,7 +463,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
}
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_script_status: {
|
||||
case _icsneo_netid_t::icsneo_netid_script_status: {
|
||||
result = ScriptStatus::DecodeToMessage(packet->data);
|
||||
if(!result) {
|
||||
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
|
||||
|
|
@ -471,7 +471,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
|
|||
}
|
||||
return true;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_disk_data: {
|
||||
case _icsneo_netid_t::icsneo_netid_disk_data: {
|
||||
result = std::make_shared<DiskDataMessage>(std::move(packet->data));
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,10 +138,10 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
|
|||
netid = uint16_t(raw->network.getNetID());
|
||||
|
||||
switch(raw->network.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_device:
|
||||
case _icsneo_netid_t::icsneo_netid_device:
|
||||
shortFormat = true;
|
||||
break;
|
||||
case Network::_icsneo_netid_t::icsneo_netid_red_oldformat: {
|
||||
case _icsneo_netid_t::icsneo_netid_red_oldformat: {
|
||||
// See the decoder for an explanation
|
||||
// We expect the network byte to be populated already in data, but not the length
|
||||
uint16_t length = uint16_t(raw->data.size()) - 1;
|
||||
|
|
@ -162,7 +162,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
|
|||
}
|
||||
|
||||
buffer = &m51msg->data;
|
||||
netid = uint16_t(Network::_icsneo_netid_t::icsneo_netid_main51);
|
||||
netid = uint16_t(_icsneo_netid_t::icsneo_netid_main51);
|
||||
|
||||
if(!m51msg->forceShortFormat) {
|
||||
// Main51 can be sent as a long message without setting the NetID to RED first
|
||||
|
|
@ -172,7 +172,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
|
|||
size += 1; // Even though we are not including the NetID bytes, the device expects them to be counted in the length
|
||||
size += 1; // Main51 Command
|
||||
m51msg->data.insert(m51msg->data.begin(), {
|
||||
(uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51, // 0x0B for long message
|
||||
(uint8_t)_icsneo_netid_t::icsneo_netid_main51, // 0x0B for long message
|
||||
(uint8_t)size, // Size, little endian 16-bit
|
||||
(uint8_t)(size >> 8),
|
||||
(uint8_t)m51msg->command
|
||||
|
|
@ -223,7 +223,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
|
|||
uint16_t size = static_cast<uint16_t>(buffer->size()) + 1 + 1 + 2 + 2 + 1;
|
||||
|
||||
buffer->insert(buffer->begin(), {
|
||||
(uint8_t)Network::_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message
|
||||
(uint8_t)_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message
|
||||
(uint8_t)size, // Size, little endian 16-bit
|
||||
(uint8_t)(size >> 8),
|
||||
(uint8_t)netid, // NetID, little endian 16-bit
|
||||
|
|
@ -243,7 +243,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
|
|||
* In this case, command 0x06 is SetLEDState.
|
||||
* This old command type is not really used anywhere else.
|
||||
*/
|
||||
auto canmsg = std::make_shared<InternalMessage>(Network::_icsneo_netid_t::icsneo_netid_device);
|
||||
auto canmsg = std::make_shared<InternalMessage>(_icsneo_netid_t::icsneo_netid_device);
|
||||
msg = canmsg;
|
||||
if(arguments.empty()) {
|
||||
report(APIEvent::Type::MessageFormattingError, APIEvent::Severity::Error);
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ std::shared_ptr<Message> AppErrorMessage::DecodeToMessage(const std::vector<uint
|
|||
}
|
||||
auto appErr = std::make_shared<AppErrorMessage>();
|
||||
appErr->errorType = data->error_type;
|
||||
appErr->errorNetID = static_cast<Network::_icsneo_netid_t>(data->network_id);
|
||||
appErr->errorNetID = static_cast<_icsneo_netid_t>(data->network_id);
|
||||
appErr->timestamp10us = data->uiTimeStamp10uS;
|
||||
appErr->timestamp10usMSB = data->uiTimeStamp10uSMSB;
|
||||
appErr->network = Network::_icsneo_netid_t::icsneo_netid_red_app_error;
|
||||
appErr->network = _icsneo_netid_t::icsneo_netid_red_app_error;
|
||||
return appErr;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ bool HardwareISO9141Packet::EncodeFromMessage(const ISO9141Message& message, std
|
|||
currentSize = (uint8_t)(bytesToSend - currentStart);
|
||||
|
||||
packet.insert(packet.begin(), {
|
||||
(uint8_t)Network::_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message
|
||||
(uint8_t)_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message
|
||||
(uint8_t)0, // Size, little endian 16-bit, filled later
|
||||
(uint8_t)0,
|
||||
(uint8_t)message.network.getNetID(), // _icsneo_netid_t, little endian 16-bit
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ bool HardwareLiveDataPacket::EncodeFromMessage(LiveDataMessage& message, std::ve
|
|||
return false;
|
||||
}
|
||||
|
||||
header->netid = static_cast<uint8_t>(Network::_icsneo_netid_t::icsneo_netid_main51);
|
||||
header->netid = static_cast<uint8_t>(_icsneo_netid_t::icsneo_netid_main51);
|
||||
header->fullLength = fullSize;
|
||||
header->command = static_cast<uint8_t>(Command::Extended);
|
||||
header->extendedCommand = static_cast<uint16_t>(ExtendedCommand::LiveData);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ bool Packetizer::input(RingBuffer& bytes) {
|
|||
if(packetLength == 0) {
|
||||
state = ReadState::ParseLongStylePacketHeader;
|
||||
break;
|
||||
} else if(packetLength == 0xA && packet.network == Network::_icsneo_netid_t::icsneo_netid_disk_data) {
|
||||
} else if(packetLength == 0xA && packet.network == _icsneo_netid_t::icsneo_netid_disk_data) {
|
||||
state = ReadState::ParseDiskDataHeader;
|
||||
break;
|
||||
}
|
||||
|
|
@ -159,7 +159,7 @@ bool Packetizer::input(RingBuffer& bytes) {
|
|||
processedPackets.push_back(std::make_shared<Packet>(packet));
|
||||
bytes.pop(packetLength);
|
||||
|
||||
if(packet.network == Network::_icsneo_netid_t::icsneo_netid_disk_data && (packetLength - headerSize) % 2 == 0) {
|
||||
if(packet.network == _icsneo_netid_t::icsneo_netid_disk_data && (packetLength - headerSize) % 2 == 0) {
|
||||
bytes.pop_front();
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -389,7 +389,7 @@ bool Device::goOnline() {
|
|||
|
||||
updateLEDState();
|
||||
|
||||
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_reset_status);
|
||||
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_reset_status);
|
||||
filter->includeInternalInAny = true;
|
||||
|
||||
// Wait until communication is enabled or 5 seconds, whichever comes first
|
||||
|
|
@ -432,7 +432,7 @@ bool Device::goOffline() {
|
|||
|
||||
updateLEDState();
|
||||
|
||||
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_reset_status);
|
||||
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_reset_status);
|
||||
filter->includeInternalInAny = true;
|
||||
|
||||
// Wait until communication is disabled or 5 seconds, whichever comes first
|
||||
|
|
@ -457,7 +457,7 @@ int8_t Device::prepareScriptLoad() {
|
|||
return false;
|
||||
}
|
||||
|
||||
static std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_coremini_preload);
|
||||
static std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_coremini_preload);
|
||||
|
||||
if(!com->sendCommand(Command::CoreMiniPreload))
|
||||
return false;
|
||||
|
|
@ -488,7 +488,7 @@ bool Device::startScript(Disk::MemoryType memType)
|
|||
|
||||
uint8_t location = static_cast<uint8_t>(memType);
|
||||
|
||||
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_device);
|
||||
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_device);
|
||||
filter->includeInternalInAny = true;
|
||||
|
||||
const auto response = com->waitForMessageSync([&]() {
|
||||
|
|
@ -510,7 +510,7 @@ bool Device::stopScript()
|
|||
return false;
|
||||
}
|
||||
|
||||
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_device);
|
||||
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_device);
|
||||
filter->includeInternalInAny = true;
|
||||
|
||||
const auto response = com->waitForMessageSync([&]() {
|
||||
|
|
@ -597,7 +597,7 @@ bool Device::uploadCoremini(std::istream& stream, Disk::MemoryType memType) {
|
|||
}
|
||||
|
||||
bool Device::eraseScriptMemory(Disk::MemoryType memType, uint64_t amount) {
|
||||
static std::shared_ptr<MessageFilter> NeoEraseDone = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done);
|
||||
static std::shared_ptr<MessageFilter> NeoEraseDone = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_neo_memory_write_done);
|
||||
|
||||
if(!supportsEraseMemory()) {
|
||||
return true;
|
||||
|
|
@ -798,7 +798,7 @@ Network Device::getNetworkByNumber(icsneo_msg_bus_type_t type, size_t index) con
|
|||
return net;
|
||||
}
|
||||
}
|
||||
return Network::_icsneo_netid_t::icsneo_netid_invalid;
|
||||
return _icsneo_netid_t::icsneo_netid_invalid;
|
||||
}
|
||||
|
||||
std::shared_ptr<HardwareInfo> Device::getHardwareInfo(std::chrono::milliseconds timeout) {
|
||||
|
|
@ -1721,7 +1721,7 @@ void Device::handleInternalMessage(std::shared_ptr<Message> message) {
|
|||
case Message::Type::InternalMessage: {
|
||||
auto rawMessage = std::static_pointer_cast<InternalMessage>(message);
|
||||
switch(rawMessage->network.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_device: {
|
||||
case _icsneo_netid_t::icsneo_netid_device: {
|
||||
// Device is not guaranteed to be a CANMessage, it might be a InternalMessage
|
||||
// if it couldn't be decoded to a CANMessage. We only care about the
|
||||
// CANMessage decoding right now.
|
||||
|
|
@ -1730,7 +1730,7 @@ void Device::handleInternalMessage(std::shared_ptr<Message> message) {
|
|||
handleNeoVIMessage(std::move(canmsg));
|
||||
break;
|
||||
}
|
||||
case Network::_icsneo_netid_t::icsneo_netid_device_status:
|
||||
case _icsneo_netid_t::icsneo_netid_device_status:
|
||||
// Device Status format is unique per device, so the devices need to decode it themselves
|
||||
handleDeviceStatus(rawMessage);
|
||||
break;
|
||||
|
|
@ -1817,7 +1817,7 @@ std::optional<EthPhyMessage> Device::sendEthPhyMsg(const EthPhyMessage& message,
|
|||
HardwareEthernetPhyRegisterPacket::EncodeFromMessage(message, bytes, report);
|
||||
std::shared_ptr<Message> response = com->waitForMessageSync(
|
||||
[this, bytes](){ return com->sendCommand(Command::PHYControlRegisters, bytes); },
|
||||
std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_eth_phy_control), timeout);
|
||||
std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_eth_phy_control), timeout);
|
||||
|
||||
if(!response) {
|
||||
report(APIEvent::Type::NoDeviceResponse, APIEvent::Severity::Error);
|
||||
|
|
@ -1888,7 +1888,7 @@ std::optional<bool> Device::SetRootDirectoryEntryFlags(uint8_t mask, uint8_t val
|
|||
|
||||
std::optional<std::chrono::time_point<std::chrono::system_clock>> Device::getRTC()
|
||||
{
|
||||
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_red_get_rtc);
|
||||
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_red_get_rtc);
|
||||
std::shared_ptr<Message> generic = com->waitForMessageSync([this]() {
|
||||
return com->sendCommand(Command::GetRTC);
|
||||
}, filter, std::chrono::milliseconds(3000));
|
||||
|
|
@ -2023,7 +2023,7 @@ bool Device::readBinaryFile(std::ostream& stream, uint16_t binaryIndex) {
|
|||
std::vector<uint8_t> arguments(sizeof(ExtendedDataMessage::ExtendedDataHeader));
|
||||
ExtendedDataMessage::ExtendedDataHeader& parameters = *reinterpret_cast<ExtendedDataMessage::ExtendedDataHeader*>(arguments.data());
|
||||
|
||||
auto filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_extended_data);
|
||||
auto filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_extended_data);
|
||||
|
||||
for(size_t offset = 0; offset < *size; offset+=ExtendedDataMessage::MaxExtendedDataBufferSize) {
|
||||
parameters.subCommand = ExtendedDataSubCommand::GenericBinaryRead;
|
||||
|
|
@ -3260,13 +3260,13 @@ std::optional<uint64_t> Device::getVSADiskSize() {
|
|||
return diskSize;
|
||||
}
|
||||
|
||||
bool Device::requestTC10Wake(Network::_icsneo_netid_t network) {
|
||||
bool Device::requestTC10Wake(_icsneo_netid_t network) {
|
||||
if(!supportsTC10()) {
|
||||
report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
|
||||
return false;
|
||||
}
|
||||
std::vector<uint8_t> args(sizeof(network));
|
||||
*(Network::_icsneo_netid_t*)args.data() = network;
|
||||
*(_icsneo_netid_t*)args.data() = network;
|
||||
auto msg = com->waitForMessageSync([&] {
|
||||
return com->sendCommand(ExtendedCommand::RequestTC10Wake, args);
|
||||
}, std::make_shared<MessageFilter>(Message::Type::ExtendedResponse), std::chrono::milliseconds(1000));
|
||||
|
|
@ -3285,13 +3285,13 @@ bool Device::requestTC10Wake(Network::_icsneo_netid_t network) {
|
|||
return resp->response == ExtendedResponse::OK;
|
||||
}
|
||||
|
||||
bool Device::requestTC10Sleep(Network::_icsneo_netid_t network) {
|
||||
bool Device::requestTC10Sleep(_icsneo_netid_t network) {
|
||||
if(!supportsTC10()) {
|
||||
report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
|
||||
return false;
|
||||
}
|
||||
std::vector<uint8_t> args(sizeof(network));
|
||||
*(Network::_icsneo_netid_t*)args.data() = network;
|
||||
*(_icsneo_netid_t*)args.data() = network;
|
||||
auto msg = com->waitForMessageSync([&] {
|
||||
return com->sendCommand(ExtendedCommand::RequestTC10Sleep, args);
|
||||
}, std::make_shared<MessageFilter>(Message::Type::ExtendedResponse), std::chrono::milliseconds(1000));
|
||||
|
|
@ -3310,13 +3310,13 @@ bool Device::requestTC10Sleep(Network::_icsneo_netid_t network) {
|
|||
return typed->response == ExtendedResponse::OK;
|
||||
}
|
||||
|
||||
std::optional<TC10StatusMessage> Device::getTC10Status(Network::_icsneo_netid_t network) {
|
||||
std::optional<TC10StatusMessage> Device::getTC10Status(_icsneo_netid_t network) {
|
||||
if(!supportsTC10()) {
|
||||
report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
|
||||
return std::nullopt;
|
||||
}
|
||||
std::vector<uint8_t> args(sizeof(network));
|
||||
*(Network::_icsneo_netid_t*)args.data() = network;
|
||||
*(_icsneo_netid_t*)args.data() = network;
|
||||
auto msg = com->waitForMessageSync([&] {
|
||||
return com->sendCommand(ExtendedCommand::GetTC10Status, args);
|
||||
}, std::make_shared<MessageFilter>(Message::Type::TC10Status), std::chrono::milliseconds(1000));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "icsneo/device/extensions/flexray/controller.h"
|
||||
#include "icsneo/device/device.h"
|
||||
#include "icsneo/icsneotypes.h"
|
||||
|
||||
using namespace icsneo;
|
||||
|
||||
|
|
@ -610,7 +611,7 @@ uint16_t FlexRay::Controller::CalculateCycleFilter(uint8_t baseCycle, uint8_t cy
|
|||
}
|
||||
|
||||
std::pair<bool, uint32_t> FlexRay::Controller::readRegister(ERAYRegister reg, std::chrono::milliseconds timeout) const {
|
||||
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(icsneo::Network::_icsneo_netid_t::icsneo_netid_flexray_control);
|
||||
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_flexray_control);
|
||||
if(timeout.count() <= 20)
|
||||
return {false, 0}; // Out of time!
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ std::optional<uint64_t> ExtExtractorDiskReadDriver::readLogicalDiskAligned(Commu
|
|||
|
||||
std::optional<uint64_t> ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligned(Communication& com, device_eventhandler_t report,
|
||||
uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) {
|
||||
static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread);
|
||||
static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_neo_memory_sdread);
|
||||
|
||||
uint64_t sector = pos / SectorSize;
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ std::optional<uint64_t> ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligne
|
|||
cv.notify_all();
|
||||
}
|
||||
}
|
||||
}, std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_disk_data)));
|
||||
}, std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_disk_data)));
|
||||
|
||||
if(!com.sendCommand(ExtendedCommand::Extract, {
|
||||
uint8_t(sector & 0xff),
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using namespace icsneo::Disk;
|
|||
|
||||
std::optional<uint64_t> NeoMemoryDiskDriver::readLogicalDiskAligned(Communication& com, device_eventhandler_t report,
|
||||
uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType memType) {
|
||||
const auto filter = std::make_shared<MessageFilter>((memType == MemoryType::SD ? Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread : Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread));
|
||||
const auto filter = std::make_shared<MessageFilter>((memType == MemoryType::SD ? _icsneo_netid_t::icsneo_netid_neo_memory_sdread : _icsneo_netid_t::icsneo_netid_red_int_memoryread));
|
||||
filter->includeInternalInAny = true;
|
||||
|
||||
if(pos % SectorSize != 0)
|
||||
|
|
@ -61,7 +61,7 @@ std::optional<uint64_t> NeoMemoryDiskDriver::readLogicalDiskAligned(Communicatio
|
|||
std::optional<uint64_t> NeoMemoryDiskDriver::writeLogicalDiskAligned(Communication& com, device_eventhandler_t report,
|
||||
uint64_t pos, const uint8_t* from, uint64_t amount, std::chrono::milliseconds timeout, MemoryType memType) {
|
||||
|
||||
static std::shared_ptr<MessageFilter> NeoMemoryDone = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done);
|
||||
static std::shared_ptr<MessageFilter> NeoMemoryDone = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_neo_memory_write_done);
|
||||
|
||||
if(pos % SectorSize != 0)
|
||||
return std::nullopt;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ using namespace icsneo::Disk;
|
|||
|
||||
std::optional<uint64_t> PlasionDiskReadDriver::readLogicalDiskAligned(Communication& com, device_eventhandler_t report,
|
||||
uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) {
|
||||
static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread);
|
||||
static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(_icsneo_netid_t::icsneo_netid_neo_memory_sdread);
|
||||
|
||||
if(amount > getBlockSizeBounds().second)
|
||||
return std::nullopt;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ void VSAExtendedMessage::appendPacket(std::shared_ptr<Packet> packet) const
|
|||
{
|
||||
packet->data.insert(packet->data.end(), payload.begin(), payload.end());
|
||||
// Set the network if not already set (Happens in AA0F records)
|
||||
if(packet->network.getNetID() == Network::_icsneo_netid_t::icsneo_netid_invalid) {
|
||||
if(packet->network.getNetID() == _icsneo_netid_t::icsneo_netid_invalid) {
|
||||
packet->network = network;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ void example0(const std::shared_ptr<icsneo::Device>& rada2b) {
|
|||
true /* true if we want 16 bit channels in the message, false for 32 bit. This should match the RAD-A2B device setting */
|
||||
);
|
||||
msg->txmsg = true;
|
||||
msg->network = icsneo::Network(icsneo::Network::_icsneo_netid_t::icsneo_netid_a2b2);
|
||||
msg->network = icsneo::Network(_icsneo_netid_t::icsneo_netid_a2b2);
|
||||
|
||||
// Load the WAV audio data into the desired channel, break if we fail to load
|
||||
if(!msg->loadAudioBuffer(wavStream, channelMap)) {
|
||||
|
|
@ -192,7 +192,7 @@ void example3(const std::shared_ptr<icsneo::Device>& rada2b) {
|
|||
std::shared_ptr<icsneo::A2BMessage> a2bmsgPtr = std::make_shared<icsneo::A2BMessage>(numFrames, icsneo::A2BMessage::TDMMode::TDM4, true);
|
||||
|
||||
icsneo::A2BMessage& a2bmsg = *a2bmsgPtr.get();
|
||||
a2bmsg.network = icsneo::Network(icsneo::Network::_icsneo_netid_t::icsneo_netid_a2b2);
|
||||
a2bmsg.network = icsneo::Network(_icsneo_netid_t::icsneo_netid_a2b2);
|
||||
a2bmsg.txmsg = true;
|
||||
|
||||
for(size_t frame = 0; frame < a2bmsg.getNumFrames(); frame++) {
|
||||
|
|
@ -245,9 +245,9 @@ void example3(const std::shared_ptr<icsneo::Device>& rada2b) {
|
|||
*/
|
||||
void example4(const std::shared_ptr<icsneo::Device>& rada2b) {
|
||||
std::shared_ptr<icsneo::I2CMessage> msg = std::make_shared<icsneo::I2CMessage>();
|
||||
std::shared_ptr<icsneo::MessageFilter> msgFilter = std::make_shared<icsneo::MessageFilter>(icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2);
|
||||
std::shared_ptr<icsneo::MessageFilter> msgFilter = std::make_shared<icsneo::MessageFilter>(_icsneo_netid_t::icsneo_netid_i2c2);
|
||||
|
||||
msg->network = icsneo::Network(icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2);
|
||||
msg->network = icsneo::Network(_icsneo_netid_t::icsneo_netid_i2c2);
|
||||
msg->controlBytes.resize(1);
|
||||
msg->controlBytes[0] = static_cast<uint8_t>(0x17u); // Register address for A2B INTTYPE
|
||||
msg->dataBytes.resize(1, 0);
|
||||
|
|
@ -261,7 +261,7 @@ void example4(const std::shared_ptr<icsneo::Device>& rada2b) {
|
|||
|
||||
if(newMsg->type == icsneo::Message::Type::BusMessage) {
|
||||
const auto& frame = std::dynamic_pointer_cast<icsneo::BusMessage>(newMsg);
|
||||
if(frame && frame->network.getNetID() == icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2) {
|
||||
if(frame && frame->network.getNetID() == _icsneo_netid_t::icsneo_netid_i2c2) {
|
||||
const auto& i2cMessage = std::dynamic_pointer_cast<icsneo::I2CMessage>(frame);
|
||||
|
||||
if(!i2cMessage) {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ int main() {
|
|||
// Add your error handling here
|
||||
auto handler = device->addMessageCallback(std::make_shared<icsneo::MessageCallback>(filter, [](std::shared_ptr<icsneo::Message> message) {
|
||||
auto msg = std::static_pointer_cast<icsneo::AppErrorMessage>(message);
|
||||
if(icsneo::Network::_icsneo_netid_t::icsneo_netid_red_app_error == msg->network.getNetID()) {
|
||||
if(_icsneo_netid_t::icsneo_netid_red_app_error == msg->network.getNetID()) {
|
||||
std::cout << std::endl << "App error reported:" << std::endl;
|
||||
std::cout << msg->getAppErrorString() << std::endl << std::endl;
|
||||
}
|
||||
|
|
@ -58,7 +58,7 @@ int main() {
|
|||
// Prepare a CAN message
|
||||
std::cout << std::endl << "Transmitting a CAN frame... ";
|
||||
auto txMessage = std::make_shared<icsneo::CANMessage>();
|
||||
txMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan;
|
||||
txMessage->network = _icsneo_netid_t::icsneo_netid_hscan;
|
||||
txMessage->arbid = 0x22;
|
||||
txMessage->data.insert(txMessage->data.end(), {0xaa, 0xbb, 0xcc});
|
||||
// The DLC will come from the length of the data vector
|
||||
|
|
|
|||
|
|
@ -508,7 +508,7 @@ int main() {
|
|||
|
||||
std::cout << "Transmitting a normal CAN frame..." << std::endl;
|
||||
auto msg = std::make_shared<icsneo::CANMessage>();
|
||||
msg->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan;
|
||||
msg->network = _icsneo_netid_t::icsneo_netid_hscan;
|
||||
msg->arbid = 0x120;
|
||||
msg->data.insert(msg->data.end(), {0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff});
|
||||
msg->isExtended = false;
|
||||
|
|
@ -565,7 +565,7 @@ int main() {
|
|||
selectedDevice = selectDevice(devices);
|
||||
|
||||
// Attempt to set baudrate and apply settings
|
||||
if(selectedDevice->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 250000) && selectedDevice->settings->apply()) {
|
||||
if(selectedDevice->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan, 250000) && selectedDevice->settings->apply()) {
|
||||
std::cout << "Successfully set HS CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl;
|
||||
} else {
|
||||
std::cout << "Failed to set HS CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl << std::endl;
|
||||
|
|
@ -586,7 +586,7 @@ int main() {
|
|||
selectedDevice = selectDevice(devices);
|
||||
|
||||
// Attempt to set baudrate and apply settings
|
||||
if(selectedDevice->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lsftcan, 250000) && selectedDevice->settings->apply()) {
|
||||
if(selectedDevice->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_lsftcan, 250000) && selectedDevice->settings->apply()) {
|
||||
std::cout << "Successfully set LSFT CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl;
|
||||
} else {
|
||||
std::cout << "Failed to set LSFT CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl << std::endl;
|
||||
|
|
@ -790,7 +790,7 @@ int main() {
|
|||
selectedDevice = selectDevice(devices);
|
||||
|
||||
std::cout << "Termination is ";
|
||||
const auto val = selectedDevice->settings->isTerminationEnabledFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
|
||||
const auto val = selectedDevice->settings->isTerminationEnabledFor(_icsneo_netid_t::icsneo_netid_hscan);
|
||||
if(!val.has_value()) {
|
||||
std::cout << "not available at this time: " << icsneo::GetLastError() << std::endl << std::endl;
|
||||
break;
|
||||
|
|
@ -807,7 +807,7 @@ int main() {
|
|||
}
|
||||
|
||||
// Attempt to set termination and apply settings
|
||||
if(selectedDevice->settings->setTerminationFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, selection2 == '1') && selectedDevice->settings->apply()) {
|
||||
if(selectedDevice->settings->setTerminationFor(_icsneo_netid_t::icsneo_netid_hscan, selection2 == '1') && selectedDevice->settings->apply()) {
|
||||
std::cout << "Successfully set HS CAN termination for " << selectedDevice->describe() << std::endl;
|
||||
} else {
|
||||
std::cout << "Failed to set HS CAN termination for " << selectedDevice->describe() << std::endl;
|
||||
|
|
|
|||
|
|
@ -33,27 +33,27 @@ int main() {
|
|||
int64_t baud = 19200;
|
||||
|
||||
std::cout << "Enable LIN commander resistor... ";
|
||||
ret = device->settings->setCommanderResistorFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, true);
|
||||
ret = device->settings->setCommanderResistorFor(_icsneo_netid_t::icsneo_netid_lin, true);
|
||||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
std::cout << "Disable LIN2 commander resistor... ";
|
||||
ret = device->settings->setCommanderResistorFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, false);
|
||||
ret = device->settings->setCommanderResistorFor(_icsneo_netid_t::icsneo_netid_lin2, false);
|
||||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
std::cout << "Setting LIN to operate at " << baud << "bit/s... ";
|
||||
ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, baud);
|
||||
ret = device->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_lin, baud);
|
||||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
std::cout << "Setting LIN2 to operate at " << baud << "bit/s... ";
|
||||
ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, baud);
|
||||
ret = device->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_lin2, baud);
|
||||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
std::cout << "Setting LIN mode to NORMAL... ";
|
||||
ret = device->settings->setLINModeFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, NORMAL_MODE);
|
||||
ret = device->settings->setLINModeFor(_icsneo_netid_t::icsneo_netid_lin, NORMAL_MODE);
|
||||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
std::cout << "Setting LIN2 mode to NORMAL... ";
|
||||
ret = device->settings->setLINModeFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, NORMAL_MODE);
|
||||
ret = device->settings->setLINModeFor(_icsneo_netid_t::icsneo_netid_lin2, NORMAL_MODE);
|
||||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
std::cout << "Applying settings... ";
|
||||
|
|
@ -61,14 +61,14 @@ int main() {
|
|||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
std::cout << "Getting LIN Baudrate... ";
|
||||
int64_t readBaud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin);
|
||||
int64_t readBaud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_lin);
|
||||
if(readBaud < 0)
|
||||
std::cout << "FAIL" << std::endl;
|
||||
else
|
||||
std::cout << "OK, " << (readBaud) << "bit/s" << std::endl;
|
||||
|
||||
std::cout << "Getting LIN2 Baudrate... ";
|
||||
readBaud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2);
|
||||
readBaud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_lin2);
|
||||
if(readBaud < 0)
|
||||
std::cout << "FAIL" << std::endl;
|
||||
else
|
||||
|
|
@ -115,7 +115,7 @@ int main() {
|
|||
// We can transmit messages
|
||||
std::cout << "Transmitting a LIN responder data frame... ";
|
||||
auto lin_r = std::make_shared<icsneo::LINMessage>();
|
||||
lin_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2;
|
||||
lin_r->network = _icsneo_netid_t::icsneo_netid_lin2;
|
||||
lin_r->ID = 0x11;
|
||||
lin_r->linMsgType = icsneo::LINMessage::Type::LIN_UPDATE_RESPONDER;
|
||||
lin_r->data = {0xaa, 0xbb, 0xcc, 0xdd, 0x11, 0x22, 0x33, 0x44};
|
||||
|
|
@ -124,7 +124,7 @@ int main() {
|
|||
|
||||
std::cout << "Transmitting a LIN commander header... ";
|
||||
auto lin_c = std::make_shared<icsneo::LINMessage>();
|
||||
lin_c->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin;
|
||||
lin_c->network = _icsneo_netid_t::icsneo_netid_lin;
|
||||
lin_c->ID = 0x11;
|
||||
lin_c->linMsgType = icsneo::LINMessage::Type::LIN_HEADER_ONLY;
|
||||
ret = device->transmit(lin_c);
|
||||
|
|
@ -134,7 +134,7 @@ int main() {
|
|||
|
||||
std::cout << "Transmitting a LIN commander frame with responder data... ";
|
||||
auto lin_d = std::make_shared<icsneo::LINMessage>();
|
||||
lin_d->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin;
|
||||
lin_d->network = _icsneo_netid_t::icsneo_netid_lin;
|
||||
lin_d->ID = 0x22;
|
||||
lin_d->isEnhancedChecksum = true;
|
||||
lin_d->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ int main()
|
|||
// We can transmit messages to read the PHY ID of BCM89810 PHY
|
||||
std::cout << "\tTransmitting a MDIO request to read ID on BCM89810...\n";
|
||||
auto mdio_r = std::make_shared<icsneo::MDIOMessage>();
|
||||
mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->phyAddress = 0x00u;
|
||||
mdio_r->regAddress = 0x02u;
|
||||
mdio_r->direction = icsneo::MDIOMessage::Direction::Read;
|
||||
|
|
@ -128,7 +128,7 @@ int main()
|
|||
// We can transmit messages to write to arbitrary register
|
||||
std::cout << "\tTransmitting a MDIO request to write register on BCM89810...\n";
|
||||
mdio_r = std::make_shared<icsneo::MDIOMessage>();
|
||||
mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->phyAddress = 0x00u;
|
||||
mdio_r->regAddress = 0x1Bu;
|
||||
mdio_r->data = {0xAA, 0xAF};
|
||||
|
|
@ -140,7 +140,7 @@ int main()
|
|||
// We can transmit messages to read back to arbitrary register
|
||||
std::cout << "\tTransmitting a MDIO request to read register on BCM89810...\n";
|
||||
mdio_r = std::make_shared<icsneo::MDIOMessage>();
|
||||
mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->phyAddress = 0x00u;
|
||||
mdio_r->regAddress = 0x1Bu;
|
||||
mdio_r->direction = icsneo::MDIOMessage::Direction::Read;
|
||||
|
|
@ -154,7 +154,7 @@ int main()
|
|||
// We can transmit messages to read the PHY ID of BCM89810 PHY
|
||||
std::cout << "\tTransmitting a MDIO request to read ID on 88Q2112...\n";
|
||||
mdio_r = std::make_shared<icsneo::MDIOMessage>();
|
||||
mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->phyAddress = 0x06u;
|
||||
mdio_r->devAddress = 0x01u;
|
||||
mdio_r->regAddress = 0x0002u;
|
||||
|
|
@ -166,7 +166,7 @@ int main()
|
|||
// We can transmit messages to write to arbitrary register
|
||||
std::cout << "\tTransmitting a MDIO request to write register on 88Q2112...\n";
|
||||
mdio_r = std::make_shared<icsneo::MDIOMessage>();
|
||||
mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->phyAddress = 0x06u;
|
||||
mdio_r->devAddress = 0x01u;
|
||||
mdio_r->regAddress = 0x0902u;
|
||||
|
|
@ -179,7 +179,7 @@ int main()
|
|||
// We can transmit messages to read back to arbitrary register
|
||||
std::cout << "\tTransmitting a MDIO request to read register on 88Q2112...\n";
|
||||
mdio_r = std::make_shared<icsneo::MDIOMessage>();
|
||||
mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1;
|
||||
mdio_r->phyAddress = 0x06u;
|
||||
mdio_r->devAddress = 0x01u;
|
||||
mdio_r->regAddress = 0x0902u;
|
||||
|
|
|
|||
|
|
@ -38,38 +38,38 @@ int main() {
|
|||
std::cout << "OK" << std::endl;
|
||||
|
||||
std::cout << "\tGetting HSCAN Baudrate... ";
|
||||
int64_t baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
|
||||
int64_t baud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan);
|
||||
if(baud < 0)
|
||||
std::cout << "FAIL" << std::endl;
|
||||
else
|
||||
std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl;
|
||||
|
||||
std::cout << "\tSetting HSCAN to operate at 125kbit/s... ";
|
||||
ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 125000);
|
||||
ret = device->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan, 125000);
|
||||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
// Changes to the settings do not take affect until you call settings->apply()!
|
||||
// When you get the baudrate here, you're reading what the device is currently operating on
|
||||
std::cout << "\tGetting HSCAN Baudrate... (expected to be unchanged) ";
|
||||
baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
|
||||
baud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan);
|
||||
if(baud < 0)
|
||||
std::cout << "FAIL" << std::endl;
|
||||
else
|
||||
std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl;
|
||||
|
||||
std::cout << "\tGetting HSCANFD Baudrate... ";
|
||||
baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
|
||||
baud = device->settings->getFDBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan);
|
||||
if(baud < 0)
|
||||
std::cout << "FAIL" << std::endl;
|
||||
else
|
||||
std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl;
|
||||
|
||||
std::cout << "\tSetting HSCANFD to operate at 8Mbit/s... ";
|
||||
ret = device->settings->setFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 8000000);
|
||||
ret = device->settings->setFDBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan, 8000000);
|
||||
std::cout << (ret ? "OK" : "FAIL") << std::endl;
|
||||
|
||||
std::cout << "\tGetting HSCANFD Baudrate... (expected to be unchanged) ";
|
||||
baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
|
||||
baud = device->settings->getFDBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan);
|
||||
if(baud < 0)
|
||||
std::cout << "FAIL" << std::endl;
|
||||
else
|
||||
|
|
@ -84,14 +84,14 @@ int main() {
|
|||
|
||||
// Now that we have applied, we expect that our operating baudrates have changed
|
||||
std::cout << "\tGetting HSCAN Baudrate... ";
|
||||
baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
|
||||
baud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan);
|
||||
if(baud < 0)
|
||||
std::cout << "FAIL" << std::endl;
|
||||
else
|
||||
std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl;
|
||||
|
||||
std::cout << "\tGetting HSCANFD Baudrate... ";
|
||||
baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
|
||||
baud = device->settings->getFDBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan);
|
||||
if(baud < 0)
|
||||
std::cout << "FAIL" << std::endl;
|
||||
else
|
||||
|
|
@ -155,7 +155,7 @@ int main() {
|
|||
// We can transmit messages
|
||||
std::cout << "\n\tTransmitting an extended CAN FD frame... ";
|
||||
auto txMessage5 = std::make_shared<icsneo::CANMessage>();
|
||||
txMessage5->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan;
|
||||
txMessage5->network = _icsneo_netid_t::icsneo_netid_hscan;
|
||||
txMessage5->arbid = 0x1C5001C5;
|
||||
txMessage5->data.insert(txMessage5->data.end(), {0xaa, 0xbb, 0xcc});
|
||||
// The DLC will come from the length of the data vector
|
||||
|
|
@ -290,7 +290,7 @@ int main() {
|
|||
// We can transmit messages
|
||||
std::cout << "\tTransmitting an extended CAN FD frame... ";
|
||||
auto txMessage = std::make_shared<icsneo::CANMessage>();
|
||||
txMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan;
|
||||
txMessage->network = _icsneo_netid_t::icsneo_netid_hscan;
|
||||
txMessage->arbid = 0x1C5001C5;
|
||||
txMessage->data.insert(txMessage->data.end(), {0xaa, 0xbb, 0xcc});
|
||||
// The DLC will come from the length of the data vector
|
||||
|
|
@ -301,7 +301,7 @@ int main() {
|
|||
|
||||
std::cout << "\tTransmitting an ethernet frame on OP (BR) Ethernet 2... ";
|
||||
auto ethTxMessage = std::make_shared<icsneo::EthernetMessage>();
|
||||
ethTxMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_op_ethernet2;
|
||||
ethTxMessage->network = _icsneo_netid_t::icsneo_netid_op_ethernet2;
|
||||
ethTxMessage->data.insert(ethTxMessage->data.end(), {
|
||||
0x00, 0xFC, 0x70, 0x00, 0x01, 0x02, /* Destination MAC */
|
||||
0x00, 0xFC, 0x70, 0x00, 0x01, 0x01, /* Source MAC */
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
|
|||
// Short Ethernet
|
||||
{
|
||||
auto frame = std::make_shared<icsneo::EthernetMessage>();
|
||||
frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_ethernet;
|
||||
frame->network = _icsneo_netid_t::icsneo_netid_ethernet;
|
||||
frames.push_back(frame);
|
||||
frame->data.resize(ShortEthSize);
|
||||
std::generate(frame->data.begin(), frame->data.end(), randByteGen);
|
||||
|
|
@ -46,7 +46,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
|
|||
// Long Ethernet
|
||||
{
|
||||
auto frame = std::make_shared<icsneo::EthernetMessage>();
|
||||
frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_ethernet;
|
||||
frame->network = _icsneo_netid_t::icsneo_netid_ethernet;
|
||||
frames.push_back(frame);
|
||||
frame->data.resize(LongEthSize);
|
||||
std::generate(frame->data.begin(), frame->data.end(), randByteGen);
|
||||
|
|
@ -56,7 +56,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
|
|||
// Classic CAN
|
||||
{
|
||||
auto frame = std::make_shared<icsneo::CANMessage>();
|
||||
frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan2;
|
||||
frame->network = _icsneo_netid_t::icsneo_netid_hscan2;
|
||||
frames.push_back(frame);
|
||||
frame->data.resize(ClassicCANSize);
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
|
|||
// CAN FD
|
||||
{
|
||||
auto frame = std::make_shared<icsneo::CANMessage>();
|
||||
frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan3;
|
||||
frame->network = _icsneo_netid_t::icsneo_netid_hscan3;
|
||||
frames.push_back(frame);
|
||||
frame->data.resize(CANFDSize);
|
||||
std::generate(frame->data.begin(), frame->data.end(), randByteGen);
|
||||
|
|
|
|||
|
|
@ -66,9 +66,9 @@ enum class AppErrorType : uint16_t {
|
|||
|
||||
class AppErrorMessage : public InternalMessage {
|
||||
public:
|
||||
AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::_icsneo_netid_t::icsneo_netid_red_app_error) {}
|
||||
AppErrorMessage() : InternalMessage(Message::Type::AppError, _icsneo_netid_t::icsneo_netid_red_app_error) {}
|
||||
uint16_t errorType;
|
||||
Network::_icsneo_netid_t errorNetID;
|
||||
_icsneo_netid_t errorNetID;
|
||||
uint32_t timestamp10us;
|
||||
uint32_t timestamp10usMSB;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace icsneo {
|
|||
|
||||
class DiskDataMessage : public InternalMessage {
|
||||
public:
|
||||
DiskDataMessage(std::vector<uint8_t>&& d) : InternalMessage(Network::_icsneo_netid_t::icsneo_netid_disk_data) {
|
||||
DiskDataMessage(std::vector<uint8_t>&& d) : InternalMessage(_icsneo_netid_t::icsneo_netid_disk_data) {
|
||||
data = std::move(d);
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ class MessageFilter {
|
|||
public:
|
||||
MessageFilter() {}
|
||||
MessageFilter(Message::Type type) : includeInternalInAny(neomessagetype_t(type) & 0x8000), messageType(type) {}
|
||||
MessageFilter(Network::_icsneo_netid_t netid) : MessageFilter(Network::GetTypeOfNetID(netid, false), netid) {} // Messages on the communication layer are never encoded as VNET ID + common ID, so skip the expansion step
|
||||
MessageFilter(icsneo_msg_bus_type_t type, Network::_icsneo_netid_t net = Network::_icsneo_netid_t::icsneo_netid_any) : networkType(type), netid(net) {
|
||||
MessageFilter(_icsneo_netid_t netid) : MessageFilter(Network::GetTypeOfNetID(netid, false), netid) {} // Messages on the communication layer are never encoded as VNET ID + common ID, so skip the expansion step
|
||||
MessageFilter(icsneo_msg_bus_type_t type, _icsneo_netid_t net = _icsneo_netid_t::icsneo_netid_any) : networkType(type), netid(net) {
|
||||
// If a icsneo_msg_bus_type_internal is used, we want to also get internal Message::Types
|
||||
// The NetID we want may be in there
|
||||
includeInternalInAny = (networkType == icsneo_msg_bus_type_internal);
|
||||
|
|
@ -34,7 +34,7 @@ public:
|
|||
return false;
|
||||
if(!matchNetID(frame->network.getNetID()))
|
||||
return false;
|
||||
} else if (netid != Network::_icsneo_netid_t::icsneo_netid_any || networkType != icsneo_msg_bus_type_any) {
|
||||
} else if (netid != _icsneo_netid_t::icsneo_netid_any || networkType != icsneo_msg_bus_type_any) {
|
||||
return false; // Filtering on a NetID or Type, but this message doesn't have one
|
||||
}
|
||||
return true;
|
||||
|
|
@ -55,9 +55,9 @@ protected:
|
|||
return networkType == mtype;
|
||||
}
|
||||
|
||||
Network::_icsneo_netid_t netid = Network::_icsneo_netid_t::icsneo_netid_any;
|
||||
bool matchNetID(Network::_icsneo_netid_t mnetid) const {
|
||||
if(netid == Network::_icsneo_netid_t::icsneo_netid_any)
|
||||
_icsneo_netid_t netid = _icsneo_netid_t::icsneo_netid_any;
|
||||
bool matchNetID(_icsneo_netid_t mnetid) const {
|
||||
if(netid == _icsneo_netid_t::icsneo_netid_any)
|
||||
return true;
|
||||
return netid == mnetid;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace icsneo {
|
|||
|
||||
class FlashMemoryMessage : public InternalMessage {
|
||||
public:
|
||||
FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread) {}
|
||||
FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, _icsneo_netid_t::icsneo_netid_red_int_memoryread) {}
|
||||
uint16_t startAddress = 0;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
namespace icsneo {
|
||||
class LiveDataMessage : public InternalMessage {
|
||||
public:
|
||||
LiveDataMessage() : InternalMessage(Message::Type::LiveData, Network::_icsneo_netid_t::icsneo_netid_extended_command) {}
|
||||
LiveDataMessage() : InternalMessage(Message::Type::LiveData, _icsneo_netid_t::icsneo_netid_extended_command) {}
|
||||
LiveDataHandle handle;
|
||||
LiveDataCommand cmd;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace icsneo {
|
|||
|
||||
class Main51Message : public InternalMessage {
|
||||
public:
|
||||
Main51Message() : InternalMessage(Message::Type::Main51, Network::_icsneo_netid_t::icsneo_netid_main51) {}
|
||||
Main51Message() : InternalMessage(Message::Type::Main51, _icsneo_netid_t::icsneo_netid_main51) {}
|
||||
Command command = Command(0);
|
||||
bool forceShortFormat = false; // Necessary for EnableNetworkCom and EnableNetworkComEx
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace icsneo {
|
|||
|
||||
class NeoReadMemorySDMessage : public InternalMessage {
|
||||
public:
|
||||
NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread) {}
|
||||
NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, _icsneo_netid_t::icsneo_netid_neo_memory_sdread) {}
|
||||
uint32_t startAddress = 0;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace icsneo {
|
|||
|
||||
class ReadSettingsMessage : public InternalMessage {
|
||||
public:
|
||||
ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, Network::_icsneo_netid_t::icsneo_netid_read_settings) {}
|
||||
ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, _icsneo_netid_t::icsneo_netid_read_settings) {}
|
||||
|
||||
enum class Response : uint8_t {
|
||||
OK = 0,
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
#include <stdint.h>
|
||||
#include <icsneo/icsneotypes.h>
|
||||
|
||||
typedef uint16_t icsneo_netid_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
#include <ostream>
|
||||
|
|
@ -23,170 +21,6 @@ class Network {
|
|||
static constexpr uint16_t OFFSET_PLASMA_SLAVE3_RANGE2 = 12800;
|
||||
|
||||
public:
|
||||
enum class _icsneo_netid_t : icsneo_netid_t {
|
||||
icsneo_netid_device = 0,
|
||||
icsneo_netid_hscan = 1,
|
||||
icsneo_netid_mscan = 2,
|
||||
icsneo_netid_swcan = 3,
|
||||
icsneo_netid_lsftcan = 4,
|
||||
icsneo_netid_fordscp = 5,
|
||||
icsneo_netid_j1708 = 6,
|
||||
icsneo_netid_aux = 7,
|
||||
icsneo_netid_j1850vpw = 8,
|
||||
icsneo_netid_iso9141 = 9,
|
||||
icsneo_netid_disk_data = 10,
|
||||
icsneo_netid_main51 = 11,
|
||||
icsneo_netid_red = 12,
|
||||
icsneo_netid_sci = 13,
|
||||
icsneo_netid_iso9141_2 = 14,
|
||||
icsneo_netid_iso14230 = 15,
|
||||
icsneo_netid_lin = 16,
|
||||
icsneo_netid_op_ethernet1 = 17,
|
||||
icsneo_netid_op_ethernet2 = 18,
|
||||
icsneo_netid_op_ethernet3 = 19,
|
||||
|
||||
// START Device Command Returns
|
||||
// When we send a command, the device returns on one of these, depending on command
|
||||
icsneo_netid_red_ext_memoryread = 20,
|
||||
icsneo_netid_red_int_memoryread = 21,
|
||||
icsneo_netid_red_dflash_read = 22,
|
||||
icsneo_netid_neo_memory_sdread = 23, // Response from NeoMemory (MemoryTypeSD)
|
||||
icsneo_netid_can_errbits = 24,
|
||||
icsneo_netid_neo_memory_write_done = 25,
|
||||
icsneo_netid_red_wave_can1_logical = 26,
|
||||
icsneo_netid_red_wave_can2_logical = 27,
|
||||
icsneo_netid_red_wave_lin1_logical = 28,
|
||||
icsneo_netid_red_wave_lin2_logical = 29,
|
||||
icsneo_netid_red_wave_lin1_analog = 30,
|
||||
icsneo_netid_red_wave_lin2_analog = 31,
|
||||
icsneo_netid_red_wave_misc_analog = 32,
|
||||
icsneo_netid_red_wave_miscdio2_logical = 33,
|
||||
icsneo_netid_red_network_com_enable_ex = 34,
|
||||
icsneo_netid_red_neovi_network = 35,
|
||||
icsneo_netid_red_read_baud_settings = 36,
|
||||
icsneo_netid_red_oldformat = 37,
|
||||
icsneo_netid_red_scope_capture = 38,
|
||||
icsneo_netid_red_hardware_excep = 39,
|
||||
icsneo_netid_red_get_rtc = 40,
|
||||
// END Device Command Returns
|
||||
|
||||
icsneo_netid_iso9141_3 = 41,
|
||||
icsneo_netid_hscan2 = 42,
|
||||
icsneo_netid_hscan3 = 44,
|
||||
icsneo_netid_op_ethernet4 = 45,
|
||||
icsneo_netid_op_ethernet5 = 46,
|
||||
icsneo_netid_iso9141_4 = 47,
|
||||
icsneo_netid_lin2 = 48,
|
||||
icsneo_netid_lin3 = 49,
|
||||
icsneo_netid_lin4 = 50,
|
||||
// MOST = 51, Old and unused
|
||||
icsneo_netid_red_app_error = 52,
|
||||
icsneo_netid_cgi = 53,
|
||||
icsneo_netid_reset_status = 54,
|
||||
icsneo_netid_fb_status = 55,
|
||||
icsneo_netid_app_signal_status = 56,
|
||||
icsneo_netid_read_datalink_cm_tx_msg = 57,
|
||||
icsneo_netid_read_datalink_cm_rx_msg = 58,
|
||||
icsneo_netid_logging_overflow = 59,
|
||||
icsneo_netid_read_settings = 60,
|
||||
icsneo_netid_hscan4 = 61,
|
||||
icsneo_netid_hscan5 = 62,
|
||||
icsneo_netid_rs232 = 63,
|
||||
icsneo_netid_uart = 64,
|
||||
icsneo_netid_uart2 = 65,
|
||||
icsneo_netid_uart3 = 66,
|
||||
icsneo_netid_uart4 = 67,
|
||||
icsneo_netid_swcan2 = 68,
|
||||
icsneo_netid_ethernet_daq = 69,
|
||||
icsneo_netid_data_to_host = 70,
|
||||
icsneo_netid_textapi_to_host = 71,
|
||||
icsneo_netid_spi1 = 72,
|
||||
icsneo_netid_op_ethernet6 = 73,
|
||||
icsneo_netid_red_vbat = 74,
|
||||
icsneo_netid_op_ethernet7 = 75,
|
||||
icsneo_netid_op_ethernet8 = 76,
|
||||
icsneo_netid_op_ethernet9 = 77,
|
||||
icsneo_netid_op_ethernet10 = 78,
|
||||
icsneo_netid_op_ethernet11 = 79,
|
||||
icsneo_netid_flexray1a = 80,
|
||||
icsneo_netid_flexray1b = 81,
|
||||
icsneo_netid_flexray2a = 82,
|
||||
icsneo_netid_flexray2b = 83,
|
||||
icsneo_netid_lin5 = 84,
|
||||
icsneo_netid_flexray = 85,
|
||||
icsneo_netid_flexray2 = 86,
|
||||
icsneo_netid_op_ethernet12 = 87,
|
||||
icsneo_netid_i2c = 88,
|
||||
icsneo_netid_most25 = 90,
|
||||
icsneo_netid_most50 = 91,
|
||||
icsneo_netid_most150 = 92,
|
||||
icsneo_netid_ethernet = 93,
|
||||
icsneo_netid_gmfsa = 94,
|
||||
icsneo_netid_tcp = 95,
|
||||
icsneo_netid_hscan6 = 96,
|
||||
icsneo_netid_hscan7 = 97,
|
||||
icsneo_netid_lin6 = 98,
|
||||
icsneo_netid_lsftcan2 = 99,
|
||||
icsneo_netid_logical_disk_info = 187,
|
||||
icsneo_netid_wivi_command = 221,
|
||||
icsneo_netid_script_status = 224,
|
||||
icsneo_netid_eth_phy_control = 239,
|
||||
icsneo_netid_extended_command = 240,
|
||||
icsneo_netid_extended_data = 242,
|
||||
icsneo_netid_flexray_control = 243,
|
||||
icsneo_netid_coremini_preload = 244,
|
||||
icsneo_netid_hw_com_latency_test = 512,
|
||||
icsneo_netid_device_status = 513,
|
||||
icsneo_netid_udp = 514,
|
||||
icsneo_netid_forwarded_message = 516,
|
||||
icsneo_netid_i2c2 = 517,
|
||||
icsneo_netid_i2c3 = 518,
|
||||
icsneo_netid_i2c4 = 519,
|
||||
icsneo_netid_ethernet2 = 520,
|
||||
icsneo_netid_a2b1 = 522,
|
||||
icsneo_netid_a2b2 = 523,
|
||||
icsneo_netid_ethernet3 = 524,
|
||||
icsneo_netid_wbms = 532,
|
||||
icsneo_netid_dwcan9 = 534,
|
||||
icsneo_netid_dwcan10 = 535,
|
||||
icsneo_netid_dwcan11 = 536,
|
||||
icsneo_netid_dwcan12 = 537,
|
||||
icsneo_netid_dwcan13 = 538,
|
||||
icsneo_netid_dwcan14 = 539,
|
||||
icsneo_netid_dwcan15 = 540,
|
||||
icsneo_netid_dwcan16 = 541,
|
||||
icsneo_netid_lin7 = 542,
|
||||
icsneo_netid_lin8 = 543,
|
||||
icsneo_netid_spi2 = 544,
|
||||
icsneo_netid_mdio1 = 545,
|
||||
icsneo_netid_mdio2 = 546,
|
||||
icsneo_netid_mdio3 = 547,
|
||||
icsneo_netid_mdio4 = 548,
|
||||
icsneo_netid_mdio5 = 549,
|
||||
icsneo_netid_mdio6 = 550,
|
||||
icsneo_netid_mdio7 = 551,
|
||||
icsneo_netid_mdio8 = 552,
|
||||
icsneo_netid_op_ethernet13 = 553,
|
||||
icsneo_netid_op_ethernet14 = 554,
|
||||
icsneo_netid_op_ethernet15 = 555,
|
||||
icsneo_netid_op_ethernet16 = 556,
|
||||
icsneo_netid_spi3 = 557,
|
||||
icsneo_netid_spi4 = 558,
|
||||
icsneo_netid_spi5 = 559,
|
||||
icsneo_netid_spi6 = 560,
|
||||
icsneo_netid_spi7 = 561,
|
||||
icsneo_netid_spi8 = 562,
|
||||
icsneo_netid_lin9 = 563,
|
||||
icsneo_netid_lin10 = 564,
|
||||
icsneo_netid_lin11 = 565,
|
||||
icsneo_netid_lin12 = 566,
|
||||
icsneo_netid_lin13 = 567,
|
||||
icsneo_netid_lin14 = 568,
|
||||
icsneo_netid_lin15 = 569,
|
||||
icsneo_netid_lin16 = 570,
|
||||
icsneo_netid_any = 0xfffe, // Never actually set as type, but used as flag for filtering
|
||||
icsneo_netid_invalid = 0xffff
|
||||
};
|
||||
enum class CoreMini : uint8_t {
|
||||
HSCAN = 0,
|
||||
MSCAN = 1,
|
||||
|
|
|
|||
|
|
@ -728,11 +728,11 @@ public:
|
|||
|
||||
virtual bool supportsTC10() const { return false; }
|
||||
|
||||
bool requestTC10Wake(Network::_icsneo_netid_t network);
|
||||
bool requestTC10Wake(_icsneo_netid_t network);
|
||||
|
||||
bool requestTC10Sleep(Network::_icsneo_netid_t network);
|
||||
bool requestTC10Sleep(_icsneo_netid_t network);
|
||||
|
||||
std::optional<TC10StatusMessage> getTC10Status(Network::_icsneo_netid_t network);
|
||||
std::optional<TC10StatusMessage> getTC10Status(_icsneo_netid_t network);
|
||||
|
||||
protected:
|
||||
bool online = false;
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -82,7 +82,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -93,7 +93,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin2
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin2
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,21 +94,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->can5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->can6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->can7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -119,21 +119,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->canfd5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->canfd6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->canfd7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -144,9 +144,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin2:
|
||||
case _icsneo_netid_t::icsneo_netid_lin2:
|
||||
return &(cfg->lin2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -16,19 +16,19 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lsftcan,
|
||||
_icsneo_netid_t::icsneo_netid_lsftcan,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_swcan,
|
||||
_icsneo_netid_t::icsneo_netid_swcan,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin4
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin2,
|
||||
_icsneo_netid_t::icsneo_netid_lin3,
|
||||
_icsneo_netid_t::icsneo_netid_lin4
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,15 +105,15 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
|
||||
case _icsneo_netid_t::icsneo_netid_lsftcan:
|
||||
return &(cfg->lsftcan);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -125,7 +125,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_swcan:
|
||||
case _icsneo_netid_t::icsneo_netid_swcan:
|
||||
return &(cfg->swcan);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -136,13 +136,13 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin2:
|
||||
case _icsneo_netid_t::icsneo_netid_lin2:
|
||||
return &(cfg->lin2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin3:
|
||||
case _icsneo_netid_t::icsneo_netid_lin3:
|
||||
return &(cfg->lin3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin4:
|
||||
case _icsneo_netid_t::icsneo_netid_lin4:
|
||||
return &(cfg->lin4);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -23,32 +23,32 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lsftcan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lsftcan2,
|
||||
_icsneo_netid_t::icsneo_netid_lsftcan,
|
||||
_icsneo_netid_t::icsneo_netid_lsftcan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_swcan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_swcan2,
|
||||
_icsneo_netid_t::icsneo_netid_swcan,
|
||||
_icsneo_netid_t::icsneo_netid_swcan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin4,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin2,
|
||||
_icsneo_netid_t::icsneo_netid_lin3,
|
||||
_icsneo_netid_t::icsneo_netid_lin4,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_iso9141,
|
||||
Network::_icsneo_netid_t::icsneo_netid_iso9141_2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_iso9141_3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_iso9141_4
|
||||
_icsneo_netid_t::icsneo_netid_iso9141,
|
||||
_icsneo_netid_t::icsneo_netid_iso9141_2,
|
||||
_icsneo_netid_t::icsneo_netid_iso9141_3,
|
||||
_icsneo_netid_t::icsneo_netid_iso9141_4
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,25 +128,25 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->can6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->can7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->can8);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
|
||||
case _icsneo_netid_t::icsneo_netid_lsftcan:
|
||||
return &(cfg->lsftcan1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lsftcan2:
|
||||
case _icsneo_netid_t::icsneo_netid_lsftcan2:
|
||||
return &(cfg->lsftcan2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -157,21 +157,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->canfd6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->canfd7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->canfd8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -183,9 +183,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_swcan:
|
||||
case _icsneo_netid_t::icsneo_netid_swcan:
|
||||
return &(cfg->swcan1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_swcan2:
|
||||
case _icsneo_netid_t::icsneo_netid_swcan2:
|
||||
return &(cfg->swcan2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -195,16 +195,16 @@ public:
|
|||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
},
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
Network(_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -214,17 +214,17 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin2:
|
||||
case _icsneo_netid_t::icsneo_netid_lin2:
|
||||
return &(cfg->lin2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin3:
|
||||
case _icsneo_netid_t::icsneo_netid_lin3:
|
||||
return &(cfg->lin3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin4:
|
||||
case _icsneo_netid_t::icsneo_netid_lin4:
|
||||
return &(cfg->lin4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin5:
|
||||
case _icsneo_netid_t::icsneo_netid_lin5:
|
||||
return &(cfg->lin5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin6:
|
||||
case _icsneo_netid_t::icsneo_netid_lin6:
|
||||
return &(cfg->lin6);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -17,35 +17,35 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan9,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan10,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan11,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan12,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan13,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan14,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan15,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan16,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan9,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan10,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan11,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan12,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan13,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan14,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan15,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan16,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet3,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet3,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin7,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin8,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin2,
|
||||
_icsneo_netid_t::icsneo_netid_lin3,
|
||||
_icsneo_netid_t::icsneo_netid_lin4,
|
||||
_icsneo_netid_t::icsneo_netid_lin5,
|
||||
_icsneo_netid_t::icsneo_netid_lin6,
|
||||
_icsneo_netid_t::icsneo_netid_lin7,
|
||||
_icsneo_netid_t::icsneo_netid_lin8,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -166,21 +166,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->can6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->can7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->can8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -191,21 +191,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->canfd6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->canfd7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->canfd8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -215,16 +215,16 @@ public:
|
|||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
},
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
Network(_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -234,21 +234,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin2:
|
||||
case _icsneo_netid_t::icsneo_netid_lin2:
|
||||
return &(cfg->lin2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin3:
|
||||
case _icsneo_netid_t::icsneo_netid_lin3:
|
||||
return &(cfg->lin3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin4:
|
||||
case _icsneo_netid_t::icsneo_netid_lin4:
|
||||
return &(cfg->lin4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin5:
|
||||
case _icsneo_netid_t::icsneo_netid_lin5:
|
||||
return &(cfg->lin5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin6:
|
||||
case _icsneo_netid_t::icsneo_netid_lin6:
|
||||
return &(cfg->lin6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin7:
|
||||
case _icsneo_netid_t::icsneo_netid_lin7:
|
||||
return &(cfg->lin7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin8:
|
||||
case _icsneo_netid_t::icsneo_netid_lin8:
|
||||
return &(cfg->lin8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -17,37 +17,37 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan9,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan10,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan11,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan12,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan13,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan14,
|
||||
Network::_icsneo_netid_t::icsneo_netid_dwcan15,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan9,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan10,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan11,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan12,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan13,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan14,
|
||||
_icsneo_netid_t::icsneo_netid_dwcan15,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet3,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet3,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin4,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin2,
|
||||
_icsneo_netid_t::icsneo_netid_lin3,
|
||||
_icsneo_netid_t::icsneo_netid_lin4,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray,
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray1a,
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray1b,
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray2a,
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray2b,
|
||||
_icsneo_netid_t::icsneo_netid_flexray,
|
||||
_icsneo_netid_t::icsneo_netid_flexray1a,
|
||||
_icsneo_netid_t::icsneo_netid_flexray1b,
|
||||
_icsneo_netid_t::icsneo_netid_flexray2,
|
||||
_icsneo_netid_t::icsneo_netid_flexray2a,
|
||||
_icsneo_netid_t::icsneo_netid_flexray2b,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -149,21 +149,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->can6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->can7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->can8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -174,21 +174,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->canfd6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->canfd7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->canfd8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -198,16 +198,16 @@ public:
|
|||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
},
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
Network(_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -217,13 +217,13 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin2:
|
||||
case _icsneo_netid_t::icsneo_netid_lin2:
|
||||
return &(cfg->lin2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin3:
|
||||
case _icsneo_netid_t::icsneo_netid_lin3:
|
||||
return &(cfg->lin3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin4:
|
||||
case _icsneo_netid_t::icsneo_netid_lin4:
|
||||
return &(cfg->lin4);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -17,20 +17,20 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin2
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin2
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,21 +107,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->can5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->can6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->can7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -132,21 +132,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->canfd5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->canfd6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->canfd7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -156,16 +156,16 @@ public:
|
|||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
},
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
Network(_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -175,9 +175,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin2:
|
||||
case _icsneo_netid_t::icsneo_netid_lin2:
|
||||
return &(cfg->lin2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -13,29 +13,29 @@ class Plasion : public Device {
|
|||
public:
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lsftcan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lsftcan2,
|
||||
_icsneo_netid_t::icsneo_netid_lsftcan,
|
||||
_icsneo_netid_t::icsneo_netid_lsftcan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_swcan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_swcan2,
|
||||
_icsneo_netid_t::icsneo_netid_swcan,
|
||||
_icsneo_netid_t::icsneo_netid_swcan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin4,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin2,
|
||||
_icsneo_netid_t::icsneo_netid_lin3,
|
||||
_icsneo_netid_t::icsneo_netid_lin4,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray
|
||||
_icsneo_netid_t::icsneo_netid_flexray
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
@ -51,8 +51,8 @@ protected:
|
|||
virtual bool isSupportedTXNetwork(const Network&) const override { return true; }
|
||||
virtual void setupExtensions() override {
|
||||
std::vector<Network> flexRayControllers;
|
||||
flexRayControllers.push_back(Network::_icsneo_netid_t::icsneo_netid_flexray);
|
||||
flexRayControllers.push_back(Network::_icsneo_netid_t::icsneo_netid_flexray); // TODO Becomes FlexRay2 if not in coldstart mode
|
||||
flexRayControllers.push_back(_icsneo_netid_t::icsneo_netid_flexray);
|
||||
flexRayControllers.push_back(_icsneo_netid_t::icsneo_netid_flexray); // TODO Becomes FlexRay2 if not in coldstart mode
|
||||
addExtension(std::make_shared<FlexRay::Extension>(*this, flexRayControllers));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,20 +21,20 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_a2b1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_a2b2,
|
||||
_icsneo_netid_t::icsneo_netid_a2b1,
|
||||
_icsneo_netid_t::icsneo_netid_a2b2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c,
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c2,
|
||||
_icsneo_netid_t::icsneo_netid_i2c,
|
||||
_icsneo_netid_t::icsneo_netid_i2c2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,9 +104,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -117,9 +117,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -131,7 +131,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ public:
|
|||
|
||||
const std::vector<Network>& GetSupportedNetworks() override {
|
||||
static std::vector<Network> supportedNetworks = RADCometBase::GetSupportedNetworks();
|
||||
supportedNetworks.push_back(Network::_icsneo_netid_t::icsneo_netid_op_ethernet3);
|
||||
supportedNetworks.push_back(Network::_icsneo_netid_t::icsneo_netid_mdio4);
|
||||
supportedNetworks.push_back(_icsneo_netid_t::icsneo_netid_op_ethernet3);
|
||||
supportedNetworks.push_back(_icsneo_netid_t::icsneo_netid_mdio4);
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@ class RADCometBase : public Device {
|
|||
public:
|
||||
virtual const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_iso9141,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_iso9141,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio3,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio3,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,9 +95,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -108,9 +108,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -18,24 +18,24 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet7,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet3,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet4,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet5,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet6,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet7,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_iso9141,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_iso9141,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,9 +92,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -105,9 +105,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet, // Connected to port 6 on the switch
|
||||
_icsneo_netid_t::icsneo_netid_ethernet, // Connected to port 6 on the switch
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin
|
||||
_icsneo_netid_t::icsneo_netid_lin
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,41 +21,41 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_swcan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_swcan2,
|
||||
_icsneo_netid_t::icsneo_netid_swcan,
|
||||
_icsneo_netid_t::icsneo_netid_swcan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet7,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet8,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet9,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet10,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet11,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet12,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet3,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet4,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet5,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet6,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet7,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet8,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet9,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet10,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet11,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet12,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio5,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio3,
|
||||
_icsneo_netid_t::icsneo_netid_mdio4,
|
||||
_icsneo_netid_t::icsneo_netid_mdio5,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,21 +112,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->can6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->can7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->can8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -137,21 +137,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->canfd6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->canfd7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->canfd8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -162,9 +162,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_swcan:
|
||||
case _icsneo_netid_t::icsneo_netid_swcan:
|
||||
return &(cfg->swcan1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_swcan2:
|
||||
case _icsneo_netid_t::icsneo_netid_swcan2:
|
||||
return &(cfg->swcan2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -176,7 +176,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -47,59 +47,59 @@ protected:
|
|||
|
||||
void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
|
||||
static std::vector<Network> supportedRxNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray1a,
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray1b,
|
||||
_icsneo_netid_t::icsneo_netid_flexray1a,
|
||||
_icsneo_netid_t::icsneo_netid_flexray1b,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c,
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c3,
|
||||
_icsneo_netid_t::icsneo_netid_i2c,
|
||||
_icsneo_netid_t::icsneo_netid_i2c2,
|
||||
_icsneo_netid_t::icsneo_netid_i2c3,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
};
|
||||
rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end());
|
||||
}
|
||||
|
||||
void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override {
|
||||
static std::vector<Network> supportedTxNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
|
||||
// FlexRay is Receive Only
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c,
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c3,
|
||||
_icsneo_netid_t::icsneo_netid_i2c,
|
||||
_icsneo_netid_t::icsneo_netid_i2c2,
|
||||
_icsneo_netid_t::icsneo_netid_i2c3,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
};
|
||||
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,17 +101,17 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->can6);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -122,17 +122,17 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->canfd6);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -142,14 +142,14 @@ public:
|
|||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4)
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan4)
|
||||
},
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5)
|
||||
Network(_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan5)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -159,7 +159,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -23,50 +23,50 @@ namespace icsneo
|
|||
static const std::vector<Network> &GetSupportedNetworks()
|
||||
{
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet7,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet8,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet9,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet10,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet3,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet4,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet5,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet6,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet7,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet8,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet9,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet10,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin7,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin8,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin9,
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin10,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin2,
|
||||
_icsneo_netid_t::icsneo_netid_lin3,
|
||||
_icsneo_netid_t::icsneo_netid_lin4,
|
||||
_icsneo_netid_t::icsneo_netid_lin5,
|
||||
_icsneo_netid_t::icsneo_netid_lin6,
|
||||
_icsneo_netid_t::icsneo_netid_lin7,
|
||||
_icsneo_netid_t::icsneo_netid_lin8,
|
||||
_icsneo_netid_t::icsneo_netid_lin9,
|
||||
_icsneo_netid_t::icsneo_netid_lin10,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c,
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c2,
|
||||
_icsneo_netid_t::icsneo_netid_i2c,
|
||||
_icsneo_netid_t::icsneo_netid_i2c2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi7,
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi8,
|
||||
_icsneo_netid_t::icsneo_netid_spi1,
|
||||
_icsneo_netid_t::icsneo_netid_spi2,
|
||||
_icsneo_netid_t::icsneo_netid_spi3,
|
||||
_icsneo_netid_t::icsneo_netid_spi4,
|
||||
_icsneo_netid_t::icsneo_netid_spi5,
|
||||
_icsneo_netid_t::icsneo_netid_spi6,
|
||||
_icsneo_netid_t::icsneo_netid_spi7,
|
||||
_icsneo_netid_t::icsneo_netid_spi8,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,13 +147,13 @@ namespace icsneo
|
|||
return nullptr;
|
||||
switch (net.getNetID())
|
||||
{
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can4);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -166,13 +166,13 @@ namespace icsneo
|
|||
return nullptr;
|
||||
switch (net.getNetID())
|
||||
{
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd4);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -182,10 +182,10 @@ namespace icsneo
|
|||
virtual std::vector<TerminationGroup> getTerminationGroups() const override
|
||||
{
|
||||
return {
|
||||
{Network(Network::_icsneo_netid_t::icsneo_netid_hscan)},
|
||||
{Network(Network::_icsneo_netid_t::icsneo_netid_hscan2)},
|
||||
{Network(Network::_icsneo_netid_t::icsneo_netid_hscan3)},
|
||||
{Network(Network::_icsneo_netid_t::icsneo_netid_hscan4)}};
|
||||
{Network(_icsneo_netid_t::icsneo_netid_hscan)},
|
||||
{Network(_icsneo_netid_t::icsneo_netid_hscan2)},
|
||||
{Network(_icsneo_netid_t::icsneo_netid_hscan3)},
|
||||
{Network(_icsneo_netid_t::icsneo_netid_hscan4)}};
|
||||
}
|
||||
|
||||
const LIN_SETTINGS *getLINSettingsFor(Network net) const override
|
||||
|
|
@ -195,25 +195,25 @@ namespace icsneo
|
|||
return nullptr;
|
||||
switch (net.getNetID())
|
||||
{
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin2:
|
||||
case _icsneo_netid_t::icsneo_netid_lin2:
|
||||
return &(cfg->lin2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin3:
|
||||
case _icsneo_netid_t::icsneo_netid_lin3:
|
||||
return &(cfg->lin3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin4:
|
||||
case _icsneo_netid_t::icsneo_netid_lin4:
|
||||
return &(cfg->lin4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin5:
|
||||
case _icsneo_netid_t::icsneo_netid_lin5:
|
||||
return &(cfg->lin5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin6:
|
||||
case _icsneo_netid_t::icsneo_netid_lin6:
|
||||
return &(cfg->lin6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin7:
|
||||
case _icsneo_netid_t::icsneo_netid_lin7:
|
||||
return &(cfg->lin7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin8:
|
||||
case _icsneo_netid_t::icsneo_netid_lin8:
|
||||
return &(cfg->lin8);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin9:
|
||||
case _icsneo_netid_t::icsneo_netid_lin9:
|
||||
return &(cfg->lin9);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin10:
|
||||
case _icsneo_netid_t::icsneo_netid_lin10:
|
||||
return &(cfg->lin10);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet // Connected to port 6 on the switch
|
||||
_icsneo_netid_t::icsneo_netid_ethernet // Connected to port 6 on the switch
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,9 +97,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -110,9 +110,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -123,7 +123,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -43,55 +43,55 @@ protected:
|
|||
|
||||
void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
|
||||
static std::vector<Network> supportedRxNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet3,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet3,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray1a,
|
||||
Network::_icsneo_netid_t::icsneo_netid_flexray1b,
|
||||
_icsneo_netid_t::icsneo_netid_flexray1a,
|
||||
_icsneo_netid_t::icsneo_netid_flexray1b,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c,
|
||||
_icsneo_netid_t::icsneo_netid_i2c,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
};
|
||||
rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end());
|
||||
}
|
||||
|
||||
void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override {
|
||||
static std::vector<Network> supportedTxNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4,
|
||||
_icsneo_netid_t::icsneo_netid_hscan5,
|
||||
_icsneo_netid_t::icsneo_netid_hscan6,
|
||||
_icsneo_netid_t::icsneo_netid_hscan7,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet3,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet3,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
|
||||
// FlexRay is Receive Only
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_i2c,
|
||||
_icsneo_netid_t::icsneo_netid_i2c,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
};
|
||||
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,21 +107,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->can6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->can7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->can8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -132,21 +132,21 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd4);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd5);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan5:
|
||||
return &(cfg->canfd6);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan6:
|
||||
return &(cfg->canfd7);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan7:
|
||||
return &(cfg->canfd8);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -156,16 +156,16 @@ public:
|
|||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan3),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan5),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan7)
|
||||
},
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
Network(_icsneo_netid_t::icsneo_netid_mscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan4),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan6)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -175,7 +175,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public:
|
|||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
// If Converter1 Target is set to USB/CM, OP_Ethernet2 will be exposed to the PC
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_spi1,
|
||||
_icsneo_netid_t::icsneo_netid_spi1,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,17 +17,17 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin,
|
||||
_icsneo_netid_t::icsneo_netid_lin,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet4
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet3,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet4
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,9 +83,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -96,9 +96,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -110,7 +110,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,9 +78,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -91,9 +91,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -105,7 +105,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_op_ethernet1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio1,
|
||||
_icsneo_netid_t::icsneo_netid_mdio2,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_mscan
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_mscan
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_mscan:
|
||||
case _icsneo_netid_t::icsneo_netid_mscan:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -29,9 +29,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -40,8 +40,8 @@ public:
|
|||
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
|
||||
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) }
|
||||
{ Network(_icsneo_netid_t::icsneo_netid_hscan) },
|
||||
{ Network(_icsneo_netid_t::icsneo_netid_hscan2) }
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -28,9 +28,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -39,8 +39,8 @@ public:
|
|||
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
|
||||
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) }
|
||||
{ Network(_icsneo_netid_t::icsneo_netid_hscan) },
|
||||
{ Network(_icsneo_netid_t::icsneo_netid_hscan2) }
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -29,9 +29,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -43,7 +43,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->can3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->can4);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -33,13 +33,13 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan3:
|
||||
return &(cfg->canfd3);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan4:
|
||||
return &(cfg->canfd4);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -49,12 +49,12 @@ public:
|
|||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3)
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan3)
|
||||
},
|
||||
{
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4)
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan2),
|
||||
Network(_icsneo_netid_t::icsneo_netid_hscan4)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -64,7 +64,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lin:
|
||||
case _icsneo_netid_t::icsneo_netid_lin:
|
||||
return &(cfg->lin1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->can2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -29,9 +29,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->canfd1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan2:
|
||||
return &(cfg->canfd2);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -40,8 +40,8 @@ public:
|
|||
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
|
||||
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) }
|
||||
{ Network(_icsneo_netid_t::icsneo_netid_hscan) },
|
||||
{ Network(_icsneo_netid_t::icsneo_netid_hscan2) }
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan
|
||||
_icsneo_netid_t::icsneo_netid_hscan
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin
|
||||
_icsneo_netid_t::icsneo_netid_lin
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan4
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan3,
|
||||
_icsneo_netid_t::icsneo_netid_hscan4
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ public:
|
|||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan,
|
||||
Network::_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
_icsneo_netid_t::icsneo_netid_hscan,
|
||||
_icsneo_netid_t::icsneo_netid_hscan2,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
_icsneo_netid_t::icsneo_netid_ethernet,
|
||||
|
||||
Network::_icsneo_netid_t::icsneo_netid_lin
|
||||
_icsneo_netid_t::icsneo_netid_lin
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_hscan:
|
||||
case _icsneo_netid_t::icsneo_netid_hscan:
|
||||
return &(cfg->can1);
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
|
||||
case _icsneo_netid_t::icsneo_netid_lsftcan:
|
||||
return &(cfg->lsftcan1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -65,7 +65,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
|
||||
case _icsneo_netid_t::icsneo_netid_lsftcan:
|
||||
return &(cfg->lsftcan1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -76,7 +76,7 @@ public:
|
|||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::_icsneo_netid_t::icsneo_netid_swcan:
|
||||
case _icsneo_netid_t::icsneo_netid_swcan:
|
||||
return &(cfg->swcan1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
|
@ -85,7 +85,7 @@ public:
|
|||
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }
|
||||
{ Network(_icsneo_netid_t::icsneo_netid_hscan) }
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -85,7 +85,9 @@ typedef enum _icsneo_error_t {
|
|||
// Generic RTC error code
|
||||
icsneo_error_rtc_failure,
|
||||
// Error setting settings
|
||||
icsneo_error_set_settings_failure
|
||||
icsneo_error_set_settings_failure,
|
||||
// Failed to transmit messages
|
||||
icsneo_error_transmit_messages_failed,
|
||||
} _icsneo_error_t;
|
||||
|
||||
/** @brief Integer representation of _icsneo_error_t enum.
|
||||
|
|
@ -168,7 +170,7 @@ ICSNEO_API icsneo_error_t icsneo_device_open(icsneo_device_t* device);
|
|||
/** @brief Close a connection to a previously opened device.
|
||||
*
|
||||
* After a successful call to icsneo_device_open(), this function must be called to close the device.
|
||||
* An already closed device will still succeed.
|
||||
* An already closed device will still succeed. All messages and events related to the device will be freed.
|
||||
*
|
||||
* @param[in] icsneo_device_t device The device to close.
|
||||
*
|
||||
|
|
@ -306,6 +308,17 @@ ICSNEO_API icsneo_error_t icsneo_device_get_timestamp_resolution(icsneo_device_t
|
|||
*/
|
||||
ICSNEO_API icsneo_error_t icsneo_device_get_messages(icsneo_device_t* device, icsneo_message_t** messages, uint32_t* messages_count, uint32_t timeout_ms);
|
||||
|
||||
/** @brief Transmit messages from a device
|
||||
*
|
||||
* @param[in] icsneo_device_t device The device to get the messages of.
|
||||
* @param[out] icsneo_message_t** messages Pointer to an array of icsneo_message_t to copy the messages into.
|
||||
* Undefined behaviour if index is out of range of messages_count.
|
||||
* @param[in,out] uint32_t* messages_count Size of the messages array. Modified with the number of messages actually transmitted.
|
||||
*
|
||||
* @return icsneo_error_t icsneo_error_success if successful, icsneo_error_invalid_parameters or icsneo_error_transmission_failed otherwise.
|
||||
*/
|
||||
ICSNEO_API icsneo_error_t icsneo_device_transmit_messages(icsneo_device_t* device, icsneo_message_t** messages, uint32_t* messages_count);
|
||||
|
||||
/** @brief Check if a message is valid
|
||||
*
|
||||
* @param[in] icsneo_device_t* device The device to check against.
|
||||
|
|
@ -421,6 +434,17 @@ ICSNEO_API icsneo_error_t icsneo_can_message_get_baudrate_switch(icsneo_device_t
|
|||
*/
|
||||
ICSNEO_API icsneo_error_t icsneo_can_message_get_error_state_indicator(icsneo_device_t* device, icsneo_message_t* message, bool* value);
|
||||
|
||||
/** @brief Create CAN messages for a device
|
||||
*
|
||||
* @param[in] icsneo_device_t device The device to get the messages of.
|
||||
* @param[out] icsneo_message_t** messages Pointer to an array of icsneo_message_t to copy the messages into.
|
||||
* Undefined behaviour if index is out of range of messages_count.
|
||||
* @param[in] uint32_t* messages_count Size of the messages array.
|
||||
*
|
||||
* @return icsneo_error_t icsneo_error_success if successful, icsneo_error_invalid_parameters otherwise.
|
||||
*/
|
||||
ICSNEO_API icsneo_error_t icsneo_can_messages_create(icsneo_device_t* device, icsneo_message_t** messages, uint32_t messages_count);
|
||||
|
||||
/** @brief Get the global events not specifically related to a device.
|
||||
*
|
||||
* @param[out] icsneo_event_t** events Pointer to an array of icsneo_event_t to copy the events into.
|
||||
|
|
|
|||
|
|
@ -196,6 +196,177 @@ typedef enum _icsneo_msg_bus_type_t {
|
|||
*/
|
||||
typedef uint8_t icsneo_msg_bus_type_t;
|
||||
|
||||
typedef enum _icsneo_netid_t {
|
||||
icsneo_netid_device = 0,
|
||||
icsneo_netid_hscan = 1,
|
||||
icsneo_netid_mscan = 2,
|
||||
icsneo_netid_swcan = 3,
|
||||
icsneo_netid_lsftcan = 4,
|
||||
icsneo_netid_fordscp = 5,
|
||||
icsneo_netid_j1708 = 6,
|
||||
icsneo_netid_aux = 7,
|
||||
icsneo_netid_j1850vpw = 8,
|
||||
icsneo_netid_iso9141 = 9,
|
||||
icsneo_netid_disk_data = 10,
|
||||
icsneo_netid_main51 = 11,
|
||||
icsneo_netid_red = 12,
|
||||
icsneo_netid_sci = 13,
|
||||
icsneo_netid_iso9141_2 = 14,
|
||||
icsneo_netid_iso14230 = 15,
|
||||
icsneo_netid_lin = 16,
|
||||
icsneo_netid_op_ethernet1 = 17,
|
||||
icsneo_netid_op_ethernet2 = 18,
|
||||
icsneo_netid_op_ethernet3 = 19,
|
||||
|
||||
// START Device Command Returns
|
||||
// When we send a command, the device returns on one of these, depending on command
|
||||
icsneo_netid_red_ext_memoryread = 20,
|
||||
icsneo_netid_red_int_memoryread = 21,
|
||||
icsneo_netid_red_dflash_read = 22,
|
||||
icsneo_netid_neo_memory_sdread = 23, // Response from NeoMemory (MemoryTypeSD)
|
||||
icsneo_netid_can_errbits = 24,
|
||||
icsneo_netid_neo_memory_write_done = 25,
|
||||
icsneo_netid_red_wave_can1_logical = 26,
|
||||
icsneo_netid_red_wave_can2_logical = 27,
|
||||
icsneo_netid_red_wave_lin1_logical = 28,
|
||||
icsneo_netid_red_wave_lin2_logical = 29,
|
||||
icsneo_netid_red_wave_lin1_analog = 30,
|
||||
icsneo_netid_red_wave_lin2_analog = 31,
|
||||
icsneo_netid_red_wave_misc_analog = 32,
|
||||
icsneo_netid_red_wave_miscdio2_logical = 33,
|
||||
icsneo_netid_red_network_com_enable_ex = 34,
|
||||
icsneo_netid_red_neovi_network = 35,
|
||||
icsneo_netid_red_read_baud_settings = 36,
|
||||
icsneo_netid_red_oldformat = 37,
|
||||
icsneo_netid_red_scope_capture = 38,
|
||||
icsneo_netid_red_hardware_excep = 39,
|
||||
icsneo_netid_red_get_rtc = 40,
|
||||
// END Device Command Returns
|
||||
|
||||
icsneo_netid_iso9141_3 = 41,
|
||||
icsneo_netid_hscan2 = 42,
|
||||
icsneo_netid_hscan3 = 44,
|
||||
icsneo_netid_op_ethernet4 = 45,
|
||||
icsneo_netid_op_ethernet5 = 46,
|
||||
icsneo_netid_iso9141_4 = 47,
|
||||
icsneo_netid_lin2 = 48,
|
||||
icsneo_netid_lin3 = 49,
|
||||
icsneo_netid_lin4 = 50,
|
||||
// MOST = 51, Old and unused
|
||||
icsneo_netid_red_app_error = 52,
|
||||
icsneo_netid_cgi = 53,
|
||||
icsneo_netid_reset_status = 54,
|
||||
icsneo_netid_fb_status = 55,
|
||||
icsneo_netid_app_signal_status = 56,
|
||||
icsneo_netid_read_datalink_cm_tx_msg = 57,
|
||||
icsneo_netid_read_datalink_cm_rx_msg = 58,
|
||||
icsneo_netid_logging_overflow = 59,
|
||||
icsneo_netid_read_settings = 60,
|
||||
icsneo_netid_hscan4 = 61,
|
||||
icsneo_netid_hscan5 = 62,
|
||||
icsneo_netid_rs232 = 63,
|
||||
icsneo_netid_uart = 64,
|
||||
icsneo_netid_uart2 = 65,
|
||||
icsneo_netid_uart3 = 66,
|
||||
icsneo_netid_uart4 = 67,
|
||||
icsneo_netid_swcan2 = 68,
|
||||
icsneo_netid_ethernet_daq = 69,
|
||||
icsneo_netid_data_to_host = 70,
|
||||
icsneo_netid_textapi_to_host = 71,
|
||||
icsneo_netid_spi1 = 72,
|
||||
icsneo_netid_op_ethernet6 = 73,
|
||||
icsneo_netid_red_vbat = 74,
|
||||
icsneo_netid_op_ethernet7 = 75,
|
||||
icsneo_netid_op_ethernet8 = 76,
|
||||
icsneo_netid_op_ethernet9 = 77,
|
||||
icsneo_netid_op_ethernet10 = 78,
|
||||
icsneo_netid_op_ethernet11 = 79,
|
||||
icsneo_netid_flexray1a = 80,
|
||||
icsneo_netid_flexray1b = 81,
|
||||
icsneo_netid_flexray2a = 82,
|
||||
icsneo_netid_flexray2b = 83,
|
||||
icsneo_netid_lin5 = 84,
|
||||
icsneo_netid_flexray = 85,
|
||||
icsneo_netid_flexray2 = 86,
|
||||
icsneo_netid_op_ethernet12 = 87,
|
||||
icsneo_netid_i2c = 88,
|
||||
icsneo_netid_most25 = 90,
|
||||
icsneo_netid_most50 = 91,
|
||||
icsneo_netid_most150 = 92,
|
||||
icsneo_netid_ethernet = 93,
|
||||
icsneo_netid_gmfsa = 94,
|
||||
icsneo_netid_tcp = 95,
|
||||
icsneo_netid_hscan6 = 96,
|
||||
icsneo_netid_hscan7 = 97,
|
||||
icsneo_netid_lin6 = 98,
|
||||
icsneo_netid_lsftcan2 = 99,
|
||||
icsneo_netid_logical_disk_info = 187,
|
||||
icsneo_netid_wivi_command = 221,
|
||||
icsneo_netid_script_status = 224,
|
||||
icsneo_netid_eth_phy_control = 239,
|
||||
icsneo_netid_extended_command = 240,
|
||||
icsneo_netid_extended_data = 242,
|
||||
icsneo_netid_flexray_control = 243,
|
||||
icsneo_netid_coremini_preload = 244,
|
||||
icsneo_netid_hw_com_latency_test = 512,
|
||||
icsneo_netid_device_status = 513,
|
||||
icsneo_netid_udp = 514,
|
||||
icsneo_netid_forwarded_message = 516,
|
||||
icsneo_netid_i2c2 = 517,
|
||||
icsneo_netid_i2c3 = 518,
|
||||
icsneo_netid_i2c4 = 519,
|
||||
icsneo_netid_ethernet2 = 520,
|
||||
icsneo_netid_a2b1 = 522,
|
||||
icsneo_netid_a2b2 = 523,
|
||||
icsneo_netid_ethernet3 = 524,
|
||||
icsneo_netid_wbms = 532,
|
||||
icsneo_netid_dwcan9 = 534,
|
||||
icsneo_netid_dwcan10 = 535,
|
||||
icsneo_netid_dwcan11 = 536,
|
||||
icsneo_netid_dwcan12 = 537,
|
||||
icsneo_netid_dwcan13 = 538,
|
||||
icsneo_netid_dwcan14 = 539,
|
||||
icsneo_netid_dwcan15 = 540,
|
||||
icsneo_netid_dwcan16 = 541,
|
||||
icsneo_netid_lin7 = 542,
|
||||
icsneo_netid_lin8 = 543,
|
||||
icsneo_netid_spi2 = 544,
|
||||
icsneo_netid_mdio1 = 545,
|
||||
icsneo_netid_mdio2 = 546,
|
||||
icsneo_netid_mdio3 = 547,
|
||||
icsneo_netid_mdio4 = 548,
|
||||
icsneo_netid_mdio5 = 549,
|
||||
icsneo_netid_mdio6 = 550,
|
||||
icsneo_netid_mdio7 = 551,
|
||||
icsneo_netid_mdio8 = 552,
|
||||
icsneo_netid_op_ethernet13 = 553,
|
||||
icsneo_netid_op_ethernet14 = 554,
|
||||
icsneo_netid_op_ethernet15 = 555,
|
||||
icsneo_netid_op_ethernet16 = 556,
|
||||
icsneo_netid_spi3 = 557,
|
||||
icsneo_netid_spi4 = 558,
|
||||
icsneo_netid_spi5 = 559,
|
||||
icsneo_netid_spi6 = 560,
|
||||
icsneo_netid_spi7 = 561,
|
||||
icsneo_netid_spi8 = 562,
|
||||
icsneo_netid_lin9 = 563,
|
||||
icsneo_netid_lin10 = 564,
|
||||
icsneo_netid_lin11 = 565,
|
||||
icsneo_netid_lin12 = 566,
|
||||
icsneo_netid_lin13 = 567,
|
||||
icsneo_netid_lin14 = 568,
|
||||
icsneo_netid_lin15 = 569,
|
||||
icsneo_netid_lin16 = 570,
|
||||
icsneo_netid_any = 0xfffe, // Never actually set as type, but used as flag for filtering
|
||||
icsneo_netid_invalid = 0xffff
|
||||
} _icsneo_netid_t;
|
||||
|
||||
/** @brief Integer representation of _icsneo_netid_t enum.
|
||||
*
|
||||
* This is used for easier ABI compatibility, especially between other languages.
|
||||
*/
|
||||
typedef uint16_t icsneo_netid_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ void FirmIO::Find(std::vector<FoundDevice>& found) {
|
|||
return;
|
||||
|
||||
std::vector<uint8_t> payload = {
|
||||
((1 << 4) | (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51
|
||||
((1 << 4) | (uint8_t)_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51
|
||||
(uint8_t)Command::RequestSerialNumber
|
||||
};
|
||||
payload.push_back(Packetizer::ICSChecksum(payload));
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ void PCAP::Find(std::vector<FoundDevice>& found) {
|
|||
memcpy(requestPacket.srcMAC, iface.macAddress, sizeof(requestPacket.srcMAC));
|
||||
requestPacket.payload.reserve(4);
|
||||
requestPacket.payload = {
|
||||
((1 << 4) | (uint8_t)Network::_icsneo_netid_t::Main51), // Packet size of 1 on NETID_MAIN51
|
||||
((1 << 4) | (uint8_t)_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51
|
||||
(uint8_t)Command::RequestSerialNumber
|
||||
};
|
||||
requestPacket.payload.push_back(Packetizer::ICSChecksum(requestPacket.payload));
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ void PCAP::Find(std::vector<FoundDevice>& found) {
|
|||
memcpy(requestPacket.srcMAC, iface.macAddress, sizeof(requestPacket.srcMAC));
|
||||
requestPacket.payload.reserve(4);
|
||||
requestPacket.payload = {
|
||||
((1 << 4) | (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51
|
||||
((1 << 4) | (uint8_t)_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51
|
||||
(uint8_t)Command::RequestSerialNumber
|
||||
};
|
||||
requestPacket.payload.push_back(Packetizer::ICSChecksum(requestPacket.payload));
|
||||
|
|
|
|||
Loading…
Reference in New Issue