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

Compare commits

base: sven:7e4c0cdc43d6b3a4bae5fc5e54118b33db7cf1ca
Branches Tags
sven:master
sven:liveDataSetValue
sven:icsneo_api
sven:ks-refactor-docs
sven:136-add-android-support
sven:add-device-sharing
sven:v0.3.0-dev
sven:checksum-failure-logging
sven:pcap
sven:1.2.2
sven:1.2.1
sven:1.2.0
sven:1.1.0
sven:1.0.0
sven:v0.2.0
sven:v0.1.2
...
compare: sven:9dcee2ae04483281fb9b4b937cbae39d9854b6c4
Branches Tags
sven:master
sven:liveDataSetValue
sven:icsneo_api
sven:ks-refactor-docs
sven:136-add-android-support
sven:add-device-sharing
sven:v0.3.0-dev
sven:checksum-failure-logging
sven:pcap
sven:1.2.2
sven:1.2.1
sven:1.2.0
sven:1.1.0
sven:1.0.0
sven:v0.2.0
sven:v0.1.2

5 Commits
7e4c0cdc43 ... 9dcee2ae04

Author SHA1 Message Date
David Rebbe 9dcee2ae04 done renaming enum 2024-12-05 17:18:04 -05:00
David Rebbe ff7b567831 more renaming 2024-12-05 17:12:25 -05:00
David Rebbe 632057dc70 more renaming in progress 2024-12-05 17:08:08 -05:00
David Rebbe faa92ca4fa in progress rename of enum 2024-12-05 16:38:47 -05:00
David Rebbe cc0f257cee added icsneo_device_supports_tc10 2024-12-05 16:23:36 -05:00
98 changed files with 1700 additions and 1680 deletions
Show Stats Expand all files Collapse all files

10
api/icsneo/icsneo.cpp
View File

@ -677,3 +677,13 @@ ICSNEO_API icsneo_error_t icsneo_device_load_default_settings(icsneo_device_t* d
return icsneo_error_success;
}
ICSNEO_API icsneo_error_t icsneo_device_supports_tc10(icsneo_device_t* device, bool* supported) {
if (!device || !supported) {
return icsneo_error_invalid_parameters;
}
// TODO: Check if device is valid
*supported = device->device->supportsTC10();
return icsneo_error_success;
}

2
bindings/python/icsneopy/communication/message/filter/messagefilter.cpp
View File

@ -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::NetID>());
.def(pybind11::init<Network::_icsneo_netid_t>());
}
} // namespace icsneo

316
bindings/python/icsneopy/communication/network.cpp
View File

@ -9,165 +9,165 @@ namespace icsneo {
void init_network(pybind11::module_& m) {
pybind11::class_<Network> network(m, "Network");
pybind11::enum_<Network::NetID>(network, "NetID")
.value("Device", Network::NetID::Device)
.value("HSCAN", Network::NetID::HSCAN)
.value("MSCAN", Network::NetID::MSCAN)
.value("SWCAN", Network::NetID::SWCAN)
.value("LSFTCAN", Network::NetID::LSFTCAN)
.value("FordSCP", Network::NetID::FordSCP)
.value("J1708", Network::NetID::J1708)
.value("Aux", Network::NetID::Aux)
.value("J1850VPW", Network::NetID::J1850VPW)
.value("ISO9141", Network::NetID::ISO9141)
.value("DiskData", Network::NetID::DiskData)
.value("Main51", Network::NetID::Main51)
.value("RED", Network::NetID::RED)
.value("SCI", Network::NetID::SCI)
.value("ISO9141_2", Network::NetID::ISO9141_2)
.value("ISO14230", Network::NetID::ISO14230)
.value("LIN", Network::NetID::LIN)
.value("OP_Ethernet1", Network::NetID::OP_Ethernet1)
.value("OP_Ethernet2", Network::NetID::OP_Ethernet2)
.value("OP_Ethernet3", Network::NetID::OP_Ethernet3)
.value("RED_EXT_MEMORYREAD", Network::NetID::RED_EXT_MEMORYREAD)
.value("RED_INT_MEMORYREAD", Network::NetID::RED_INT_MEMORYREAD)
.value("RED_DFLASH_READ", Network::NetID::RED_DFLASH_READ)
.value("NeoMemorySDRead", Network::NetID::NeoMemorySDRead)
.value("CAN_ERRBITS", Network::NetID::CAN_ERRBITS)
.value("NeoMemoryWriteDone", Network::NetID::NeoMemoryWriteDone)
.value("RED_WAVE_CAN1_LOGICAL", Network::NetID::RED_WAVE_CAN1_LOGICAL)
.value("RED_WAVE_CAN2_LOGICAL", Network::NetID::RED_WAVE_CAN2_LOGICAL)
.value("RED_WAVE_LIN1_LOGICAL", Network::NetID::RED_WAVE_LIN1_LOGICAL)
.value("RED_WAVE_LIN2_LOGICAL", Network::NetID::RED_WAVE_LIN2_LOGICAL)
.value("RED_WAVE_LIN1_ANALOG", Network::NetID::RED_WAVE_LIN1_ANALOG)
.value("RED_WAVE_LIN2_ANALOG", Network::NetID::RED_WAVE_LIN2_ANALOG)
.value("RED_WAVE_MISC_ANALOG", Network::NetID::RED_WAVE_MISC_ANALOG)
.value("RED_WAVE_MISCDIO2_LOGICAL", Network::NetID::RED_WAVE_MISCDIO2_LOGICAL)
.value("RED_NETWORK_COM_ENABLE_EX", Network::NetID::RED_NETWORK_COM_ENABLE_EX)
.value("RED_NEOVI_NETWORK", Network::NetID::RED_NEOVI_NETWORK)
.value("RED_READ_BAUD_SETTINGS", Network::NetID::RED_READ_BAUD_SETTINGS)
.value("RED_OLDFORMAT", Network::NetID::RED_OLDFORMAT)
.value("RED_SCOPE_CAPTURE", Network::NetID::RED_SCOPE_CAPTURE)
.value("RED_HARDWARE_EXCEP", Network::NetID::RED_HARDWARE_EXCEP)
.value("RED_GET_RTC", Network::NetID::RED_GET_RTC)
.value("ISO9141_3", Network::NetID::ISO9141_3)
.value("HSCAN2", Network::NetID::HSCAN2)
.value("HSCAN3", Network::NetID::HSCAN3)
.value("OP_Ethernet4", Network::NetID::OP_Ethernet4)
.value("OP_Ethernet5", Network::NetID::OP_Ethernet5)
.value("ISO9141_4", Network::NetID::ISO9141_4)
.value("LIN2", Network::NetID::LIN2)
.value("LIN3", Network::NetID::LIN3)
.value("LIN4", Network::NetID::LIN4)
.value("RED_App_Error", Network::NetID::RED_App_Error)
.value("CGI", Network::NetID::CGI)
.value("Reset_Status", Network::NetID::Reset_Status)
.value("FB_Status", Network::NetID::FB_Status)
.value("App_Signal_Status", Network::NetID::App_Signal_Status)
.value("Read_Datalink_Cm_Tx_Msg", Network::NetID::Read_Datalink_Cm_Tx_Msg)
.value("Read_Datalink_Cm_Rx_Msg", Network::NetID::Read_Datalink_Cm_Rx_Msg)
.value("Logging_Overflow", Network::NetID::Logging_Overflow)
.value("ReadSettings", Network::NetID::ReadSettings)
.value("HSCAN4", Network::NetID::HSCAN4)
.value("HSCAN5", Network::NetID::HSCAN5)
.value("RS232", Network::NetID::RS232)
.value("UART", Network::NetID::UART)
.value("UART2", Network::NetID::UART2)
.value("UART3", Network::NetID::UART3)
.value("UART4", Network::NetID::UART4)
.value("SWCAN2", Network::NetID::SWCAN2)
.value("Ethernet_DAQ", Network::NetID::Ethernet_DAQ)
.value("Data_To_Host", Network::NetID::Data_To_Host)
.value("TextAPI_To_Host", Network::NetID::TextAPI_To_Host)
.value("SPI1", Network::NetID::SPI1)
.value("OP_Ethernet6", Network::NetID::OP_Ethernet6)
.value("Red_VBat", Network::NetID::Red_VBat)
.value("OP_Ethernet7", Network::NetID::OP_Ethernet7)
.value("OP_Ethernet8", Network::NetID::OP_Ethernet8)
.value("OP_Ethernet9", Network::NetID::OP_Ethernet9)
.value("OP_Ethernet10", Network::NetID::OP_Ethernet10)
.value("OP_Ethernet11", Network::NetID::OP_Ethernet11)
.value("FlexRay1a", Network::NetID::FlexRay1a)
.value("FlexRay1b", Network::NetID::FlexRay1b)
.value("FlexRay2a", Network::NetID::FlexRay2a)
.value("FlexRay2b", Network::NetID::FlexRay2b)
.value("LIN5", Network::NetID::LIN5)
.value("FlexRay", Network::NetID::FlexRay)
.value("FlexRay2", Network::NetID::FlexRay2)
.value("OP_Ethernet12", Network::NetID::OP_Ethernet12)
.value("I2C", Network::NetID::I2C)
.value("MOST25", Network::NetID::MOST25)
.value("MOST50", Network::NetID::MOST50)
.value("MOST150", Network::NetID::MOST150)
.value("Ethernet", Network::NetID::Ethernet)
.value("GMFSA", Network::NetID::GMFSA)
.value("TCP", Network::NetID::TCP)
.value("HSCAN6", Network::NetID::HSCAN6)
.value("HSCAN7", Network::NetID::HSCAN7)
.value("LIN6", Network::NetID::LIN6)
.value("LSFTCAN2", Network::NetID::LSFTCAN2)
.value("LogicalDiskInfo", Network::NetID::LogicalDiskInfo)
.value("WiVICommand", Network::NetID::WiVICommand)
.value("ScriptStatus", Network::NetID::ScriptStatus)
.value("EthPHYControl", Network::NetID::EthPHYControl)
.value("ExtendedCommand", Network::NetID::ExtendedCommand)
.value("ExtendedData", Network::NetID::ExtendedData)
.value("FlexRayControl", Network::NetID::FlexRayControl)
.value("CoreMiniPreLoad", Network::NetID::CoreMiniPreLoad)
.value("HW_COM_Latency_Test", Network::NetID::HW_COM_Latency_Test)
.value("DeviceStatus", Network::NetID::DeviceStatus)
.value("UDP", Network::NetID::UDP)
.value("ForwardedMessage", Network::NetID::ForwardedMessage)
.value("I2C2", Network::NetID::I2C2)
.value("I2C3", Network::NetID::I2C3)
.value("I2C4", Network::NetID::I2C4)
.value("Ethernet2", Network::NetID::Ethernet2)
.value("A2B1", Network::NetID::A2B1)
.value("A2B2", Network::NetID::A2B2)
.value("Ethernet3", Network::NetID::Ethernet3)
.value("WBMS", Network::NetID::WBMS)
.value("DWCAN9", Network::NetID::DWCAN9)
.value("DWCAN10", Network::NetID::DWCAN10)
.value("DWCAN11", Network::NetID::DWCAN11)
.value("DWCAN12", Network::NetID::DWCAN12)
.value("DWCAN13", Network::NetID::DWCAN13)
.value("DWCAN14", Network::NetID::DWCAN14)
.value("DWCAN15", Network::NetID::DWCAN15)
.value("DWCAN16", Network::NetID::DWCAN16)
.value("LIN7", Network::NetID::LIN7)
.value("LIN8", Network::NetID::LIN8)
.value("SPI2", Network::NetID::SPI2)
.value("MDIO1", Network::NetID::MDIO1)
.value("MDIO2", Network::NetID::MDIO2)
.value("MDIO3", Network::NetID::MDIO3)
.value("MDIO4", Network::NetID::MDIO4)
.value("MDIO5", Network::NetID::MDIO5)
.value("MDIO6", Network::NetID::MDIO6)
.value("MDIO7", Network::NetID::MDIO7)
.value("MDIO8", Network::NetID::MDIO8)
.value("OP_Ethernet13", Network::NetID::OP_Ethernet13)
.value("OP_Ethernet14", Network::NetID::OP_Ethernet14)
.value("OP_Ethernet15", Network::NetID::OP_Ethernet15)
.value("OP_Ethernet16", Network::NetID::OP_Ethernet16)
.value("SPI3", Network::NetID::SPI3)
.value("SPI4", Network::NetID::SPI4)
.value("SPI5", Network::NetID::SPI5)
.value("SPI6", Network::NetID::SPI6)
.value("SPI7", Network::NetID::SPI7)
.value("SPI8", Network::NetID::SPI8)
.value("LIN9", Network::NetID::LIN9)
.value("LIN10", Network::NetID::LIN10)
.value("LIN11", Network::NetID::LIN11)
.value("LIN12", Network::NetID::LIN12)
.value("LIN13", Network::NetID::LIN13)
.value("LIN14", Network::NetID::LIN14)
.value("LIN15", Network::NetID::LIN15)
.value("LIN16", Network::NetID::LIN16)
.value("Any", Network::NetID::Any)
.value("Invalid", Network::NetID::Invalid);
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);
network.def(pybind11::init<Network::NetID>());
network.def(pybind11::init<Network::_icsneo_netid_t>());
}
} // namespace icsneo

