From 21964fafe493d7ab24f44175c9c3bc89fbb18d65 Mon Sep 17 00:00:00 2001 From: David Rebbe Date: Sun, 8 Dec 2024 06:50:01 -0500 Subject: [PATCH] moved _icsneo_netid_t enum --- .../message/filter/messagefilter.cpp | 2 +- .../python/icsneopy/communication/network.cpp | 316 +++++++++--------- communication/communication.cpp | 2 +- communication/decoder.cpp | 38 +-- communication/encoder.cpp | 12 +- communication/message/apperrormessage.cpp | 4 +- communication/packet/iso9141packet.cpp | 2 +- communication/packet/livedatapacket.cpp | 2 +- communication/packetizer.cpp | 4 +- device/device.cpp | 36 +- device/extensions/flexray/controller.cpp | 3 +- disk/extextractordiskreaddriver.cpp | 4 +- disk/neomemorydiskdriver.cpp | 4 +- disk/plasiondiskreaddriver.cpp | 2 +- disk/vsa/vsa.cpp | 2 +- examples/cpp/a2b/src/a2b.cpp | 10 +- examples/cpp/apperror/src/AppErrorExample.cpp | 4 +- .../interactive/src/InteractiveExample.cpp | 10 +- examples/cpp/lin/src/LINExample.cpp | 22 +- examples/cpp/mdio/src/MDIOExample.cpp | 12 +- examples/cpp/simple/src/SimpleExample.cpp | 22 +- examples/cpp/vsa/src/VSAExample.cpp | 8 +- .../communication/message/apperrormessage.h | 4 +- .../communication/message/diskdatamessage.h | 2 +- .../message/filter/messagefilter.h | 12 +- .../message/flashmemorymessage.h | 2 +- .../communication/message/livedatamessage.h | 2 +- .../communication/message/main51message.h | 2 +- .../message/neoreadmemorysdmessage.h | 2 +- .../message/readsettingsmessage.h | 2 +- include/icsneo/communication/network.h | 166 --------- include/icsneo/device/device.h | 6 +- .../device/tree/etherbadge/etherbadge.h | 6 +- .../tree/etherbadge/etherbadgesettings.h | 6 +- .../device/tree/neoobd2pro/neoobd2pro.h | 4 +- .../device/tree/neoobd2sim/neoobd2sim.h | 4 +- .../device/tree/neoviconnect/neoviconnect.h | 22 +- .../tree/neoviconnect/neoviconnectsettings.h | 36 +- .../icsneo/device/tree/neovifire/neovifire.h | 20 +- .../device/tree/neovifire/neovifiresettings.h | 20 +- .../device/tree/neovifire2/neovifire2.h | 42 +-- .../tree/neovifire2/neovifire2settings.h | 68 ++-- .../device/tree/neovifire3/neovifire3.h | 54 +-- .../tree/neovifire3/neovifire3settings.h | 64 ++-- .../neovifire3flexray/neovifire3flexray.h | 56 ++-- .../neovifire3flexraysettings.h | 56 ++-- .../icsneo/device/tree/neovired2/neovired2.h | 24 +- .../device/tree/neovired2/neovired2settings.h | 52 +-- include/icsneo/device/tree/plasion/plasion.h | 40 +-- include/icsneo/device/tree/rada2b/rada2b.h | 18 +- .../device/tree/rada2b/rada2bsettings.h | 10 +- .../icsneo/device/tree/radcomet/radcomet2.h | 4 +- .../device/tree/radcomet/radcometbase.h | 20 +- .../device/tree/radcomet/radcometsettings.h | 8 +- .../icsneo/device/tree/radcomet3/radcomet3.h | 28 +- .../device/tree/radcomet3/radcomet3settings.h | 8 +- .../device/tree/radepsilon/radepsilon.h | 8 +- .../icsneo/device/tree/radgalaxy/radgalaxy.h | 60 ++-- .../device/tree/radgalaxy/radgalaxysettings.h | 38 +-- .../device/tree/radgigastar/radgigastar.h | 68 ++-- .../tree/radgigastar/radgigastarsettings.h | 38 +-- .../device/tree/radgigastar2/radgigastar2.h | 76 ++--- .../tree/radgigastar2/radgigastar2settings.h | 44 +-- .../device/tree/radjupiter/radjupiter.h | 8 +- .../tree/radjupiter/radjupitersettings.h | 10 +- include/icsneo/device/tree/radmars/radmars.h | 64 ++-- .../device/tree/radmars/radmarssettings.h | 50 +-- .../device/tree/radmoon2/radmoon2base.h | 4 +- .../icsneo/device/tree/radmoon3/radmoon3.h | 4 +- .../device/tree/radmoonduo/radmoonduo.h | 2 +- .../device/tree/radmoont1s/radmoont1s.h | 8 +- .../icsneo/device/tree/radpluto/radpluto.h | 16 +- .../device/tree/radpluto/radplutosettings.h | 10 +- .../icsneo/device/tree/radstar2/radstar2.h | 14 +- .../device/tree/radstar2/radstar2settings.h | 10 +- .../device/tree/radsupermoon/radsupermoon.h | 8 +- .../icsneo/device/tree/valuecan3/valuecan3.h | 4 +- .../device/tree/valuecan3/valuecan3settings.h | 4 +- .../valuecan4/settings/valuecan4-1settings.h | 2 +- .../settings/valuecan4-2elsettings.h | 14 +- .../valuecan4/settings/valuecan4-2settings.h | 12 +- .../settings/valuecan4-4-2elsettings.h | 10 +- .../valuecan4/settings/valuecan4-4settings.h | 26 +- .../settings/valuecan4industrialsettings.h | 12 +- .../device/tree/valuecan4/valuecan4-1.h | 2 +- .../device/tree/valuecan4/valuecan4-2.h | 4 +- .../device/tree/valuecan4/valuecan4-2el.h | 8 +- .../device/tree/valuecan4/valuecan4-4.h | 8 +- .../tree/valuecan4/valuecan4industrial.h | 8 +- .../device/tree/vividcan/vividcansettings.h | 10 +- include/icsneo/icsneotypes.h | 171 ++++++++++ platform/posix/firmio.cpp | 2 +- platform/posix/pcap.cpp | 2 +- platform/windows/pcap.cpp | 2 +- 94 files changed, 1119 insertions(+), 1113 deletions(-) diff --git a/bindings/python/icsneopy/communication/message/filter/messagefilter.cpp b/bindings/python/icsneopy/communication/message/filter/messagefilter.cpp index a6ee660..680894a 100644 --- a/bindings/python/icsneopy/communication/message/filter/messagefilter.cpp +++ b/bindings/python/icsneopy/communication/message/filter/messagefilter.cpp @@ -8,7 +8,7 @@ namespace icsneo { void init_messagefilter(pybind11::module_& m) { pybind11::class_>(m, "MessageFilter") - .def(pybind11::init()); + .def(pybind11::init<_icsneo_netid_t>()); } } // namespace icsneo diff --git a/bindings/python/icsneopy/communication/network.cpp b/bindings/python/icsneopy/communication/network.cpp index 3c4acb2..b44bcd7 100644 --- a/bindings/python/icsneopy/communication/network.cpp +++ b/bindings/python/icsneopy/communication/network.cpp @@ -9,165 +9,165 @@ namespace icsneo { void init_network(pybind11::module_& m) { pybind11::class_ network(m, "Network"); - pybind11::enum_(network, "_icsneo_netid_t") - .value("Device", Network::_icsneo_netid_t::icsneo_netid_device) - .value("HSCAN", Network::_icsneo_netid_t::icsneo_netid_hscan) - .value("MSCAN", Network::_icsneo_netid_t::icsneo_netid_mscan) - .value("SWCAN", Network::_icsneo_netid_t::icsneo_netid_swcan) - .value("LSFTCAN", Network::_icsneo_netid_t::icsneo_netid_lsftcan) - .value("FordSCP", Network::_icsneo_netid_t::icsneo_netid_fordscp) - .value("J1708", Network::_icsneo_netid_t::icsneo_netid_j1708) - .value("Aux", Network::_icsneo_netid_t::icsneo_netid_aux) - .value("J1850VPW", Network::_icsneo_netid_t::icsneo_netid_j1850vpw) - .value("ISO9141", Network::_icsneo_netid_t::icsneo_netid_iso9141) - .value("DiskData", Network::_icsneo_netid_t::icsneo_netid_disk_data) - .value("Main51", Network::_icsneo_netid_t::icsneo_netid_main51) - .value("RED", Network::_icsneo_netid_t::icsneo_netid_red) - .value("SCI", Network::_icsneo_netid_t::icsneo_netid_sci) - .value("ISO9141_2", Network::_icsneo_netid_t::icsneo_netid_iso9141_2) - .value("ISO14230", Network::_icsneo_netid_t::icsneo_netid_iso14230) - .value("LIN", Network::_icsneo_netid_t::icsneo_netid_lin) - .value("OP_Ethernet1", Network::_icsneo_netid_t::icsneo_netid_op_ethernet1) - .value("OP_Ethernet2", Network::_icsneo_netid_t::icsneo_netid_op_ethernet2) - .value("OP_Ethernet3", Network::_icsneo_netid_t::icsneo_netid_op_ethernet3) - .value("RED_EXT_MEMORYREAD", Network::_icsneo_netid_t::icsneo_netid_red_ext_memoryread) - .value("RED_INT_MEMORYREAD", Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread) - .value("RED_DFLASH_READ", Network::_icsneo_netid_t::icsneo_netid_red_dflash_read) - .value("NeoMemorySDRead", Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread) - .value("CAN_ERRBITS", Network::_icsneo_netid_t::icsneo_netid_can_errbits) - .value("NeoMemoryWriteDone", Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done) - .value("RED_WAVE_CAN1_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_can1_logical) - .value("RED_WAVE_CAN2_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_can2_logical) - .value("RED_WAVE_LIN1_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin1_logical) - .value("RED_WAVE_LIN2_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin2_logical) - .value("RED_WAVE_LIN1_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin1_analog) - .value("RED_WAVE_LIN2_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin2_analog) - .value("RED_WAVE_MISC_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_misc_analog) - .value("RED_WAVE_MISCDIO2_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_miscdio2_logical) - .value("RED_NETWORK_COM_ENABLE_EX", Network::_icsneo_netid_t::icsneo_netid_red_network_com_enable_ex) - .value("RED_NEOVI_NETWORK", Network::_icsneo_netid_t::icsneo_netid_red_neovi_network) - .value("RED_READ_BAUD_SETTINGS", Network::_icsneo_netid_t::icsneo_netid_red_read_baud_settings) - .value("RED_OLDFORMAT", Network::_icsneo_netid_t::icsneo_netid_red_oldformat) - .value("RED_SCOPE_CAPTURE", Network::_icsneo_netid_t::icsneo_netid_red_scope_capture) - .value("RED_HARDWARE_EXCEP", Network::_icsneo_netid_t::icsneo_netid_red_hardware_excep) - .value("RED_GET_RTC", Network::_icsneo_netid_t::icsneo_netid_red_get_rtc) - .value("ISO9141_3", Network::_icsneo_netid_t::icsneo_netid_iso9141_3) - .value("HSCAN2", Network::_icsneo_netid_t::icsneo_netid_hscan2) - .value("HSCAN3", Network::_icsneo_netid_t::icsneo_netid_hscan3) - .value("OP_Ethernet4", Network::_icsneo_netid_t::icsneo_netid_op_ethernet4) - .value("OP_Ethernet5", Network::_icsneo_netid_t::icsneo_netid_op_ethernet5) - .value("ISO9141_4", Network::_icsneo_netid_t::icsneo_netid_iso9141_4) - .value("LIN2", Network::_icsneo_netid_t::icsneo_netid_lin2) - .value("LIN3", Network::_icsneo_netid_t::icsneo_netid_lin3) - .value("LIN4", Network::_icsneo_netid_t::icsneo_netid_lin4) - .value("RED_App_Error", Network::_icsneo_netid_t::icsneo_netid_red_app_error) - .value("CGI", Network::_icsneo_netid_t::icsneo_netid_cgi) - .value("Reset_Status", Network::_icsneo_netid_t::icsneo_netid_reset_status) - .value("FB_Status", Network::_icsneo_netid_t::icsneo_netid_fb_status) - .value("App_Signal_Status", Network::_icsneo_netid_t::icsneo_netid_app_signal_status) - .value("Read_Datalink_Cm_Tx_Msg", Network::_icsneo_netid_t::icsneo_netid_read_datalink_cm_tx_msg) - .value("Read_Datalink_Cm_Rx_Msg", Network::_icsneo_netid_t::icsneo_netid_read_datalink_cm_rx_msg) - .value("Logging_Overflow", Network::_icsneo_netid_t::icsneo_netid_logging_overflow) - .value("ReadSettings", Network::_icsneo_netid_t::icsneo_netid_read_settings) - .value("HSCAN4", Network::_icsneo_netid_t::icsneo_netid_hscan4) - .value("HSCAN5", Network::_icsneo_netid_t::icsneo_netid_hscan5) - .value("RS232", Network::_icsneo_netid_t::icsneo_netid_rs232) - .value("UART", Network::_icsneo_netid_t::icsneo_netid_uart) - .value("UART2", Network::_icsneo_netid_t::icsneo_netid_uart2) - .value("UART3", Network::_icsneo_netid_t::icsneo_netid_uart3) - .value("UART4", Network::_icsneo_netid_t::icsneo_netid_uart4) - .value("SWCAN2", Network::_icsneo_netid_t::icsneo_netid_swcan2) - .value("Ethernet_DAQ", Network::_icsneo_netid_t::icsneo_netid_ethernet_daq) - .value("Data_To_Host", Network::_icsneo_netid_t::icsneo_netid_data_to_host) - .value("TextAPI_To_Host", Network::_icsneo_netid_t::icsneo_netid_textapi_to_host) - .value("SPI1", Network::_icsneo_netid_t::icsneo_netid_spi1) - .value("OP_Ethernet6", Network::_icsneo_netid_t::icsneo_netid_op_ethernet6) - .value("Red_VBat", Network::_icsneo_netid_t::icsneo_netid_red_vbat) - .value("OP_Ethernet7", Network::_icsneo_netid_t::icsneo_netid_op_ethernet7) - .value("OP_Ethernet8", Network::_icsneo_netid_t::icsneo_netid_op_ethernet8) - .value("OP_Ethernet9", Network::_icsneo_netid_t::icsneo_netid_op_ethernet9) - .value("OP_Ethernet10", Network::_icsneo_netid_t::icsneo_netid_op_ethernet10) - .value("OP_Ethernet11", Network::_icsneo_netid_t::icsneo_netid_op_ethernet11) - .value("FlexRay1a", Network::_icsneo_netid_t::icsneo_netid_flexray1a) - .value("FlexRay1b", Network::_icsneo_netid_t::icsneo_netid_flexray1b) - .value("FlexRay2a", Network::_icsneo_netid_t::icsneo_netid_flexray2a) - .value("FlexRay2b", Network::_icsneo_netid_t::icsneo_netid_flexray2b) - .value("LIN5", Network::_icsneo_netid_t::icsneo_netid_lin5) - .value("FlexRay", Network::_icsneo_netid_t::icsneo_netid_flexray) - .value("FlexRay2", Network::_icsneo_netid_t::icsneo_netid_flexray2) - .value("OP_Ethernet12", Network::_icsneo_netid_t::icsneo_netid_op_ethernet12) - .value("I2C", Network::_icsneo_netid_t::icsneo_netid_i2c) - .value("MOST25", Network::_icsneo_netid_t::icsneo_netid_most25) - .value("MOST50", Network::_icsneo_netid_t::icsneo_netid_most50) - .value("MOST150", Network::_icsneo_netid_t::icsneo_netid_most150) - .value("Ethernet", Network::_icsneo_netid_t::icsneo_netid_ethernet) - .value("GMFSA", Network::_icsneo_netid_t::icsneo_netid_gmfsa) - .value("TCP", Network::_icsneo_netid_t::icsneo_netid_tcp) - .value("HSCAN6", Network::_icsneo_netid_t::icsneo_netid_hscan6) - .value("HSCAN7", Network::_icsneo_netid_t::icsneo_netid_hscan7) - .value("LIN6", Network::_icsneo_netid_t::icsneo_netid_lin6) - .value("LSFTCAN2", Network::_icsneo_netid_t::icsneo_netid_lsftcan2) - .value("LogicalDiskInfo", Network::_icsneo_netid_t::icsneo_netid_logical_disk_info) - .value("WiVICommand", Network::_icsneo_netid_t::icsneo_netid_wivi_command) - .value("ScriptStatus", Network::_icsneo_netid_t::icsneo_netid_script_status) - .value("EthPHYControl", Network::_icsneo_netid_t::icsneo_netid_eth_phy_control) - .value("ExtendedCommand", Network::_icsneo_netid_t::icsneo_netid_extended_command) - .value("ExtendedData", Network::_icsneo_netid_t::icsneo_netid_extended_data) - .value("FlexRayControl", Network::_icsneo_netid_t::icsneo_netid_flexray_control) - .value("CoreMiniPreLoad", Network::_icsneo_netid_t::icsneo_netid_coremini_preload) - .value("HW_COM_Latency_Test", Network::_icsneo_netid_t::icsneo_netid_hw_com_latency_test) - .value("DeviceStatus", Network::_icsneo_netid_t::icsneo_netid_device_status) - .value("UDP", Network::_icsneo_netid_t::icsneo_netid_udp) - .value("ForwardedMessage", Network::_icsneo_netid_t::icsneo_netid_forwarded_message) - .value("I2C2", Network::_icsneo_netid_t::icsneo_netid_i2c2) - .value("I2C3", Network::_icsneo_netid_t::icsneo_netid_i2c3) - .value("I2C4", Network::_icsneo_netid_t::icsneo_netid_i2c4) - .value("Ethernet2", Network::_icsneo_netid_t::icsneo_netid_ethernet2) - .value("A2B1", Network::_icsneo_netid_t::icsneo_netid_a2b1) - .value("A2B2", Network::_icsneo_netid_t::icsneo_netid_a2b2) - .value("Ethernet3", Network::_icsneo_netid_t::icsneo_netid_ethernet3) - .value("WBMS", Network::_icsneo_netid_t::icsneo_netid_wbms) - .value("DWCAN9", Network::_icsneo_netid_t::icsneo_netid_dwcan9) - .value("DWCAN10", Network::_icsneo_netid_t::icsneo_netid_dwcan10) - .value("DWCAN11", Network::_icsneo_netid_t::icsneo_netid_dwcan11) - .value("DWCAN12", Network::_icsneo_netid_t::icsneo_netid_dwcan12) - .value("DWCAN13", Network::_icsneo_netid_t::icsneo_netid_dwcan13) - .value("DWCAN14", Network::_icsneo_netid_t::icsneo_netid_dwcan14) - .value("DWCAN15", Network::_icsneo_netid_t::icsneo_netid_dwcan15) - .value("DWCAN16", Network::_icsneo_netid_t::icsneo_netid_dwcan16) - .value("LIN7", Network::_icsneo_netid_t::icsneo_netid_lin7) - .value("LIN8", Network::_icsneo_netid_t::icsneo_netid_lin8) - .value("SPI2", Network::_icsneo_netid_t::icsneo_netid_spi2) - .value("MDIO1", Network::_icsneo_netid_t::icsneo_netid_mdio1) - .value("MDIO2", Network::_icsneo_netid_t::icsneo_netid_mdio2) - .value("MDIO3", Network::_icsneo_netid_t::icsneo_netid_mdio3) - .value("MDIO4", Network::_icsneo_netid_t::icsneo_netid_mdio4) - .value("MDIO5", Network::_icsneo_netid_t::icsneo_netid_mdio5) - .value("MDIO6", Network::_icsneo_netid_t::icsneo_netid_mdio6) - .value("MDIO7", Network::_icsneo_netid_t::icsneo_netid_mdio7) - .value("MDIO8", Network::_icsneo_netid_t::icsneo_netid_mdio8) - .value("OP_Ethernet13", Network::_icsneo_netid_t::icsneo_netid_op_ethernet13) - .value("OP_Ethernet14", Network::_icsneo_netid_t::icsneo_netid_op_ethernet14) - .value("OP_Ethernet15", Network::_icsneo_netid_t::icsneo_netid_op_ethernet15) - .value("OP_Ethernet16", Network::_icsneo_netid_t::icsneo_netid_op_ethernet16) - .value("SPI3", Network::_icsneo_netid_t::icsneo_netid_spi3) - .value("SPI4", Network::_icsneo_netid_t::icsneo_netid_spi4) - .value("SPI5", Network::_icsneo_netid_t::icsneo_netid_spi5) - .value("SPI6", Network::_icsneo_netid_t::icsneo_netid_spi6) - .value("SPI7", Network::_icsneo_netid_t::icsneo_netid_spi7) - .value("SPI8", Network::_icsneo_netid_t::icsneo_netid_spi8) - .value("LIN9", Network::_icsneo_netid_t::icsneo_netid_lin9) - .value("LIN10", Network::_icsneo_netid_t::icsneo_netid_lin10) - .value("LIN11", Network::_icsneo_netid_t::icsneo_netid_lin11) - .value("LIN12", Network::_icsneo_netid_t::icsneo_netid_lin12) - .value("LIN13", Network::_icsneo_netid_t::icsneo_netid_lin13) - .value("LIN14", Network::_icsneo_netid_t::icsneo_netid_lin14) - .value("LIN15", Network::_icsneo_netid_t::icsneo_netid_lin15) - .value("LIN16", Network::_icsneo_netid_t::icsneo_netid_lin16) - .value("Any", Network::_icsneo_netid_t::icsneo_netid_any) - .value("Invalid", Network::_icsneo_netid_t::icsneo_netid_invalid); + pybind11::enum_<_icsneo_netid_t>(network, "_icsneo_netid_t") + .value("Device", _icsneo_netid_t::icsneo_netid_device) + .value("HSCAN", _icsneo_netid_t::icsneo_netid_hscan) + .value("MSCAN", _icsneo_netid_t::icsneo_netid_mscan) + .value("SWCAN", _icsneo_netid_t::icsneo_netid_swcan) + .value("LSFTCAN", _icsneo_netid_t::icsneo_netid_lsftcan) + .value("FordSCP", _icsneo_netid_t::icsneo_netid_fordscp) + .value("J1708", _icsneo_netid_t::icsneo_netid_j1708) + .value("Aux", _icsneo_netid_t::icsneo_netid_aux) + .value("J1850VPW", _icsneo_netid_t::icsneo_netid_j1850vpw) + .value("ISO9141", _icsneo_netid_t::icsneo_netid_iso9141) + .value("DiskData", _icsneo_netid_t::icsneo_netid_disk_data) + .value("Main51", _icsneo_netid_t::icsneo_netid_main51) + .value("RED", _icsneo_netid_t::icsneo_netid_red) + .value("SCI", _icsneo_netid_t::icsneo_netid_sci) + .value("ISO9141_2", _icsneo_netid_t::icsneo_netid_iso9141_2) + .value("ISO14230", _icsneo_netid_t::icsneo_netid_iso14230) + .value("LIN", _icsneo_netid_t::icsneo_netid_lin) + .value("OP_Ethernet1", _icsneo_netid_t::icsneo_netid_op_ethernet1) + .value("OP_Ethernet2", _icsneo_netid_t::icsneo_netid_op_ethernet2) + .value("OP_Ethernet3", _icsneo_netid_t::icsneo_netid_op_ethernet3) + .value("RED_EXT_MEMORYREAD", _icsneo_netid_t::icsneo_netid_red_ext_memoryread) + .value("RED_INT_MEMORYREAD", _icsneo_netid_t::icsneo_netid_red_int_memoryread) + .value("RED_DFLASH_READ", _icsneo_netid_t::icsneo_netid_red_dflash_read) + .value("NeoMemorySDRead", _icsneo_netid_t::icsneo_netid_neo_memory_sdread) + .value("CAN_ERRBITS", _icsneo_netid_t::icsneo_netid_can_errbits) + .value("NeoMemoryWriteDone", _icsneo_netid_t::icsneo_netid_neo_memory_write_done) + .value("RED_WAVE_CAN1_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_can1_logical) + .value("RED_WAVE_CAN2_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_can2_logical) + .value("RED_WAVE_LIN1_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_lin1_logical) + .value("RED_WAVE_LIN2_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_lin2_logical) + .value("RED_WAVE_LIN1_ANALOG", _icsneo_netid_t::icsneo_netid_red_wave_lin1_analog) + .value("RED_WAVE_LIN2_ANALOG", _icsneo_netid_t::icsneo_netid_red_wave_lin2_analog) + .value("RED_WAVE_MISC_ANALOG", _icsneo_netid_t::icsneo_netid_red_wave_misc_analog) + .value("RED_WAVE_MISCDIO2_LOGICAL", _icsneo_netid_t::icsneo_netid_red_wave_miscdio2_logical) + .value("RED_NETWORK_COM_ENABLE_EX", _icsneo_netid_t::icsneo_netid_red_network_com_enable_ex) + .value("RED_NEOVI_NETWORK", _icsneo_netid_t::icsneo_netid_red_neovi_network) + .value("RED_READ_BAUD_SETTINGS", _icsneo_netid_t::icsneo_netid_red_read_baud_settings) + .value("RED_OLDFORMAT", _icsneo_netid_t::icsneo_netid_red_oldformat) + .value("RED_SCOPE_CAPTURE", _icsneo_netid_t::icsneo_netid_red_scope_capture) + .value("RED_HARDWARE_EXCEP", _icsneo_netid_t::icsneo_netid_red_hardware_excep) + .value("RED_GET_RTC", _icsneo_netid_t::icsneo_netid_red_get_rtc) + .value("ISO9141_3", _icsneo_netid_t::icsneo_netid_iso9141_3) + .value("HSCAN2", _icsneo_netid_t::icsneo_netid_hscan2) + .value("HSCAN3", _icsneo_netid_t::icsneo_netid_hscan3) + .value("OP_Ethernet4", _icsneo_netid_t::icsneo_netid_op_ethernet4) + .value("OP_Ethernet5", _icsneo_netid_t::icsneo_netid_op_ethernet5) + .value("ISO9141_4", _icsneo_netid_t::icsneo_netid_iso9141_4) + .value("LIN2", _icsneo_netid_t::icsneo_netid_lin2) + .value("LIN3", _icsneo_netid_t::icsneo_netid_lin3) + .value("LIN4", _icsneo_netid_t::icsneo_netid_lin4) + .value("RED_App_Error", _icsneo_netid_t::icsneo_netid_red_app_error) + .value("CGI", _icsneo_netid_t::icsneo_netid_cgi) + .value("Reset_Status", _icsneo_netid_t::icsneo_netid_reset_status) + .value("FB_Status", _icsneo_netid_t::icsneo_netid_fb_status) + .value("App_Signal_Status", _icsneo_netid_t::icsneo_netid_app_signal_status) + .value("Read_Datalink_Cm_Tx_Msg", _icsneo_netid_t::icsneo_netid_read_datalink_cm_tx_msg) + .value("Read_Datalink_Cm_Rx_Msg", _icsneo_netid_t::icsneo_netid_read_datalink_cm_rx_msg) + .value("Logging_Overflow", _icsneo_netid_t::icsneo_netid_logging_overflow) + .value("ReadSettings", _icsneo_netid_t::icsneo_netid_read_settings) + .value("HSCAN4", _icsneo_netid_t::icsneo_netid_hscan4) + .value("HSCAN5", _icsneo_netid_t::icsneo_netid_hscan5) + .value("RS232", _icsneo_netid_t::icsneo_netid_rs232) + .value("UART", _icsneo_netid_t::icsneo_netid_uart) + .value("UART2", _icsneo_netid_t::icsneo_netid_uart2) + .value("UART3", _icsneo_netid_t::icsneo_netid_uart3) + .value("UART4", _icsneo_netid_t::icsneo_netid_uart4) + .value("SWCAN2", _icsneo_netid_t::icsneo_netid_swcan2) + .value("Ethernet_DAQ", _icsneo_netid_t::icsneo_netid_ethernet_daq) + .value("Data_To_Host", _icsneo_netid_t::icsneo_netid_data_to_host) + .value("TextAPI_To_Host", _icsneo_netid_t::icsneo_netid_textapi_to_host) + .value("SPI1", _icsneo_netid_t::icsneo_netid_spi1) + .value("OP_Ethernet6", _icsneo_netid_t::icsneo_netid_op_ethernet6) + .value("Red_VBat", _icsneo_netid_t::icsneo_netid_red_vbat) + .value("OP_Ethernet7", _icsneo_netid_t::icsneo_netid_op_ethernet7) + .value("OP_Ethernet8", _icsneo_netid_t::icsneo_netid_op_ethernet8) + .value("OP_Ethernet9", _icsneo_netid_t::icsneo_netid_op_ethernet9) + .value("OP_Ethernet10", _icsneo_netid_t::icsneo_netid_op_ethernet10) + .value("OP_Ethernet11", _icsneo_netid_t::icsneo_netid_op_ethernet11) + .value("FlexRay1a", _icsneo_netid_t::icsneo_netid_flexray1a) + .value("FlexRay1b", _icsneo_netid_t::icsneo_netid_flexray1b) + .value("FlexRay2a", _icsneo_netid_t::icsneo_netid_flexray2a) + .value("FlexRay2b", _icsneo_netid_t::icsneo_netid_flexray2b) + .value("LIN5", _icsneo_netid_t::icsneo_netid_lin5) + .value("FlexRay", _icsneo_netid_t::icsneo_netid_flexray) + .value("FlexRay2", _icsneo_netid_t::icsneo_netid_flexray2) + .value("OP_Ethernet12", _icsneo_netid_t::icsneo_netid_op_ethernet12) + .value("I2C", _icsneo_netid_t::icsneo_netid_i2c) + .value("MOST25", _icsneo_netid_t::icsneo_netid_most25) + .value("MOST50", _icsneo_netid_t::icsneo_netid_most50) + .value("MOST150", _icsneo_netid_t::icsneo_netid_most150) + .value("Ethernet", _icsneo_netid_t::icsneo_netid_ethernet) + .value("GMFSA", _icsneo_netid_t::icsneo_netid_gmfsa) + .value("TCP", _icsneo_netid_t::icsneo_netid_tcp) + .value("HSCAN6", _icsneo_netid_t::icsneo_netid_hscan6) + .value("HSCAN7", _icsneo_netid_t::icsneo_netid_hscan7) + .value("LIN6", _icsneo_netid_t::icsneo_netid_lin6) + .value("LSFTCAN2", _icsneo_netid_t::icsneo_netid_lsftcan2) + .value("LogicalDiskInfo", _icsneo_netid_t::icsneo_netid_logical_disk_info) + .value("WiVICommand", _icsneo_netid_t::icsneo_netid_wivi_command) + .value("ScriptStatus", _icsneo_netid_t::icsneo_netid_script_status) + .value("EthPHYControl", _icsneo_netid_t::icsneo_netid_eth_phy_control) + .value("ExtendedCommand", _icsneo_netid_t::icsneo_netid_extended_command) + .value("ExtendedData", _icsneo_netid_t::icsneo_netid_extended_data) + .value("FlexRayControl", _icsneo_netid_t::icsneo_netid_flexray_control) + .value("CoreMiniPreLoad", _icsneo_netid_t::icsneo_netid_coremini_preload) + .value("HW_COM_Latency_Test", _icsneo_netid_t::icsneo_netid_hw_com_latency_test) + .value("DeviceStatus", _icsneo_netid_t::icsneo_netid_device_status) + .value("UDP", _icsneo_netid_t::icsneo_netid_udp) + .value("ForwardedMessage", _icsneo_netid_t::icsneo_netid_forwarded_message) + .value("I2C2", _icsneo_netid_t::icsneo_netid_i2c2) + .value("I2C3", _icsneo_netid_t::icsneo_netid_i2c3) + .value("I2C4", _icsneo_netid_t::icsneo_netid_i2c4) + .value("Ethernet2", _icsneo_netid_t::icsneo_netid_ethernet2) + .value("A2B1", _icsneo_netid_t::icsneo_netid_a2b1) + .value("A2B2", _icsneo_netid_t::icsneo_netid_a2b2) + .value("Ethernet3", _icsneo_netid_t::icsneo_netid_ethernet3) + .value("WBMS", _icsneo_netid_t::icsneo_netid_wbms) + .value("DWCAN9", _icsneo_netid_t::icsneo_netid_dwcan9) + .value("DWCAN10", _icsneo_netid_t::icsneo_netid_dwcan10) + .value("DWCAN11", _icsneo_netid_t::icsneo_netid_dwcan11) + .value("DWCAN12", _icsneo_netid_t::icsneo_netid_dwcan12) + .value("DWCAN13", _icsneo_netid_t::icsneo_netid_dwcan13) + .value("DWCAN14", _icsneo_netid_t::icsneo_netid_dwcan14) + .value("DWCAN15", _icsneo_netid_t::icsneo_netid_dwcan15) + .value("DWCAN16", _icsneo_netid_t::icsneo_netid_dwcan16) + .value("LIN7", _icsneo_netid_t::icsneo_netid_lin7) + .value("LIN8", _icsneo_netid_t::icsneo_netid_lin8) + .value("SPI2", _icsneo_netid_t::icsneo_netid_spi2) + .value("MDIO1", _icsneo_netid_t::icsneo_netid_mdio1) + .value("MDIO2", _icsneo_netid_t::icsneo_netid_mdio2) + .value("MDIO3", _icsneo_netid_t::icsneo_netid_mdio3) + .value("MDIO4", _icsneo_netid_t::icsneo_netid_mdio4) + .value("MDIO5", _icsneo_netid_t::icsneo_netid_mdio5) + .value("MDIO6", _icsneo_netid_t::icsneo_netid_mdio6) + .value("MDIO7", _icsneo_netid_t::icsneo_netid_mdio7) + .value("MDIO8", _icsneo_netid_t::icsneo_netid_mdio8) + .value("OP_Ethernet13", _icsneo_netid_t::icsneo_netid_op_ethernet13) + .value("OP_Ethernet14", _icsneo_netid_t::icsneo_netid_op_ethernet14) + .value("OP_Ethernet15", _icsneo_netid_t::icsneo_netid_op_ethernet15) + .value("OP_Ethernet16", _icsneo_netid_t::icsneo_netid_op_ethernet16) + .value("SPI3", _icsneo_netid_t::icsneo_netid_spi3) + .value("SPI4", _icsneo_netid_t::icsneo_netid_spi4) + .value("SPI5", _icsneo_netid_t::icsneo_netid_spi5) + .value("SPI6", _icsneo_netid_t::icsneo_netid_spi6) + .value("SPI7", _icsneo_netid_t::icsneo_netid_spi7) + .value("SPI8", _icsneo_netid_t::icsneo_netid_spi8) + .value("LIN9", _icsneo_netid_t::icsneo_netid_lin9) + .value("LIN10", _icsneo_netid_t::icsneo_netid_lin10) + .value("LIN11", _icsneo_netid_t::icsneo_netid_lin11) + .value("LIN12", _icsneo_netid_t::icsneo_netid_lin12) + .value("LIN13", _icsneo_netid_t::icsneo_netid_lin13) + .value("LIN14", _icsneo_netid_t::icsneo_netid_lin14) + .value("LIN15", _icsneo_netid_t::icsneo_netid_lin15) + .value("LIN16", _icsneo_netid_t::icsneo_netid_lin16) + .value("Any", _icsneo_netid_t::icsneo_netid_any) + .value("Invalid", _icsneo_netid_t::icsneo_netid_invalid); - network.def(pybind11::init()); + network.def(pybind11::init<_icsneo_netid_t>()); } } // namespace icsneo diff --git a/communication/communication.cpp b/communication/communication.cpp index 314c0b0..cfad29f 100644 --- a/communication/communication.cpp +++ b/communication/communication.cpp @@ -100,7 +100,7 @@ bool Communication::sendCommand(ExtendedCommand cmd, std::vector argume } bool Communication::getSettingsSync(std::vector& data, std::chrono::milliseconds timeout) { - static const std::shared_ptr filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_read_settings); + static const std::shared_ptr filter = std::make_shared(_icsneo_netid_t::icsneo_netid_read_settings); std::shared_ptr msg = waitForMessageSync([this]() { return sendCommand(Command::ReadSettings, { 0, 0, 0, 1 /* Get Global Settings */, 0, 1 /* Subversion 1 */ }); }, filter, timeout); diff --git a/communication/decoder.cpp b/communication/decoder.cpp index 4975d49..033fff2 100644 --- a/communication/decoder.cpp +++ b/communication/decoder.cpp @@ -194,7 +194,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrnetwork.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_reset_status: { + case _icsneo_netid_t::icsneo_netid_reset_status: { // We can deal with not having the last two fields (voltage and temperature) if(packet->data.size() < (sizeof(HardwareResetStatusPacket) - (sizeof(uint16_t) * 2))) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error); @@ -225,12 +225,12 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata.size() < 24) { - auto rawmsg = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_device); + auto rawmsg = std::make_shared(_icsneo_netid_t::icsneo_netid_device); result = rawmsg; rawmsg->data = packet->data; return true; @@ -253,12 +253,12 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrnetwork = packet->network; return true; } - case Network::_icsneo_netid_t::icsneo_netid_device_status: { + case _icsneo_netid_t::icsneo_netid_device_status: { // Just pass along the data, the device needs to handle this itself result = std::make_shared(packet->network, packet->data); return true; } - case Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread: { + case _icsneo_netid_t::icsneo_netid_red_int_memoryread: { if(packet->data.size() != 512 + sizeof(uint16_t)) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error); return false; // Should get enough data for a start address and sector @@ -270,7 +270,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata.insert(msg->data.end(), packet->data.begin() + 2, packet->data.end()); return true; } - case Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread: { + case _icsneo_netid_t::icsneo_netid_neo_memory_sdread: { if(packet->data.size() != 512 + sizeof(uint32_t)) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error); return false; // Should get enough data for a start address and sector @@ -282,7 +282,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata.insert(msg->data.end(), packet->data.begin() + 4, packet->data.end()); return true; } - case Network::_icsneo_netid_t::icsneo_netid_extended_command: { + case _icsneo_netid_t::icsneo_netid_extended_command: { if(packet->data.size() < sizeof(ExtendedResponseMessage::PackedGenericResponse)) break; // Handle as a raw message, might not be a generic response @@ -313,7 +313,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata.size() < sizeof(ExtendedDataMessage::ExtendedDataHeader)) break; const auto& header = *reinterpret_cast(packet->data.data()); @@ -328,7 +328,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata.begin() + sizeof(header), packet->data.begin() + sizeof(header) + numRead, extDataMsg->data.begin()); - extDataMsg->network = Network(static_cast(Network::_icsneo_netid_t::icsneo_netid_extended_data), false); + extDataMsg->network = Network(static_cast(_icsneo_netid_t::icsneo_netid_extended_data), false); return true; } default: @@ -336,7 +336,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr(*packet); if(!frResult->decoded) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error); @@ -345,7 +345,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata[0]) { case Command::RequestSerialNumber: { auto msg = std::make_shared(); @@ -397,7 +397,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr& result, const std::shared_ptrdata.resize(length); return decode(result, packet); } - case Network::_icsneo_netid_t::icsneo_netid_red_app_error: { + case _icsneo_netid_t::icsneo_netid_red_app_error: { result = AppErrorMessage::DecodeToMessage(packet->data, report); if(!result) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning); @@ -420,7 +420,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr(); msg->response = ReadSettingsMessage::Response(packet->data[0]); @@ -439,7 +439,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata); if(!result) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning); @@ -447,7 +447,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata); if(!result) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning); @@ -455,7 +455,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata, report); if(!result) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning); @@ -463,7 +463,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata); if(!result) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning); @@ -471,7 +471,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr(std::move(packet->data)); return true; } diff --git a/communication/encoder.cpp b/communication/encoder.cpp index ed603b5..a1a3e16 100644 --- a/communication/encoder.cpp +++ b/communication/encoder.cpp @@ -138,10 +138,10 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, netid = uint16_t(raw->network.getNetID()); switch(raw->network.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_device: + case _icsneo_netid_t::icsneo_netid_device: shortFormat = true; break; - case Network::_icsneo_netid_t::icsneo_netid_red_oldformat: { + case _icsneo_netid_t::icsneo_netid_red_oldformat: { // See the decoder for an explanation // We expect the network byte to be populated already in data, but not the length uint16_t length = uint16_t(raw->data.size()) - 1; @@ -162,7 +162,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, } buffer = &m51msg->data; - netid = uint16_t(Network::_icsneo_netid_t::icsneo_netid_main51); + netid = uint16_t(_icsneo_netid_t::icsneo_netid_main51); if(!m51msg->forceShortFormat) { // Main51 can be sent as a long message without setting the NetID to RED first @@ -172,7 +172,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, size += 1; // Even though we are not including the NetID bytes, the device expects them to be counted in the length size += 1; // Main51 Command m51msg->data.insert(m51msg->data.begin(), { - (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51, // 0x0B for long message + (uint8_t)_icsneo_netid_t::icsneo_netid_main51, // 0x0B for long message (uint8_t)size, // Size, little endian 16-bit (uint8_t)(size >> 8), (uint8_t)m51msg->command @@ -223,7 +223,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, uint16_t size = static_cast(buffer->size()) + 1 + 1 + 2 + 2 + 1; buffer->insert(buffer->begin(), { - (uint8_t)Network::_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message + (uint8_t)_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message (uint8_t)size, // Size, little endian 16-bit (uint8_t)(size >> 8), (uint8_t)netid, // NetID, little endian 16-bit @@ -243,7 +243,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, * In this case, command 0x06 is SetLEDState. * This old command type is not really used anywhere else. */ - auto canmsg = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_device); + auto canmsg = std::make_shared(_icsneo_netid_t::icsneo_netid_device); msg = canmsg; if(arguments.empty()) { report(APIEvent::Type::MessageFormattingError, APIEvent::Severity::Error); diff --git a/communication/message/apperrormessage.cpp b/communication/message/apperrormessage.cpp index 2d2c39a..837c29f 100644 --- a/communication/message/apperrormessage.cpp +++ b/communication/message/apperrormessage.cpp @@ -21,10 +21,10 @@ std::shared_ptr AppErrorMessage::DecodeToMessage(const std::vector(); appErr->errorType = data->error_type; - appErr->errorNetID = static_cast(data->network_id); + appErr->errorNetID = static_cast<_icsneo_netid_t>(data->network_id); appErr->timestamp10us = data->uiTimeStamp10uS; appErr->timestamp10usMSB = data->uiTimeStamp10uSMSB; - appErr->network = Network::_icsneo_netid_t::icsneo_netid_red_app_error; + appErr->network = _icsneo_netid_t::icsneo_netid_red_app_error; return appErr; } diff --git a/communication/packet/iso9141packet.cpp b/communication/packet/iso9141packet.cpp index b4ed5bb..718a7cf 100644 --- a/communication/packet/iso9141packet.cpp +++ b/communication/packet/iso9141packet.cpp @@ -30,7 +30,7 @@ bool HardwareISO9141Packet::EncodeFromMessage(const ISO9141Message& message, std currentSize = (uint8_t)(bytesToSend - currentStart); packet.insert(packet.begin(), { - (uint8_t)Network::_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message + (uint8_t)_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message (uint8_t)0, // Size, little endian 16-bit, filled later (uint8_t)0, (uint8_t)message.network.getNetID(), // _icsneo_netid_t, little endian 16-bit diff --git a/communication/packet/livedatapacket.cpp b/communication/packet/livedatapacket.cpp index ded1238..26c974a 100644 --- a/communication/packet/livedatapacket.cpp +++ b/communication/packet/livedatapacket.cpp @@ -113,7 +113,7 @@ bool HardwareLiveDataPacket::EncodeFromMessage(LiveDataMessage& message, std::ve return false; } - header->netid = static_cast(Network::_icsneo_netid_t::icsneo_netid_main51); + header->netid = static_cast(_icsneo_netid_t::icsneo_netid_main51); header->fullLength = fullSize; header->command = static_cast(Command::Extended); header->extendedCommand = static_cast(ExtendedCommand::LiveData); diff --git a/communication/packetizer.cpp b/communication/packetizer.cpp index 0040187..38fe7d1 100644 --- a/communication/packetizer.cpp +++ b/communication/packetizer.cpp @@ -54,7 +54,7 @@ bool Packetizer::input(RingBuffer& bytes) { if(packetLength == 0) { state = ReadState::ParseLongStylePacketHeader; break; - } else if(packetLength == 0xA && packet.network == Network::_icsneo_netid_t::icsneo_netid_disk_data) { + } else if(packetLength == 0xA && packet.network == _icsneo_netid_t::icsneo_netid_disk_data) { state = ReadState::ParseDiskDataHeader; break; } @@ -159,7 +159,7 @@ bool Packetizer::input(RingBuffer& bytes) { processedPackets.push_back(std::make_shared(packet)); bytes.pop(packetLength); - if(packet.network == Network::_icsneo_netid_t::icsneo_netid_disk_data && (packetLength - headerSize) % 2 == 0) { + if(packet.network == _icsneo_netid_t::icsneo_netid_disk_data && (packetLength - headerSize) % 2 == 0) { bytes.pop_front(); } } else { diff --git a/device/device.cpp b/device/device.cpp index 970a09b..4e851fd 100644 --- a/device/device.cpp +++ b/device/device.cpp @@ -389,7 +389,7 @@ bool Device::goOnline() { updateLEDState(); - std::shared_ptr filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_reset_status); + std::shared_ptr filter = std::make_shared(_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 filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_reset_status); + std::shared_ptr filter = std::make_shared(_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 filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_coremini_preload); + static std::shared_ptr filter = std::make_shared(_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(memType); - std::shared_ptr filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_device); + std::shared_ptr filter = std::make_shared(_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 filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_device); + std::shared_ptr filter = std::make_shared(_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 NeoEraseDone = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done); + static std::shared_ptr NeoEraseDone = std::make_shared(_icsneo_netid_t::icsneo_netid_neo_memory_write_done); if(!supportsEraseMemory()) { return true; @@ -798,7 +798,7 @@ Network Device::getNetworkByNumber(icsneo_msg_bus_type_t type, size_t index) con return net; } } - return Network::_icsneo_netid_t::icsneo_netid_invalid; + return _icsneo_netid_t::icsneo_netid_invalid; } std::shared_ptr Device::getHardwareInfo(std::chrono::milliseconds timeout) { @@ -1721,7 +1721,7 @@ void Device::handleInternalMessage(std::shared_ptr message) { case Message::Type::InternalMessage: { auto rawMessage = std::static_pointer_cast(message); switch(rawMessage->network.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_device: { + case _icsneo_netid_t::icsneo_netid_device: { // Device is not guaranteed to be a CANMessage, it might be a InternalMessage // if it couldn't be decoded to a CANMessage. We only care about the // CANMessage decoding right now. @@ -1730,7 +1730,7 @@ void Device::handleInternalMessage(std::shared_ptr message) { handleNeoVIMessage(std::move(canmsg)); break; } - case Network::_icsneo_netid_t::icsneo_netid_device_status: + case _icsneo_netid_t::icsneo_netid_device_status: // Device Status format is unique per device, so the devices need to decode it themselves handleDeviceStatus(rawMessage); break; @@ -1817,7 +1817,7 @@ std::optional Device::sendEthPhyMsg(const EthPhyMessage& message, HardwareEthernetPhyRegisterPacket::EncodeFromMessage(message, bytes, report); std::shared_ptr response = com->waitForMessageSync( [this, bytes](){ return com->sendCommand(Command::PHYControlRegisters, bytes); }, - std::make_shared(Network::_icsneo_netid_t::icsneo_netid_eth_phy_control), timeout); + std::make_shared(_icsneo_netid_t::icsneo_netid_eth_phy_control), timeout); if(!response) { report(APIEvent::Type::NoDeviceResponse, APIEvent::Severity::Error); @@ -1888,7 +1888,7 @@ std::optional Device::SetRootDirectoryEntryFlags(uint8_t mask, uint8_t val std::optional> Device::getRTC() { - static const std::shared_ptr filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_red_get_rtc); + static const std::shared_ptr filter = std::make_shared(_icsneo_netid_t::icsneo_netid_red_get_rtc); std::shared_ptr 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 arguments(sizeof(ExtendedDataMessage::ExtendedDataHeader)); ExtendedDataMessage::ExtendedDataHeader& parameters = *reinterpret_cast(arguments.data()); - auto filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_extended_data); + auto filter = std::make_shared(_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 Device::getVSADiskSize() { return diskSize; } -bool Device::requestTC10Wake(Network::_icsneo_netid_t network) { +bool Device::requestTC10Wake(_icsneo_netid_t network) { if(!supportsTC10()) { report(APIEvent::Type::NotSupported, APIEvent::Severity::Error); return false; } std::vector args(sizeof(network)); - *(Network::_icsneo_netid_t*)args.data() = network; + *(_icsneo_netid_t*)args.data() = network; auto msg = com->waitForMessageSync([&] { return com->sendCommand(ExtendedCommand::RequestTC10Wake, args); }, std::make_shared(Message::Type::ExtendedResponse), std::chrono::milliseconds(1000)); @@ -3285,13 +3285,13 @@ bool Device::requestTC10Wake(Network::_icsneo_netid_t network) { return resp->response == ExtendedResponse::OK; } -bool Device::requestTC10Sleep(Network::_icsneo_netid_t network) { +bool Device::requestTC10Sleep(_icsneo_netid_t network) { if(!supportsTC10()) { report(APIEvent::Type::NotSupported, APIEvent::Severity::Error); return false; } std::vector args(sizeof(network)); - *(Network::_icsneo_netid_t*)args.data() = network; + *(_icsneo_netid_t*)args.data() = network; auto msg = com->waitForMessageSync([&] { return com->sendCommand(ExtendedCommand::RequestTC10Sleep, args); }, std::make_shared(Message::Type::ExtendedResponse), std::chrono::milliseconds(1000)); @@ -3310,13 +3310,13 @@ bool Device::requestTC10Sleep(Network::_icsneo_netid_t network) { return typed->response == ExtendedResponse::OK; } -std::optional Device::getTC10Status(Network::_icsneo_netid_t network) { +std::optional Device::getTC10Status(_icsneo_netid_t network) { if(!supportsTC10()) { report(APIEvent::Type::NotSupported, APIEvent::Severity::Error); return std::nullopt; } std::vector args(sizeof(network)); - *(Network::_icsneo_netid_t*)args.data() = network; + *(_icsneo_netid_t*)args.data() = network; auto msg = com->waitForMessageSync([&] { return com->sendCommand(ExtendedCommand::GetTC10Status, args); }, std::make_shared(Message::Type::TC10Status), std::chrono::milliseconds(1000)); diff --git a/device/extensions/flexray/controller.cpp b/device/extensions/flexray/controller.cpp index f2bfb29..5324a16 100644 --- a/device/extensions/flexray/controller.cpp +++ b/device/extensions/flexray/controller.cpp @@ -1,5 +1,6 @@ #include "icsneo/device/extensions/flexray/controller.h" #include "icsneo/device/device.h" +#include "icsneo/icsneotypes.h" using namespace icsneo; @@ -610,7 +611,7 @@ uint16_t FlexRay::Controller::CalculateCycleFilter(uint8_t baseCycle, uint8_t cy } std::pair FlexRay::Controller::readRegister(ERAYRegister reg, std::chrono::milliseconds timeout) const { - static const std::shared_ptr filter = std::make_shared(icsneo::Network::_icsneo_netid_t::icsneo_netid_flexray_control); + static const std::shared_ptr filter = std::make_shared(_icsneo_netid_t::icsneo_netid_flexray_control); if(timeout.count() <= 20) return {false, 0}; // Out of time! diff --git a/disk/extextractordiskreaddriver.cpp b/disk/extextractordiskreaddriver.cpp index 3617c68..feec0fb 100644 --- a/disk/extextractordiskreaddriver.cpp +++ b/disk/extextractordiskreaddriver.cpp @@ -34,7 +34,7 @@ std::optional ExtExtractorDiskReadDriver::readLogicalDiskAligned(Commu std::optional 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 NeoMemorySDRead = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread); + static std::shared_ptr NeoMemorySDRead = std::make_shared(_icsneo_netid_t::icsneo_netid_neo_memory_sdread); uint64_t sector = pos / SectorSize; @@ -67,7 +67,7 @@ std::optional ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligne cv.notify_all(); } } - }, std::make_shared(Network::_icsneo_netid_t::icsneo_netid_disk_data))); + }, std::make_shared(_icsneo_netid_t::icsneo_netid_disk_data))); if(!com.sendCommand(ExtendedCommand::Extract, { uint8_t(sector & 0xff), diff --git a/disk/neomemorydiskdriver.cpp b/disk/neomemorydiskdriver.cpp index 8b926f9..2f62301 100644 --- a/disk/neomemorydiskdriver.cpp +++ b/disk/neomemorydiskdriver.cpp @@ -9,7 +9,7 @@ using namespace icsneo::Disk; std::optional 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((memType == MemoryType::SD ? Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread : Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread)); + const auto filter = std::make_shared((memType == MemoryType::SD ? _icsneo_netid_t::icsneo_netid_neo_memory_sdread : _icsneo_netid_t::icsneo_netid_red_int_memoryread)); filter->includeInternalInAny = true; if(pos % SectorSize != 0) @@ -61,7 +61,7 @@ std::optional NeoMemoryDiskDriver::readLogicalDiskAligned(Communicatio std::optional 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 NeoMemoryDone = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done); + static std::shared_ptr NeoMemoryDone = std::make_shared(_icsneo_netid_t::icsneo_netid_neo_memory_write_done); if(pos % SectorSize != 0) return std::nullopt; diff --git a/disk/plasiondiskreaddriver.cpp b/disk/plasiondiskreaddriver.cpp index 6fd3133..646f8d2 100644 --- a/disk/plasiondiskreaddriver.cpp +++ b/disk/plasiondiskreaddriver.cpp @@ -8,7 +8,7 @@ using namespace icsneo::Disk; std::optional 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 NeoMemorySDRead = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread); + static std::shared_ptr NeoMemorySDRead = std::make_shared(_icsneo_netid_t::icsneo_netid_neo_memory_sdread); if(amount > getBlockSizeBounds().second) return std::nullopt; diff --git a/disk/vsa/vsa.cpp b/disk/vsa/vsa.cpp index adbf41e..17e5dd6 100644 --- a/disk/vsa/vsa.cpp +++ b/disk/vsa/vsa.cpp @@ -22,7 +22,7 @@ void VSAExtendedMessage::appendPacket(std::shared_ptr packet) const { packet->data.insert(packet->data.end(), payload.begin(), payload.end()); // Set the network if not already set (Happens in AA0F records) - if(packet->network.getNetID() == Network::_icsneo_netid_t::icsneo_netid_invalid) { + if(packet->network.getNetID() == _icsneo_netid_t::icsneo_netid_invalid) { packet->network = network; } } diff --git a/examples/cpp/a2b/src/a2b.cpp b/examples/cpp/a2b/src/a2b.cpp index 639c450..3f389b1 100644 --- a/examples/cpp/a2b/src/a2b.cpp +++ b/examples/cpp/a2b/src/a2b.cpp @@ -79,7 +79,7 @@ void example0(const std::shared_ptr& rada2b) { true /* true if we want 16 bit channels in the message, false for 32 bit. This should match the RAD-A2B device setting */ ); msg->txmsg = true; - msg->network = icsneo::Network(icsneo::Network::_icsneo_netid_t::icsneo_netid_a2b2); + msg->network = icsneo::Network(_icsneo_netid_t::icsneo_netid_a2b2); // Load the WAV audio data into the desired channel, break if we fail to load if(!msg->loadAudioBuffer(wavStream, channelMap)) { @@ -192,7 +192,7 @@ void example3(const std::shared_ptr& rada2b) { std::shared_ptr a2bmsgPtr = std::make_shared(numFrames, icsneo::A2BMessage::TDMMode::TDM4, true); icsneo::A2BMessage& a2bmsg = *a2bmsgPtr.get(); - a2bmsg.network = icsneo::Network(icsneo::Network::_icsneo_netid_t::icsneo_netid_a2b2); + a2bmsg.network = icsneo::Network(_icsneo_netid_t::icsneo_netid_a2b2); a2bmsg.txmsg = true; for(size_t frame = 0; frame < a2bmsg.getNumFrames(); frame++) { @@ -245,9 +245,9 @@ void example3(const std::shared_ptr& rada2b) { */ void example4(const std::shared_ptr& rada2b) { std::shared_ptr msg = std::make_shared(); - std::shared_ptr msgFilter = std::make_shared(icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2); + std::shared_ptr msgFilter = std::make_shared(_icsneo_netid_t::icsneo_netid_i2c2); - msg->network = icsneo::Network(icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2); + msg->network = icsneo::Network(_icsneo_netid_t::icsneo_netid_i2c2); msg->controlBytes.resize(1); msg->controlBytes[0] = static_cast(0x17u); // Register address for A2B INTTYPE msg->dataBytes.resize(1, 0); @@ -261,7 +261,7 @@ void example4(const std::shared_ptr& rada2b) { if(newMsg->type == icsneo::Message::Type::BusMessage) { const auto& frame = std::dynamic_pointer_cast(newMsg); - if(frame && frame->network.getNetID() == icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2) { + if(frame && frame->network.getNetID() == _icsneo_netid_t::icsneo_netid_i2c2) { const auto& i2cMessage = std::dynamic_pointer_cast(frame); if(!i2cMessage) { diff --git a/examples/cpp/apperror/src/AppErrorExample.cpp b/examples/cpp/apperror/src/AppErrorExample.cpp index dfcbdab..d08837b 100644 --- a/examples/cpp/apperror/src/AppErrorExample.cpp +++ b/examples/cpp/apperror/src/AppErrorExample.cpp @@ -40,7 +40,7 @@ int main() { // Add your error handling here auto handler = device->addMessageCallback(std::make_shared(filter, [](std::shared_ptr message) { auto msg = std::static_pointer_cast(message); - if(icsneo::Network::_icsneo_netid_t::icsneo_netid_red_app_error == msg->network.getNetID()) { + if(_icsneo_netid_t::icsneo_netid_red_app_error == msg->network.getNetID()) { std::cout << std::endl << "App error reported:" << std::endl; std::cout << msg->getAppErrorString() << std::endl << std::endl; } @@ -58,7 +58,7 @@ int main() { // Prepare a CAN message std::cout << std::endl << "Transmitting a CAN frame... "; auto txMessage = std::make_shared(); - txMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan; + txMessage->network = _icsneo_netid_t::icsneo_netid_hscan; txMessage->arbid = 0x22; txMessage->data.insert(txMessage->data.end(), {0xaa, 0xbb, 0xcc}); // The DLC will come from the length of the data vector diff --git a/examples/cpp/interactive/src/InteractiveExample.cpp b/examples/cpp/interactive/src/InteractiveExample.cpp index 970ceb3..81ef7cc 100644 --- a/examples/cpp/interactive/src/InteractiveExample.cpp +++ b/examples/cpp/interactive/src/InteractiveExample.cpp @@ -508,7 +508,7 @@ int main() { std::cout << "Transmitting a normal CAN frame..." << std::endl; auto msg = std::make_shared(); - msg->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan; + msg->network = _icsneo_netid_t::icsneo_netid_hscan; msg->arbid = 0x120; msg->data.insert(msg->data.end(), {0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}); msg->isExtended = false; @@ -565,7 +565,7 @@ int main() { selectedDevice = selectDevice(devices); // Attempt to set baudrate and apply settings - if(selectedDevice->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 250000) && selectedDevice->settings->apply()) { + if(selectedDevice->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan, 250000) && selectedDevice->settings->apply()) { std::cout << "Successfully set HS CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl; } else { std::cout << "Failed to set HS CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl << std::endl; @@ -586,7 +586,7 @@ int main() { selectedDevice = selectDevice(devices); // Attempt to set baudrate and apply settings - if(selectedDevice->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lsftcan, 250000) && selectedDevice->settings->apply()) { + if(selectedDevice->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_lsftcan, 250000) && selectedDevice->settings->apply()) { std::cout << "Successfully set LSFT CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl; } else { std::cout << "Failed to set LSFT CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl << std::endl; @@ -790,7 +790,7 @@ int main() { selectedDevice = selectDevice(devices); std::cout << "Termination is "; - const auto val = selectedDevice->settings->isTerminationEnabledFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan); + const auto val = selectedDevice->settings->isTerminationEnabledFor(_icsneo_netid_t::icsneo_netid_hscan); if(!val.has_value()) { std::cout << "not available at this time: " << icsneo::GetLastError() << std::endl << std::endl; break; @@ -807,7 +807,7 @@ int main() { } // Attempt to set termination and apply settings - if(selectedDevice->settings->setTerminationFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, selection2 == '1') && selectedDevice->settings->apply()) { + if(selectedDevice->settings->setTerminationFor(_icsneo_netid_t::icsneo_netid_hscan, selection2 == '1') && selectedDevice->settings->apply()) { std::cout << "Successfully set HS CAN termination for " << selectedDevice->describe() << std::endl; } else { std::cout << "Failed to set HS CAN termination for " << selectedDevice->describe() << std::endl; diff --git a/examples/cpp/lin/src/LINExample.cpp b/examples/cpp/lin/src/LINExample.cpp index da8e6cc..d4c60e5 100644 --- a/examples/cpp/lin/src/LINExample.cpp +++ b/examples/cpp/lin/src/LINExample.cpp @@ -33,27 +33,27 @@ int main() { int64_t baud = 19200; std::cout << "Enable LIN commander resistor... "; - ret = device->settings->setCommanderResistorFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, true); + ret = device->settings->setCommanderResistorFor(_icsneo_netid_t::icsneo_netid_lin, true); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Disable LIN2 commander resistor... "; - ret = device->settings->setCommanderResistorFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, false); + ret = device->settings->setCommanderResistorFor(_icsneo_netid_t::icsneo_netid_lin2, false); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Setting LIN to operate at " << baud << "bit/s... "; - ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, baud); + ret = device->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_lin, baud); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Setting LIN2 to operate at " << baud << "bit/s... "; - ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, baud); + ret = device->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_lin2, baud); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Setting LIN mode to NORMAL... "; - ret = device->settings->setLINModeFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, NORMAL_MODE); + ret = device->settings->setLINModeFor(_icsneo_netid_t::icsneo_netid_lin, NORMAL_MODE); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Setting LIN2 mode to NORMAL... "; - ret = device->settings->setLINModeFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, NORMAL_MODE); + ret = device->settings->setLINModeFor(_icsneo_netid_t::icsneo_netid_lin2, NORMAL_MODE); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Applying settings... "; @@ -61,14 +61,14 @@ int main() { std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Getting LIN Baudrate... "; - int64_t readBaud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin); + int64_t readBaud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_lin); if(readBaud < 0) std::cout << "FAIL" << std::endl; else std::cout << "OK, " << (readBaud) << "bit/s" << std::endl; std::cout << "Getting LIN2 Baudrate... "; - readBaud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2); + readBaud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_lin2); if(readBaud < 0) std::cout << "FAIL" << std::endl; else @@ -115,7 +115,7 @@ int main() { // We can transmit messages std::cout << "Transmitting a LIN responder data frame... "; auto lin_r = std::make_shared(); - lin_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2; + lin_r->network = _icsneo_netid_t::icsneo_netid_lin2; lin_r->ID = 0x11; lin_r->linMsgType = icsneo::LINMessage::Type::LIN_UPDATE_RESPONDER; lin_r->data = {0xaa, 0xbb, 0xcc, 0xdd, 0x11, 0x22, 0x33, 0x44}; @@ -124,7 +124,7 @@ int main() { std::cout << "Transmitting a LIN commander header... "; auto lin_c = std::make_shared(); - lin_c->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin; + lin_c->network = _icsneo_netid_t::icsneo_netid_lin; lin_c->ID = 0x11; lin_c->linMsgType = icsneo::LINMessage::Type::LIN_HEADER_ONLY; ret = device->transmit(lin_c); @@ -134,7 +134,7 @@ int main() { std::cout << "Transmitting a LIN commander frame with responder data... "; auto lin_d = std::make_shared(); - lin_d->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin; + lin_d->network = _icsneo_netid_t::icsneo_netid_lin; lin_d->ID = 0x22; lin_d->isEnhancedChecksum = true; lin_d->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG; diff --git a/examples/cpp/mdio/src/MDIOExample.cpp b/examples/cpp/mdio/src/MDIOExample.cpp index 0d79f92..5d18cb7 100644 --- a/examples/cpp/mdio/src/MDIOExample.cpp +++ b/examples/cpp/mdio/src/MDIOExample.cpp @@ -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(); - mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1; + mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1; mdio_r->phyAddress = 0x00u; mdio_r->regAddress = 0x02u; mdio_r->direction = icsneo::MDIOMessage::Direction::Read; @@ -128,7 +128,7 @@ int main() // We can transmit messages to write to arbitrary register std::cout << "\tTransmitting a MDIO request to write register on BCM89810...\n"; mdio_r = std::make_shared(); - mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1; + mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1; mdio_r->phyAddress = 0x00u; mdio_r->regAddress = 0x1Bu; mdio_r->data = {0xAA, 0xAF}; @@ -140,7 +140,7 @@ int main() // We can transmit messages to read back to arbitrary register std::cout << "\tTransmitting a MDIO request to read register on BCM89810...\n"; mdio_r = std::make_shared(); - mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1; + mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1; mdio_r->phyAddress = 0x00u; mdio_r->regAddress = 0x1Bu; mdio_r->direction = icsneo::MDIOMessage::Direction::Read; @@ -154,7 +154,7 @@ int main() // We can transmit messages to read the PHY ID of BCM89810 PHY std::cout << "\tTransmitting a MDIO request to read ID on 88Q2112...\n"; mdio_r = std::make_shared(); - mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1; + mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1; mdio_r->phyAddress = 0x06u; mdio_r->devAddress = 0x01u; mdio_r->regAddress = 0x0002u; @@ -166,7 +166,7 @@ int main() // We can transmit messages to write to arbitrary register std::cout << "\tTransmitting a MDIO request to write register on 88Q2112...\n"; mdio_r = std::make_shared(); - mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1; + mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1; mdio_r->phyAddress = 0x06u; mdio_r->devAddress = 0x01u; mdio_r->regAddress = 0x0902u; @@ -179,7 +179,7 @@ int main() // We can transmit messages to read back to arbitrary register std::cout << "\tTransmitting a MDIO request to read register on 88Q2112...\n"; mdio_r = std::make_shared(); - mdio_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_mdio1; + mdio_r->network = _icsneo_netid_t::icsneo_netid_mdio1; mdio_r->phyAddress = 0x06u; mdio_r->devAddress = 0x01u; mdio_r->regAddress = 0x0902u; diff --git a/examples/cpp/simple/src/SimpleExample.cpp b/examples/cpp/simple/src/SimpleExample.cpp index 6b2f8cc..7fadf77 100644 --- a/examples/cpp/simple/src/SimpleExample.cpp +++ b/examples/cpp/simple/src/SimpleExample.cpp @@ -38,38 +38,38 @@ int main() { std::cout << "OK" << std::endl; std::cout << "\tGetting HSCAN Baudrate... "; - int64_t baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan); + int64_t baud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan); if(baud < 0) std::cout << "FAIL" << std::endl; else std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl; std::cout << "\tSetting HSCAN to operate at 125kbit/s... "; - ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 125000); + ret = device->settings->setBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan, 125000); std::cout << (ret ? "OK" : "FAIL") << std::endl; // Changes to the settings do not take affect until you call settings->apply()! // When you get the baudrate here, you're reading what the device is currently operating on std::cout << "\tGetting HSCAN Baudrate... (expected to be unchanged) "; - baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan); + baud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan); if(baud < 0) std::cout << "FAIL" << std::endl; else std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl; std::cout << "\tGetting HSCANFD Baudrate... "; - baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan); + baud = device->settings->getFDBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan); if(baud < 0) std::cout << "FAIL" << std::endl; else std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl; std::cout << "\tSetting HSCANFD to operate at 8Mbit/s... "; - ret = device->settings->setFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 8000000); + ret = device->settings->setFDBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan, 8000000); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "\tGetting HSCANFD Baudrate... (expected to be unchanged) "; - baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan); + baud = device->settings->getFDBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan); if(baud < 0) std::cout << "FAIL" << std::endl; else @@ -84,14 +84,14 @@ int main() { // Now that we have applied, we expect that our operating baudrates have changed std::cout << "\tGetting HSCAN Baudrate... "; - baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan); + baud = device->settings->getBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan); if(baud < 0) std::cout << "FAIL" << std::endl; else std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl; std::cout << "\tGetting HSCANFD Baudrate... "; - baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan); + baud = device->settings->getFDBaudrateFor(_icsneo_netid_t::icsneo_netid_hscan); if(baud < 0) std::cout << "FAIL" << std::endl; else @@ -155,7 +155,7 @@ int main() { // We can transmit messages std::cout << "\n\tTransmitting an extended CAN FD frame... "; auto txMessage5 = std::make_shared(); - txMessage5->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan; + txMessage5->network = _icsneo_netid_t::icsneo_netid_hscan; txMessage5->arbid = 0x1C5001C5; txMessage5->data.insert(txMessage5->data.end(), {0xaa, 0xbb, 0xcc}); // The DLC will come from the length of the data vector @@ -290,7 +290,7 @@ int main() { // We can transmit messages std::cout << "\tTransmitting an extended CAN FD frame... "; auto txMessage = std::make_shared(); - txMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan; + txMessage->network = _icsneo_netid_t::icsneo_netid_hscan; txMessage->arbid = 0x1C5001C5; txMessage->data.insert(txMessage->data.end(), {0xaa, 0xbb, 0xcc}); // The DLC will come from the length of the data vector @@ -301,7 +301,7 @@ int main() { std::cout << "\tTransmitting an ethernet frame on OP (BR) Ethernet 2... "; auto ethTxMessage = std::make_shared(); - ethTxMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_op_ethernet2; + ethTxMessage->network = _icsneo_netid_t::icsneo_netid_op_ethernet2; ethTxMessage->data.insert(ethTxMessage->data.end(), { 0x00, 0xFC, 0x70, 0x00, 0x01, 0x02, /* Destination MAC */ 0x00, 0xFC, 0x70, 0x00, 0x01, 0x01, /* Source MAC */ diff --git a/examples/cpp/vsa/src/VSAExample.cpp b/examples/cpp/vsa/src/VSAExample.cpp index 9006899..66f70b2 100644 --- a/examples/cpp/vsa/src/VSAExample.cpp +++ b/examples/cpp/vsa/src/VSAExample.cpp @@ -36,7 +36,7 @@ std::vector> constructRandomFrames(size_t fr // Short Ethernet { auto frame = std::make_shared(); - frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_ethernet; + frame->network = _icsneo_netid_t::icsneo_netid_ethernet; frames.push_back(frame); frame->data.resize(ShortEthSize); std::generate(frame->data.begin(), frame->data.end(), randByteGen); @@ -46,7 +46,7 @@ std::vector> constructRandomFrames(size_t fr // Long Ethernet { auto frame = std::make_shared(); - frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_ethernet; + frame->network = _icsneo_netid_t::icsneo_netid_ethernet; frames.push_back(frame); frame->data.resize(LongEthSize); std::generate(frame->data.begin(), frame->data.end(), randByteGen); @@ -56,7 +56,7 @@ std::vector> constructRandomFrames(size_t fr // Classic CAN { auto frame = std::make_shared(); - frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan2; + frame->network = _icsneo_netid_t::icsneo_netid_hscan2; frames.push_back(frame); frame->data.resize(ClassicCANSize); @@ -67,7 +67,7 @@ std::vector> constructRandomFrames(size_t fr // CAN FD { auto frame = std::make_shared(); - frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan3; + frame->network = _icsneo_netid_t::icsneo_netid_hscan3; frames.push_back(frame); frame->data.resize(CANFDSize); std::generate(frame->data.begin(), frame->data.end(), randByteGen); diff --git a/include/icsneo/communication/message/apperrormessage.h b/include/icsneo/communication/message/apperrormessage.h index 78f686a..5668451 100644 --- a/include/icsneo/communication/message/apperrormessage.h +++ b/include/icsneo/communication/message/apperrormessage.h @@ -66,9 +66,9 @@ enum class AppErrorType : uint16_t { class AppErrorMessage : public InternalMessage { public: - AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::_icsneo_netid_t::icsneo_netid_red_app_error) {} + AppErrorMessage() : InternalMessage(Message::Type::AppError, _icsneo_netid_t::icsneo_netid_red_app_error) {} uint16_t errorType; - Network::_icsneo_netid_t errorNetID; + _icsneo_netid_t errorNetID; uint32_t timestamp10us; uint32_t timestamp10usMSB; diff --git a/include/icsneo/communication/message/diskdatamessage.h b/include/icsneo/communication/message/diskdatamessage.h index 66abbc6..83ad6b7 100644 --- a/include/icsneo/communication/message/diskdatamessage.h +++ b/include/icsneo/communication/message/diskdatamessage.h @@ -9,7 +9,7 @@ namespace icsneo { class DiskDataMessage : public InternalMessage { public: - DiskDataMessage(std::vector&& d) : InternalMessage(Network::_icsneo_netid_t::icsneo_netid_disk_data) { + DiskDataMessage(std::vector&& d) : InternalMessage(_icsneo_netid_t::icsneo_netid_disk_data) { data = std::move(d); } }; diff --git a/include/icsneo/communication/message/filter/messagefilter.h b/include/icsneo/communication/message/filter/messagefilter.h index 9f8d11c..05ac75a 100644 --- a/include/icsneo/communication/message/filter/messagefilter.h +++ b/include/icsneo/communication/message/filter/messagefilter.h @@ -13,8 +13,8 @@ class MessageFilter { public: MessageFilter() {} MessageFilter(Message::Type type) : includeInternalInAny(neomessagetype_t(type) & 0x8000), messageType(type) {} - MessageFilter(Network::_icsneo_netid_t netid) : MessageFilter(Network::GetTypeOfNetID(netid, false), netid) {} // Messages on the communication layer are never encoded as VNET ID + common ID, so skip the expansion step - MessageFilter(icsneo_msg_bus_type_t type, Network::_icsneo_netid_t net = Network::_icsneo_netid_t::icsneo_netid_any) : networkType(type), netid(net) { + MessageFilter(_icsneo_netid_t netid) : MessageFilter(Network::GetTypeOfNetID(netid, false), netid) {} // Messages on the communication layer are never encoded as VNET ID + common ID, so skip the expansion step + MessageFilter(icsneo_msg_bus_type_t type, _icsneo_netid_t net = _icsneo_netid_t::icsneo_netid_any) : networkType(type), netid(net) { // If a icsneo_msg_bus_type_internal is used, we want to also get internal Message::Types // The NetID we want may be in there includeInternalInAny = (networkType == icsneo_msg_bus_type_internal); @@ -34,7 +34,7 @@ public: return false; if(!matchNetID(frame->network.getNetID())) return false; - } else if (netid != Network::_icsneo_netid_t::icsneo_netid_any || networkType != icsneo_msg_bus_type_any) { + } else if (netid != _icsneo_netid_t::icsneo_netid_any || networkType != icsneo_msg_bus_type_any) { return false; // Filtering on a NetID or Type, but this message doesn't have one } return true; @@ -55,9 +55,9 @@ protected: return networkType == mtype; } - Network::_icsneo_netid_t netid = Network::_icsneo_netid_t::icsneo_netid_any; - bool matchNetID(Network::_icsneo_netid_t mnetid) const { - if(netid == Network::_icsneo_netid_t::icsneo_netid_any) + _icsneo_netid_t netid = _icsneo_netid_t::icsneo_netid_any; + bool matchNetID(_icsneo_netid_t mnetid) const { + if(netid == _icsneo_netid_t::icsneo_netid_any) return true; return netid == mnetid; } diff --git a/include/icsneo/communication/message/flashmemorymessage.h b/include/icsneo/communication/message/flashmemorymessage.h index fae4a40..32d9eda 100644 --- a/include/icsneo/communication/message/flashmemorymessage.h +++ b/include/icsneo/communication/message/flashmemorymessage.h @@ -9,7 +9,7 @@ namespace icsneo { class FlashMemoryMessage : public InternalMessage { public: - FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread) {} + FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, _icsneo_netid_t::icsneo_netid_red_int_memoryread) {} uint16_t startAddress = 0; }; diff --git a/include/icsneo/communication/message/livedatamessage.h b/include/icsneo/communication/message/livedatamessage.h index c4f57d9..a097e5e 100644 --- a/include/icsneo/communication/message/livedatamessage.h +++ b/include/icsneo/communication/message/livedatamessage.h @@ -10,7 +10,7 @@ namespace icsneo { class LiveDataMessage : public InternalMessage { public: - LiveDataMessage() : InternalMessage(Message::Type::LiveData, Network::_icsneo_netid_t::icsneo_netid_extended_command) {} + LiveDataMessage() : InternalMessage(Message::Type::LiveData, _icsneo_netid_t::icsneo_netid_extended_command) {} LiveDataHandle handle; LiveDataCommand cmd; }; diff --git a/include/icsneo/communication/message/main51message.h b/include/icsneo/communication/message/main51message.h index bc2f30d..8430305 100644 --- a/include/icsneo/communication/message/main51message.h +++ b/include/icsneo/communication/message/main51message.h @@ -10,7 +10,7 @@ namespace icsneo { class Main51Message : public InternalMessage { public: - Main51Message() : InternalMessage(Message::Type::Main51, Network::_icsneo_netid_t::icsneo_netid_main51) {} + Main51Message() : InternalMessage(Message::Type::Main51, _icsneo_netid_t::icsneo_netid_main51) {} Command command = Command(0); bool forceShortFormat = false; // Necessary for EnableNetworkCom and EnableNetworkComEx }; diff --git a/include/icsneo/communication/message/neoreadmemorysdmessage.h b/include/icsneo/communication/message/neoreadmemorysdmessage.h index e28ff23..00a1ada 100644 --- a/include/icsneo/communication/message/neoreadmemorysdmessage.h +++ b/include/icsneo/communication/message/neoreadmemorysdmessage.h @@ -9,7 +9,7 @@ namespace icsneo { class NeoReadMemorySDMessage : public InternalMessage { public: - NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread) {} + NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, _icsneo_netid_t::icsneo_netid_neo_memory_sdread) {} uint32_t startAddress = 0; }; diff --git a/include/icsneo/communication/message/readsettingsmessage.h b/include/icsneo/communication/message/readsettingsmessage.h index f0b04aa..c11ab6b 100644 --- a/include/icsneo/communication/message/readsettingsmessage.h +++ b/include/icsneo/communication/message/readsettingsmessage.h @@ -10,7 +10,7 @@ namespace icsneo { class ReadSettingsMessage : public InternalMessage { public: - ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, Network::_icsneo_netid_t::icsneo_netid_read_settings) {} + ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, _icsneo_netid_t::icsneo_netid_read_settings) {} enum class Response : uint8_t { OK = 0, diff --git a/include/icsneo/communication/network.h b/include/icsneo/communication/network.h index dc41982..ff489b4 100644 --- a/include/icsneo/communication/network.h +++ b/include/icsneo/communication/network.h @@ -4,8 +4,6 @@ #include #include -typedef uint16_t icsneo_netid_t; - #ifdef __cplusplus #include @@ -23,170 +21,6 @@ class Network { static constexpr uint16_t OFFSET_PLASMA_SLAVE3_RANGE2 = 12800; public: - enum class _icsneo_netid_t : icsneo_netid_t { - icsneo_netid_device = 0, - icsneo_netid_hscan = 1, - icsneo_netid_mscan = 2, - icsneo_netid_swcan = 3, - icsneo_netid_lsftcan = 4, - icsneo_netid_fordscp = 5, - icsneo_netid_j1708 = 6, - icsneo_netid_aux = 7, - icsneo_netid_j1850vpw = 8, - icsneo_netid_iso9141 = 9, - icsneo_netid_disk_data = 10, - icsneo_netid_main51 = 11, - icsneo_netid_red = 12, - icsneo_netid_sci = 13, - icsneo_netid_iso9141_2 = 14, - icsneo_netid_iso14230 = 15, - icsneo_netid_lin = 16, - icsneo_netid_op_ethernet1 = 17, - icsneo_netid_op_ethernet2 = 18, - icsneo_netid_op_ethernet3 = 19, - - // START Device Command Returns - // When we send a command, the device returns on one of these, depending on command - icsneo_netid_red_ext_memoryread = 20, - icsneo_netid_red_int_memoryread = 21, - icsneo_netid_red_dflash_read = 22, - icsneo_netid_neo_memory_sdread = 23, // Response from NeoMemory (MemoryTypeSD) - icsneo_netid_can_errbits = 24, - icsneo_netid_neo_memory_write_done = 25, - icsneo_netid_red_wave_can1_logical = 26, - icsneo_netid_red_wave_can2_logical = 27, - icsneo_netid_red_wave_lin1_logical = 28, - icsneo_netid_red_wave_lin2_logical = 29, - icsneo_netid_red_wave_lin1_analog = 30, - icsneo_netid_red_wave_lin2_analog = 31, - icsneo_netid_red_wave_misc_analog = 32, - icsneo_netid_red_wave_miscdio2_logical = 33, - icsneo_netid_red_network_com_enable_ex = 34, - icsneo_netid_red_neovi_network = 35, - icsneo_netid_red_read_baud_settings = 36, - icsneo_netid_red_oldformat = 37, - icsneo_netid_red_scope_capture = 38, - icsneo_netid_red_hardware_excep = 39, - icsneo_netid_red_get_rtc = 40, - // END Device Command Returns - - icsneo_netid_iso9141_3 = 41, - icsneo_netid_hscan2 = 42, - icsneo_netid_hscan3 = 44, - icsneo_netid_op_ethernet4 = 45, - icsneo_netid_op_ethernet5 = 46, - icsneo_netid_iso9141_4 = 47, - icsneo_netid_lin2 = 48, - icsneo_netid_lin3 = 49, - icsneo_netid_lin4 = 50, - // MOST = 51, Old and unused - icsneo_netid_red_app_error = 52, - icsneo_netid_cgi = 53, - icsneo_netid_reset_status = 54, - icsneo_netid_fb_status = 55, - icsneo_netid_app_signal_status = 56, - icsneo_netid_read_datalink_cm_tx_msg = 57, - icsneo_netid_read_datalink_cm_rx_msg = 58, - icsneo_netid_logging_overflow = 59, - icsneo_netid_read_settings = 60, - icsneo_netid_hscan4 = 61, - icsneo_netid_hscan5 = 62, - icsneo_netid_rs232 = 63, - icsneo_netid_uart = 64, - icsneo_netid_uart2 = 65, - icsneo_netid_uart3 = 66, - icsneo_netid_uart4 = 67, - icsneo_netid_swcan2 = 68, - icsneo_netid_ethernet_daq = 69, - icsneo_netid_data_to_host = 70, - icsneo_netid_textapi_to_host = 71, - icsneo_netid_spi1 = 72, - icsneo_netid_op_ethernet6 = 73, - icsneo_netid_red_vbat = 74, - icsneo_netid_op_ethernet7 = 75, - icsneo_netid_op_ethernet8 = 76, - icsneo_netid_op_ethernet9 = 77, - icsneo_netid_op_ethernet10 = 78, - icsneo_netid_op_ethernet11 = 79, - icsneo_netid_flexray1a = 80, - icsneo_netid_flexray1b = 81, - icsneo_netid_flexray2a = 82, - icsneo_netid_flexray2b = 83, - icsneo_netid_lin5 = 84, - icsneo_netid_flexray = 85, - icsneo_netid_flexray2 = 86, - icsneo_netid_op_ethernet12 = 87, - icsneo_netid_i2c = 88, - icsneo_netid_most25 = 90, - icsneo_netid_most50 = 91, - icsneo_netid_most150 = 92, - icsneo_netid_ethernet = 93, - icsneo_netid_gmfsa = 94, - icsneo_netid_tcp = 95, - icsneo_netid_hscan6 = 96, - icsneo_netid_hscan7 = 97, - icsneo_netid_lin6 = 98, - icsneo_netid_lsftcan2 = 99, - icsneo_netid_logical_disk_info = 187, - icsneo_netid_wivi_command = 221, - icsneo_netid_script_status = 224, - icsneo_netid_eth_phy_control = 239, - icsneo_netid_extended_command = 240, - icsneo_netid_extended_data = 242, - icsneo_netid_flexray_control = 243, - icsneo_netid_coremini_preload = 244, - icsneo_netid_hw_com_latency_test = 512, - icsneo_netid_device_status = 513, - icsneo_netid_udp = 514, - icsneo_netid_forwarded_message = 516, - icsneo_netid_i2c2 = 517, - icsneo_netid_i2c3 = 518, - icsneo_netid_i2c4 = 519, - icsneo_netid_ethernet2 = 520, - icsneo_netid_a2b1 = 522, - icsneo_netid_a2b2 = 523, - icsneo_netid_ethernet3 = 524, - icsneo_netid_wbms = 532, - icsneo_netid_dwcan9 = 534, - icsneo_netid_dwcan10 = 535, - icsneo_netid_dwcan11 = 536, - icsneo_netid_dwcan12 = 537, - icsneo_netid_dwcan13 = 538, - icsneo_netid_dwcan14 = 539, - icsneo_netid_dwcan15 = 540, - icsneo_netid_dwcan16 = 541, - icsneo_netid_lin7 = 542, - icsneo_netid_lin8 = 543, - icsneo_netid_spi2 = 544, - icsneo_netid_mdio1 = 545, - icsneo_netid_mdio2 = 546, - icsneo_netid_mdio3 = 547, - icsneo_netid_mdio4 = 548, - icsneo_netid_mdio5 = 549, - icsneo_netid_mdio6 = 550, - icsneo_netid_mdio7 = 551, - icsneo_netid_mdio8 = 552, - icsneo_netid_op_ethernet13 = 553, - icsneo_netid_op_ethernet14 = 554, - icsneo_netid_op_ethernet15 = 555, - icsneo_netid_op_ethernet16 = 556, - icsneo_netid_spi3 = 557, - icsneo_netid_spi4 = 558, - icsneo_netid_spi5 = 559, - icsneo_netid_spi6 = 560, - icsneo_netid_spi7 = 561, - icsneo_netid_spi8 = 562, - icsneo_netid_lin9 = 563, - icsneo_netid_lin10 = 564, - icsneo_netid_lin11 = 565, - icsneo_netid_lin12 = 566, - icsneo_netid_lin13 = 567, - icsneo_netid_lin14 = 568, - icsneo_netid_lin15 = 569, - icsneo_netid_lin16 = 570, - icsneo_netid_any = 0xfffe, // Never actually set as type, but used as flag for filtering - icsneo_netid_invalid = 0xffff - }; enum class CoreMini : uint8_t { HSCAN = 0, MSCAN = 1, diff --git a/include/icsneo/device/device.h b/include/icsneo/device/device.h index b81ad25..7934fa5 100644 --- a/include/icsneo/device/device.h +++ b/include/icsneo/device/device.h @@ -728,11 +728,11 @@ public: virtual bool supportsTC10() const { return false; } - bool requestTC10Wake(Network::_icsneo_netid_t network); + bool requestTC10Wake(_icsneo_netid_t network); - bool requestTC10Sleep(Network::_icsneo_netid_t network); + bool requestTC10Sleep(_icsneo_netid_t network); - std::optional getTC10Status(Network::_icsneo_netid_t network); + std::optional getTC10Status(_icsneo_netid_t network); protected: bool online = false; diff --git a/include/icsneo/device/tree/etherbadge/etherbadge.h b/include/icsneo/device/tree/etherbadge/etherbadge.h index de22c76..a2c3843 100644 --- a/include/icsneo/device/tree/etherbadge/etherbadge.h +++ b/include/icsneo/device/tree/etherbadge/etherbadge.h @@ -19,9 +19,9 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1 + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_op_ethernet1 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/etherbadge/etherbadgesettings.h b/include/icsneo/device/tree/etherbadge/etherbadgesettings.h index adf8fe5..be8be3b 100644 --- a/include/icsneo/device/tree/etherbadge/etherbadgesettings.h +++ b/include/icsneo/device/tree/etherbadge/etherbadgesettings.h @@ -71,7 +71,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); default: return nullptr; @@ -82,7 +82,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); default: return nullptr; @@ -93,7 +93,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h b/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h index 6b02545..034bc22 100644 --- a/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h +++ b/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h @@ -16,8 +16,8 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2 + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h b/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h index 7886b57..86c8192 100644 --- a/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h +++ b/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h @@ -16,8 +16,8 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2 + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/neoviconnect/neoviconnect.h b/include/icsneo/device/tree/neoviconnect/neoviconnect.h index 2becb22..68e354b 100644 --- a/include/icsneo/device/tree/neoviconnect/neoviconnect.h +++ b/include/icsneo/device/tree/neoviconnect/neoviconnect.h @@ -17,19 +17,19 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_lin2 + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin2 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h b/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h index f37c1fb..54ffa58 100644 --- a/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h +++ b/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h @@ -94,21 +94,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can5); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->can6); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->can7); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can8); default: return nullptr; @@ -119,21 +119,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd4); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd5); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->canfd6); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->canfd7); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd8); default: return nullptr; @@ -144,9 +144,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::icsneo_netid_lin2: + case _icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); default: return nullptr; diff --git a/include/icsneo/device/tree/neovifire/neovifire.h b/include/icsneo/device/tree/neovifire/neovifire.h index 5c3b7c7..a48f0bc 100644 --- a/include/icsneo/device/tree/neovifire/neovifire.h +++ b/include/icsneo/device/tree/neovifire/neovifire.h @@ -16,19 +16,19 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_lsftcan, + _icsneo_netid_t::icsneo_netid_lsftcan, - Network::_icsneo_netid_t::icsneo_netid_swcan, + _icsneo_netid_t::icsneo_netid_swcan, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_lin2, - Network::_icsneo_netid_t::icsneo_netid_lin3, - Network::_icsneo_netid_t::icsneo_netid_lin4 + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin2, + _icsneo_netid_t::icsneo_netid_lin3, + _icsneo_netid_t::icsneo_netid_lin4 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/neovifire/neovifiresettings.h b/include/icsneo/device/tree/neovifire/neovifiresettings.h index de7ce5f..3c84c7c 100644 --- a/include/icsneo/device/tree/neovifire/neovifiresettings.h +++ b/include/icsneo/device/tree/neovifire/neovifiresettings.h @@ -105,15 +105,15 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_lsftcan: + case _icsneo_netid_t::icsneo_netid_lsftcan: return &(cfg->lsftcan); default: return nullptr; @@ -125,7 +125,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_swcan: + case _icsneo_netid_t::icsneo_netid_swcan: return &(cfg->swcan); default: return nullptr; @@ -136,13 +136,13 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::icsneo_netid_lin2: + case _icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::icsneo_netid_lin3: + case _icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::icsneo_netid_lin4: + case _icsneo_netid_t::icsneo_netid_lin4: return &(cfg->lin4); default: return nullptr; diff --git a/include/icsneo/device/tree/neovifire2/neovifire2.h b/include/icsneo/device/tree/neovifire2/neovifire2.h index c458445..80df543 100644 --- a/include/icsneo/device/tree/neovifire2/neovifire2.h +++ b/include/icsneo/device/tree/neovifire2/neovifire2.h @@ -23,32 +23,32 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_lsftcan, - Network::_icsneo_netid_t::icsneo_netid_lsftcan2, + _icsneo_netid_t::icsneo_netid_lsftcan, + _icsneo_netid_t::icsneo_netid_lsftcan2, - Network::_icsneo_netid_t::icsneo_netid_swcan, - Network::_icsneo_netid_t::icsneo_netid_swcan2, + _icsneo_netid_t::icsneo_netid_swcan, + _icsneo_netid_t::icsneo_netid_swcan2, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_lin2, - Network::_icsneo_netid_t::icsneo_netid_lin3, - Network::_icsneo_netid_t::icsneo_netid_lin4, + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin2, + _icsneo_netid_t::icsneo_netid_lin3, + _icsneo_netid_t::icsneo_netid_lin4, - Network::_icsneo_netid_t::icsneo_netid_iso9141, - Network::_icsneo_netid_t::icsneo_netid_iso9141_2, - Network::_icsneo_netid_t::icsneo_netid_iso9141_3, - Network::_icsneo_netid_t::icsneo_netid_iso9141_4 + _icsneo_netid_t::icsneo_netid_iso9141, + _icsneo_netid_t::icsneo_netid_iso9141_2, + _icsneo_netid_t::icsneo_netid_iso9141_3, + _icsneo_netid_t::icsneo_netid_iso9141_4 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/neovifire2/neovifire2settings.h b/include/icsneo/device/tree/neovifire2/neovifire2settings.h index f852a00..dc899e0 100644 --- a/include/icsneo/device/tree/neovifire2/neovifire2settings.h +++ b/include/icsneo/device/tree/neovifire2/neovifire2settings.h @@ -128,25 +128,25 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->can7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->can8); - case Network::_icsneo_netid_t::icsneo_netid_lsftcan: + case _icsneo_netid_t::icsneo_netid_lsftcan: return &(cfg->lsftcan1); - case Network::_icsneo_netid_t::icsneo_netid_lsftcan2: + case _icsneo_netid_t::icsneo_netid_lsftcan2: return &(cfg->lsftcan2); default: return nullptr; @@ -157,21 +157,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->canfd7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->canfd8); default: return nullptr; @@ -183,9 +183,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_swcan: + case _icsneo_netid_t::icsneo_netid_swcan: return &(cfg->swcan1); - case Network::_icsneo_netid_t::icsneo_netid_swcan2: + case _icsneo_netid_t::icsneo_netid_swcan2: return &(cfg->swcan2); default: return nullptr; @@ -195,16 +195,16 @@ public: virtual std::vector getTerminationGroups() const override { return { { - Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan7) + Network(_icsneo_netid_t::icsneo_netid_hscan), + Network(_icsneo_netid_t::icsneo_netid_hscan3), + Network(_icsneo_netid_t::icsneo_netid_hscan5), + Network(_icsneo_netid_t::icsneo_netid_hscan7) }, { - Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan6) + Network(_icsneo_netid_t::icsneo_netid_mscan), + Network(_icsneo_netid_t::icsneo_netid_hscan2), + Network(_icsneo_netid_t::icsneo_netid_hscan4), + Network(_icsneo_netid_t::icsneo_netid_hscan6) } }; } @@ -214,17 +214,17 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::icsneo_netid_lin2: + case _icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::icsneo_netid_lin3: + case _icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::icsneo_netid_lin4: + case _icsneo_netid_t::icsneo_netid_lin4: return &(cfg->lin4); - case Network::_icsneo_netid_t::icsneo_netid_lin5: + case _icsneo_netid_t::icsneo_netid_lin5: return &(cfg->lin5); - case Network::_icsneo_netid_t::icsneo_netid_lin6: + case _icsneo_netid_t::icsneo_netid_lin6: return &(cfg->lin6); default: return nullptr; diff --git a/include/icsneo/device/tree/neovifire3/neovifire3.h b/include/icsneo/device/tree/neovifire3/neovifire3.h index 9ff76c8..dda1941 100644 --- a/include/icsneo/device/tree/neovifire3/neovifire3.h +++ b/include/icsneo/device/tree/neovifire3/neovifire3.h @@ -17,35 +17,35 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_dwcan9, - Network::_icsneo_netid_t::icsneo_netid_dwcan10, - Network::_icsneo_netid_t::icsneo_netid_dwcan11, - Network::_icsneo_netid_t::icsneo_netid_dwcan12, - Network::_icsneo_netid_t::icsneo_netid_dwcan13, - Network::_icsneo_netid_t::icsneo_netid_dwcan14, - Network::_icsneo_netid_t::icsneo_netid_dwcan15, - Network::_icsneo_netid_t::icsneo_netid_dwcan16, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_dwcan9, + _icsneo_netid_t::icsneo_netid_dwcan10, + _icsneo_netid_t::icsneo_netid_dwcan11, + _icsneo_netid_t::icsneo_netid_dwcan12, + _icsneo_netid_t::icsneo_netid_dwcan13, + _icsneo_netid_t::icsneo_netid_dwcan14, + _icsneo_netid_t::icsneo_netid_dwcan15, + _icsneo_netid_t::icsneo_netid_dwcan16, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_ethernet3, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet3, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_lin2, - Network::_icsneo_netid_t::icsneo_netid_lin3, - Network::_icsneo_netid_t::icsneo_netid_lin4, - Network::_icsneo_netid_t::icsneo_netid_lin5, - Network::_icsneo_netid_t::icsneo_netid_lin6, - Network::_icsneo_netid_t::icsneo_netid_lin7, - Network::_icsneo_netid_t::icsneo_netid_lin8, + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin2, + _icsneo_netid_t::icsneo_netid_lin3, + _icsneo_netid_t::icsneo_netid_lin4, + _icsneo_netid_t::icsneo_netid_lin5, + _icsneo_netid_t::icsneo_netid_lin6, + _icsneo_netid_t::icsneo_netid_lin7, + _icsneo_netid_t::icsneo_netid_lin8, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/neovifire3/neovifire3settings.h b/include/icsneo/device/tree/neovifire3/neovifire3settings.h index 89fee1b..5930922 100644 --- a/include/icsneo/device/tree/neovifire3/neovifire3settings.h +++ b/include/icsneo/device/tree/neovifire3/neovifire3settings.h @@ -166,21 +166,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->can7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->can8); default: return nullptr; @@ -191,21 +191,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->canfd7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->canfd8); default: return nullptr; @@ -215,16 +215,16 @@ public: virtual std::vector getTerminationGroups() const override { return { { - Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan7) + Network(_icsneo_netid_t::icsneo_netid_hscan), + Network(_icsneo_netid_t::icsneo_netid_hscan3), + Network(_icsneo_netid_t::icsneo_netid_hscan5), + Network(_icsneo_netid_t::icsneo_netid_hscan7) }, { - Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan6) + Network(_icsneo_netid_t::icsneo_netid_mscan), + Network(_icsneo_netid_t::icsneo_netid_hscan2), + Network(_icsneo_netid_t::icsneo_netid_hscan4), + Network(_icsneo_netid_t::icsneo_netid_hscan6) } }; } @@ -234,21 +234,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::icsneo_netid_lin2: + case _icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::icsneo_netid_lin3: + case _icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::icsneo_netid_lin4: + case _icsneo_netid_t::icsneo_netid_lin4: return &(cfg->lin4); - case Network::_icsneo_netid_t::icsneo_netid_lin5: + case _icsneo_netid_t::icsneo_netid_lin5: return &(cfg->lin5); - case Network::_icsneo_netid_t::icsneo_netid_lin6: + case _icsneo_netid_t::icsneo_netid_lin6: return &(cfg->lin6); - case Network::_icsneo_netid_t::icsneo_netid_lin7: + case _icsneo_netid_t::icsneo_netid_lin7: return &(cfg->lin7); - case Network::_icsneo_netid_t::icsneo_netid_lin8: + case _icsneo_netid_t::icsneo_netid_lin8: return &(cfg->lin8); default: return nullptr; diff --git a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h index bdb70b0..83c4140 100644 --- a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h +++ b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h @@ -17,37 +17,37 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_dwcan9, - Network::_icsneo_netid_t::icsneo_netid_dwcan10, - Network::_icsneo_netid_t::icsneo_netid_dwcan11, - Network::_icsneo_netid_t::icsneo_netid_dwcan12, - Network::_icsneo_netid_t::icsneo_netid_dwcan13, - Network::_icsneo_netid_t::icsneo_netid_dwcan14, - Network::_icsneo_netid_t::icsneo_netid_dwcan15, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_dwcan9, + _icsneo_netid_t::icsneo_netid_dwcan10, + _icsneo_netid_t::icsneo_netid_dwcan11, + _icsneo_netid_t::icsneo_netid_dwcan12, + _icsneo_netid_t::icsneo_netid_dwcan13, + _icsneo_netid_t::icsneo_netid_dwcan14, + _icsneo_netid_t::icsneo_netid_dwcan15, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_ethernet3, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet3, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_lin2, - Network::_icsneo_netid_t::icsneo_netid_lin3, - Network::_icsneo_netid_t::icsneo_netid_lin4, + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin2, + _icsneo_netid_t::icsneo_netid_lin3, + _icsneo_netid_t::icsneo_netid_lin4, - Network::_icsneo_netid_t::icsneo_netid_flexray, - Network::_icsneo_netid_t::icsneo_netid_flexray1a, - Network::_icsneo_netid_t::icsneo_netid_flexray1b, - Network::_icsneo_netid_t::icsneo_netid_flexray2, - Network::_icsneo_netid_t::icsneo_netid_flexray2a, - Network::_icsneo_netid_t::icsneo_netid_flexray2b, + _icsneo_netid_t::icsneo_netid_flexray, + _icsneo_netid_t::icsneo_netid_flexray1a, + _icsneo_netid_t::icsneo_netid_flexray1b, + _icsneo_netid_t::icsneo_netid_flexray2, + _icsneo_netid_t::icsneo_netid_flexray2a, + _icsneo_netid_t::icsneo_netid_flexray2b, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h index 3f19fe9..fe2f155 100644 --- a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h +++ b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h @@ -149,21 +149,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->can7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->can8); default: return nullptr; @@ -174,21 +174,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->canfd7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->canfd8); default: return nullptr; @@ -198,16 +198,16 @@ public: virtual std::vector getTerminationGroups() const override { return { { - Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan7) + Network(_icsneo_netid_t::icsneo_netid_hscan), + Network(_icsneo_netid_t::icsneo_netid_hscan3), + Network(_icsneo_netid_t::icsneo_netid_hscan5), + Network(_icsneo_netid_t::icsneo_netid_hscan7) }, { - Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan6) + Network(_icsneo_netid_t::icsneo_netid_mscan), + Network(_icsneo_netid_t::icsneo_netid_hscan2), + Network(_icsneo_netid_t::icsneo_netid_hscan4), + Network(_icsneo_netid_t::icsneo_netid_hscan6) } }; } @@ -217,13 +217,13 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::icsneo_netid_lin2: + case _icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::icsneo_netid_lin3: + case _icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::icsneo_netid_lin4: + case _icsneo_netid_t::icsneo_netid_lin4: return &(cfg->lin4); default: return nullptr; diff --git a/include/icsneo/device/tree/neovired2/neovired2.h b/include/icsneo/device/tree/neovired2/neovired2.h index bac25cb..4ccc43e 100644 --- a/include/icsneo/device/tree/neovired2/neovired2.h +++ b/include/icsneo/device/tree/neovired2/neovired2.h @@ -17,20 +17,20 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_lin2 + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin2 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/neovired2/neovired2settings.h b/include/icsneo/device/tree/neovired2/neovired2settings.h index 84329a5..31cbf7b 100644 --- a/include/icsneo/device/tree/neovired2/neovired2settings.h +++ b/include/icsneo/device/tree/neovired2/neovired2settings.h @@ -107,21 +107,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can5); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->can6); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->can7); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can8); default: return nullptr; @@ -132,21 +132,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd4); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd5); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->canfd6); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->canfd7); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd8); default: return nullptr; @@ -156,16 +156,16 @@ public: virtual std::vector getTerminationGroups() const override { return { { - Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan7) + Network(_icsneo_netid_t::icsneo_netid_hscan), + Network(_icsneo_netid_t::icsneo_netid_hscan3), + Network(_icsneo_netid_t::icsneo_netid_hscan5), + Network(_icsneo_netid_t::icsneo_netid_hscan7) }, { - Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan6) + Network(_icsneo_netid_t::icsneo_netid_mscan), + Network(_icsneo_netid_t::icsneo_netid_hscan2), + Network(_icsneo_netid_t::icsneo_netid_hscan4), + Network(_icsneo_netid_t::icsneo_netid_hscan6) } }; } @@ -175,9 +175,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::icsneo_netid_lin2: + case _icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); default: return nullptr; diff --git a/include/icsneo/device/tree/plasion/plasion.h b/include/icsneo/device/tree/plasion/plasion.h index 6b05360..1939f7e 100644 --- a/include/icsneo/device/tree/plasion/plasion.h +++ b/include/icsneo/device/tree/plasion/plasion.h @@ -13,29 +13,29 @@ class Plasion : public Device { public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_lsftcan, - Network::_icsneo_netid_t::icsneo_netid_lsftcan2, + _icsneo_netid_t::icsneo_netid_lsftcan, + _icsneo_netid_t::icsneo_netid_lsftcan2, - Network::_icsneo_netid_t::icsneo_netid_swcan, - Network::_icsneo_netid_t::icsneo_netid_swcan2, + _icsneo_netid_t::icsneo_netid_swcan, + _icsneo_netid_t::icsneo_netid_swcan2, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_lin2, - Network::_icsneo_netid_t::icsneo_netid_lin3, - Network::_icsneo_netid_t::icsneo_netid_lin4, + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin2, + _icsneo_netid_t::icsneo_netid_lin3, + _icsneo_netid_t::icsneo_netid_lin4, - Network::_icsneo_netid_t::icsneo_netid_flexray + _icsneo_netid_t::icsneo_netid_flexray }; return supportedNetworks; } @@ -51,8 +51,8 @@ protected: virtual bool isSupportedTXNetwork(const Network&) const override { return true; } virtual void setupExtensions() override { std::vector flexRayControllers; - flexRayControllers.push_back(Network::_icsneo_netid_t::icsneo_netid_flexray); - flexRayControllers.push_back(Network::_icsneo_netid_t::icsneo_netid_flexray); // TODO Becomes FlexRay2 if not in coldstart mode + flexRayControllers.push_back(_icsneo_netid_t::icsneo_netid_flexray); + flexRayControllers.push_back(_icsneo_netid_t::icsneo_netid_flexray); // TODO Becomes FlexRay2 if not in coldstart mode addExtension(std::make_shared(*this, flexRayControllers)); } diff --git a/include/icsneo/device/tree/rada2b/rada2b.h b/include/icsneo/device/tree/rada2b/rada2b.h index 98d2a6f..88caf83 100644 --- a/include/icsneo/device/tree/rada2b/rada2b.h +++ b/include/icsneo/device/tree/rada2b/rada2b.h @@ -21,20 +21,20 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_a2b1, - Network::_icsneo_netid_t::icsneo_netid_a2b2, + _icsneo_netid_t::icsneo_netid_a2b1, + _icsneo_netid_t::icsneo_netid_a2b2, - Network::_icsneo_netid_t::icsneo_netid_i2c, - Network::_icsneo_netid_t::icsneo_netid_i2c2, + _icsneo_netid_t::icsneo_netid_i2c, + _icsneo_netid_t::icsneo_netid_i2c2, - Network::_icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio1, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/rada2b/rada2bsettings.h b/include/icsneo/device/tree/rada2b/rada2bsettings.h index 26003c2..ee822f5 100644 --- a/include/icsneo/device/tree/rada2b/rada2bsettings.h +++ b/include/icsneo/device/tree/rada2b/rada2bsettings.h @@ -104,9 +104,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -117,9 +117,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -131,7 +131,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/radcomet/radcomet2.h b/include/icsneo/device/tree/radcomet/radcomet2.h index 8d23bc5..0b66b5e 100644 --- a/include/icsneo/device/tree/radcomet/radcomet2.h +++ b/include/icsneo/device/tree/radcomet/radcomet2.h @@ -22,8 +22,8 @@ public: const std::vector& GetSupportedNetworks() override { static std::vector supportedNetworks = RADCometBase::GetSupportedNetworks(); - supportedNetworks.push_back(Network::_icsneo_netid_t::icsneo_netid_op_ethernet3); - supportedNetworks.push_back(Network::_icsneo_netid_t::icsneo_netid_mdio4); + supportedNetworks.push_back(_icsneo_netid_t::icsneo_netid_op_ethernet3); + supportedNetworks.push_back(_icsneo_netid_t::icsneo_netid_mdio4); return supportedNetworks; } diff --git a/include/icsneo/device/tree/radcomet/radcometbase.h b/include/icsneo/device/tree/radcomet/radcometbase.h index 265d1c9..f803ab2 100644 --- a/include/icsneo/device/tree/radcomet/radcometbase.h +++ b/include/icsneo/device/tree/radcomet/radcometbase.h @@ -12,20 +12,20 @@ class RADCometBase : public Device { public: virtual const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2, + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_iso9141, + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_iso9141, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, - Network::_icsneo_netid_t::icsneo_netid_mdio3, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio3, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radcomet/radcometsettings.h b/include/icsneo/device/tree/radcomet/radcometsettings.h index a20e401..27ef1ad 100644 --- a/include/icsneo/device/tree/radcomet/radcometsettings.h +++ b/include/icsneo/device/tree/radcomet/radcometsettings.h @@ -95,9 +95,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -108,9 +108,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; diff --git a/include/icsneo/device/tree/radcomet3/radcomet3.h b/include/icsneo/device/tree/radcomet3/radcomet3.h index d42dce6..ce1d0b8 100644 --- a/include/icsneo/device/tree/radcomet3/radcomet3.h +++ b/include/icsneo/device/tree/radcomet3/radcomet3.h @@ -18,24 +18,24 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet3, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet4, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet5, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet6, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet7, + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet2, + _icsneo_netid_t::icsneo_netid_op_ethernet3, + _icsneo_netid_t::icsneo_netid_op_ethernet4, + _icsneo_netid_t::icsneo_netid_op_ethernet5, + _icsneo_netid_t::icsneo_netid_op_ethernet6, + _icsneo_netid_t::icsneo_netid_op_ethernet7, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_iso9141, + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_iso9141, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radcomet3/radcomet3settings.h b/include/icsneo/device/tree/radcomet3/radcomet3settings.h index 68e81ee..a637339 100644 --- a/include/icsneo/device/tree/radcomet3/radcomet3settings.h +++ b/include/icsneo/device/tree/radcomet3/radcomet3settings.h @@ -92,9 +92,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -105,9 +105,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; diff --git a/include/icsneo/device/tree/radepsilon/radepsilon.h b/include/icsneo/device/tree/radepsilon/radepsilon.h index bb24fcc..b685b3e 100644 --- a/include/icsneo/device/tree/radepsilon/radepsilon.h +++ b/include/icsneo/device/tree/radepsilon/radepsilon.h @@ -14,12 +14,12 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_ethernet, // Connected to port 6 on the switch + _icsneo_netid_t::icsneo_netid_ethernet, // Connected to port 6 on the switch - Network::_icsneo_netid_t::icsneo_netid_lin + _icsneo_netid_t::icsneo_netid_lin }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radgalaxy/radgalaxy.h b/include/icsneo/device/tree/radgalaxy/radgalaxy.h index 7cdb8b8..2021eec 100644 --- a/include/icsneo/device/tree/radgalaxy/radgalaxy.h +++ b/include/icsneo/device/tree/radgalaxy/radgalaxy.h @@ -21,41 +21,41 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_swcan, - Network::_icsneo_netid_t::icsneo_netid_swcan2, + _icsneo_netid_t::icsneo_netid_swcan, + _icsneo_netid_t::icsneo_netid_swcan2, - Network::_icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet3, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet4, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet5, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet6, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet7, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet8, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet9, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet10, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet11, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet12, + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet2, + _icsneo_netid_t::icsneo_netid_op_ethernet3, + _icsneo_netid_t::icsneo_netid_op_ethernet4, + _icsneo_netid_t::icsneo_netid_op_ethernet5, + _icsneo_netid_t::icsneo_netid_op_ethernet6, + _icsneo_netid_t::icsneo_netid_op_ethernet7, + _icsneo_netid_t::icsneo_netid_op_ethernet8, + _icsneo_netid_t::icsneo_netid_op_ethernet9, + _icsneo_netid_t::icsneo_netid_op_ethernet10, + _icsneo_netid_t::icsneo_netid_op_ethernet11, + _icsneo_netid_t::icsneo_netid_op_ethernet12, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, - Network::_icsneo_netid_t::icsneo_netid_mdio3, - Network::_icsneo_netid_t::icsneo_netid_mdio4, - Network::_icsneo_netid_t::icsneo_netid_mdio5, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio3, + _icsneo_netid_t::icsneo_netid_mdio4, + _icsneo_netid_t::icsneo_netid_mdio5, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h b/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h index bbba721..ad44ff9 100644 --- a/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h +++ b/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h @@ -112,21 +112,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->can7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->can8); default: return nullptr; @@ -137,21 +137,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->canfd7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->canfd8); default: return nullptr; @@ -162,9 +162,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_swcan: + case _icsneo_netid_t::icsneo_netid_swcan: return &(cfg->swcan1); - case Network::_icsneo_netid_t::icsneo_netid_swcan2: + case _icsneo_netid_t::icsneo_netid_swcan2: return &(cfg->swcan2); default: return nullptr; @@ -176,7 +176,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/radgigastar/radgigastar.h b/include/icsneo/device/tree/radgigastar/radgigastar.h index 9a9b0f1..e9d9649 100644 --- a/include/icsneo/device/tree/radgigastar/radgigastar.h +++ b/include/icsneo/device/tree/radgigastar/radgigastar.h @@ -47,59 +47,59 @@ protected: void setupSupportedRXNetworks(std::vector& rxNetworks) override { static std::vector supportedRxNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2, + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_flexray1a, - Network::_icsneo_netid_t::icsneo_netid_flexray1b, + _icsneo_netid_t::icsneo_netid_flexray1a, + _icsneo_netid_t::icsneo_netid_flexray1b, - Network::_icsneo_netid_t::icsneo_netid_i2c, - Network::_icsneo_netid_t::icsneo_netid_i2c2, - Network::_icsneo_netid_t::icsneo_netid_i2c3, + _icsneo_netid_t::icsneo_netid_i2c, + _icsneo_netid_t::icsneo_netid_i2c2, + _icsneo_netid_t::icsneo_netid_i2c3, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, }; rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end()); } void setupSupportedTXNetworks(std::vector& txNetworks) override { static std::vector supportedTxNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2, + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin, // FlexRay is Receive Only - Network::_icsneo_netid_t::icsneo_netid_i2c, - Network::_icsneo_netid_t::icsneo_netid_i2c2, - Network::_icsneo_netid_t::icsneo_netid_i2c3, + _icsneo_netid_t::icsneo_netid_i2c, + _icsneo_netid_t::icsneo_netid_i2c2, + _icsneo_netid_t::icsneo_netid_i2c3, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, }; txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end()); } diff --git a/include/icsneo/device/tree/radgigastar/radgigastarsettings.h b/include/icsneo/device/tree/radgigastar/radgigastarsettings.h index 4428315..c5840fb 100644 --- a/include/icsneo/device/tree/radgigastar/radgigastarsettings.h +++ b/include/icsneo/device/tree/radgigastar/radgigastarsettings.h @@ -101,17 +101,17 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); default: return nullptr; @@ -122,17 +122,17 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); default: return nullptr; @@ -142,14 +142,14 @@ public: virtual std::vector getTerminationGroups() const override { return { { - Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan4) + Network(_icsneo_netid_t::icsneo_netid_hscan), + Network(_icsneo_netid_t::icsneo_netid_hscan2), + Network(_icsneo_netid_t::icsneo_netid_hscan3), + Network(_icsneo_netid_t::icsneo_netid_hscan4) }, { - Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan5) + Network(_icsneo_netid_t::icsneo_netid_mscan), + Network(_icsneo_netid_t::icsneo_netid_hscan5) } }; } @@ -159,7 +159,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/radgigastar2/radgigastar2.h b/include/icsneo/device/tree/radgigastar2/radgigastar2.h index 589dda9..a5e7c0b 100644 --- a/include/icsneo/device/tree/radgigastar2/radgigastar2.h +++ b/include/icsneo/device/tree/radgigastar2/radgigastar2.h @@ -23,50 +23,50 @@ namespace icsneo static const std::vector &GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet3, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet4, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet5, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet6, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet7, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet8, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet9, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet10, + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet2, + _icsneo_netid_t::icsneo_netid_op_ethernet3, + _icsneo_netid_t::icsneo_netid_op_ethernet4, + _icsneo_netid_t::icsneo_netid_op_ethernet5, + _icsneo_netid_t::icsneo_netid_op_ethernet6, + _icsneo_netid_t::icsneo_netid_op_ethernet7, + _icsneo_netid_t::icsneo_netid_op_ethernet8, + _icsneo_netid_t::icsneo_netid_op_ethernet9, + _icsneo_netid_t::icsneo_netid_op_ethernet10, - Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_lin2, - Network::_icsneo_netid_t::icsneo_netid_lin3, - Network::_icsneo_netid_t::icsneo_netid_lin4, - Network::_icsneo_netid_t::icsneo_netid_lin5, - Network::_icsneo_netid_t::icsneo_netid_lin6, - Network::_icsneo_netid_t::icsneo_netid_lin7, - Network::_icsneo_netid_t::icsneo_netid_lin8, - Network::_icsneo_netid_t::icsneo_netid_lin9, - Network::_icsneo_netid_t::icsneo_netid_lin10, + _icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin2, + _icsneo_netid_t::icsneo_netid_lin3, + _icsneo_netid_t::icsneo_netid_lin4, + _icsneo_netid_t::icsneo_netid_lin5, + _icsneo_netid_t::icsneo_netid_lin6, + _icsneo_netid_t::icsneo_netid_lin7, + _icsneo_netid_t::icsneo_netid_lin8, + _icsneo_netid_t::icsneo_netid_lin9, + _icsneo_netid_t::icsneo_netid_lin10, - Network::_icsneo_netid_t::icsneo_netid_i2c, - Network::_icsneo_netid_t::icsneo_netid_i2c2, + _icsneo_netid_t::icsneo_netid_i2c, + _icsneo_netid_t::icsneo_netid_i2c2, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, - Network::_icsneo_netid_t::icsneo_netid_spi1, - Network::_icsneo_netid_t::icsneo_netid_spi2, - Network::_icsneo_netid_t::icsneo_netid_spi3, - Network::_icsneo_netid_t::icsneo_netid_spi4, - Network::_icsneo_netid_t::icsneo_netid_spi5, - Network::_icsneo_netid_t::icsneo_netid_spi6, - Network::_icsneo_netid_t::icsneo_netid_spi7, - Network::_icsneo_netid_t::icsneo_netid_spi8, + _icsneo_netid_t::icsneo_netid_spi1, + _icsneo_netid_t::icsneo_netid_spi2, + _icsneo_netid_t::icsneo_netid_spi3, + _icsneo_netid_t::icsneo_netid_spi4, + _icsneo_netid_t::icsneo_netid_spi5, + _icsneo_netid_t::icsneo_netid_spi6, + _icsneo_netid_t::icsneo_netid_spi7, + _icsneo_netid_t::icsneo_netid_spi8, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h b/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h index 1213b13..587b0c3 100644 --- a/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h +++ b/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h @@ -147,13 +147,13 @@ namespace icsneo return nullptr; switch (net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can4); default: return nullptr; @@ -166,13 +166,13 @@ namespace icsneo return nullptr; switch (net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd4); default: return nullptr; @@ -182,10 +182,10 @@ namespace icsneo virtual std::vector getTerminationGroups() const override { return { - {Network(Network::_icsneo_netid_t::icsneo_netid_hscan)}, - {Network(Network::_icsneo_netid_t::icsneo_netid_hscan2)}, - {Network(Network::_icsneo_netid_t::icsneo_netid_hscan3)}, - {Network(Network::_icsneo_netid_t::icsneo_netid_hscan4)}}; + {Network(_icsneo_netid_t::icsneo_netid_hscan)}, + {Network(_icsneo_netid_t::icsneo_netid_hscan2)}, + {Network(_icsneo_netid_t::icsneo_netid_hscan3)}, + {Network(_icsneo_netid_t::icsneo_netid_hscan4)}}; } const LIN_SETTINGS *getLINSettingsFor(Network net) const override @@ -195,25 +195,25 @@ namespace icsneo return nullptr; switch (net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::icsneo_netid_lin2: + case _icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::icsneo_netid_lin3: + case _icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::icsneo_netid_lin4: + case _icsneo_netid_t::icsneo_netid_lin4: return &(cfg->lin4); - case Network::_icsneo_netid_t::icsneo_netid_lin5: + case _icsneo_netid_t::icsneo_netid_lin5: return &(cfg->lin5); - case Network::_icsneo_netid_t::icsneo_netid_lin6: + case _icsneo_netid_t::icsneo_netid_lin6: return &(cfg->lin6); - case Network::_icsneo_netid_t::icsneo_netid_lin7: + case _icsneo_netid_t::icsneo_netid_lin7: return &(cfg->lin7); - case Network::_icsneo_netid_t::icsneo_netid_lin8: + case _icsneo_netid_t::icsneo_netid_lin8: return &(cfg->lin8); - case Network::_icsneo_netid_t::icsneo_netid_lin9: + case _icsneo_netid_t::icsneo_netid_lin9: return &(cfg->lin9); - case Network::_icsneo_netid_t::icsneo_netid_lin10: + case _icsneo_netid_t::icsneo_netid_lin10: return &(cfg->lin10); default: return nullptr; diff --git a/include/icsneo/device/tree/radjupiter/radjupiter.h b/include/icsneo/device/tree/radjupiter/radjupiter.h index 9e3b5e3..556c315 100644 --- a/include/icsneo/device/tree/radjupiter/radjupiter.h +++ b/include/icsneo/device/tree/radjupiter/radjupiter.h @@ -17,12 +17,12 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_ethernet // Connected to port 6 on the switch + _icsneo_netid_t::icsneo_netid_ethernet // Connected to port 6 on the switch }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radjupiter/radjupitersettings.h b/include/icsneo/device/tree/radjupiter/radjupitersettings.h index e6a531d..78d65c4 100644 --- a/include/icsneo/device/tree/radjupiter/radjupitersettings.h +++ b/include/icsneo/device/tree/radjupiter/radjupitersettings.h @@ -97,9 +97,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -110,9 +110,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -123,7 +123,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/radmars/radmars.h b/include/icsneo/device/tree/radmars/radmars.h index 43b48b5..ae2ea06 100644 --- a/include/icsneo/device/tree/radmars/radmars.h +++ b/include/icsneo/device/tree/radmars/radmars.h @@ -43,55 +43,55 @@ protected: void setupSupportedRXNetworks(std::vector& rxNetworks) override { static std::vector supportedRxNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_ethernet3, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet3, - Network::_icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_flexray1a, - Network::_icsneo_netid_t::icsneo_netid_flexray1b, + _icsneo_netid_t::icsneo_netid_flexray1a, + _icsneo_netid_t::icsneo_netid_flexray1b, - Network::_icsneo_netid_t::icsneo_netid_i2c, + _icsneo_netid_t::icsneo_netid_i2c, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, }; rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end()); } void setupSupportedTXNetworks(std::vector& txNetworks) override { static std::vector supportedTxNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4, - Network::_icsneo_netid_t::icsneo_netid_hscan5, - Network::_icsneo_netid_t::icsneo_netid_hscan6, - Network::_icsneo_netid_t::icsneo_netid_hscan7, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4, + _icsneo_netid_t::icsneo_netid_hscan5, + _icsneo_netid_t::icsneo_netid_hscan6, + _icsneo_netid_t::icsneo_netid_hscan7, - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_ethernet3, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet2, + _icsneo_netid_t::icsneo_netid_ethernet3, - Network::_icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin, // FlexRay is Receive Only - Network::_icsneo_netid_t::icsneo_netid_i2c, + _icsneo_netid_t::icsneo_netid_i2c, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, }; txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end()); } diff --git a/include/icsneo/device/tree/radmars/radmarssettings.h b/include/icsneo/device/tree/radmars/radmarssettings.h index ba3f057..2f28be9 100644 --- a/include/icsneo/device/tree/radmars/radmarssettings.h +++ b/include/icsneo/device/tree/radmars/radmarssettings.h @@ -107,21 +107,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->can7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->can8); default: return nullptr; @@ -132,21 +132,21 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::icsneo_netid_hscan5: + case _icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); - case Network::_icsneo_netid_t::icsneo_netid_hscan6: + case _icsneo_netid_t::icsneo_netid_hscan6: return &(cfg->canfd7); - case Network::_icsneo_netid_t::icsneo_netid_hscan7: + case _icsneo_netid_t::icsneo_netid_hscan7: return &(cfg->canfd8); default: return nullptr; @@ -156,16 +156,16 @@ public: virtual std::vector getTerminationGroups() const override { return { { - Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan7) + Network(_icsneo_netid_t::icsneo_netid_hscan), + Network(_icsneo_netid_t::icsneo_netid_hscan3), + Network(_icsneo_netid_t::icsneo_netid_hscan5), + Network(_icsneo_netid_t::icsneo_netid_hscan7) }, { - Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan6) + Network(_icsneo_netid_t::icsneo_netid_mscan), + Network(_icsneo_netid_t::icsneo_netid_hscan2), + Network(_icsneo_netid_t::icsneo_netid_hscan4), + Network(_icsneo_netid_t::icsneo_netid_hscan6) } }; } @@ -175,7 +175,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/radmoon2/radmoon2base.h b/include/icsneo/device/tree/radmoon2/radmoon2base.h index 23fc793..36efb8a 100644 --- a/include/icsneo/device/tree/radmoon2/radmoon2base.h +++ b/include/icsneo/device/tree/radmoon2/radmoon2base.h @@ -18,8 +18,8 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radmoon3/radmoon3.h b/include/icsneo/device/tree/radmoon3/radmoon3.h index 856a3a8..39eb737 100644 --- a/include/icsneo/device/tree/radmoon3/radmoon3.h +++ b/include/icsneo/device/tree/radmoon3/radmoon3.h @@ -17,8 +17,8 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_op_ethernet1, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radmoonduo/radmoonduo.h b/include/icsneo/device/tree/radmoonduo/radmoonduo.h index 26925b9..0fa9acd 100644 --- a/include/icsneo/device/tree/radmoonduo/radmoonduo.h +++ b/include/icsneo/device/tree/radmoonduo/radmoonduo.h @@ -18,7 +18,7 @@ public: static const std::vector& GetSupportedNetworks() { // If Converter1 Target is set to USB/CM, OP_Ethernet2 will be exposed to the PC static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2 + _icsneo_netid_t::icsneo_netid_op_ethernet2 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radmoont1s/radmoont1s.h b/include/icsneo/device/tree/radmoont1s/radmoont1s.h index b5fbad1..d460745 100644 --- a/include/icsneo/device/tree/radmoont1s/radmoont1s.h +++ b/include/icsneo/device/tree/radmoont1s/radmoont1s.h @@ -18,13 +18,13 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_spi1, + _icsneo_netid_t::icsneo_netid_spi1, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radpluto/radpluto.h b/include/icsneo/device/tree/radpluto/radpluto.h index c0b3354..67fe995 100644 --- a/include/icsneo/device/tree/radpluto/radpluto.h +++ b/include/icsneo/device/tree/radpluto/radpluto.h @@ -17,17 +17,17 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_lin, + _icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet3, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet4 + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet2, + _icsneo_netid_t::icsneo_netid_op_ethernet3, + _icsneo_netid_t::icsneo_netid_op_ethernet4 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radpluto/radplutosettings.h b/include/icsneo/device/tree/radpluto/radplutosettings.h index 26a8065..87c4e7d 100644 --- a/include/icsneo/device/tree/radpluto/radplutosettings.h +++ b/include/icsneo/device/tree/radpluto/radplutosettings.h @@ -83,9 +83,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -96,9 +96,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -110,7 +110,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/radstar2/radstar2.h b/include/icsneo/device/tree/radstar2/radstar2.h index ae7d48c..4a53b3e 100644 --- a/include/icsneo/device/tree/radstar2/radstar2.h +++ b/include/icsneo/device/tree/radstar2/radstar2.h @@ -18,16 +18,16 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet2, + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_op_ethernet2, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/radstar2/radstar2settings.h b/include/icsneo/device/tree/radstar2/radstar2settings.h index b2d3c0b..3f61731 100644 --- a/include/icsneo/device/tree/radstar2/radstar2settings.h +++ b/include/icsneo/device/tree/radstar2/radstar2settings.h @@ -78,9 +78,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); default: return nullptr; @@ -91,9 +91,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); default: return nullptr; @@ -105,7 +105,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/radsupermoon/radsupermoon.h b/include/icsneo/device/tree/radsupermoon/radsupermoon.h index a522f7c..ed9223d 100644 --- a/include/icsneo/device/tree/radsupermoon/radsupermoon.h +++ b/include/icsneo/device/tree/radsupermoon/radsupermoon.h @@ -22,10 +22,10 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_op_ethernet1, - Network::_icsneo_netid_t::icsneo_netid_mdio1, - Network::_icsneo_netid_t::icsneo_netid_mdio2, + _icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_op_ethernet1, + _icsneo_netid_t::icsneo_netid_mdio1, + _icsneo_netid_t::icsneo_netid_mdio2, }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/valuecan3/valuecan3.h b/include/icsneo/device/tree/valuecan3/valuecan3.h index 5f93688..55510d4 100644 --- a/include/icsneo/device/tree/valuecan3/valuecan3.h +++ b/include/icsneo/device/tree/valuecan3/valuecan3.h @@ -16,8 +16,8 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_mscan + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_mscan }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/valuecan3/valuecan3settings.h b/include/icsneo/device/tree/valuecan3/valuecan3settings.h index 8f2e794..c903e2e 100644 --- a/include/icsneo/device/tree/valuecan3/valuecan3settings.h +++ b/include/icsneo/device/tree/valuecan3/valuecan3settings.h @@ -41,9 +41,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_mscan: + case _icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); default: return nullptr; diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h index 915e118..c3d8e84 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h @@ -15,7 +15,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); default: return nullptr; diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h index e808499..68ad6a3 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h @@ -16,9 +16,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -29,9 +29,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -40,8 +40,8 @@ public: virtual std::vector getTerminationGroups() const override { return { - { Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }, - { Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) } + { Network(_icsneo_netid_t::icsneo_netid_hscan) }, + { Network(_icsneo_netid_t::icsneo_netid_hscan2) } }; } @@ -50,7 +50,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h index af4b18a..ccb91b1 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h @@ -15,9 +15,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -28,9 +28,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -39,8 +39,8 @@ public: virtual std::vector getTerminationGroups() const override { return { - { Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }, - { Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) } + { Network(_icsneo_netid_t::icsneo_netid_hscan) }, + { Network(_icsneo_netid_t::icsneo_netid_hscan2) } }; } diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h index a8eb5a9..3040292 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h @@ -16,9 +16,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -29,9 +29,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -43,7 +43,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h index 8a50da7..78a3669 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h @@ -16,13 +16,13 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can3); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can4); default: return nullptr; @@ -33,13 +33,13 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); - case Network::_icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd3); - case Network::_icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd4); default: return nullptr; @@ -49,12 +49,12 @@ public: virtual std::vector getTerminationGroups() const override { return { { - Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan3) + Network(_icsneo_netid_t::icsneo_netid_hscan), + Network(_icsneo_netid_t::icsneo_netid_hscan3) }, { - Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), - Network(Network::_icsneo_netid_t::icsneo_netid_hscan4) + Network(_icsneo_netid_t::icsneo_netid_hscan2), + Network(_icsneo_netid_t::icsneo_netid_hscan4) } }; } @@ -64,7 +64,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lin: + case _icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); default: return nullptr; diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h index c2aa2a8..2fad600 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h @@ -16,9 +16,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -29,9 +29,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -40,8 +40,8 @@ public: virtual std::vector getTerminationGroups() const override { return { - { Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }, - { Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) } + { Network(_icsneo_netid_t::icsneo_netid_hscan) }, + { Network(_icsneo_netid_t::icsneo_netid_hscan2) } }; } diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-1.h b/include/icsneo/device/tree/valuecan4/valuecan4-1.h index 93e9025..bd3b6fa 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-1.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-1.h @@ -16,7 +16,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan + _icsneo_netid_t::icsneo_netid_hscan }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-2.h b/include/icsneo/device/tree/valuecan4/valuecan4-2.h index 01b09c9..74939b9 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-2.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-2.h @@ -21,8 +21,8 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2 + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h index a29441e..2fe3bd0 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h @@ -50,12 +50,12 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_lin + _icsneo_netid_t::icsneo_netid_lin }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-4.h b/include/icsneo/device/tree/valuecan4/valuecan4-4.h index cbd31b8..4bd04e1 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-4.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-4.h @@ -23,10 +23,10 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_hscan3, - Network::_icsneo_netid_t::icsneo_netid_hscan4 + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan3, + _icsneo_netid_t::icsneo_netid_hscan4 }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/valuecan4/valuecan4industrial.h b/include/icsneo/device/tree/valuecan4/valuecan4industrial.h index afd6395..452ef4e 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4industrial.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4industrial.h @@ -17,12 +17,12 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { - Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::icsneo_netid_hscan2, + _icsneo_netid_t::icsneo_netid_hscan, + _icsneo_netid_t::icsneo_netid_hscan2, - Network::_icsneo_netid_t::icsneo_netid_ethernet, + _icsneo_netid_t::icsneo_netid_ethernet, - Network::_icsneo_netid_t::icsneo_netid_lin + _icsneo_netid_t::icsneo_netid_lin }; return supportedNetworks; } diff --git a/include/icsneo/device/tree/vividcan/vividcansettings.h b/include/icsneo/device/tree/vividcan/vividcansettings.h index 1172388..224f0d0 100644 --- a/include/icsneo/device/tree/vividcan/vividcansettings.h +++ b/include/icsneo/device/tree/vividcan/vividcansettings.h @@ -52,9 +52,9 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_hscan: + case _icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::icsneo_netid_lsftcan: + case _icsneo_netid_t::icsneo_netid_lsftcan: return &(cfg->lsftcan1); default: return nullptr; @@ -65,7 +65,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_lsftcan: + case _icsneo_netid_t::icsneo_netid_lsftcan: return &(cfg->lsftcan1); default: return nullptr; @@ -76,7 +76,7 @@ public: if(cfg == nullptr) return nullptr; switch(net.getNetID()) { - case Network::_icsneo_netid_t::icsneo_netid_swcan: + case _icsneo_netid_t::icsneo_netid_swcan: return &(cfg->swcan1); default: return nullptr; @@ -85,7 +85,7 @@ public: virtual std::vector getTerminationGroups() const override { return { - { Network(Network::_icsneo_netid_t::icsneo_netid_hscan) } + { Network(_icsneo_netid_t::icsneo_netid_hscan) } }; } diff --git a/include/icsneo/icsneotypes.h b/include/icsneo/icsneotypes.h index 4828655..7410d15 100644 --- a/include/icsneo/icsneotypes.h +++ b/include/icsneo/icsneotypes.h @@ -196,6 +196,177 @@ typedef enum _icsneo_msg_bus_type_t { */ typedef uint8_t icsneo_msg_bus_type_t; +typedef enum _icsneo_netid_t { + icsneo_netid_device = 0, + icsneo_netid_hscan = 1, + icsneo_netid_mscan = 2, + icsneo_netid_swcan = 3, + icsneo_netid_lsftcan = 4, + icsneo_netid_fordscp = 5, + icsneo_netid_j1708 = 6, + icsneo_netid_aux = 7, + icsneo_netid_j1850vpw = 8, + icsneo_netid_iso9141 = 9, + icsneo_netid_disk_data = 10, + icsneo_netid_main51 = 11, + icsneo_netid_red = 12, + icsneo_netid_sci = 13, + icsneo_netid_iso9141_2 = 14, + icsneo_netid_iso14230 = 15, + icsneo_netid_lin = 16, + icsneo_netid_op_ethernet1 = 17, + icsneo_netid_op_ethernet2 = 18, + icsneo_netid_op_ethernet3 = 19, + + // START Device Command Returns + // When we send a command, the device returns on one of these, depending on command + icsneo_netid_red_ext_memoryread = 20, + icsneo_netid_red_int_memoryread = 21, + icsneo_netid_red_dflash_read = 22, + icsneo_netid_neo_memory_sdread = 23, // Response from NeoMemory (MemoryTypeSD) + icsneo_netid_can_errbits = 24, + icsneo_netid_neo_memory_write_done = 25, + icsneo_netid_red_wave_can1_logical = 26, + icsneo_netid_red_wave_can2_logical = 27, + icsneo_netid_red_wave_lin1_logical = 28, + icsneo_netid_red_wave_lin2_logical = 29, + icsneo_netid_red_wave_lin1_analog = 30, + icsneo_netid_red_wave_lin2_analog = 31, + icsneo_netid_red_wave_misc_analog = 32, + icsneo_netid_red_wave_miscdio2_logical = 33, + icsneo_netid_red_network_com_enable_ex = 34, + icsneo_netid_red_neovi_network = 35, + icsneo_netid_red_read_baud_settings = 36, + icsneo_netid_red_oldformat = 37, + icsneo_netid_red_scope_capture = 38, + icsneo_netid_red_hardware_excep = 39, + icsneo_netid_red_get_rtc = 40, + // END Device Command Returns + + icsneo_netid_iso9141_3 = 41, + icsneo_netid_hscan2 = 42, + icsneo_netid_hscan3 = 44, + icsneo_netid_op_ethernet4 = 45, + icsneo_netid_op_ethernet5 = 46, + icsneo_netid_iso9141_4 = 47, + icsneo_netid_lin2 = 48, + icsneo_netid_lin3 = 49, + icsneo_netid_lin4 = 50, + // MOST = 51, Old and unused + icsneo_netid_red_app_error = 52, + icsneo_netid_cgi = 53, + icsneo_netid_reset_status = 54, + icsneo_netid_fb_status = 55, + icsneo_netid_app_signal_status = 56, + icsneo_netid_read_datalink_cm_tx_msg = 57, + icsneo_netid_read_datalink_cm_rx_msg = 58, + icsneo_netid_logging_overflow = 59, + icsneo_netid_read_settings = 60, + icsneo_netid_hscan4 = 61, + icsneo_netid_hscan5 = 62, + icsneo_netid_rs232 = 63, + icsneo_netid_uart = 64, + icsneo_netid_uart2 = 65, + icsneo_netid_uart3 = 66, + icsneo_netid_uart4 = 67, + icsneo_netid_swcan2 = 68, + icsneo_netid_ethernet_daq = 69, + icsneo_netid_data_to_host = 70, + icsneo_netid_textapi_to_host = 71, + icsneo_netid_spi1 = 72, + icsneo_netid_op_ethernet6 = 73, + icsneo_netid_red_vbat = 74, + icsneo_netid_op_ethernet7 = 75, + icsneo_netid_op_ethernet8 = 76, + icsneo_netid_op_ethernet9 = 77, + icsneo_netid_op_ethernet10 = 78, + icsneo_netid_op_ethernet11 = 79, + icsneo_netid_flexray1a = 80, + icsneo_netid_flexray1b = 81, + icsneo_netid_flexray2a = 82, + icsneo_netid_flexray2b = 83, + icsneo_netid_lin5 = 84, + icsneo_netid_flexray = 85, + icsneo_netid_flexray2 = 86, + icsneo_netid_op_ethernet12 = 87, + icsneo_netid_i2c = 88, + icsneo_netid_most25 = 90, + icsneo_netid_most50 = 91, + icsneo_netid_most150 = 92, + icsneo_netid_ethernet = 93, + icsneo_netid_gmfsa = 94, + icsneo_netid_tcp = 95, + icsneo_netid_hscan6 = 96, + icsneo_netid_hscan7 = 97, + icsneo_netid_lin6 = 98, + icsneo_netid_lsftcan2 = 99, + icsneo_netid_logical_disk_info = 187, + icsneo_netid_wivi_command = 221, + icsneo_netid_script_status = 224, + icsneo_netid_eth_phy_control = 239, + icsneo_netid_extended_command = 240, + icsneo_netid_extended_data = 242, + icsneo_netid_flexray_control = 243, + icsneo_netid_coremini_preload = 244, + icsneo_netid_hw_com_latency_test = 512, + icsneo_netid_device_status = 513, + icsneo_netid_udp = 514, + icsneo_netid_forwarded_message = 516, + icsneo_netid_i2c2 = 517, + icsneo_netid_i2c3 = 518, + icsneo_netid_i2c4 = 519, + icsneo_netid_ethernet2 = 520, + icsneo_netid_a2b1 = 522, + icsneo_netid_a2b2 = 523, + icsneo_netid_ethernet3 = 524, + icsneo_netid_wbms = 532, + icsneo_netid_dwcan9 = 534, + icsneo_netid_dwcan10 = 535, + icsneo_netid_dwcan11 = 536, + icsneo_netid_dwcan12 = 537, + icsneo_netid_dwcan13 = 538, + icsneo_netid_dwcan14 = 539, + icsneo_netid_dwcan15 = 540, + icsneo_netid_dwcan16 = 541, + icsneo_netid_lin7 = 542, + icsneo_netid_lin8 = 543, + icsneo_netid_spi2 = 544, + icsneo_netid_mdio1 = 545, + icsneo_netid_mdio2 = 546, + icsneo_netid_mdio3 = 547, + icsneo_netid_mdio4 = 548, + icsneo_netid_mdio5 = 549, + icsneo_netid_mdio6 = 550, + icsneo_netid_mdio7 = 551, + icsneo_netid_mdio8 = 552, + icsneo_netid_op_ethernet13 = 553, + icsneo_netid_op_ethernet14 = 554, + icsneo_netid_op_ethernet15 = 555, + icsneo_netid_op_ethernet16 = 556, + icsneo_netid_spi3 = 557, + icsneo_netid_spi4 = 558, + icsneo_netid_spi5 = 559, + icsneo_netid_spi6 = 560, + icsneo_netid_spi7 = 561, + icsneo_netid_spi8 = 562, + icsneo_netid_lin9 = 563, + icsneo_netid_lin10 = 564, + icsneo_netid_lin11 = 565, + icsneo_netid_lin12 = 566, + icsneo_netid_lin13 = 567, + icsneo_netid_lin14 = 568, + icsneo_netid_lin15 = 569, + icsneo_netid_lin16 = 570, + icsneo_netid_any = 0xfffe, // Never actually set as type, but used as flag for filtering + icsneo_netid_invalid = 0xffff +} _icsneo_netid_t; + +/** @brief Integer representation of _icsneo_netid_t enum. + * + * This is used for easier ABI compatibility, especially between other languages. + */ +typedef uint16_t icsneo_netid_t; + #ifdef __cplusplus } #endif diff --git a/platform/posix/firmio.cpp b/platform/posix/firmio.cpp index 932e2fa..405cfab 100644 --- a/platform/posix/firmio.cpp +++ b/platform/posix/firmio.cpp @@ -32,7 +32,7 @@ void FirmIO::Find(std::vector& found) { return; std::vector payload = { - ((1 << 4) | (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51 + ((1 << 4) | (uint8_t)_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51 (uint8_t)Command::RequestSerialNumber }; payload.push_back(Packetizer::ICSChecksum(payload)); diff --git a/platform/posix/pcap.cpp b/platform/posix/pcap.cpp index 336f880..07101fc 100644 --- a/platform/posix/pcap.cpp +++ b/platform/posix/pcap.cpp @@ -126,7 +126,7 @@ void PCAP::Find(std::vector& found) { memcpy(requestPacket.srcMAC, iface.macAddress, sizeof(requestPacket.srcMAC)); requestPacket.payload.reserve(4); requestPacket.payload = { - ((1 << 4) | (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51 + ((1 << 4) | (uint8_t)_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51 (uint8_t)Command::RequestSerialNumber }; requestPacket.payload.push_back(Packetizer::ICSChecksum(requestPacket.payload)); diff --git a/platform/windows/pcap.cpp b/platform/windows/pcap.cpp index 2fdcf05..bdbfd2e 100644 --- a/platform/windows/pcap.cpp +++ b/platform/windows/pcap.cpp @@ -115,7 +115,7 @@ void PCAP::Find(std::vector& found) { memcpy(requestPacket.srcMAC, iface.macAddress, sizeof(requestPacket.srcMAC)); requestPacket.payload.reserve(4); requestPacket.payload = { - ((1 << 4) | (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51 + ((1 << 4) | (uint8_t)_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51 (uint8_t)Command::RequestSerialNumber }; requestPacket.payload.push_back(Packetizer::ICSChecksum(requestPacket.payload));