From 632057dc70e6faf58ea85d11376424f92952221e Mon Sep 17 00:00:00 2001 From: David Rebbe Date: Thu, 5 Dec 2024 17:08:08 -0500 Subject: [PATCH] more renaming in progress --- .../python/icsneopy/communication/network.cpp | 102 ++--- communication/communication.cpp | 2 +- communication/decoder.cpp | 8 +- communication/encoder.cpp | 2 +- communication/message/apperrormessage.cpp | 2 +- device/device.cpp | 6 +- examples/cpp/apperror/src/AppErrorExample.cpp | 2 +- examples/cpp/lin/src/LINExample.cpp | 10 +- examples/cpp/vsa/src/VSAExample.cpp | 4 +- .../communication/message/apperrormessage.h | 2 +- .../message/readsettingsmessage.h | 2 +- include/icsneo/communication/network.h | 430 +++++++++--------- .../device/tree/neoobd2pro/neoobd2pro.h | 2 +- .../device/tree/neoobd2sim/neoobd2sim.h | 2 +- .../device/tree/neoviconnect/neoviconnect.h | 10 +- .../tree/neoviconnect/neoviconnectsettings.h | 18 +- .../icsneo/device/tree/neovifire/neovifire.h | 10 +- .../device/tree/neovifire/neovifiresettings.h | 10 +- .../device/tree/neovifire2/neovifire2.h | 20 +- .../tree/neovifire2/neovifire2settings.h | 34 +- .../device/tree/neovifire3/neovifire3.h | 16 +- .../tree/neovifire3/neovifire3settings.h | 32 +- .../neovifire3flexray/neovifire3flexray.h | 24 +- .../neovifire3flexraysettings.h | 30 +- .../icsneo/device/tree/neovired2/neovired2.h | 10 +- .../device/tree/neovired2/neovired2settings.h | 26 +- include/icsneo/device/tree/plasion/plasion.h | 22 +- include/icsneo/device/tree/rada2b/rada2b.h | 2 +- .../device/tree/rada2b/rada2bsettings.h | 4 +- .../device/tree/radcomet/radcometbase.h | 2 +- .../device/tree/radcomet/radcometsettings.h | 4 +- .../icsneo/device/tree/radcomet3/radcomet3.h | 10 +- .../device/tree/radcomet3/radcomet3settings.h | 4 +- .../device/tree/radepsilon/radepsilon.h | 2 +- .../icsneo/device/tree/radgalaxy/radgalaxy.h | 26 +- .../device/tree/radgalaxy/radgalaxysettings.h | 18 +- .../device/tree/radgigastar/radgigastar.h | 20 +- .../tree/radgigastar/radgigastarsettings.h | 24 +- .../device/tree/radgigastar2/radgigastar2.h | 30 +- .../tree/radgigastar2/radgigastar2settings.h | 26 +- .../device/tree/radjupiter/radjupiter.h | 2 +- .../tree/radjupiter/radjupitersettings.h | 4 +- include/icsneo/device/tree/radmars/radmars.h | 20 +- .../device/tree/radmars/radmarssettings.h | 24 +- .../device/tree/radmoont1s/radmoont1s.h | 2 +- .../icsneo/device/tree/radpluto/radpluto.h | 4 +- .../device/tree/radpluto/radplutosettings.h | 4 +- .../settings/valuecan4-2elsettings.h | 6 +- .../valuecan4/settings/valuecan4-2settings.h | 6 +- .../settings/valuecan4-4-2elsettings.h | 4 +- .../valuecan4/settings/valuecan4-4settings.h | 18 +- .../settings/valuecan4industrialsettings.h | 6 +- .../device/tree/valuecan4/valuecan4-2.h | 2 +- .../device/tree/valuecan4/valuecan4-2el.h | 2 +- .../device/tree/valuecan4/valuecan4-4.h | 6 +- .../tree/valuecan4/valuecan4industrial.h | 2 +- 56 files changed, 561 insertions(+), 561 deletions(-) diff --git a/bindings/python/icsneopy/communication/network.cpp b/bindings/python/icsneopy/communication/network.cpp index 6ee83dc..fb20ecc 100644 --- a/bindings/python/icsneopy/communication/network.cpp +++ b/bindings/python/icsneopy/communication/network.cpp @@ -43,57 +43,57 @@ void init_network(pybind11::module_& m) { .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::RED_WAVE_MISCDIO2_LOGICAL) - .value("RED_NETWORK_COM_ENABLE_EX", Network::_icsneo_netid_t::RED_NETWORK_COM_ENABLE_EX) - .value("RED_NEOVI_NETWORK", Network::_icsneo_netid_t::RED_NEOVI_NETWORK) - .value("RED_READ_BAUD_SETTINGS", Network::_icsneo_netid_t::RED_READ_BAUD_SETTINGS) - .value("RED_OLDFORMAT", Network::_icsneo_netid_t::RED_OLDFORMAT) - .value("RED_SCOPE_CAPTURE", Network::_icsneo_netid_t::RED_SCOPE_CAPTURE) - .value("RED_HARDWARE_EXCEP", Network::_icsneo_netid_t::RED_HARDWARE_EXCEP) - .value("RED_GET_RTC", Network::_icsneo_netid_t::RED_GET_RTC) - .value("ISO9141_3", Network::_icsneo_netid_t::ISO9141_3) - .value("HSCAN2", Network::_icsneo_netid_t::HSCAN2) - .value("HSCAN3", Network::_icsneo_netid_t::HSCAN3) - .value("OP_Ethernet4", Network::_icsneo_netid_t::OP_Ethernet4) - .value("OP_Ethernet5", Network::_icsneo_netid_t::OP_Ethernet5) - .value("ISO9141_4", Network::_icsneo_netid_t::ISO9141_4) - .value("LIN2", Network::_icsneo_netid_t::LIN2) - .value("LIN3", Network::_icsneo_netid_t::LIN3) - .value("LIN4", Network::_icsneo_netid_t::LIN4) - .value("RED_App_Error", Network::_icsneo_netid_t::RED_App_Error) - .value("CGI", Network::_icsneo_netid_t::CGI) - .value("Reset_Status", Network::_icsneo_netid_t::Reset_Status) - .value("FB_Status", Network::_icsneo_netid_t::FB_Status) - .value("App_Signal_Status", Network::_icsneo_netid_t::App_Signal_Status) - .value("Read_Datalink_Cm_Tx_Msg", Network::_icsneo_netid_t::Read_Datalink_Cm_Tx_Msg) - .value("Read_Datalink_Cm_Rx_Msg", Network::_icsneo_netid_t::Read_Datalink_Cm_Rx_Msg) - .value("Logging_Overflow", Network::_icsneo_netid_t::Logging_Overflow) - .value("ReadSettings", Network::_icsneo_netid_t::ReadSettings) - .value("HSCAN4", Network::_icsneo_netid_t::HSCAN4) - .value("HSCAN5", Network::_icsneo_netid_t::HSCAN5) - .value("RS232", Network::_icsneo_netid_t::RS232) - .value("UART", Network::_icsneo_netid_t::UART) - .value("UART2", Network::_icsneo_netid_t::UART2) - .value("UART3", Network::_icsneo_netid_t::UART3) - .value("UART4", Network::_icsneo_netid_t::UART4) - .value("SWCAN2", Network::_icsneo_netid_t::SWCAN2) - .value("Ethernet_DAQ", Network::_icsneo_netid_t::Ethernet_DAQ) - .value("Data_To_Host", Network::_icsneo_netid_t::Data_To_Host) - .value("TextAPI_To_Host", Network::_icsneo_netid_t::TextAPI_To_Host) - .value("SPI1", Network::_icsneo_netid_t::SPI1) - .value("OP_Ethernet6", Network::_icsneo_netid_t::OP_Ethernet6) - .value("Red_VBat", Network::_icsneo_netid_t::Red_VBat) - .value("OP_Ethernet7", Network::_icsneo_netid_t::OP_Ethernet7) - .value("OP_Ethernet8", Network::_icsneo_netid_t::OP_Ethernet8) - .value("OP_Ethernet9", Network::_icsneo_netid_t::OP_Ethernet9) - .value("OP_Ethernet10", Network::_icsneo_netid_t::OP_Ethernet10) - .value("OP_Ethernet11", Network::_icsneo_netid_t::OP_Ethernet11) - .value("FlexRay1a", Network::_icsneo_netid_t::FlexRay1a) - .value("FlexRay1b", Network::_icsneo_netid_t::FlexRay1b) - .value("FlexRay2a", Network::_icsneo_netid_t::FlexRay2a) - .value("FlexRay2b", Network::_icsneo_netid_t::FlexRay2b) - .value("LIN5", Network::_icsneo_netid_t::LIN5) - .value("FlexRay", Network::_icsneo_netid_t::FlexRay) + .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::FlexRay2) .value("OP_Ethernet12", Network::_icsneo_netid_t::OP_Ethernet12) .value("I2C", Network::_icsneo_netid_t::I2C) diff --git a/communication/communication.cpp b/communication/communication.cpp index fd7f47e..314c0b0 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::ReadSettings); + static const std::shared_ptr filter = std::make_shared(Network::_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 17e711c..7cc4ddd 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::Reset_Status: { + case Network::_icsneo_netid_t::icsneo_netid_reset_status: { // We can deal with not having the last two fields (voltage and temperature) if(packet->data.size() < (sizeof(HardwareResetStatusPacket) - (sizeof(uint16_t) * 2))) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error); @@ -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::RED_App_Error: { + case Network::_icsneo_netid_t::icsneo_netid_red_app_error: { result = AppErrorMessage::DecodeToMessage(packet->data, report); if(!result) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning); @@ -420,7 +420,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr(); msg->response = ReadSettingsMessage::Response(packet->data[0]); diff --git a/communication/encoder.cpp b/communication/encoder.cpp index d55005a..ed603b5 100644 --- a/communication/encoder.cpp +++ b/communication/encoder.cpp @@ -141,7 +141,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, case Network::_icsneo_netid_t::icsneo_netid_device: shortFormat = true; break; - case Network::_icsneo_netid_t::RED_OLDFORMAT: { + case Network::_icsneo_netid_t::icsneo_netid_red_oldformat: { // See the decoder for an explanation // We expect the network byte to be populated already in data, but not the length uint16_t length = uint16_t(raw->data.size()) - 1; diff --git a/communication/message/apperrormessage.cpp b/communication/message/apperrormessage.cpp index aca1948..2d2c39a 100644 --- a/communication/message/apperrormessage.cpp +++ b/communication/message/apperrormessage.cpp @@ -24,7 +24,7 @@ std::shared_ptr AppErrorMessage::DecodeToMessage(const std::vectorerrorNetID = static_cast(data->network_id); appErr->timestamp10us = data->uiTimeStamp10uS; appErr->timestamp10usMSB = data->uiTimeStamp10uSMSB; - appErr->network = Network::_icsneo_netid_t::RED_App_Error; + appErr->network = Network::_icsneo_netid_t::icsneo_netid_red_app_error; return appErr; } diff --git a/device/device.cpp b/device/device.cpp index 4c08b5a..e24471b 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::Reset_Status); + std::shared_ptr filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_reset_status); filter->includeInternalInAny = true; // Wait until communication is enabled or 5 seconds, whichever comes first @@ -432,7 +432,7 @@ bool Device::goOffline() { updateLEDState(); - std::shared_ptr filter = std::make_shared(Network::_icsneo_netid_t::Reset_Status); + std::shared_ptr filter = std::make_shared(Network::_icsneo_netid_t::icsneo_netid_reset_status); filter->includeInternalInAny = true; // Wait until communication is disabled or 5 seconds, whichever comes first @@ -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::RED_GET_RTC); + static const std::shared_ptr filter = std::make_shared(Network::_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)); diff --git a/examples/cpp/apperror/src/AppErrorExample.cpp b/examples/cpp/apperror/src/AppErrorExample.cpp index 157bbef..dfcbdab 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::RED_App_Error == msg->network.getNetID()) { + if(icsneo::Network::_icsneo_netid_t::icsneo_netid_red_app_error == msg->network.getNetID()) { std::cout << std::endl << "App error reported:" << std::endl; std::cout << msg->getAppErrorString() << std::endl << std::endl; } diff --git a/examples/cpp/lin/src/LINExample.cpp b/examples/cpp/lin/src/LINExample.cpp index 64ae601..da8e6cc 100644 --- a/examples/cpp/lin/src/LINExample.cpp +++ b/examples/cpp/lin/src/LINExample.cpp @@ -37,7 +37,7 @@ int main() { std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Disable LIN2 commander resistor... "; - ret = device->settings->setCommanderResistorFor(icsneo::Network::_icsneo_netid_t::LIN2, false); + ret = device->settings->setCommanderResistorFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, false); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Setting LIN to operate at " << baud << "bit/s... "; @@ -45,7 +45,7 @@ int main() { 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::LIN2, baud); + ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, baud); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Setting LIN mode to NORMAL... "; @@ -53,7 +53,7 @@ int main() { std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Setting LIN2 mode to NORMAL... "; - ret = device->settings->setLINModeFor(icsneo::Network::_icsneo_netid_t::LIN2, NORMAL_MODE); + ret = device->settings->setLINModeFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2, NORMAL_MODE); std::cout << (ret ? "OK" : "FAIL") << std::endl; std::cout << "Applying settings... "; @@ -68,7 +68,7 @@ int main() { std::cout << "OK, " << (readBaud) << "bit/s" << std::endl; std::cout << "Getting LIN2 Baudrate... "; - readBaud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::LIN2); + readBaud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2); if(readBaud < 0) std::cout << "FAIL" << std::endl; else @@ -115,7 +115,7 @@ int main() { // We can transmit messages std::cout << "Transmitting a LIN responder data frame... "; auto lin_r = std::make_shared(); - lin_r->network = icsneo::Network::_icsneo_netid_t::LIN2; + lin_r->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin2; lin_r->ID = 0x11; lin_r->linMsgType = icsneo::LINMessage::Type::LIN_UPDATE_RESPONDER; lin_r->data = {0xaa, 0xbb, 0xcc, 0xdd, 0x11, 0x22, 0x33, 0x44}; diff --git a/examples/cpp/vsa/src/VSAExample.cpp b/examples/cpp/vsa/src/VSAExample.cpp index a288efc..79a2561 100644 --- a/examples/cpp/vsa/src/VSAExample.cpp +++ b/examples/cpp/vsa/src/VSAExample.cpp @@ -56,7 +56,7 @@ std::vector> constructRandomFrames(size_t fr // Classic CAN { auto frame = std::make_shared(); - frame->network = icsneo::Network::_icsneo_netid_t::HSCAN2; + frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan2; frames.push_back(frame); frame->data.resize(ClassicCANSize); @@ -67,7 +67,7 @@ std::vector> constructRandomFrames(size_t fr // CAN FD { auto frame = std::make_shared(); - frame->network = icsneo::Network::_icsneo_netid_t::HSCAN3; + frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan3; frames.push_back(frame); frame->data.resize(CANFDSize); std::generate(frame->data.begin(), frame->data.end(), randByteGen); diff --git a/include/icsneo/communication/message/apperrormessage.h b/include/icsneo/communication/message/apperrormessage.h index a5bfcd9..78f686a 100644 --- a/include/icsneo/communication/message/apperrormessage.h +++ b/include/icsneo/communication/message/apperrormessage.h @@ -66,7 +66,7 @@ enum class AppErrorType : uint16_t { class AppErrorMessage : public InternalMessage { public: - AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::_icsneo_netid_t::RED_App_Error) {} + AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::_icsneo_netid_t::icsneo_netid_red_app_error) {} uint16_t errorType; Network::_icsneo_netid_t errorNetID; uint32_t timestamp10us; diff --git a/include/icsneo/communication/message/readsettingsmessage.h b/include/icsneo/communication/message/readsettingsmessage.h index 4c12ee5..f0b04aa 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::ReadSettings) {} + ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, Network::_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 d7b27b7..e051a53 100644 --- a/include/icsneo/communication/network.h +++ b/include/icsneo/communication/network.h @@ -60,60 +60,60 @@ public: icsneo_netid_red_wave_lin1_analog = 30, icsneo_netid_red_wave_lin2_analog = 31, icsneo_netid_red_wave_misc_analog = 32, - RED_WAVE_MISCDIO2_LOGICAL = 33, - RED_NETWORK_COM_ENABLE_EX = 34, - RED_NEOVI_NETWORK = 35, - RED_READ_BAUD_SETTINGS = 36, - RED_OLDFORMAT = 37, - RED_SCOPE_CAPTURE = 38, - RED_HARDWARE_EXCEP = 39, - RED_GET_RTC = 40, + 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 - ISO9141_3 = 41, - HSCAN2 = 42, - HSCAN3 = 44, - OP_Ethernet4 = 45, - OP_Ethernet5 = 46, - ISO9141_4 = 47, - LIN2 = 48, - LIN3 = 49, - LIN4 = 50, + 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 - RED_App_Error = 52, - CGI = 53, - Reset_Status = 54, - FB_Status = 55, - App_Signal_Status = 56, - Read_Datalink_Cm_Tx_Msg = 57, - Read_Datalink_Cm_Rx_Msg = 58, - Logging_Overflow = 59, - ReadSettings = 60, - HSCAN4 = 61, - HSCAN5 = 62, - RS232 = 63, - UART = 64, - UART2 = 65, - UART3 = 66, - UART4 = 67, - SWCAN2 = 68, - Ethernet_DAQ = 69, - Data_To_Host = 70, - TextAPI_To_Host = 71, - SPI1 = 72, - OP_Ethernet6 = 73, - Red_VBat = 74, - OP_Ethernet7 = 75, - OP_Ethernet8 = 76, - OP_Ethernet9 = 77, - OP_Ethernet10 = 78, - OP_Ethernet11 = 79, - FlexRay1a = 80, - FlexRay1b = 81, - FlexRay2a = 82, - FlexRay2b = 83, - LIN5 = 84, - FlexRay = 85, + 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, FlexRay2 = 86, OP_Ethernet12 = 87, I2C = 88, @@ -374,29 +374,29 @@ public: case 16: return _icsneo_netid_t::icsneo_netid_lin; case 17: - return _icsneo_netid_t::ISO9141_3; + return _icsneo_netid_t::icsneo_netid_iso9141_3; case 18: - return _icsneo_netid_t::HSCAN2; + return _icsneo_netid_t::icsneo_netid_hscan2; case 19: - return _icsneo_netid_t::HSCAN3; + return _icsneo_netid_t::icsneo_netid_hscan3; case 20: - return _icsneo_netid_t::ISO9141_4; + return _icsneo_netid_t::icsneo_netid_iso9141_4; case 21: - return _icsneo_netid_t::LIN2; + return _icsneo_netid_t::icsneo_netid_lin2; case 22: - return _icsneo_netid_t::LIN3; + return _icsneo_netid_t::icsneo_netid_lin3; case 23: - return _icsneo_netid_t::LIN4; + return _icsneo_netid_t::icsneo_netid_lin4; //case 24: // return NetID::MOST; // Deprecated case 25: - return _icsneo_netid_t::CGI; + return _icsneo_netid_t::icsneo_netid_cgi; case 26: return _icsneo_netid_t::I2C; case 27: - return _icsneo_netid_t::SPI1; + return _icsneo_netid_t::icsneo_netid_spi1; case 28: - return _icsneo_netid_t::FlexRay1a; + return _icsneo_netid_t::icsneo_netid_flexray1a; case 29: return _icsneo_netid_t::MOST25; case 30: @@ -404,35 +404,35 @@ public: case 31: return _icsneo_netid_t::MOST150; case 32: - return _icsneo_netid_t::HSCAN4; + return _icsneo_netid_t::icsneo_netid_hscan4; case 33: - return _icsneo_netid_t::HSCAN5; + return _icsneo_netid_t::icsneo_netid_hscan5; case 34: - return _icsneo_netid_t::RS232; + return _icsneo_netid_t::icsneo_netid_rs232; case 35: - return _icsneo_netid_t::UART; + return _icsneo_netid_t::icsneo_netid_uart; case 36: - return _icsneo_netid_t::UART2; + return _icsneo_netid_t::icsneo_netid_uart2; case 37: - return _icsneo_netid_t::UART3; + return _icsneo_netid_t::icsneo_netid_uart3; case 38: - return _icsneo_netid_t::UART4; + return _icsneo_netid_t::icsneo_netid_uart4; case 39: - return _icsneo_netid_t::SWCAN2; + return _icsneo_netid_t::icsneo_netid_swcan2; case 40: - return _icsneo_netid_t::FlexRay1b; + return _icsneo_netid_t::icsneo_netid_flexray1b; case 41: - return _icsneo_netid_t::FlexRay2a; + return _icsneo_netid_t::icsneo_netid_flexray2a; case 42: - return _icsneo_netid_t::FlexRay2b; + return _icsneo_netid_t::icsneo_netid_flexray2b; case 43: - return _icsneo_netid_t::LIN5; + return _icsneo_netid_t::icsneo_netid_lin5; case 44: return _icsneo_netid_t::Ethernet; case 45: - return _icsneo_netid_t::Ethernet_DAQ; + return _icsneo_netid_t::icsneo_netid_ethernet_daq; case 46: - return _icsneo_netid_t::RED_App_Error; + return _icsneo_netid_t::icsneo_netid_red_app_error; case 47: return _icsneo_netid_t::HSCAN6; case 48: @@ -501,10 +501,10 @@ public: switch(netid) { case _icsneo_netid_t::icsneo_netid_hscan: case _icsneo_netid_t::icsneo_netid_mscan: - case _icsneo_netid_t::HSCAN2: - case _icsneo_netid_t::HSCAN3: - case _icsneo_netid_t::HSCAN4: - case _icsneo_netid_t::HSCAN5: + case _icsneo_netid_t::icsneo_netid_hscan2: + case _icsneo_netid_t::icsneo_netid_hscan3: + case _icsneo_netid_t::icsneo_netid_hscan4: + case _icsneo_netid_t::icsneo_netid_hscan5: case _icsneo_netid_t::HSCAN6: case _icsneo_netid_t::HSCAN7: case _icsneo_netid_t::DWCAN9: @@ -517,10 +517,10 @@ public: case _icsneo_netid_t::DWCAN16: return icsneo_msg_bus_type_can; case _icsneo_netid_t::icsneo_netid_lin: - case _icsneo_netid_t::LIN2: - case _icsneo_netid_t::LIN3: - case _icsneo_netid_t::LIN4: - case _icsneo_netid_t::LIN5: + case _icsneo_netid_t::icsneo_netid_lin2: + case _icsneo_netid_t::icsneo_netid_lin3: + case _icsneo_netid_t::icsneo_netid_lin4: + case _icsneo_netid_t::icsneo_netid_lin5: case _icsneo_netid_t::LIN6: case _icsneo_netid_t::LIN7: case _icsneo_netid_t::LIN8: @@ -533,25 +533,25 @@ public: case _icsneo_netid_t::LIN15: case _icsneo_netid_t::LIN16: return icsneo_msg_bus_type_lin; - case _icsneo_netid_t::FlexRay: - case _icsneo_netid_t::FlexRay1a: - case _icsneo_netid_t::FlexRay1b: + case _icsneo_netid_t::icsneo_netid_flexray: + case _icsneo_netid_t::icsneo_netid_flexray1a: + case _icsneo_netid_t::icsneo_netid_flexray1b: case _icsneo_netid_t::FlexRay2: - case _icsneo_netid_t::FlexRay2a: - case _icsneo_netid_t::FlexRay2b: + case _icsneo_netid_t::icsneo_netid_flexray2a: + case _icsneo_netid_t::icsneo_netid_flexray2b: return icsneo_msg_bus_type_flexray; case _icsneo_netid_t::MOST25: case _icsneo_netid_t::MOST50: case _icsneo_netid_t::MOST150: return icsneo_msg_bus_type_most; case _icsneo_netid_t::icsneo_netid_red: - case _icsneo_netid_t::RED_OLDFORMAT: + case _icsneo_netid_t::icsneo_netid_red_oldformat: case _icsneo_netid_t::icsneo_netid_device: - case _icsneo_netid_t::Reset_Status: + case _icsneo_netid_t::icsneo_netid_reset_status: case _icsneo_netid_t::DeviceStatus: case _icsneo_netid_t::FlexRayControl: case _icsneo_netid_t::icsneo_netid_main51: - case _icsneo_netid_t::ReadSettings: + case _icsneo_netid_t::icsneo_netid_read_settings: case _icsneo_netid_t::LogicalDiskInfo: case _icsneo_netid_t::WiVICommand: case _icsneo_netid_t::ScriptStatus: @@ -562,28 +562,28 @@ public: case _icsneo_netid_t::icsneo_netid_red_int_memoryread: case _icsneo_netid_t::icsneo_netid_neo_memory_sdread: case _icsneo_netid_t::icsneo_netid_neo_memory_write_done: - case _icsneo_netid_t::RED_GET_RTC: + case _icsneo_netid_t::icsneo_netid_red_get_rtc: case _icsneo_netid_t::icsneo_netid_disk_data: - case _icsneo_netid_t::RED_App_Error: + case _icsneo_netid_t::icsneo_netid_red_app_error: return icsneo_msg_bus_type_internal; case _icsneo_netid_t::Invalid: case _icsneo_netid_t::Any: return icsneo_msg_bus_type_invalid; case _icsneo_netid_t::Ethernet: - case _icsneo_netid_t::Ethernet_DAQ: + case _icsneo_netid_t::icsneo_netid_ethernet_daq: case _icsneo_netid_t::Ethernet2: case _icsneo_netid_t::Ethernet3: case _icsneo_netid_t::icsneo_netid_op_ethernet1: case _icsneo_netid_t::icsneo_netid_op_ethernet2: case _icsneo_netid_t::icsneo_netid_op_ethernet3: - case _icsneo_netid_t::OP_Ethernet4: - case _icsneo_netid_t::OP_Ethernet5: - case _icsneo_netid_t::OP_Ethernet6: - case _icsneo_netid_t::OP_Ethernet7: - case _icsneo_netid_t::OP_Ethernet8: - case _icsneo_netid_t::OP_Ethernet9: - case _icsneo_netid_t::OP_Ethernet10: - case _icsneo_netid_t::OP_Ethernet11: + case _icsneo_netid_t::icsneo_netid_op_ethernet4: + case _icsneo_netid_t::icsneo_netid_op_ethernet5: + case _icsneo_netid_t::icsneo_netid_op_ethernet6: + case _icsneo_netid_t::icsneo_netid_op_ethernet7: + case _icsneo_netid_t::icsneo_netid_op_ethernet8: + case _icsneo_netid_t::icsneo_netid_op_ethernet9: + case _icsneo_netid_t::icsneo_netid_op_ethernet10: + case _icsneo_netid_t::icsneo_netid_op_ethernet11: case _icsneo_netid_t::OP_Ethernet12: case _icsneo_netid_t::OP_Ethernet13: case _icsneo_netid_t::OP_Ethernet14: @@ -594,12 +594,12 @@ public: case _icsneo_netid_t::LSFTCAN2: return icsneo_msg_bus_type_lsftcan; case _icsneo_netid_t::icsneo_netid_swcan: - case _icsneo_netid_t::SWCAN2: + case _icsneo_netid_t::icsneo_netid_swcan2: return icsneo_msg_bus_type_swcan; case _icsneo_netid_t::icsneo_netid_iso9141: case _icsneo_netid_t::icsneo_netid_iso9141_2: - case _icsneo_netid_t::ISO9141_3: - case _icsneo_netid_t::ISO9141_4: + case _icsneo_netid_t::icsneo_netid_iso9141_3: + case _icsneo_netid_t::icsneo_netid_iso9141_4: return icsneo_msg_bus_type_iso9141; case _icsneo_netid_t::I2C: case _icsneo_netid_t::I2C2: @@ -609,7 +609,7 @@ public: case _icsneo_netid_t::A2B1: case _icsneo_netid_t::A2B2: return icsneo_msg_bus_type_a2b; - case _icsneo_netid_t::SPI1: + case _icsneo_netid_t::icsneo_netid_spi1: case _icsneo_netid_t::SPI2: case _icsneo_netid_t::SPI3: case _icsneo_netid_t::SPI4: @@ -702,105 +702,105 @@ public: return "RED_WAVE_LIN2_ANALOG"; case _icsneo_netid_t::icsneo_netid_red_wave_misc_analog: return "RED_WAVE_MISC_ANALOG"; - case _icsneo_netid_t::RED_WAVE_MISCDIO2_LOGICAL: + case _icsneo_netid_t::icsneo_netid_red_wave_miscdio2_logical: return "RED_WAVE_MISCDIO2_LOGICAL"; - case _icsneo_netid_t::RED_NETWORK_COM_ENABLE_EX: + case _icsneo_netid_t::icsneo_netid_red_network_com_enable_ex: return "RED_NETWORK_COM_ENABLE_EX"; - case _icsneo_netid_t::RED_NEOVI_NETWORK: + case _icsneo_netid_t::icsneo_netid_red_neovi_network: return "RED_NEOVI_NETWORK"; - case _icsneo_netid_t::RED_READ_BAUD_SETTINGS: + case _icsneo_netid_t::icsneo_netid_red_read_baud_settings: return "RED_READ_BAUD_SETTINGS"; - case _icsneo_netid_t::RED_OLDFORMAT: + case _icsneo_netid_t::icsneo_netid_red_oldformat: return "RED_OLDFORMAT"; - case _icsneo_netid_t::RED_SCOPE_CAPTURE: + case _icsneo_netid_t::icsneo_netid_red_scope_capture: return "RED_SCOPE_CAPTURE"; - case _icsneo_netid_t::RED_HARDWARE_EXCEP: + case _icsneo_netid_t::icsneo_netid_red_hardware_excep: return "RED_HARDWARE_EXCEP"; - case _icsneo_netid_t::RED_GET_RTC: + case _icsneo_netid_t::icsneo_netid_red_get_rtc: return "RED_GET_RTC"; - case _icsneo_netid_t::ISO9141_3: + case _icsneo_netid_t::icsneo_netid_iso9141_3: return "ISO 9141 3"; - case _icsneo_netid_t::HSCAN2: + case _icsneo_netid_t::icsneo_netid_hscan2: return "HSCAN 2"; - case _icsneo_netid_t::HSCAN3: + case _icsneo_netid_t::icsneo_netid_hscan3: return "HSCAN 3"; - case _icsneo_netid_t::OP_Ethernet4: + case _icsneo_netid_t::icsneo_netid_op_ethernet4: return "OP (BR) Ethernet 4"; - case _icsneo_netid_t::OP_Ethernet5: + case _icsneo_netid_t::icsneo_netid_op_ethernet5: return "OP (BR) Ethernet 5"; - case _icsneo_netid_t::ISO9141_4: + case _icsneo_netid_t::icsneo_netid_iso9141_4: return "ISO 9141 4"; - case _icsneo_netid_t::LIN2: + case _icsneo_netid_t::icsneo_netid_lin2: return "LIN 2"; - case _icsneo_netid_t::LIN3: + case _icsneo_netid_t::icsneo_netid_lin3: return "LIN 3"; - case _icsneo_netid_t::LIN4: + case _icsneo_netid_t::icsneo_netid_lin4: return "LIN 4"; - case _icsneo_netid_t::RED_App_Error: + case _icsneo_netid_t::icsneo_netid_red_app_error: return "App Error"; - case _icsneo_netid_t::CGI: + case _icsneo_netid_t::icsneo_netid_cgi: return "CGI"; - case _icsneo_netid_t::Reset_Status: + case _icsneo_netid_t::icsneo_netid_reset_status: return "Reset Status"; - case _icsneo_netid_t::FB_Status: + case _icsneo_netid_t::icsneo_netid_fb_status: return "FB Status"; - case _icsneo_netid_t::App_Signal_Status: + case _icsneo_netid_t::icsneo_netid_app_signal_status: return "App Signal Status"; - case _icsneo_netid_t::Read_Datalink_Cm_Tx_Msg: + case _icsneo_netid_t::icsneo_netid_read_datalink_cm_tx_msg: return "Read Datalink Cm Tx Msg"; - case _icsneo_netid_t::Read_Datalink_Cm_Rx_Msg: + case _icsneo_netid_t::icsneo_netid_read_datalink_cm_rx_msg: return "Read Datalink Cm Rx Msg"; - case _icsneo_netid_t::Logging_Overflow: + case _icsneo_netid_t::icsneo_netid_logging_overflow: return "Logging Overflow"; - case _icsneo_netid_t::ReadSettings: + case _icsneo_netid_t::icsneo_netid_read_settings: return "Read Settings"; - case _icsneo_netid_t::HSCAN4: + case _icsneo_netid_t::icsneo_netid_hscan4: return "HSCAN 4"; - case _icsneo_netid_t::HSCAN5: + case _icsneo_netid_t::icsneo_netid_hscan5: return "HSCAN 5"; - case _icsneo_netid_t::RS232: + case _icsneo_netid_t::icsneo_netid_rs232: return "RS232"; - case _icsneo_netid_t::UART: + case _icsneo_netid_t::icsneo_netid_uart: return "UART"; - case _icsneo_netid_t::UART2: + case _icsneo_netid_t::icsneo_netid_uart2: return "UART 2"; - case _icsneo_netid_t::UART3: + case _icsneo_netid_t::icsneo_netid_uart3: return "UART 3"; - case _icsneo_netid_t::UART4: + case _icsneo_netid_t::icsneo_netid_uart4: return "UART 4"; - case _icsneo_netid_t::SWCAN2: + case _icsneo_netid_t::icsneo_netid_swcan2: return "SWCAN 2"; - case _icsneo_netid_t::Ethernet_DAQ: + case _icsneo_netid_t::icsneo_netid_ethernet_daq: return "Ethernet DAQ"; - case _icsneo_netid_t::Data_To_Host: + case _icsneo_netid_t::icsneo_netid_data_to_host: return "Data To Host"; - case _icsneo_netid_t::TextAPI_To_Host: + case _icsneo_netid_t::icsneo_netid_textapi_to_host: return "TextAPI To Host"; - case _icsneo_netid_t::OP_Ethernet6: + case _icsneo_netid_t::icsneo_netid_op_ethernet6: return "OP (BR) Ethernet 6"; - case _icsneo_netid_t::Red_VBat: + case _icsneo_netid_t::icsneo_netid_red_vbat: return "Red VBat"; - case _icsneo_netid_t::OP_Ethernet7: + case _icsneo_netid_t::icsneo_netid_op_ethernet7: return "OP (BR) Ethernet 7"; - case _icsneo_netid_t::OP_Ethernet8: + case _icsneo_netid_t::icsneo_netid_op_ethernet8: return "OP (BR) Ethernet 8"; - case _icsneo_netid_t::OP_Ethernet9: + case _icsneo_netid_t::icsneo_netid_op_ethernet9: return "OP (BR) Ethernet 9"; - case _icsneo_netid_t::OP_Ethernet10: + case _icsneo_netid_t::icsneo_netid_op_ethernet10: return "OP (BR) Ethernet 10"; - case _icsneo_netid_t::OP_Ethernet11: + case _icsneo_netid_t::icsneo_netid_op_ethernet11: return "OP (BR) Ethernet 11"; - case _icsneo_netid_t::FlexRay1a: + case _icsneo_netid_t::icsneo_netid_flexray1a: return "FlexRay 1a"; - case _icsneo_netid_t::FlexRay1b: + case _icsneo_netid_t::icsneo_netid_flexray1b: return "FlexRay 1b"; - case _icsneo_netid_t::FlexRay2a: + case _icsneo_netid_t::icsneo_netid_flexray2a: return "FlexRay 2a"; - case _icsneo_netid_t::FlexRay2b: + case _icsneo_netid_t::icsneo_netid_flexray2b: return "FlexRay 2b"; - case _icsneo_netid_t::LIN5: + case _icsneo_netid_t::icsneo_netid_lin5: return "LIN 5"; - case _icsneo_netid_t::FlexRay: + case _icsneo_netid_t::icsneo_netid_flexray: return "FlexRay"; case _icsneo_netid_t::FlexRay2: return "FlexRay 2"; @@ -912,7 +912,7 @@ public: return "LIN 16"; case _icsneo_netid_t::WBMS: return "WBMS"; - case _icsneo_netid_t::SPI1: + case _icsneo_netid_t::icsneo_netid_spi1: return "SPI 1"; case _icsneo_netid_t::SPI2: return "SPI 2"; @@ -958,63 +958,63 @@ public: return CoreMini::MSCAN; case _icsneo_netid_t::icsneo_netid_lin: return CoreMini::LIN; - case _icsneo_netid_t::LIN2: + case _icsneo_netid_t::icsneo_netid_lin2: return CoreMini::LIN2; case _icsneo_netid_t::icsneo_netid_device: return CoreMini::Virtual; - case _icsneo_netid_t::HSCAN2: + case _icsneo_netid_t::icsneo_netid_hscan2: return CoreMini::HSCAN2; case _icsneo_netid_t::icsneo_netid_lsftcan: return CoreMini::LSFTCAN; case _icsneo_netid_t::icsneo_netid_swcan: return CoreMini::SWCAN; - case _icsneo_netid_t::HSCAN3: + case _icsneo_netid_t::icsneo_netid_hscan3: return CoreMini::HSCAN3; - case _icsneo_netid_t::CGI: + case _icsneo_netid_t::icsneo_netid_cgi: return CoreMini::CGI; case _icsneo_netid_t::icsneo_netid_j1850vpw: return CoreMini::J1850VPW; - case _icsneo_netid_t::LIN3: + case _icsneo_netid_t::icsneo_netid_lin3: return CoreMini::LIN3; - case _icsneo_netid_t::LIN4: + case _icsneo_netid_t::icsneo_netid_lin4: return CoreMini::LIN4; case _icsneo_netid_t::icsneo_netid_j1708: return CoreMini::J1708; - case _icsneo_netid_t::HSCAN4: + case _icsneo_netid_t::icsneo_netid_hscan4: return CoreMini::HSCAN4; - case _icsneo_netid_t::HSCAN5: + case _icsneo_netid_t::icsneo_netid_hscan5: return CoreMini::HSCAN5; case _icsneo_netid_t::icsneo_netid_iso9141: return CoreMini::KLine1; case _icsneo_netid_t::icsneo_netid_iso9141_2: return CoreMini::KLine2; - case _icsneo_netid_t::ISO9141_3: + case _icsneo_netid_t::icsneo_netid_iso9141_3: return CoreMini::KLine3; - case _icsneo_netid_t::ISO9141_4: + case _icsneo_netid_t::icsneo_netid_iso9141_4: return CoreMini::KLine4; - case _icsneo_netid_t::FlexRay1a: + case _icsneo_netid_t::icsneo_netid_flexray1a: return CoreMini::FlexRay1a; - case _icsneo_netid_t::UART: + case _icsneo_netid_t::icsneo_netid_uart: return CoreMini::UART; - case _icsneo_netid_t::UART2: + case _icsneo_netid_t::icsneo_netid_uart2: return CoreMini::UART2; - case _icsneo_netid_t::LIN5: + case _icsneo_netid_t::icsneo_netid_lin5: return CoreMini::LIN5; case _icsneo_netid_t::MOST25: return CoreMini::MOST25; case _icsneo_netid_t::MOST50: return CoreMini::MOST50; - case _icsneo_netid_t::FlexRay1b: + case _icsneo_netid_t::icsneo_netid_flexray1b: return CoreMini::FlexRay1b; - case _icsneo_netid_t::SWCAN2: + case _icsneo_netid_t::icsneo_netid_swcan2: return CoreMini::SWCAN2; - case _icsneo_netid_t::Ethernet_DAQ: + case _icsneo_netid_t::icsneo_netid_ethernet_daq: return CoreMini::EthernetDAQ; case _icsneo_netid_t::Ethernet: return CoreMini::Ethernet; - case _icsneo_netid_t::FlexRay2a: + case _icsneo_netid_t::icsneo_netid_flexray2a: return CoreMini::FlexRay2a; - case _icsneo_netid_t::FlexRay2b: + case _icsneo_netid_t::icsneo_netid_flexray2b: return CoreMini::FlexRay2b; case _icsneo_netid_t::HSCAN6: return CoreMini::HSCAN6; @@ -1030,21 +1030,21 @@ public: return CoreMini::OP_Ethernet2; case _icsneo_netid_t::icsneo_netid_op_ethernet3: return CoreMini::OP_Ethernet3; - case _icsneo_netid_t::OP_Ethernet4: + case _icsneo_netid_t::icsneo_netid_op_ethernet4: return CoreMini::OP_Ethernet4; - case _icsneo_netid_t::OP_Ethernet5: + case _icsneo_netid_t::icsneo_netid_op_ethernet5: return CoreMini::OP_Ethernet5; - case _icsneo_netid_t::OP_Ethernet6: + case _icsneo_netid_t::icsneo_netid_op_ethernet6: return CoreMini::OP_Ethernet6; - case _icsneo_netid_t::OP_Ethernet7: + case _icsneo_netid_t::icsneo_netid_op_ethernet7: return CoreMini::OP_Ethernet7; - case _icsneo_netid_t::OP_Ethernet8: + case _icsneo_netid_t::icsneo_netid_op_ethernet8: return CoreMini::OP_Ethernet8; - case _icsneo_netid_t::OP_Ethernet9: + case _icsneo_netid_t::icsneo_netid_op_ethernet9: return CoreMini::OP_Ethernet9; - case _icsneo_netid_t::OP_Ethernet10: + case _icsneo_netid_t::icsneo_netid_op_ethernet10: return CoreMini::OP_Ethernet10; - case _icsneo_netid_t::OP_Ethernet11: + case _icsneo_netid_t::icsneo_netid_op_ethernet11: return CoreMini::OP_Ethernet11; case _icsneo_netid_t::OP_Ethernet12: return CoreMini::OP_Ethernet12; @@ -1060,7 +1060,7 @@ public: return CoreMini::TCPVirtual; case _icsneo_netid_t::UDP: return CoreMini::UDPVirtual; - case _icsneo_netid_t::FlexRay: + case _icsneo_netid_t::icsneo_netid_flexray: return CoreMini::FlexRay1; case _icsneo_netid_t::FlexRay2: return CoreMini::FlexRay2; @@ -1120,7 +1120,7 @@ public: return CoreMini::LIN15; case _icsneo_netid_t::LIN16: return CoreMini::LIN16; - case _icsneo_netid_t::SPI1: + case _icsneo_netid_t::icsneo_netid_spi1: return CoreMini::SPI1; case _icsneo_netid_t::SPI2: return CoreMini::SPI2; @@ -1165,63 +1165,63 @@ public: case CoreMini::LIN: return _icsneo_netid_t::icsneo_netid_lin; case CoreMini::LIN2: - return _icsneo_netid_t::LIN2; + return _icsneo_netid_t::icsneo_netid_lin2; case CoreMini::Virtual: return _icsneo_netid_t::icsneo_netid_device; case CoreMini::HSCAN2: - return _icsneo_netid_t::HSCAN2; + return _icsneo_netid_t::icsneo_netid_hscan2; case CoreMini::LSFTCAN: return _icsneo_netid_t::icsneo_netid_lsftcan; case CoreMini::SWCAN: return _icsneo_netid_t::icsneo_netid_swcan; case CoreMini::HSCAN3: - return _icsneo_netid_t::HSCAN3; + return _icsneo_netid_t::icsneo_netid_hscan3; case CoreMini::CGI: - return _icsneo_netid_t::CGI; + return _icsneo_netid_t::icsneo_netid_cgi; case CoreMini::J1850VPW: return _icsneo_netid_t::icsneo_netid_j1850vpw; case CoreMini::LIN3: - return _icsneo_netid_t::LIN3; + return _icsneo_netid_t::icsneo_netid_lin3; case CoreMini::LIN4: - return _icsneo_netid_t::LIN4; + return _icsneo_netid_t::icsneo_netid_lin4; case CoreMini::J1708: return _icsneo_netid_t::icsneo_netid_j1708; case CoreMini::HSCAN4: - return _icsneo_netid_t::HSCAN4; + return _icsneo_netid_t::icsneo_netid_hscan4; case CoreMini::HSCAN5: - return _icsneo_netid_t::HSCAN5; + return _icsneo_netid_t::icsneo_netid_hscan5; case CoreMini::KLine1: return _icsneo_netid_t::icsneo_netid_iso9141; case CoreMini::KLine2: return _icsneo_netid_t::icsneo_netid_iso9141_2; case CoreMini::KLine3: - return _icsneo_netid_t::ISO9141_3; + return _icsneo_netid_t::icsneo_netid_iso9141_3; case CoreMini::KLine4: - return _icsneo_netid_t::ISO9141_4; + return _icsneo_netid_t::icsneo_netid_iso9141_4; case CoreMini::FlexRay1a: - return _icsneo_netid_t::FlexRay1a; + return _icsneo_netid_t::icsneo_netid_flexray1a; case CoreMini::UART: - return _icsneo_netid_t::UART; + return _icsneo_netid_t::icsneo_netid_uart; case CoreMini::UART2: - return _icsneo_netid_t::UART2; + return _icsneo_netid_t::icsneo_netid_uart2; case CoreMini::LIN5: - return _icsneo_netid_t::LIN5; + return _icsneo_netid_t::icsneo_netid_lin5; case CoreMini::MOST25: return _icsneo_netid_t::MOST25; case CoreMini::MOST50: return _icsneo_netid_t::MOST50; case CoreMini::FlexRay1b: - return _icsneo_netid_t::FlexRay1b; + return _icsneo_netid_t::icsneo_netid_flexray1b; case CoreMini::SWCAN2: - return _icsneo_netid_t::SWCAN2; + return _icsneo_netid_t::icsneo_netid_swcan2; case CoreMini::EthernetDAQ: - return _icsneo_netid_t::Ethernet_DAQ; + return _icsneo_netid_t::icsneo_netid_ethernet_daq; case CoreMini::Ethernet: return _icsneo_netid_t::Ethernet; case CoreMini::FlexRay2a: - return _icsneo_netid_t::FlexRay2a; + return _icsneo_netid_t::icsneo_netid_flexray2a; case CoreMini::FlexRay2b: - return _icsneo_netid_t::FlexRay2b; + return _icsneo_netid_t::icsneo_netid_flexray2b; case CoreMini::HSCAN6: return _icsneo_netid_t::HSCAN6; case CoreMini::HSCAN7: @@ -1237,21 +1237,21 @@ public: case CoreMini::OP_Ethernet3: return _icsneo_netid_t::icsneo_netid_op_ethernet3; case CoreMini::OP_Ethernet4: - return _icsneo_netid_t::OP_Ethernet4; + return _icsneo_netid_t::icsneo_netid_op_ethernet4; case CoreMini::OP_Ethernet5: - return _icsneo_netid_t::OP_Ethernet5; + return _icsneo_netid_t::icsneo_netid_op_ethernet5; case CoreMini::OP_Ethernet6: - return _icsneo_netid_t::OP_Ethernet6; + return _icsneo_netid_t::icsneo_netid_op_ethernet6; case CoreMini::OP_Ethernet7: - return _icsneo_netid_t::OP_Ethernet7; + return _icsneo_netid_t::icsneo_netid_op_ethernet7; case CoreMini::OP_Ethernet8: - return _icsneo_netid_t::OP_Ethernet8; + return _icsneo_netid_t::icsneo_netid_op_ethernet8; case CoreMini::OP_Ethernet9: - return _icsneo_netid_t::OP_Ethernet9; + return _icsneo_netid_t::icsneo_netid_op_ethernet9; case CoreMini::OP_Ethernet10: - return _icsneo_netid_t::OP_Ethernet10; + return _icsneo_netid_t::icsneo_netid_op_ethernet10; case CoreMini::OP_Ethernet11: - return _icsneo_netid_t::OP_Ethernet11; + return _icsneo_netid_t::icsneo_netid_op_ethernet11; case CoreMini::OP_Ethernet12: return _icsneo_netid_t::OP_Ethernet12; case CoreMini::OP_Ethernet13: @@ -1267,7 +1267,7 @@ public: case CoreMini::UDPVirtual: return _icsneo_netid_t::UDP; case CoreMini::FlexRay1: - return _icsneo_netid_t::FlexRay; + return _icsneo_netid_t::icsneo_netid_flexray; case CoreMini::FlexRay2: return _icsneo_netid_t::FlexRay2; case CoreMini::ForwardedMessage: @@ -1327,7 +1327,7 @@ public: case CoreMini::LIN16: return _icsneo_netid_t::LIN16; case CoreMini::SPI1: - return _icsneo_netid_t::SPI1; + return _icsneo_netid_t::icsneo_netid_spi1; case CoreMini::SPI2: return _icsneo_netid_t::SPI2; case CoreMini::SPI3: diff --git a/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h b/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h index b31ed1c..6b02545 100644 --- a/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h +++ b/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h @@ -17,7 +17,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2 + Network::_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 954b08b..7886b57 100644 --- a/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h +++ b/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h @@ -17,7 +17,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2 + Network::_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 d76b879..88c0034 100644 --- a/include/icsneo/device/tree/neoviconnect/neoviconnect.h +++ b/include/icsneo/device/tree/neoviconnect/neoviconnect.h @@ -19,17 +19,17 @@ public: static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, Network::_icsneo_netid_t::Ethernet, Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::LIN2 + Network::_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 14c5b5c..7a2c469 100644 --- a/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h +++ b/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h @@ -96,13 +96,13 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can4); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can5); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->can6); @@ -121,13 +121,13 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd4); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd5); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->canfd6); @@ -146,7 +146,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::LIN2: + case Network::_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 8663efa..5c3b7c7 100644 --- a/include/icsneo/device/tree/neovifire/neovifire.h +++ b/include/icsneo/device/tree/neovifire/neovifire.h @@ -18,17 +18,17 @@ public: static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, + Network::_icsneo_netid_t::icsneo_netid_hscan2, + Network::_icsneo_netid_t::icsneo_netid_hscan3, Network::_icsneo_netid_t::icsneo_netid_lsftcan, Network::_icsneo_netid_t::icsneo_netid_swcan, Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::LIN2, - Network::_icsneo_netid_t::LIN3, - Network::_icsneo_netid_t::LIN4 + Network::_icsneo_netid_t::icsneo_netid_lin2, + Network::_icsneo_netid_t::icsneo_netid_lin3, + Network::_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 55c8085..de7ce5f 100644 --- a/include/icsneo/device/tree/neovifire/neovifiresettings.h +++ b/include/icsneo/device/tree/neovifire/neovifiresettings.h @@ -109,9 +109,9 @@ public: return &(cfg->can1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); case Network::_icsneo_netid_t::icsneo_netid_lsftcan: return &(cfg->lsftcan); @@ -138,11 +138,11 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::LIN2: + case Network::_icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::LIN3: + case Network::_icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::LIN4: + case Network::_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 9897934..199d4f6 100644 --- a/include/icsneo/device/tree/neovifire2/neovifire2.h +++ b/include/icsneo/device/tree/neovifire2/neovifire2.h @@ -25,10 +25,10 @@ public: static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, @@ -36,19 +36,19 @@ public: Network::_icsneo_netid_t::LSFTCAN2, Network::_icsneo_netid_t::icsneo_netid_swcan, - Network::_icsneo_netid_t::SWCAN2, + Network::_icsneo_netid_t::icsneo_netid_swcan2, Network::_icsneo_netid_t::Ethernet, Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::LIN2, - Network::_icsneo_netid_t::LIN3, - Network::_icsneo_netid_t::LIN4, + 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_iso9141, Network::_icsneo_netid_t::icsneo_netid_iso9141_2, - Network::_icsneo_netid_t::ISO9141_3, - Network::_icsneo_netid_t::ISO9141_4 + Network::_icsneo_netid_t::icsneo_netid_iso9141_3, + Network::_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 a36a93c..a96adec 100644 --- a/include/icsneo/device/tree/neovifire2/neovifire2settings.h +++ b/include/icsneo/device/tree/neovifire2/neovifire2settings.h @@ -132,13 +132,13 @@ public: return &(cfg->can1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->can7); @@ -161,13 +161,13 @@ public: return &(cfg->canfd1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->canfd7); @@ -185,7 +185,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_swcan: return &(cfg->swcan1); - case Network::_icsneo_netid_t::SWCAN2: + case Network::_icsneo_netid_t::icsneo_netid_swcan2: return &(cfg->swcan2); default: return nullptr; @@ -196,14 +196,14 @@ public: return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::HSCAN3), - Network(Network::_icsneo_netid_t::HSCAN5), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), Network(Network::_icsneo_netid_t::HSCAN7) }, { Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::HSCAN2), - Network(Network::_icsneo_netid_t::HSCAN4), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), Network(Network::_icsneo_netid_t::HSCAN6) } }; @@ -216,13 +216,13 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::LIN2: + case Network::_icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::LIN3: + case Network::_icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::LIN4: + case Network::_icsneo_netid_t::icsneo_netid_lin4: return &(cfg->lin4); - case Network::_icsneo_netid_t::LIN5: + case Network::_icsneo_netid_t::icsneo_netid_lin5: return &(cfg->lin5); case Network::_icsneo_netid_t::LIN6: return &(cfg->lin6); diff --git a/include/icsneo/device/tree/neovifire3/neovifire3.h b/include/icsneo/device/tree/neovifire3/neovifire3.h index 073a7af..9aa2ec3 100644 --- a/include/icsneo/device/tree/neovifire3/neovifire3.h +++ b/include/icsneo/device/tree/neovifire3/neovifire3.h @@ -19,10 +19,10 @@ public: static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, Network::_icsneo_netid_t::DWCAN9, @@ -39,10 +39,10 @@ public: Network::_icsneo_netid_t::Ethernet3, Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::LIN2, - Network::_icsneo_netid_t::LIN3, - Network::_icsneo_netid_t::LIN4, - Network::_icsneo_netid_t::LIN5, + 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::LIN6, Network::_icsneo_netid_t::LIN7, Network::_icsneo_netid_t::LIN8, diff --git a/include/icsneo/device/tree/neovifire3/neovifire3settings.h b/include/icsneo/device/tree/neovifire3/neovifire3settings.h index 324babf..7f0a574 100644 --- a/include/icsneo/device/tree/neovifire3/neovifire3settings.h +++ b/include/icsneo/device/tree/neovifire3/neovifire3settings.h @@ -170,13 +170,13 @@ public: return &(cfg->can1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->can7); @@ -195,13 +195,13 @@ public: return &(cfg->canfd1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->canfd7); @@ -216,14 +216,14 @@ public: return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::HSCAN3), - Network(Network::_icsneo_netid_t::HSCAN5), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), Network(Network::_icsneo_netid_t::HSCAN7) }, { Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::HSCAN2), - Network(Network::_icsneo_netid_t::HSCAN4), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), Network(Network::_icsneo_netid_t::HSCAN6) } }; @@ -236,13 +236,13 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::LIN2: + case Network::_icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::LIN3: + case Network::_icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::LIN4: + case Network::_icsneo_netid_t::icsneo_netid_lin4: return &(cfg->lin4); - case Network::_icsneo_netid_t::LIN5: + case Network::_icsneo_netid_t::icsneo_netid_lin5: return &(cfg->lin5); case Network::_icsneo_netid_t::LIN6: return &(cfg->lin6); diff --git a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h index 157e569..d40aa3f 100644 --- a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h +++ b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h @@ -19,10 +19,10 @@ public: static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, Network::_icsneo_netid_t::DWCAN9, @@ -38,16 +38,16 @@ public: Network::_icsneo_netid_t::Ethernet3, Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::LIN2, - Network::_icsneo_netid_t::LIN3, - Network::_icsneo_netid_t::LIN4, + 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::FlexRay, - Network::_icsneo_netid_t::FlexRay1a, - Network::_icsneo_netid_t::FlexRay1b, + 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::FlexRay2, - Network::_icsneo_netid_t::FlexRay2a, - Network::_icsneo_netid_t::FlexRay2b, + Network::_icsneo_netid_t::icsneo_netid_flexray2a, + Network::_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 01ab50a..b7525c0 100644 --- a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h +++ b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h @@ -153,13 +153,13 @@ public: return &(cfg->can1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->can7); @@ -178,13 +178,13 @@ public: return &(cfg->canfd1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->canfd7); @@ -199,14 +199,14 @@ public: return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::HSCAN3), - Network(Network::_icsneo_netid_t::HSCAN5), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), Network(Network::_icsneo_netid_t::HSCAN7) }, { Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::HSCAN2), - Network(Network::_icsneo_netid_t::HSCAN4), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), Network(Network::_icsneo_netid_t::HSCAN6) } }; @@ -219,11 +219,11 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::LIN2: + case Network::_icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::LIN3: + case Network::_icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::LIN4: + case Network::_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 62309c7..3d8f86d 100644 --- a/include/icsneo/device/tree/neovired2/neovired2.h +++ b/include/icsneo/device/tree/neovired2/neovired2.h @@ -19,10 +19,10 @@ public: static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, @@ -30,7 +30,7 @@ public: Network::_icsneo_netid_t::Ethernet2, Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::LIN2 + Network::_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 cddbb9f..55edbb6 100644 --- a/include/icsneo/device/tree/neovired2/neovired2settings.h +++ b/include/icsneo/device/tree/neovired2/neovired2settings.h @@ -109,13 +109,13 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can4); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can5); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->can6); @@ -134,13 +134,13 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd4); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd5); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->canfd6); @@ -157,14 +157,14 @@ public: return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::HSCAN3), - Network(Network::_icsneo_netid_t::HSCAN5), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), Network(Network::_icsneo_netid_t::HSCAN7) }, { Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::HSCAN2), - Network(Network::_icsneo_netid_t::HSCAN4), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), Network(Network::_icsneo_netid_t::HSCAN6) } }; @@ -177,7 +177,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::LIN2: + case Network::_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 0669308..5ca8820 100644 --- a/include/icsneo/device/tree/plasion/plasion.h +++ b/include/icsneo/device/tree/plasion/plasion.h @@ -15,10 +15,10 @@ public: static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, @@ -26,16 +26,16 @@ public: Network::_icsneo_netid_t::LSFTCAN2, Network::_icsneo_netid_t::icsneo_netid_swcan, - Network::_icsneo_netid_t::SWCAN2, + Network::_icsneo_netid_t::icsneo_netid_swcan2, Network::_icsneo_netid_t::Ethernet, Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::LIN2, - Network::_icsneo_netid_t::LIN3, - Network::_icsneo_netid_t::LIN4, + 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::FlexRay + Network::_icsneo_netid_t::icsneo_netid_flexray }; return supportedNetworks; } @@ -51,8 +51,8 @@ protected: virtual bool isSupportedTXNetwork(const Network&) const override { return true; } virtual void setupExtensions() override { std::vector flexRayControllers; - flexRayControllers.push_back(Network::_icsneo_netid_t::FlexRay); - flexRayControllers.push_back(Network::_icsneo_netid_t::FlexRay); // TODO Becomes FlexRay2 if not in coldstart mode + flexRayControllers.push_back(Network::_icsneo_netid_t::icsneo_netid_flexray); + flexRayControllers.push_back(Network::_icsneo_netid_t::icsneo_netid_flexray); // TODO Becomes FlexRay2 if not in coldstart mode addExtension(std::make_shared(*this, flexRayControllers)); } diff --git a/include/icsneo/device/tree/rada2b/rada2b.h b/include/icsneo/device/tree/rada2b/rada2b.h index d8cecb4..aefb819 100644 --- a/include/icsneo/device/tree/rada2b/rada2b.h +++ b/include/icsneo/device/tree/rada2b/rada2b.h @@ -22,7 +22,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, + Network::_icsneo_netid_t::icsneo_netid_hscan2, Network::_icsneo_netid_t::Ethernet, diff --git a/include/icsneo/device/tree/rada2b/rada2bsettings.h b/include/icsneo/device/tree/rada2b/rada2bsettings.h index f9a8d42..26003c2 100644 --- a/include/icsneo/device/tree/rada2b/rada2bsettings.h +++ b/include/icsneo/device/tree/rada2b/rada2bsettings.h @@ -106,7 +106,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -119,7 +119,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; diff --git a/include/icsneo/device/tree/radcomet/radcometbase.h b/include/icsneo/device/tree/radcomet/radcometbase.h index 46d17e5..259287a 100644 --- a/include/icsneo/device/tree/radcomet/radcometbase.h +++ b/include/icsneo/device/tree/radcomet/radcometbase.h @@ -13,7 +13,7 @@ public: virtual const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, + Network::_icsneo_netid_t::icsneo_netid_hscan2, Network::_icsneo_netid_t::Ethernet, diff --git a/include/icsneo/device/tree/radcomet/radcometsettings.h b/include/icsneo/device/tree/radcomet/radcometsettings.h index 03e4771..a20e401 100644 --- a/include/icsneo/device/tree/radcomet/radcometsettings.h +++ b/include/icsneo/device/tree/radcomet/radcometsettings.h @@ -97,7 +97,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -110,7 +110,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_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 62cd757..3f766ad 100644 --- a/include/icsneo/device/tree/radcomet3/radcomet3.h +++ b/include/icsneo/device/tree/radcomet3/radcomet3.h @@ -19,17 +19,17 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, + Network::_icsneo_netid_t::icsneo_netid_hscan2, Network::_icsneo_netid_t::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::OP_Ethernet4, - Network::_icsneo_netid_t::OP_Ethernet5, - Network::_icsneo_netid_t::OP_Ethernet6, - Network::_icsneo_netid_t::OP_Ethernet7, + 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_lin, Network::_icsneo_netid_t::icsneo_netid_iso9141, diff --git a/include/icsneo/device/tree/radcomet3/radcomet3settings.h b/include/icsneo/device/tree/radcomet3/radcomet3settings.h index 1b70d5f..68e81ee 100644 --- a/include/icsneo/device/tree/radcomet3/radcomet3settings.h +++ b/include/icsneo/device/tree/radcomet3/radcomet3settings.h @@ -94,7 +94,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -107,7 +107,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_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 625a555..710623f 100644 --- a/include/icsneo/device/tree/radepsilon/radepsilon.h +++ b/include/icsneo/device/tree/radepsilon/radepsilon.h @@ -15,7 +15,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, + Network::_icsneo_netid_t::icsneo_netid_hscan2, Network::_icsneo_netid_t::Ethernet, // Connected to port 6 on the switch diff --git a/include/icsneo/device/tree/radgalaxy/radgalaxy.h b/include/icsneo/device/tree/radgalaxy/radgalaxy.h index c36f944..4b809eb 100644 --- a/include/icsneo/device/tree/radgalaxy/radgalaxy.h +++ b/include/icsneo/device/tree/radgalaxy/radgalaxy.h @@ -23,15 +23,15 @@ public: static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, Network::_icsneo_netid_t::icsneo_netid_swcan, - Network::_icsneo_netid_t::SWCAN2, + Network::_icsneo_netid_t::icsneo_netid_swcan2, Network::_icsneo_netid_t::icsneo_netid_lin, @@ -41,14 +41,14 @@ public: 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::OP_Ethernet4, - Network::_icsneo_netid_t::OP_Ethernet5, - Network::_icsneo_netid_t::OP_Ethernet6, - Network::_icsneo_netid_t::OP_Ethernet7, - Network::_icsneo_netid_t::OP_Ethernet8, - Network::_icsneo_netid_t::OP_Ethernet9, - Network::_icsneo_netid_t::OP_Ethernet10, - Network::_icsneo_netid_t::OP_Ethernet11, + 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::OP_Ethernet12, Network::_icsneo_netid_t::MDIO1, diff --git a/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h b/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h index 79aa511..a16be01 100644 --- a/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h +++ b/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h @@ -116,13 +116,13 @@ public: return &(cfg->can1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->can7); @@ -141,13 +141,13 @@ public: return &(cfg->canfd1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->canfd7); @@ -164,7 +164,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_swcan: return &(cfg->swcan1); - case Network::_icsneo_netid_t::SWCAN2: + case Network::_icsneo_netid_t::icsneo_netid_swcan2: return &(cfg->swcan2); default: return nullptr; diff --git a/include/icsneo/device/tree/radgigastar/radgigastar.h b/include/icsneo/device/tree/radgigastar/radgigastar.h index f231d1b..fb0cf43 100644 --- a/include/icsneo/device/tree/radgigastar/radgigastar.h +++ b/include/icsneo/device/tree/radgigastar/radgigastar.h @@ -49,10 +49,10 @@ protected: static std::vector supportedRxNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::Ethernet, Network::_icsneo_netid_t::Ethernet2, @@ -62,8 +62,8 @@ protected: Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::FlexRay1a, - Network::_icsneo_netid_t::FlexRay1b, + Network::_icsneo_netid_t::icsneo_netid_flexray1a, + Network::_icsneo_netid_t::icsneo_netid_flexray1b, Network::_icsneo_netid_t::I2C, Network::_icsneo_netid_t::I2C2, @@ -79,10 +79,10 @@ protected: static std::vector supportedTxNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::Ethernet, Network::_icsneo_netid_t::Ethernet2, diff --git a/include/icsneo/device/tree/radgigastar/radgigastarsettings.h b/include/icsneo/device/tree/radgigastar/radgigastarsettings.h index 3a21772..4428315 100644 --- a/include/icsneo/device/tree/radgigastar/radgigastarsettings.h +++ b/include/icsneo/device/tree/radgigastar/radgigastarsettings.h @@ -105,13 +105,13 @@ public: return &(cfg->can1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); default: return nullptr; @@ -126,13 +126,13 @@ public: return &(cfg->canfd1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); default: return nullptr; @@ -143,13 +143,13 @@ public: return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::HSCAN2), - Network(Network::_icsneo_netid_t::HSCAN3), - Network(Network::_icsneo_netid_t::HSCAN4) + Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan4) }, { Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::HSCAN5) + Network(Network::_icsneo_netid_t::icsneo_netid_hscan5) } }; } diff --git a/include/icsneo/device/tree/radgigastar2/radgigastar2.h b/include/icsneo/device/tree/radgigastar2/radgigastar2.h index e467f12..1fcaf3d 100644 --- a/include/icsneo/device/tree/radgigastar2/radgigastar2.h +++ b/include/icsneo/device/tree/radgigastar2/radgigastar2.h @@ -24,9 +24,9 @@ namespace icsneo { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, + 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::Ethernet, Network::_icsneo_netid_t::Ethernet2, @@ -34,19 +34,19 @@ namespace icsneo 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::OP_Ethernet4, - Network::_icsneo_netid_t::OP_Ethernet5, - Network::_icsneo_netid_t::OP_Ethernet6, - Network::_icsneo_netid_t::OP_Ethernet7, - Network::_icsneo_netid_t::OP_Ethernet8, - Network::_icsneo_netid_t::OP_Ethernet9, - Network::_icsneo_netid_t::OP_Ethernet10, + 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_lin, - Network::_icsneo_netid_t::LIN2, - Network::_icsneo_netid_t::LIN3, - Network::_icsneo_netid_t::LIN4, - Network::_icsneo_netid_t::LIN5, + 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::LIN6, Network::_icsneo_netid_t::LIN7, Network::_icsneo_netid_t::LIN8, @@ -59,7 +59,7 @@ namespace icsneo Network::_icsneo_netid_t::MDIO1, Network::_icsneo_netid_t::MDIO2, - Network::_icsneo_netid_t::SPI1, + Network::_icsneo_netid_t::icsneo_netid_spi1, Network::_icsneo_netid_t::SPI2, Network::_icsneo_netid_t::SPI3, Network::_icsneo_netid_t::SPI4, diff --git a/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h b/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h index 9583b73..8cd8c35 100644 --- a/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h +++ b/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h @@ -149,11 +149,11 @@ namespace icsneo { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can4); default: return nullptr; @@ -168,11 +168,11 @@ namespace icsneo { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd4); default: return nullptr; @@ -183,9 +183,9 @@ namespace icsneo { return { {Network(Network::_icsneo_netid_t::icsneo_netid_hscan)}, - {Network(Network::_icsneo_netid_t::HSCAN2)}, - {Network(Network::_icsneo_netid_t::HSCAN3)}, - {Network(Network::_icsneo_netid_t::HSCAN4)}}; + {Network(Network::_icsneo_netid_t::icsneo_netid_hscan2)}, + {Network(Network::_icsneo_netid_t::icsneo_netid_hscan3)}, + {Network(Network::_icsneo_netid_t::icsneo_netid_hscan4)}}; } const LIN_SETTINGS *getLINSettingsFor(Network net) const override @@ -197,13 +197,13 @@ namespace icsneo { case Network::_icsneo_netid_t::icsneo_netid_lin: return &(cfg->lin1); - case Network::_icsneo_netid_t::LIN2: + case Network::_icsneo_netid_t::icsneo_netid_lin2: return &(cfg->lin2); - case Network::_icsneo_netid_t::LIN3: + case Network::_icsneo_netid_t::icsneo_netid_lin3: return &(cfg->lin3); - case Network::_icsneo_netid_t::LIN4: + case Network::_icsneo_netid_t::icsneo_netid_lin4: return &(cfg->lin4); - case Network::_icsneo_netid_t::LIN5: + case Network::_icsneo_netid_t::icsneo_netid_lin5: return &(cfg->lin5); case Network::_icsneo_netid_t::LIN6: return &(cfg->lin6); diff --git a/include/icsneo/device/tree/radjupiter/radjupiter.h b/include/icsneo/device/tree/radjupiter/radjupiter.h index 83ca79b..4e64c0b 100644 --- a/include/icsneo/device/tree/radjupiter/radjupiter.h +++ b/include/icsneo/device/tree/radjupiter/radjupiter.h @@ -18,7 +18,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, + Network::_icsneo_netid_t::icsneo_netid_hscan2, Network::_icsneo_netid_t::icsneo_netid_lin, diff --git a/include/icsneo/device/tree/radjupiter/radjupitersettings.h b/include/icsneo/device/tree/radjupiter/radjupitersettings.h index a71427e..e6a531d 100644 --- a/include/icsneo/device/tree/radjupiter/radjupitersettings.h +++ b/include/icsneo/device/tree/radjupiter/radjupitersettings.h @@ -99,7 +99,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -112,7 +112,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; diff --git a/include/icsneo/device/tree/radmars/radmars.h b/include/icsneo/device/tree/radmars/radmars.h index 200d9a5..cf1c962 100644 --- a/include/icsneo/device/tree/radmars/radmars.h +++ b/include/icsneo/device/tree/radmars/radmars.h @@ -45,10 +45,10 @@ protected: static std::vector supportedRxNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, @@ -58,8 +58,8 @@ protected: Network::_icsneo_netid_t::icsneo_netid_lin, - Network::_icsneo_netid_t::FlexRay1a, - Network::_icsneo_netid_t::FlexRay1b, + Network::_icsneo_netid_t::icsneo_netid_flexray1a, + Network::_icsneo_netid_t::icsneo_netid_flexray1b, Network::_icsneo_netid_t::I2C, @@ -73,10 +73,10 @@ protected: static std::vector supportedTxNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, Network::_icsneo_netid_t::icsneo_netid_mscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4, - Network::_icsneo_netid_t::HSCAN5, + 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::HSCAN6, Network::_icsneo_netid_t::HSCAN7, diff --git a/include/icsneo/device/tree/radmars/radmarssettings.h b/include/icsneo/device/tree/radmars/radmarssettings.h index 8bddd7a..b6ea21b 100644 --- a/include/icsneo/device/tree/radmars/radmarssettings.h +++ b/include/icsneo/device/tree/radmars/radmarssettings.h @@ -111,13 +111,13 @@ public: return &(cfg->can1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->can6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->can7); @@ -136,13 +136,13 @@ public: return &(cfg->canfd1); case Network::_icsneo_netid_t::icsneo_netid_mscan: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd4); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd5); - case Network::_icsneo_netid_t::HSCAN5: + case Network::_icsneo_netid_t::icsneo_netid_hscan5: return &(cfg->canfd6); case Network::_icsneo_netid_t::HSCAN6: return &(cfg->canfd7); @@ -157,14 +157,14 @@ public: return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::HSCAN3), - Network(Network::_icsneo_netid_t::HSCAN5), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan3), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan5), Network(Network::_icsneo_netid_t::HSCAN7) }, { Network(Network::_icsneo_netid_t::icsneo_netid_mscan), - Network(Network::_icsneo_netid_t::HSCAN2), - Network(Network::_icsneo_netid_t::HSCAN4), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan4), Network(Network::_icsneo_netid_t::HSCAN6) } }; diff --git a/include/icsneo/device/tree/radmoont1s/radmoont1s.h b/include/icsneo/device/tree/radmoont1s/radmoont1s.h index b9431eb..cba4e5b 100644 --- a/include/icsneo/device/tree/radmoont1s/radmoont1s.h +++ b/include/icsneo/device/tree/radmoont1s/radmoont1s.h @@ -24,7 +24,7 @@ public: Network::_icsneo_netid_t::MDIO1, - Network::_icsneo_netid_t::SPI1, + Network::_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 56b2948..522b1b4 100644 --- a/include/icsneo/device/tree/radpluto/radpluto.h +++ b/include/icsneo/device/tree/radpluto/radpluto.h @@ -18,7 +18,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, + Network::_icsneo_netid_t::icsneo_netid_hscan2, Network::_icsneo_netid_t::icsneo_netid_lin, @@ -27,7 +27,7 @@ public: 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::OP_Ethernet4 + Network::_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 cec79b8..26a8065 100644 --- a/include/icsneo/device/tree/radpluto/radplutosettings.h +++ b/include/icsneo/device/tree/radpluto/radplutosettings.h @@ -85,7 +85,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -98,7 +98,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); 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 38b2598..e808499 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h @@ -18,7 +18,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -31,7 +31,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -41,7 +41,7 @@ public: virtual std::vector getTerminationGroups() const override { return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }, - { Network(Network::_icsneo_netid_t::HSCAN2) } + { Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) } }; } diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h index 00294b8..af4b18a 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h @@ -17,7 +17,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -30,7 +30,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -40,7 +40,7 @@ public: virtual std::vector getTerminationGroups() const override { return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }, - { Network(Network::_icsneo_netid_t::HSCAN2) } + { Network(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 d83b143..a8eb5a9 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h @@ -18,7 +18,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -31,7 +31,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); 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 5099f9b..8a50da7 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h @@ -18,11 +18,11 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->can3); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->can4); default: return nullptr; @@ -35,11 +35,11 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); - case Network::_icsneo_netid_t::HSCAN3: + case Network::_icsneo_netid_t::icsneo_netid_hscan3: return &(cfg->canfd3); - case Network::_icsneo_netid_t::HSCAN4: + case Network::_icsneo_netid_t::icsneo_netid_hscan4: return &(cfg->canfd4); default: return nullptr; @@ -50,11 +50,11 @@ public: return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan), - Network(Network::_icsneo_netid_t::HSCAN3) + Network(Network::_icsneo_netid_t::icsneo_netid_hscan3) }, { - Network(Network::_icsneo_netid_t::HSCAN2), - Network(Network::_icsneo_netid_t::HSCAN4) + Network(Network::_icsneo_netid_t::icsneo_netid_hscan2), + Network(Network::_icsneo_netid_t::icsneo_netid_hscan4) } }; } diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h index 36c0fc8..c2aa2a8 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h @@ -18,7 +18,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->can1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->can2); default: return nullptr; @@ -31,7 +31,7 @@ public: switch(net.getNetID()) { case Network::_icsneo_netid_t::icsneo_netid_hscan: return &(cfg->canfd1); - case Network::_icsneo_netid_t::HSCAN2: + case Network::_icsneo_netid_t::icsneo_netid_hscan2: return &(cfg->canfd2); default: return nullptr; @@ -41,7 +41,7 @@ public: virtual std::vector getTerminationGroups() const override { return { { Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }, - { Network(Network::_icsneo_netid_t::HSCAN2) } + { Network(Network::_icsneo_netid_t::icsneo_netid_hscan2) } }; } diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-2.h b/include/icsneo/device/tree/valuecan4/valuecan4-2.h index ec202ee..01b09c9 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-2.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-2.h @@ -22,7 +22,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2 + Network::_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 de57cda..84f42c1 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h @@ -51,7 +51,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, + Network::_icsneo_netid_t::icsneo_netid_hscan2, Network::_icsneo_netid_t::Ethernet, diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-4.h b/include/icsneo/device/tree/valuecan4/valuecan4-4.h index 3f972e5..cbd31b8 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-4.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-4.h @@ -24,9 +24,9 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, - Network::_icsneo_netid_t::HSCAN3, - Network::_icsneo_netid_t::HSCAN4 + Network::_icsneo_netid_t::icsneo_netid_hscan2, + Network::_icsneo_netid_t::icsneo_netid_hscan3, + Network::_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 5952e70..6e11020 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4industrial.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4industrial.h @@ -18,7 +18,7 @@ public: static const std::vector& GetSupportedNetworks() { static std::vector supportedNetworks = { Network::_icsneo_netid_t::icsneo_netid_hscan, - Network::_icsneo_netid_t::HSCAN2, + Network::_icsneo_netid_t::icsneo_netid_hscan2, Network::_icsneo_netid_t::Ethernet,