2
communication/communication.cpp
View File

@ -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::NetID::ReadSettings);
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_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);

38
communication/decoder.cpp
View File

@ -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::NetID::Reset_Status: {
case Network::_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::NetID::Device: {
case Network::_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::NetID::Device);
auto rawmsg = std::make_shared<InternalMessage>(Network::_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::NetID::DeviceStatus: {
case Network::_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::NetID::RED_INT_MEMORYREAD: {
case Network::_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::NetID::NeoMemorySDRead: {
case Network::_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::NetID::ExtendedCommand: {
case Network::_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::NetID::ExtendedData: {
case Network::_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::NetID::ExtendedData), false);
extDataMsg->network = Network(static_cast<uint16_t>(Network::_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::NetID::FlexRayControl: {
case Network::_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::NetID::Main51: {
case Network::_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::NetID::RED_OLDFORMAT: {
case Network::_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::NetID::RED_App_Error: {
case Network::_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::NetID::ReadSettings: {
case Network::_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::NetID::LogicalDiskInfo: {
case Network::_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::NetID::WiVICommand: {
case Network::_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::NetID::EthPHYControl: {
case Network::_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::NetID::ScriptStatus: {
case Network::_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::NetID::DiskData: {
case Network::_icsneo_netid_t::icsneo_netid_disk_data: {
result = std::make_shared<DiskDataMessage>(std::move(packet->data));
return true;
}

14
communication/encoder.cpp
View File

@ -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::NetID::Device:
case Network::_icsneo_netid_t::icsneo_netid_device:
shortFormat = true;
break;
case Network::NetID::RED_OLDFORMAT: {
case Network::_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::NetID::Main51);
netid = uint16_t(Network::_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::NetID::Main51, // 0x0B for long message
(uint8_t)Network::_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::NetID::RED, // 0x0C for long message
(uint8_t)Network::_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
@ -238,12 +238,12 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result, Command cmd, std::vector<uint8_t> arguments) {
std::shared_ptr<Message> msg;
if(cmd == Command::UpdateLEDState) {
/* NetID::Device is a super old command type.
/* _icsneo_netid_t::Device is a super old command type.
* It has a leading 0x00 byte, a byte for command, and a byte for an argument.
* In this case, command 0x06 is SetLEDState.
* This old command type is not really used anywhere else.
*/
auto canmsg = std::make_shared<InternalMessage>(Network::NetID::Device);
auto canmsg = std::make_shared<InternalMessage>(Network::_icsneo_netid_t::icsneo_netid_device);
msg = canmsg;
if(arguments.empty()) {
report(APIEvent::Type::MessageFormattingError, APIEvent::Severity::Error);

4
communication/message/apperrormessage.cpp
View File

@ -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::NetID>(data->network_id);
appErr->errorNetID = static_cast<Network::_icsneo_netid_t>(data->network_id);
appErr->timestamp10us = data->uiTimeStamp10uS;
appErr->timestamp10usMSB = data->uiTimeStamp10uSMSB;
appErr->network = Network::NetID::RED_App_Error;
appErr->network = Network::_icsneo_netid_t::icsneo_netid_red_app_error;
return appErr;
}

4
communication/message/neomessage.cpp
View File

@ -19,7 +19,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr<Message> message) {
auto framemsg = std::static_pointer_cast<BusMessage>(message);
const auto netType = framemsg->network.getType();
frame.netid = (neonetid_t)framemsg->network.getNetID();
frame.netid = (icsneo_netid_t)framemsg->network.getNetID();
frame.type = (icsneo_msg_bus_type_t)netType;
frame.description = framemsg->description;
frame.length = framemsg->data.size();
@ -108,7 +108,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr<Message> message) {
canerror.transmitErrorCount = canerrormsg->transmitErrorCount;
canerror.receiveErrorCount = canerrormsg->receiveErrorCount;
canerror.status.canBusOff = canerrormsg->busOff;
canerror.netid = (neonetid_t)canerrormsg->network.getNetID();
canerror.netid = (icsneo_netid_t)canerrormsg->network.getNetID();
canerror.type = (icsneo_msg_bus_type_t)canerrormsg->network.getType();
break;
}

4
communication/packet/iso9141packet.cpp
View File

@ -30,10 +30,10 @@ bool HardwareISO9141Packet::EncodeFromMessage(const ISO9141Message& message, std
currentSize = (uint8_t)(bytesToSend - currentStart);
packet.insert(packet.begin(), {
(uint8_t)Network::NetID::RED, // 0x0C for long message
(uint8_t)Network::_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(), // NetID, little endian 16-bit
(uint8_t)message.network.getNetID(), // _icsneo_netid_t, little endian 16-bit
(uint8_t)(uint16_t(message.network.getNetID()) >> 8)
});
packet.push_back(uint8_t(message.network.getNetID()) + uint8_t((currentSize + (firstPacket ? 6 : 3)) << 4));

2
communication/packet/livedatapacket.cpp
View File

@ -113,7 +113,7 @@ bool HardwareLiveDataPacket::EncodeFromMessage(LiveDataMessage& message, std::ve
return false;
}
header->netid = static_cast<uint8_t>(Network::NetID::Main51);
header->netid = static_cast<uint8_t>(Network::_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);

4
communication/packetizer.cpp
View File

@ -54,7 +54,7 @@ bool Packetizer::input(RingBuffer& bytes) {
if(packetLength == 0) {
state = ReadState::ParseLongStylePacketHeader;
break;
} else if(packetLength == 0xA && packet.network == Network::NetID::DiskData) {
} else if(packetLength == 0xA && packet.network == 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::NetID::DiskData && (packetLength - headerSize) % 2 == 0) {
if(packet.network == Network::_icsneo_netid_t::icsneo_netid_disk_data && (packetLength - headerSize) % 2 == 0) {
bytes.pop_front();
}
} else {

36
device/device.cpp
View File

@ -389,7 +389,7 @@ bool Device::goOnline() {
updateLEDState();
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::NetID::Reset_Status);
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_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::NetID::Reset_Status);
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_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::NetID::CoreMiniPreLoad);
static std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_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::NetID::Device);
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_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::NetID::Device);
std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_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::NetID::NeoMemoryWriteDone);
static std::shared_ptr<MessageFilter> NeoEraseDone = std::make_shared<MessageFilter>(Network::_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::NetID::Invalid;
return Network::_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::NetID::Device: {
case Network::_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::NetID::DeviceStatus:
case Network::_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::NetID::EthPHYControl), timeout);
std::make_shared<MessageFilter>(Network::_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::NetID::RED_GET_RTC);
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_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::NetID::ExtendedData);
auto filter = std::make_shared<MessageFilter>(Network::_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::NetID network) {
bool Device::requestTC10Wake(Network::_icsneo_netid_t network) {
if(!supportsTC10()) {
report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
return false;
}
std::vector<uint8_t> args(sizeof(network));
*(Network::NetID*)args.data() = network;
*(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::NetID network) {
return resp->response == ExtendedResponse::OK;
}
bool Device::requestTC10Sleep(Network::NetID network) {
bool Device::requestTC10Sleep(Network::_icsneo_netid_t network) {
if(!supportsTC10()) {
report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
return false;
}
std::vector<uint8_t> args(sizeof(network));
*(Network::NetID*)args.data() = network;
*(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::NetID network) {
return typed->response == ExtendedResponse::OK;
}
std::optional<TC10StatusMessage> Device::getTC10Status(Network::NetID network) {
std::optional<TC10StatusMessage> Device::getTC10Status(Network::_icsneo_netid_t network) {
if(!supportsTC10()) {
report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
return std::nullopt;
}
std::vector<uint8_t> args(sizeof(network));
*(Network::NetID*)args.data() = network;
*(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));

2
device/extensions/flexray/controller.cpp
View File

@ -610,7 +610,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::NetID::FlexRayControl);
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(icsneo::Network::_icsneo_netid_t::icsneo_netid_flexray_control);
if(timeout.count() <= 20)
return {false, 0}; // Out of time!

4
disk/extextractordiskreaddriver.cpp
View File

@ -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::NetID::NeoMemorySDRead);
static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::_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::NetID::DiskData)));
}, std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_disk_data)));
if(!com.sendCommand(ExtendedCommand::Extract, {
uint8_t(sector & 0xff),

4
disk/neomemorydiskdriver.cpp
View File

@ -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::NetID::NeoMemorySDRead : Network::NetID::RED_INT_MEMORYREAD));
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));
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::NetID::NeoMemoryWriteDone);
static std::shared_ptr<MessageFilter> NeoMemoryDone = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done);
if(pos % SectorSize != 0)
return std::nullopt;

2
disk/plasiondiskreaddriver.cpp
View File

@ -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::NetID::NeoMemorySDRead);
static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread);
if(amount > getBlockSizeBounds().second)
return std::nullopt;

2
disk/vsa/vsa.cpp
View File

@ -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::NetID::Invalid) {
if(packet->network.getNetID() == Network::_icsneo_netid_t::icsneo_netid_invalid) {
packet->network = network;
}
}

10
examples/cpp/a2b/src/a2b.cpp
View File

@ -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::NetID::A2B2);
msg->network = icsneo::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::NetID::A2B2);
a2bmsg.network = icsneo::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::NetID::I2C2);
std::shared_ptr<icsneo::MessageFilter> msgFilter = std::make_shared<icsneo::MessageFilter>(icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2);
msg->network = icsneo::Network(icsneo::Network::NetID::I2C2);
msg->network = icsneo::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::NetID::I2C2) {
if(frame && frame->network.getNetID() == icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2) {
const auto& i2cMessage = std::dynamic_pointer_cast<icsneo::I2CMessage>(frame);
if(!i2cMessage) {

4
examples/cpp/apperror/src/AppErrorExample.cpp
View File

@ -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::NetID::RED_App_Error == msg->network.getNetID()) {
if(icsneo::Network::_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::NetID::HSCAN;
txMessage->network = icsneo::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

10
examples/cpp/interactive/src/InteractiveExample.cpp
View File

@ -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::NetID::HSCAN;
msg->network = icsneo::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::NetID::HSCAN, 250000) && selectedDevice->settings->apply()) {
if(selectedDevice->settings->setBaudrateFor(icsneo::Network::_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::NetID::LSFTCAN, 250000) && selectedDevice->settings->apply()) {
if(selectedDevice->settings->setBaudrateFor(icsneo::Network::_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::NetID::HSCAN);
const auto val = selectedDevice->settings->isTerminationEnabledFor(icsneo::Network::_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::NetID::HSCAN, selection2 == '1') && selectedDevice->settings->apply()) {
if(selectedDevice->settings->setTerminationFor(icsneo::Network::_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;

22
examples/cpp/lin/src/LINExample.cpp
View File

@ -33,27 +33,27 @@ int main() {
int64_t baud = 19200;
std::cout << "Enable LIN commander resistor... ";
ret = device->settings->setCommanderResistorFor(icsneo::Network::NetID::LIN, true);
ret = device->settings->setCommanderResistorFor(icsneo::Network::_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::NetID::LIN2, false);
ret = device->settings->setCommanderResistorFor(icsneo::Network::_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::NetID::LIN, baud);
ret = device->settings->setBaudrateFor(icsneo::Network::_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::NetID::LIN2, baud);
ret = device->settings->setBaudrateFor(icsneo::Network::_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::NetID::LIN, NORMAL_MODE);
ret = device->settings->setLINModeFor(icsneo::Network::_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::NetID::LIN2, NORMAL_MODE);
ret = device->settings->setLINModeFor(icsneo::Network::_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::NetID::LIN);
int64_t readBaud = device->settings->getBaudrateFor(icsneo::Network::_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::NetID::LIN2);
readBaud = device->settings->getBaudrateFor(icsneo::Network::_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::NetID::LIN2;
lin_r->network = icsneo::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::NetID::LIN;
lin_c->network = icsneo::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::NetID::LIN;
lin_d->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin;
lin_d->ID = 0x22;
lin_d->isEnhancedChecksum = true;
lin_d->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG;

12
examples/cpp/mdio/src/MDIOExample.cpp
View File

@ -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::NetID::MDIO1;
mdio_r->network = icsneo::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::NetID::MDIO1;
mdio_r->network = icsneo::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::NetID::MDIO1;
mdio_r->network = icsneo::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::NetID::MDIO1;
mdio_r->network = icsneo::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::NetID::MDIO1;
mdio_r->network = icsneo::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::NetID::MDIO1;
mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1;
mdio_r->phyAddress = 0x06u;
mdio_r->devAddress = 0x01u;
mdio_r->regAddress = 0x0902u;

22
examples/cpp/simple/src/SimpleExample.cpp
View File

@ -38,38 +38,38 @@ int main() {
std::cout << "OK" << std::endl;
std::cout << "\tGetting HSCAN Baudrate... ";
int64_t baud = device->settings->getBaudrateFor(icsneo::Network::NetID::HSCAN);
int64_t baud = device->settings->getBaudrateFor(icsneo::Network::_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::NetID::HSCAN, 125000);
ret = device->settings->setBaudrateFor(icsneo::Network::_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::NetID::HSCAN);
baud = device->settings->getBaudrateFor(icsneo::Network::_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::NetID::HSCAN);
baud = device->settings->getFDBaudrateFor(icsneo::Network::_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::NetID::HSCAN, 8000000);
ret = device->settings->setFDBaudrateFor(icsneo::Network::_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::NetID::HSCAN);
baud = device->settings->getFDBaudrateFor(icsneo::Network::_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::NetID::HSCAN);
baud = device->settings->getBaudrateFor(icsneo::Network::_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::NetID::HSCAN);
baud = device->settings->getFDBaudrateFor(icsneo::Network::_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::NetID::HSCAN;
txMessage5->network = icsneo::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::NetID::HSCAN;
txMessage->network = icsneo::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::NetID::OP_Ethernet2;
ethTxMessage->network = icsneo::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 */

8
examples/cpp/vsa/src/VSAExample.cpp
View File

@ -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::NetID::Ethernet;
frame->network = icsneo::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::NetID::Ethernet;
frame->network = icsneo::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::NetID::HSCAN2;
frame->network = icsneo::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::NetID::HSCAN3;
frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan3;
frames.push_back(frame);
frame->data.resize(CANFDSize);
std::generate(frame->data.begin(), frame->data.end(), randByteGen);

4
include/icsneo/communication/message/apperrormessage.h
View File

@ -66,9 +66,9 @@ enum class AppErrorType : uint16_t {
class AppErrorMessage : public InternalMessage {
public:
AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::NetID::RED_App_Error) {}
AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::_icsneo_netid_t::icsneo_netid_red_app_error) {}
uint16_t errorType;
Network::NetID errorNetID;
Network::_icsneo_netid_t errorNetID;
uint32_t timestamp10us;
uint32_t timestamp10usMSB;

2
include/icsneo/communication/message/diskdatamessage.h
View File

@ -9,7 +9,7 @@ namespace icsneo {
class DiskDataMessage : public InternalMessage {
public:
DiskDataMessage(std::vector<uint8_t>&& d) : InternalMessage(Network::NetID::DiskData) {
DiskDataMessage(std::vector<uint8_t>&& d) : InternalMessage(Network::_icsneo_netid_t::icsneo_netid_disk_data) {
data = std::move(d);
}
};

12
include/icsneo/communication/message/filter/messagefilter.h
View File

@ -13,8 +13,8 @@ class MessageFilter {
public:
MessageFilter() {}
MessageFilter(Message::Type type) : includeInternalInAny(neomessagetype_t(type) & 0x8000), messageType(type) {}
MessageFilter(Network::NetID 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::NetID net = Network::NetID::Any) : networkType(type), netid(net) {
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) {
// 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::NetID::Any || networkType != icsneo_msg_bus_type_any) {
} else if (netid != Network::_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::NetID netid = Network::NetID::Any;
bool matchNetID(Network::NetID mnetid) const {
if(netid == Network::NetID::Any)
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)
return true;
return netid == mnetid;
}

2
include/icsneo/communication/message/flashmemorymessage.h
View File

@ -9,7 +9,7 @@ namespace icsneo {
class FlashMemoryMessage : public InternalMessage {
public:
FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, Network::NetID::RED_INT_MEMORYREAD) {}
FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread) {}
uint16_t startAddress = 0;
};

2
include/icsneo/communication/message/livedatamessage.h
View File

@ -10,7 +10,7 @@
namespace icsneo {
class LiveDataMessage : public InternalMessage {
public:
LiveDataMessage() : InternalMessage(Message::Type::LiveData, Network::NetID::ExtendedCommand) {}
LiveDataMessage() : InternalMessage(Message::Type::LiveData, Network::_icsneo_netid_t::icsneo_netid_extended_command) {}
LiveDataHandle handle;
LiveDataCommand cmd;
};

2
include/icsneo/communication/message/main51message.h
View File

@ -10,7 +10,7 @@ namespace icsneo {
class Main51Message : public InternalMessage {
public:
Main51Message() : InternalMessage(Message::Type::Main51, Network::NetID::Main51) {}
Main51Message() : InternalMessage(Message::Type::Main51, Network::_icsneo_netid_t::icsneo_netid_main51) {}
Command command = Command(0);
bool forceShortFormat = false; // Necessary for EnableNetworkCom and EnableNetworkComEx
};

12
include/icsneo/communication/message/neomessage.h
View File

@ -115,7 +115,7 @@ typedef struct {
uint8_t _reserved1[16];
uint64_t timestamp;
uint64_t _reservedTimestamp;
uint8_t _reserved2[sizeof(size_t) * 2 + 7 + sizeof(neonetid_t) + sizeof(icsneo_msg_bus_type_t)];
uint8_t _reserved2[sizeof(size_t) * 2 + 7 + sizeof(icsneo_netid_t) + sizeof(icsneo_msg_bus_type_t)];
neomessagetype_t messageType;
uint8_t _reserved3[12];
} neomessage_t; // 72 bytes total
@ -128,7 +128,7 @@ typedef struct {
const uint8_t* data;
size_t length;
uint8_t header[4];
neonetid_t netid;
icsneo_netid_t netid;
icsneo_msg_bus_type_t type;
uint8_t _reserved0;
uint16_t description;
@ -143,7 +143,7 @@ typedef struct {
const uint8_t* data;
size_t length;
uint32_t arbid;
neonetid_t netid;
icsneo_netid_t netid;
icsneo_msg_bus_type_t type;
uint8_t dlcOnWire;
uint16_t description;
@ -159,7 +159,7 @@ typedef struct {
uint8_t transmitErrorCount;
uint8_t receiveErrorCount;
uint8_t _reserved3[5];
neonetid_t netid;
icsneo_netid_t netid;
icsneo_msg_bus_type_t type;
neomessagetype_t messageType;
uint8_t _reserved4[12];
@ -173,7 +173,7 @@ typedef struct {
size_t length;
uint8_t preemptionFlags;
uint8_t _reservedHeader[3];
neonetid_t netid;
icsneo_netid_t netid;
icsneo_msg_bus_type_t type;
uint8_t _reserved0;
uint16_t description;
@ -199,7 +199,7 @@ typedef struct {
const uint8_t* data;
size_t length;
uint8_t header[4];
neonetid_t netid;
icsneo_netid_t netid;
icsneo_msg_bus_type_t type;
neomessage_linstatus_t linStatus;
uint16_t description;

2
include/icsneo/communication/message/neoreadmemorysdmessage.h
View File

@ -9,7 +9,7 @@ namespace icsneo {
class NeoReadMemorySDMessage : public InternalMessage {
public:
NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, Network::NetID::NeoMemorySDRead) {}
NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread) {}
uint32_t startAddress = 0;
};

2
include/icsneo/communication/message/readsettingsmessage.h
View File

@ -10,7 +10,7 @@ namespace icsneo {
class ReadSettingsMessage : public InternalMessage {
public:
ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, Network::NetID::ReadSettings) {}
ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, Network::_icsneo_netid_t::icsneo_netid_read_settings) {}
enum class Response : uint8_t {
OK = 0,

1410
include/icsneo/communication/network.h
View File

File diff suppressed because it is too large Load Diff

6
include/icsneo/device/device.h
View File

@ -728,11 +728,11 @@ public:
virtual bool supportsTC10() const { return false; }
bool requestTC10Wake(Network::NetID network);
bool requestTC10Wake(Network::_icsneo_netid_t network);
bool requestTC10Sleep(Network::NetID network);
bool requestTC10Sleep(Network::_icsneo_netid_t network);
std::optional<TC10StatusMessage> getTC10Status(Network::NetID network);
std::optional<TC10StatusMessage> getTC10Status(Network::_icsneo_netid_t network);
protected:
bool online = false;

6
include/icsneo/device/tree/etherbadge/etherbadge.h
View File

@ -19,9 +19,9 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::LIN,
Network::NetID::OP_Ethernet1
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1
};
return supportedNetworks;
}

6
include/icsneo/device/tree/etherbadge/etherbadgesettings.h
View File

@ -71,7 +71,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_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::NetID::HSCAN:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

4
include/icsneo/device/tree/neoobd2pro/neoobd2pro.h
View File

@ -16,8 +16,8 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2
};
return supportedNetworks;
}

4
include/icsneo/device/tree/neoobd2sim/neoobd2sim.h
View File

@ -16,8 +16,8 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2
};
return supportedNetworks;
}

22
include/icsneo/device/tree/neoviconnect/neoviconnect.h
View File

@ -17,19 +17,19 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
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::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::LIN,
Network::NetID::LIN2
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_lin2
};
return supportedNetworks;
}

36
include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h
View File

@ -94,21 +94,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can2);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can3);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->can4);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can5);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can6);
case Network::NetID::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can7);
case Network::NetID::MSCAN:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd2);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd3);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->canfd4);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd5);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd6);
case Network::NetID::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd7);
case Network::NetID::MSCAN:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
case Network::NetID::LIN2:
case Network::_icsneo_netid_t::icsneo_netid_lin2:
return &(cfg->lin2);
default:
return nullptr;

20
include/icsneo/device/tree/neovifire/neovifire.h
View File

@ -16,19 +16,19 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
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::NetID::LSFTCAN,
Network::_icsneo_netid_t::icsneo_netid_lsftcan,
Network::NetID::SWCAN,
Network::_icsneo_netid_t::icsneo_netid_swcan,
Network::NetID::LIN,
Network::NetID::LIN2,
Network::NetID::LIN3,
Network::NetID::LIN4
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
};
return supportedNetworks;
}

20
include/icsneo/device/tree/neovifire/neovifiresettings.h
View File

@ -105,15 +105,15 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can4);
case Network::NetID::LSFTCAN:
case Network::_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::NetID::SWCAN:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
case Network::NetID::LIN2:
case Network::_icsneo_netid_t::icsneo_netid_lin2:
return &(cfg->lin2);
case Network::NetID::LIN3:
case Network::_icsneo_netid_t::icsneo_netid_lin3:
return &(cfg->lin3);
case Network::NetID::LIN4:
case Network::_icsneo_netid_t::icsneo_netid_lin4:
return &(cfg->lin4);
default:
return nullptr;

42
include/icsneo/device/tree/neovifire2/neovifire2.h
View File

@ -23,32 +23,32 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
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::NetID::LSFTCAN,
Network::NetID::LSFTCAN2,
Network::_icsneo_netid_t::icsneo_netid_lsftcan,
Network::_icsneo_netid_t::icsneo_netid_lsftcan2,
Network::NetID::SWCAN,
Network::NetID::SWCAN2,
Network::_icsneo_netid_t::icsneo_netid_swcan,
Network::_icsneo_netid_t::icsneo_netid_swcan2,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::LIN,
Network::NetID::LIN2,
Network::NetID::LIN3,
Network::NetID::LIN4,
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::NetID::ISO9141,
Network::NetID::ISO9141_2,
Network::NetID::ISO9141_3,
Network::NetID::ISO9141_4
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
};
return supportedNetworks;
}

68
include/icsneo/device/tree/neovifire2/neovifire2settings.h
View File

@ -128,25 +128,25 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->can5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::NetID::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can8);
case Network::NetID::LSFTCAN:
case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
return &(cfg->lsftcan1);
case Network::NetID::LSFTCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->canfd2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->canfd5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::SWCAN:
case Network::_icsneo_netid_t::icsneo_netid_swcan:
return &(cfg->swcan1);
case Network::NetID::SWCAN2:
case Network::_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::NetID::HSCAN),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN5),
Network(Network::NetID::HSCAN7)
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(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4),
Network(Network::NetID::HSCAN6)
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)
}
};
}
@ -214,17 +214,17 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
case Network::NetID::LIN2:
case Network::_icsneo_netid_t::icsneo_netid_lin2:
return &(cfg->lin2);
case Network::NetID::LIN3:
case Network::_icsneo_netid_t::icsneo_netid_lin3:
return &(cfg->lin3);
case Network::NetID::LIN4:
case Network::_icsneo_netid_t::icsneo_netid_lin4:
return &(cfg->lin4);
case Network::NetID::LIN5:
case Network::_icsneo_netid_t::icsneo_netid_lin5:
return &(cfg->lin5);
case Network::NetID::LIN6:
case Network::_icsneo_netid_t::icsneo_netid_lin6:
return &(cfg->lin6);
default:
return nullptr;

54
include/icsneo/device/tree/neovifire3/neovifire3.h
View File

@ -17,35 +17,35 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
Network::NetID::DWCAN9,
Network::NetID::DWCAN10,
Network::NetID::DWCAN11,
Network::NetID::DWCAN12,
Network::NetID::DWCAN13,
Network::NetID::DWCAN14,
Network::NetID::DWCAN15,
Network::NetID::DWCAN16,
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,
Network::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet3,
Network::NetID::LIN,
Network::NetID::LIN2,
Network::NetID::LIN3,
Network::NetID::LIN4,
Network::NetID::LIN5,
Network::NetID::LIN6,
Network::NetID::LIN7,
Network::NetID::LIN8,
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,
};
return supportedNetworks;
}

64
include/icsneo/device/tree/neovifire3/neovifire3settings.h
View File

@ -166,21 +166,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->can5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->canfd2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->canfd5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::HSCAN),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN5),
Network(Network::NetID::HSCAN7)
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(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4),
Network(Network::NetID::HSCAN6)
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)
}
};
}
@ -234,21 +234,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
case Network::NetID::LIN2:
case Network::_icsneo_netid_t::icsneo_netid_lin2:
return &(cfg->lin2);
case Network::NetID::LIN3:
case Network::_icsneo_netid_t::icsneo_netid_lin3:
return &(cfg->lin3);
case Network::NetID::LIN4:
case Network::_icsneo_netid_t::icsneo_netid_lin4:
return &(cfg->lin4);
case Network::NetID::LIN5:
case Network::_icsneo_netid_t::icsneo_netid_lin5:
return &(cfg->lin5);
case Network::NetID::LIN6:
case Network::_icsneo_netid_t::icsneo_netid_lin6:
return &(cfg->lin6);
case Network::NetID::LIN7:
case Network::_icsneo_netid_t::icsneo_netid_lin7:
return &(cfg->lin7);
case Network::NetID::LIN8:
case Network::_icsneo_netid_t::icsneo_netid_lin8:
return &(cfg->lin8);
default:
return nullptr;

56
include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h
View File

@ -17,37 +17,37 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
Network::NetID::DWCAN9,
Network::NetID::DWCAN10,
Network::NetID::DWCAN11,
Network::NetID::DWCAN12,
Network::NetID::DWCAN13,
Network::NetID::DWCAN14,
Network::NetID::DWCAN15,
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::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet3,
Network::NetID::LIN,
Network::NetID::LIN2,
Network::NetID::LIN3,
Network::NetID::LIN4,
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::NetID::FlexRay,
Network::NetID::FlexRay1a,
Network::NetID::FlexRay1b,
Network::NetID::FlexRay2,
Network::NetID::FlexRay2a,
Network::NetID::FlexRay2b,
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,
};
return supportedNetworks;
}

56
include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h
View File

@ -149,21 +149,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->can5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->canfd2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->canfd5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::HSCAN),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN5),
Network(Network::NetID::HSCAN7)
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(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4),
Network(Network::NetID::HSCAN6)
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)
}
};
}
@ -217,13 +217,13 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
case Network::NetID::LIN2:
case Network::_icsneo_netid_t::icsneo_netid_lin2:
return &(cfg->lin2);
case Network::NetID::LIN3:
case Network::_icsneo_netid_t::icsneo_netid_lin3:
return &(cfg->lin3);
case Network::NetID::LIN4:
case Network::_icsneo_netid_t::icsneo_netid_lin4:
return &(cfg->lin4);
default:
return nullptr;

24
include/icsneo/device/tree/neovired2/neovired2.h
View File

@ -17,20 +17,20 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
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::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::NetID::LIN,
Network::NetID::LIN2
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_lin2
};
return supportedNetworks;
}

52
include/icsneo/device/tree/neovired2/neovired2settings.h
View File

@ -107,21 +107,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can2);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can3);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->can4);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can5);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can6);
case Network::NetID::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can7);
case Network::NetID::MSCAN:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd2);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd3);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->canfd4);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd5);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd6);
case Network::NetID::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd7);
case Network::NetID::MSCAN:
case Network::_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::NetID::HSCAN),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN5),
Network(Network::NetID::HSCAN7)
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(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4),
Network(Network::NetID::HSCAN6)
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)
}
};
}
@ -175,9 +175,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
case Network::NetID::LIN2:
case Network::_icsneo_netid_t::icsneo_netid_lin2:
return &(cfg->lin2);
default:
return nullptr;

40
include/icsneo/device/tree/plasion/plasion.h
View File

@ -13,29 +13,29 @@ class Plasion : public Device {
public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
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::NetID::LSFTCAN,
Network::NetID::LSFTCAN2,
Network::_icsneo_netid_t::icsneo_netid_lsftcan,
Network::_icsneo_netid_t::icsneo_netid_lsftcan2,
Network::NetID::SWCAN,
Network::NetID::SWCAN2,
Network::_icsneo_netid_t::icsneo_netid_swcan,
Network::_icsneo_netid_t::icsneo_netid_swcan2,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::LIN,
Network::NetID::LIN2,
Network::NetID::LIN3,
Network::NetID::LIN4,
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::NetID::FlexRay
Network::_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::NetID::FlexRay);
flexRayControllers.push_back(Network::NetID::FlexRay); // TODO Becomes FlexRay2 if not in coldstart mode
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
addExtension(std::make_shared<FlexRay::Extension>(*this, flexRayControllers));
}

18
include/icsneo/device/tree/rada2b/rada2b.h
View File

@ -21,20 +21,20 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::LIN,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::NetID::A2B1,
Network::NetID::A2B2,
Network::_icsneo_netid_t::icsneo_netid_a2b1,
Network::_icsneo_netid_t::icsneo_netid_a2b2,
Network::NetID::I2C,
Network::NetID::I2C2,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::icsneo_netid_i2c2,
Network::NetID::MDIO1,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
};
return supportedNetworks;
}

10
include/icsneo/device/tree/rada2b/rada2bsettings.h
View File

@ -104,9 +104,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

4
include/icsneo/device/tree/radcomet/radcomet2.h
View File

@ -22,8 +22,8 @@ public:
const std::vector<Network>& GetSupportedNetworks() override {
static std::vector<Network> supportedNetworks = RADCometBase::GetSupportedNetworks();
supportedNetworks.push_back(Network::NetID::OP_Ethernet3);
supportedNetworks.push_back(Network::NetID::MDIO4);
supportedNetworks.push_back(Network::_icsneo_netid_t::icsneo_netid_op_ethernet3);
supportedNetworks.push_back(Network::_icsneo_netid_t::icsneo_netid_mdio4);
return supportedNetworks;
}

20
include/icsneo/device/tree/radcomet/radcometbase.h
View File

@ -12,20 +12,20 @@ class RADCometBase : public Device {
public:
virtual const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
Network::NetID::LIN,
Network::NetID::ISO9141,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_iso9141,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO3,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_icsneo_netid_t::icsneo_netid_mdio2,
Network::_icsneo_netid_t::icsneo_netid_mdio3,
};
return supportedNetworks;
}

8
include/icsneo/device/tree/radcomet/radcometsettings.h
View File

@ -95,9 +95,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd2);
default:
return nullptr;

28
include/icsneo/device/tree/radcomet3/radcomet3.h
View File

@ -18,24 +18,24 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4,
Network::NetID::OP_Ethernet5,
Network::NetID::OP_Ethernet6,
Network::NetID::OP_Ethernet7,
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::NetID::LIN,
Network::NetID::ISO9141,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_iso9141,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_icsneo_netid_t::icsneo_netid_mdio2,
};
return supportedNetworks;
}

8
include/icsneo/device/tree/radcomet3/radcomet3settings.h
View File

@ -92,9 +92,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd2);
default:
return nullptr;

8
include/icsneo/device/tree/radepsilon/radepsilon.h
View File

@ -14,12 +14,12 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::NetID::Ethernet, // Connected to port 6 on the switch
Network::_icsneo_netid_t::icsneo_netid_ethernet, // Connected to port 6 on the switch
Network::NetID::LIN
Network::_icsneo_netid_t::icsneo_netid_lin
};
return supportedNetworks;
}

60
include/icsneo/device/tree/radgalaxy/radgalaxy.h
View File

@ -21,41 +21,41 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
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::NetID::SWCAN,
Network::NetID::SWCAN2,
Network::_icsneo_netid_t::icsneo_netid_swcan,
Network::_icsneo_netid_t::icsneo_netid_swcan2,
Network::NetID::LIN,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4,
Network::NetID::OP_Ethernet5,
Network::NetID::OP_Ethernet6,
Network::NetID::OP_Ethernet7,
Network::NetID::OP_Ethernet8,
Network::NetID::OP_Ethernet9,
Network::NetID::OP_Ethernet10,
Network::NetID::OP_Ethernet11,
Network::NetID::OP_Ethernet12,
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,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO3,
Network::NetID::MDIO4,
Network::NetID::MDIO5,
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,
};
return supportedNetworks;
}

38
include/icsneo/device/tree/radgalaxy/radgalaxysettings.h
View File

@ -112,21 +112,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->can5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->canfd2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->canfd5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::SWCAN:
case Network::_icsneo_netid_t::icsneo_netid_swcan:
return &(cfg->swcan1);
case Network::NetID::SWCAN2:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

68
include/icsneo/device/tree/radgigastar/radgigastar.h
View File

@ -47,59 +47,59 @@ protected:
void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
static std::vector<Network> supportedRxNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
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::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
Network::NetID::LIN,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::NetID::FlexRay1a,
Network::NetID::FlexRay1b,
Network::_icsneo_netid_t::icsneo_netid_flexray1a,
Network::_icsneo_netid_t::icsneo_netid_flexray1b,
Network::NetID::I2C,
Network::NetID::I2C2,
Network::NetID::I2C3,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::icsneo_netid_i2c2,
Network::_icsneo_netid_t::icsneo_netid_i2c3,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_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::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
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::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
Network::NetID::LIN,
Network::_icsneo_netid_t::icsneo_netid_lin,
// FlexRay is Receive Only
Network::NetID::I2C,
Network::NetID::I2C2,
Network::NetID::I2C3,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::icsneo_netid_i2c2,
Network::_icsneo_netid_t::icsneo_netid_i2c3,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_icsneo_netid_t::icsneo_netid_mdio2,
};
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
}

38
include/icsneo/device/tree/radgigastar/radgigastarsettings.h
View File

@ -101,17 +101,17 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->can5);
case Network::NetID::HSCAN5:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->canfd2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->canfd5);
case Network::NetID::HSCAN5:
case Network::_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::NetID::HSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN4)
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(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN5)
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5)
}
};
}
@ -159,7 +159,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

76
include/icsneo/device/tree/radgigastar2/radgigastar2.h
View File

@ -23,50 +23,50 @@ namespace icsneo
static const std::vector<Network> &GetSupportedNetworks()
{
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::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::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4,
Network::NetID::OP_Ethernet5,
Network::NetID::OP_Ethernet6,
Network::NetID::OP_Ethernet7,
Network::NetID::OP_Ethernet8,
Network::NetID::OP_Ethernet9,
Network::NetID::OP_Ethernet10,
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::NetID::LIN,
Network::NetID::LIN2,
Network::NetID::LIN3,
Network::NetID::LIN4,
Network::NetID::LIN5,
Network::NetID::LIN6,
Network::NetID::LIN7,
Network::NetID::LIN8,
Network::NetID::LIN9,
Network::NetID::LIN10,
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,
Network::NetID::I2C,
Network::NetID::I2C2,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::icsneo_netid_i2c2,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_icsneo_netid_t::icsneo_netid_mdio2,
Network::NetID::SPI1,
Network::NetID::SPI2,
Network::NetID::SPI3,
Network::NetID::SPI4,
Network::NetID::SPI5,
Network::NetID::SPI6,
Network::NetID::SPI7,
Network::NetID::SPI8,
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,
};
return supportedNetworks;
}

44
include/icsneo/device/tree/radgigastar2/radgigastar2settings.h
View File

@ -147,13 +147,13 @@ namespace icsneo
return nullptr;
switch (net.getNetID())
{
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can2);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can3);
case Network::NetID::HSCAN4:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd2);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd3);
case Network::NetID::HSCAN4:
case Network::_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::NetID::HSCAN)},
{Network(Network::NetID::HSCAN2)},
{Network(Network::NetID::HSCAN3)},
{Network(Network::NetID::HSCAN4)}};
{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)}};
}
const LIN_SETTINGS *getLINSettingsFor(Network net) const override
@ -195,25 +195,25 @@ namespace icsneo
return nullptr;
switch (net.getNetID())
{
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
case Network::NetID::LIN2:
case Network::_icsneo_netid_t::icsneo_netid_lin2:
return &(cfg->lin2);
case Network::NetID::LIN3:
case Network::_icsneo_netid_t::icsneo_netid_lin3:
return &(cfg->lin3);
case Network::NetID::LIN4:
case Network::_icsneo_netid_t::icsneo_netid_lin4:
return &(cfg->lin4);
case Network::NetID::LIN5:
case Network::_icsneo_netid_t::icsneo_netid_lin5:
return &(cfg->lin5);
case Network::NetID::LIN6:
case Network::_icsneo_netid_t::icsneo_netid_lin6:
return &(cfg->lin6);
case Network::NetID::LIN7:
case Network::_icsneo_netid_t::icsneo_netid_lin7:
return &(cfg->lin7);
case Network::NetID::LIN8:
case Network::_icsneo_netid_t::icsneo_netid_lin8:
return &(cfg->lin8);
case Network::NetID::LIN9:
case Network::_icsneo_netid_t::icsneo_netid_lin9:
return &(cfg->lin9);
case Network::NetID::LIN10:
case Network::_icsneo_netid_t::icsneo_netid_lin10:
return &(cfg->lin10);
default:
return nullptr;

8
include/icsneo/device/tree/radjupiter/radjupiter.h
View File

@ -17,12 +17,12 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::NetID::LIN,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::NetID::Ethernet // Connected to port 6 on the switch
Network::_icsneo_netid_t::icsneo_netid_ethernet // Connected to port 6 on the switch
};
return supportedNetworks;
}

10
include/icsneo/device/tree/radjupiter/radjupitersettings.h
View File

@ -97,9 +97,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

64
include/icsneo/device/tree/radmars/radmars.h
View File

@ -43,55 +43,55 @@ protected:
void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
static std::vector<Network> supportedRxNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
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::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet3,
Network::NetID::LIN,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::NetID::FlexRay1a,
Network::NetID::FlexRay1b,
Network::_icsneo_netid_t::icsneo_netid_flexray1a,
Network::_icsneo_netid_t::icsneo_netid_flexray1b,
Network::NetID::I2C,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_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::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
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::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet3,
Network::NetID::LIN,
Network::_icsneo_netid_t::icsneo_netid_lin,
// FlexRay is Receive Only
Network::NetID::I2C,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_icsneo_netid_t::icsneo_netid_mdio2,
};
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
}

50
include/icsneo/device/tree/radmars/radmarssettings.h
View File

@ -107,21 +107,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->can5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->canfd2);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd3);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd4);
case Network::NetID::HSCAN4:
case Network::_icsneo_netid_t::icsneo_netid_hscan4:
return &(cfg->canfd5);
case Network::NetID::HSCAN5:
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::NetID::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::NetID::HSCAN7:
case Network::_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::NetID::HSCAN),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN5),
Network(Network::NetID::HSCAN7)
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(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4),
Network(Network::NetID::HSCAN6)
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)
}
};
}
@ -175,7 +175,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

4
include/icsneo/device/tree/radmoon2/radmoon2base.h
View File

@ -18,8 +18,8 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_icsneo_netid_t::icsneo_netid_mdio2,
};
return supportedNetworks;
}

4
include/icsneo/device/tree/radmoon3/radmoon3.h
View File

@ -17,8 +17,8 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::Ethernet,
Network::NetID::OP_Ethernet1,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
};
return supportedNetworks;
}

2
include/icsneo/device/tree/radmoonduo/radmoonduo.h
View File

@ -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::NetID::OP_Ethernet2
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2
};
return supportedNetworks;
}

8
include/icsneo/device/tree/radmoont1s/radmoont1s.h
View File

@ -18,13 +18,13 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::OP_Ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::NetID::MDIO1,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::NetID::SPI1,
Network::_icsneo_netid_t::icsneo_netid_spi1,
};
return supportedNetworks;
}

16
include/icsneo/device/tree/radpluto/radpluto.h
View File

@ -17,17 +17,17 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::NetID::LIN,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4
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
};
return supportedNetworks;
}

10
include/icsneo/device/tree/radpluto/radplutosettings.h
View File

@ -83,9 +83,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

14
include/icsneo/device/tree/radstar2/radstar2.h
View File

@ -18,16 +18,16 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_mscan,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::_icsneo_netid_t::icsneo_netid_mdio1,
Network::_icsneo_netid_t::icsneo_netid_mdio2,
};
return supportedNetworks;
}

10
include/icsneo/device/tree/radstar2/radstar2settings.h
View File

@ -78,9 +78,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::MSCAN:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

8
include/icsneo/device/tree/radsupermoon/radsupermoon.h
View File

@ -22,10 +22,10 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::Ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
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,
};
return supportedNetworks;
}

4
include/icsneo/device/tree/valuecan3/valuecan3.h
View File

@ -16,8 +16,8 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_mscan
};
return supportedNetworks;
}

4
include/icsneo/device/tree/valuecan3/valuecan3settings.h
View File

@ -41,9 +41,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can2);
default:
return nullptr;

2
include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h
View File

@ -15,7 +15,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
default:
return nullptr;

14
include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h
View File

@ -16,9 +16,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN) },
{ Network(Network::NetID::HSCAN2) }
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) }
};
}
@ -50,7 +50,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

12
include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h
View File

@ -15,9 +15,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN) },
{ Network(Network::NetID::HSCAN2) }
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) }
};
}

10
include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h
View File

@ -16,9 +16,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

26
include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h
View File

@ -16,13 +16,13 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->can2);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->can3);
case Network::NetID::HSCAN4:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_icsneo_netid_t::icsneo_netid_hscan2:
return &(cfg->canfd2);
case Network::NetID::HSCAN3:
case Network::_icsneo_netid_t::icsneo_netid_hscan3:
return &(cfg->canfd3);
case Network::NetID::HSCAN4:
case Network::_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::NetID::HSCAN),
Network(Network::NetID::HSCAN3)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3)
},
{
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4)
}
};
}
@ -64,7 +64,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::_icsneo_netid_t::icsneo_netid_lin:
return &(cfg->lin1);
default:
return nullptr;

12
include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h
View File

@ -16,9 +16,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->canfd1);
case Network::NetID::HSCAN2:
case Network::_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::NetID::HSCAN) },
{ Network(Network::NetID::HSCAN2) }
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) }
};
}

2
include/icsneo/device/tree/valuecan4/valuecan4-1.h
View File

@ -16,7 +16,7 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN
Network::_icsneo_netid_t::icsneo_netid_hscan
};
return supportedNetworks;
}

4
include/icsneo/device/tree/valuecan4/valuecan4-2.h
View File

@ -21,8 +21,8 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2
};
return supportedNetworks;
}

8
include/icsneo/device/tree/valuecan4/valuecan4-2el.h
View File

@ -50,12 +50,12 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::LIN
Network::_icsneo_netid_t::icsneo_netid_lin
};
return supportedNetworks;
}

8
include/icsneo/device/tree/valuecan4/valuecan4-4.h
View File

@ -23,10 +23,10 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::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
};
return supportedNetworks;
}

8
include/icsneo/device/tree/valuecan4/valuecan4industrial.h
View File

@ -17,12 +17,12 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::NetID::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::NetID::LIN
Network::_icsneo_netid_t::icsneo_netid_lin
};
return supportedNetworks;
}

10
include/icsneo/device/tree/vividcan/vividcansettings.h
View File

@ -52,9 +52,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::_icsneo_netid_t::icsneo_netid_hscan:
return &(cfg->can1);
case Network::NetID::LSFTCAN:
case Network::_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::NetID::LSFTCAN:
case Network::_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::NetID::SWCAN:
case Network::_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::NetID::HSCAN) }
{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }
};
}

10
include/icsneo/icsneo.h
View File

@ -478,6 +478,16 @@ ICSNEO_API icsneo_error_t icsneo_device_set_rtc(icsneo_device_t* device, int64_t
* @return icsneo_error_t icsneo_error_success if successful, icsneo_error_invalid_parameters otherwise.
*/
ICSNEO_API icsneo_error_t icsneo_device_load_default_settings(icsneo_device_t* device, bool save);
/** @brief Check if the device supports TC10.
*
* @param[in] icsneo_device_t* device The device to check against.
* @param[out] bool* supported Pointer to a uint32_t to copy the value into.
*
* @return icsneo_error_t icsneo_error_success if successful, icsneo_error_invalid_parameters otherwise.
*/
ICSNEO_API icsneo_error_t icsneo_device_supports_tc10(icsneo_device_t* device, bool* supported);
#ifdef __cplusplus
}
#endif

36
include/icsneo/icsneoc.h
View File

@ -313,7 +313,7 @@ extern bool DLLExport icsneo_removeMessageCallback(const neodevice_t* device, in
* device. For instance, on a ValueCAN 4-2, the second CAN network is ICSNEO_NETID_HSCAN2, while
* on a neoVI FIRE the second CAN network is ICSNEO_NETID_MSCAN.
*/
extern neonetid_t DLLExport icsneo_getNetworkByNumber(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number);
extern icsneo_netid_t DLLExport icsneo_getNetworkByNumber(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number);
/**
* \brief Get the friendly product name for a specified device.
@ -474,7 +474,7 @@ extern bool DLLExport icsneo_settingsApplyStructureTemporary(const neodevice_t*
* In the case of CAN, this function gets the standard CAN baudrate.
* See icsneo_getFDBaudrate() to get the baudrate for (the baudrate-switched portion of) CAN FD.
*/
extern int64_t DLLExport icsneo_getBaudrate(const neodevice_t* device, neonetid_t netid);
extern int64_t DLLExport icsneo_getBaudrate(const neodevice_t* device, icsneo_netid_t netid);
/**
* \brief Set the network baudrate for a specified device.
@ -488,7 +488,7 @@ extern int64_t DLLExport icsneo_getBaudrate(const neodevice_t* device, neonetid_
*
* Call icsneo_settingsApply() or similar to make the changes active on the device.
*/
extern bool DLLExport icsneo_setBaudrate(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate);
extern bool DLLExport icsneo_setBaudrate(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate);
/**
* \brief Get the CAN FD baudrate for a specified device.
@ -498,7 +498,7 @@ extern bool DLLExport icsneo_setBaudrate(const neodevice_t* device, neonetid_t n
*
* See icsneo_getBaudrate() to get the baudrate for the non baudrate-switched portion of CAN FD, classical CAN 2.0, and other network types.
*/
extern int64_t DLLExport icsneo_getFDBaudrate(const neodevice_t* device, neonetid_t netid);
extern int64_t DLLExport icsneo_getFDBaudrate(const neodevice_t* device, icsneo_netid_t netid);
/**
* \brief Set the CAN FD baudrate for a specified device.
@ -511,7 +511,7 @@ extern int64_t DLLExport icsneo_getFDBaudrate(const neodevice_t* device, neoneti
*
* Call icsneo_settingsApply() or similar to make the changes active on the device.
*/
extern bool DLLExport icsneo_setFDBaudrate(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate);
extern bool DLLExport icsneo_setFDBaudrate(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate);
/**
* \brief Transmit a single message.
@ -764,7 +764,7 @@ extern bool DLLExport icsneo_setDigitalIO(const neodevice_t* device, neoio_t typ
* group has termination enabled, check canTerminationBeEnabledFor
* for that.
*/
extern bool DLLExport icsneo_isTerminationSupportedFor(const neodevice_t* device, neonetid_t netid);
extern bool DLLExport icsneo_isTerminationSupportedFor(const neodevice_t* device, icsneo_netid_t netid);
/**
* \brief Check whether software switchable termination can currently be enabled for a given network.
@ -777,7 +777,7 @@ extern bool DLLExport icsneo_isTerminationSupportedFor(const neodevice_t* device
* returned and an error will have been reported in
* icsneo_getLastError().
*/
extern bool DLLExport icsneo_canTerminationBeEnabledFor(const neodevice_t* device, neonetid_t netid);
extern bool DLLExport icsneo_canTerminationBeEnabledFor(const neodevice_t* device, icsneo_netid_t netid);
/**
* \brief Check whether software switchable termination is currently
@ -793,7 +793,7 @@ extern bool DLLExport icsneo_canTerminationBeEnabledFor(const neodevice_t* devic
* False will be returned and an error will be set in
* icsneo_getLastError if the setting is unreadable.
*/
extern bool DLLExport icsneo_isTerminationEnabledFor(const neodevice_t* device, neonetid_t netid);
extern bool DLLExport icsneo_isTerminationEnabledFor(const neodevice_t* device, icsneo_netid_t netid);
/**
* \brief Enable or disable software switchable termination for a given network.
@ -806,7 +806,7 @@ extern bool DLLExport icsneo_isTerminationEnabledFor(const neodevice_t* device,
* prior to the call, but the change does not need to be applied
* to the device before enqueing the enable.
*/
extern bool DLLExport icsneo_setTerminationFor(const neodevice_t* device, neonetid_t netid, bool enabled);
extern bool DLLExport icsneo_setTerminationFor(const neodevice_t* device, icsneo_netid_t netid, bool enabled);
/**
* \brief Return the device status structures for a specified device.
@ -908,7 +908,7 @@ fn_icsneo_addMessageCallback icsneo_addMessageCallback;
typedef bool(*fn_icsneo_removeMessageCallback)(const neodevice_t* device, int id);
fn_icsneo_removeMessageCallback icsneo_removeMessageCallback;
typedef neonetid_t (*fn_icsneo_getNetworkByNumber)(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number);
typedef icsneo_netid_t (*fn_icsneo_getNetworkByNumber)(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number);
fn_icsneo_getNetworkByNumber icsneo_getNetworkByNumber;
typedef bool(*fn_icsneo_getProductName)(const neodevice_t* device, char* str, size_t* maxLength);
@ -938,16 +938,16 @@ fn_icsneo_settingsApplyStructure icsneo_settingsApplyStructure;
typedef bool(*fn_icsneo_settingsApplyStructureTemporary)(const neodevice_t* device, const void* structure, size_t structureSize);
fn_icsneo_settingsApplyStructureTemporary icsneo_settingsApplyStructureTemporary;
typedef int64_t(*fn_icsneo_getBaudrate)(const neodevice_t* device, neonetid_t netid);
typedef int64_t(*fn_icsneo_getBaudrate)(const neodevice_t* device, icsneo_netid_t netid);
fn_icsneo_getBaudrate icsneo_getBaudrate;
typedef bool(*fn_icsneo_setBaudrate)(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate);
typedef bool(*fn_icsneo_setBaudrate)(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate);
fn_icsneo_setBaudrate icsneo_setBaudrate;
typedef int64_t(*fn_icsneo_getFDBaudrate)(const neodevice_t* device, neonetid_t netid);
typedef int64_t(*fn_icsneo_getFDBaudrate)(const neodevice_t* device, icsneo_netid_t netid);
fn_icsneo_getFDBaudrate icsneo_getFDBaudrate;
typedef bool(*fn_icsneo_setFDBaudrate)(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate);
typedef bool(*fn_icsneo_setFDBaudrate)(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate);
fn_icsneo_setFDBaudrate icsneo_setFDBaudrate;
typedef bool(*fn_icsneo_transmit)(const neodevice_t* device, const neomessage_t* message);
@ -1004,16 +1004,16 @@ fn_icsneo_getDigitalIO icsneo_getDigitalIO;
typedef bool(*fn_icsneo_setDigitalIO)(const neodevice_t* device, neoio_t type, uint32_t number, bool value);
fn_icsneo_setDigitalIO icsneo_setDigitalIO;
typedef bool(*fn_icsneo_isTerminationSupportedFor)(const neodevice_t* device, neonetid_t netid);
typedef bool(*fn_icsneo_isTerminationSupportedFor)(const neodevice_t* device, icsneo_netid_t netid);
fn_icsneo_isTerminationSupportedFor icsneo_isTerminationSupportedFor;
typedef bool(*fn_icsneo_canTerminationBeEnabledFor)(const neodevice_t* device, neonetid_t netid);
typedef bool(*fn_icsneo_canTerminationBeEnabledFor)(const neodevice_t* device, icsneo_netid_t netid);
fn_icsneo_canTerminationBeEnabledFor icsneo_canTerminationBeEnabledFor;
typedef bool(*fn_icsneo_isTerminationEnabledFor)(const neodevice_t* device, neonetid_t netid);
typedef bool(*fn_icsneo_isTerminationEnabledFor)(const neodevice_t* device, icsneo_netid_t netid);
fn_icsneo_isTerminationEnabledFor icsneo_isTerminationEnabledFor;
typedef bool(*fn_icsneo_setTerminationFor)(const neodevice_t* device, neonetid_t netid, bool enabled);
typedef bool(*fn_icsneo_setTerminationFor)(const neodevice_t* device, icsneo_netid_t netid, bool enabled);
fn_icsneo_setTerminationFor icsneo_setTerminationFor;
typedef int (*fn_icsneo_getDeviceStatus)(const neodevice_t* device, void* status, size_t* size);

2
platform/posix/firmio.cpp
View File

@ -32,7 +32,7 @@ void FirmIO::Find(std::vector<FoundDevice>& found) {
return;
std::vector<uint8_t> payload = {
((1 << 4) | (uint8_t)Network::NetID::Main51), // Packet size of 1 on NETID_MAIN51
((1 << 4) | (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51
(uint8_t)Command::RequestSerialNumber
};
payload.push_back(Packetizer::ICSChecksum(payload));

2
platform/posix/pcap.cpp
View File

@ -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::NetID::Main51), // Packet size of 1 on NETID_MAIN51
((1 << 4) | (uint8_t)Network::_icsneo_netid_t::Main51), // Packet size of 1 on NETID_MAIN51
(uint8_t)Command::RequestSerialNumber
};
requestPacket.payload.push_back(Packetizer::ICSChecksum(requestPacket.payload));

2
platform/windows/pcap.cpp
View File

@ -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::NetID::Main51), // Packet size of 1 on NETID_MAIN51
((1 << 4) | (uint8_t)Network::_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));