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

more renaming

David Rebbe 2024-12-05 17:12:25 -05:00
parent 632057dc70
commit ff7b567831
38 changed files with 285 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,35 +94,35 @@ void init_network(pybind11::module_& m) {
.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)
.value("MOST25", Network::_icsneo_netid_t::MOST25)
.value("MOST50", Network::_icsneo_netid_t::MOST50)
.value("MOST150", Network::_icsneo_netid_t::MOST150)
.value("Ethernet", Network::_icsneo_netid_t::Ethernet)
.value("GMFSA", Network::_icsneo_netid_t::GMFSA)
.value("TCP", Network::_icsneo_netid_t::TCP)
.value("HSCAN6", Network::_icsneo_netid_t::HSCAN6)
.value("HSCAN7", Network::_icsneo_netid_t::HSCAN7)
.value("LIN6", Network::_icsneo_netid_t::LIN6)
.value("LSFTCAN2", Network::_icsneo_netid_t::LSFTCAN2)
.value("LogicalDiskInfo", Network::_icsneo_netid_t::LogicalDiskInfo)
.value("WiVICommand", Network::_icsneo_netid_t::WiVICommand)
.value("ScriptStatus", Network::_icsneo_netid_t::ScriptStatus)
.value("EthPHYControl", Network::_icsneo_netid_t::EthPHYControl)
.value("ExtendedCommand", Network::_icsneo_netid_t::ExtendedCommand)
.value("ExtendedData", Network::_icsneo_netid_t::ExtendedData)
.value("FlexRayControl", Network::_icsneo_netid_t::FlexRayControl)
.value("CoreMiniPreLoad", Network::_icsneo_netid_t::CoreMiniPreLoad)
.value("HW_COM_Latency_Test", Network::_icsneo_netid_t::HW_COM_Latency_Test)
.value("DeviceStatus", Network::_icsneo_netid_t::DeviceStatus)
.value("UDP", Network::_icsneo_netid_t::UDP)
.value("ForwardedMessage", Network::_icsneo_netid_t::ForwardedMessage)
.value("I2C2", Network::_icsneo_netid_t::I2C2)
.value("I2C3", Network::_icsneo_netid_t::I2C3)
.value("I2C4", Network::_icsneo_netid_t::I2C4)
.value("Ethernet2", Network::_icsneo_netid_t::Ethernet2)
.value("FlexRay2", Network::_icsneo_netid_t::icsneo_netid_flexray2)
.value("OP_Ethernet12", Network::_icsneo_netid_t::icsneo_netid_op_ethernet12)
.value("I2C", Network::_icsneo_netid_t::icsneo_netid_i2c)
.value("MOST25", Network::_icsneo_netid_t::icsneo_netid_most25)
.value("MOST50", Network::_icsneo_netid_t::icsneo_netid_most50)
.value("MOST150", Network::_icsneo_netid_t::icsneo_netid_most150)
.value("Ethernet", Network::_icsneo_netid_t::icsneo_netid_ethernet)
.value("GMFSA", Network::_icsneo_netid_t::icsneo_netid_gmfsa)
.value("TCP", Network::_icsneo_netid_t::icsneo_netid_tcp)
.value("HSCAN6", Network::_icsneo_netid_t::icsneo_netid_hscan6)
.value("HSCAN7", Network::_icsneo_netid_t::icsneo_netid_hscan7)
.value("LIN6", Network::_icsneo_netid_t::icsneo_netid_lin6)
.value("LSFTCAN2", Network::_icsneo_netid_t::icsneo_netid_lsftcan2)
.value("LogicalDiskInfo", Network::_icsneo_netid_t::icsneo_netid_logical_disk_info)
.value("WiVICommand", Network::_icsneo_netid_t::icsneo_netid_wivi_command)
.value("ScriptStatus", Network::_icsneo_netid_t::icsneo_netid_script_status)
.value("EthPHYControl", Network::_icsneo_netid_t::icsneo_netid_eth_phy_control)
.value("ExtendedCommand", Network::_icsneo_netid_t::icsneo_netid_extended_command)
.value("ExtendedData", Network::_icsneo_netid_t::icsneo_netid_extended_data)
.value("FlexRayControl", Network::_icsneo_netid_t::icsneo_netid_flexray_control)
.value("CoreMiniPreLoad", Network::_icsneo_netid_t::icsneo_netid_coremini_preload)
.value("HW_COM_Latency_Test", Network::_icsneo_netid_t::icsneo_netid_hw_com_latency_test)
.value("DeviceStatus", Network::_icsneo_netid_t::icsneo_netid_device_status)
.value("UDP", Network::_icsneo_netid_t::icsneo_netid_udp)
.value("ForwardedMessage", Network::_icsneo_netid_t::icsneo_netid_forwarded_message)
.value("I2C2", Network::_icsneo_netid_t::icsneo_netid_i2c2)
.value("I2C3", Network::_icsneo_netid_t::icsneo_netid_i2c3)
.value("I2C4", Network::_icsneo_netid_t::icsneo_netid_i2c4)
.value("Ethernet2", Network::_icsneo_netid_t::icsneo_netid_ethernet2)
.value("A2B1", Network::_icsneo_netid_t::A2B1)
.value("A2B2", Network::_icsneo_netid_t::A2B2)
.value("Ethernet3", Network::_icsneo_netid_t::Ethernet3)

18
communication/decoder.cpp
View File

@ -253,7 +253,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
raw->network = packet->network;
return true;
}
case Network::_icsneo_netid_t::DeviceStatus: {
case Network::_icsneo_netid_t::icsneo_netid_device_status: {
// Just pass along the data, the device needs to handle this itself
result = std::make_shared<InternalMessage>(packet->network, packet->data);
return true;
@ -282,7 +282,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
msg->data.insert(msg->data.end(), packet->data.begin() + 4, packet->data.end());
return true;
}
case Network::_icsneo_netid_t::ExtendedCommand: {
case Network::_icsneo_netid_t::icsneo_netid_extended_command: {
if(packet->data.size() < sizeof(ExtendedResponseMessage::PackedGenericResponse))
break; // Handle as a raw message, might not be a generic response
@ -313,7 +313,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
}
break;
}
case Network::_icsneo_netid_t::ExtendedData: {
case Network::_icsneo_netid_t::icsneo_netid_extended_data: {
if(packet->data.size() < sizeof(ExtendedDataMessage::ExtendedDataHeader))
break;
const auto& header = *reinterpret_cast<ExtendedDataMessage::ExtendedDataHeader*>(packet->data.data());
@ -328,7 +328,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
std::copy(packet->data.begin() + sizeof(header), packet->data.begin() + sizeof(header) + numRead, extDataMsg->data.begin());
extDataMsg->network = Network(static_cast<uint16_t>(Network::_icsneo_netid_t::ExtendedData), false);
extDataMsg->network = Network(static_cast<uint16_t>(Network::_icsneo_netid_t::icsneo_netid_extended_data), false);
return true;
}
default:
@ -336,7 +336,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
}
break;
}
case Network::_icsneo_netid_t::FlexRayControl: {
case Network::_icsneo_netid_t::icsneo_netid_flexray_control: {
auto frResult = std::make_shared<FlexRayControlMessage>(*packet);
if(!frResult->decoded) {
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
@ -439,7 +439,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
result = msg;
return true;
}
case Network::_icsneo_netid_t::LogicalDiskInfo: {
case Network::_icsneo_netid_t::icsneo_netid_logical_disk_info: {
result = LogicalDiskInfoPacket::DecodeToMessage(packet->data);
if(!result) {
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
@ -447,7 +447,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
}
return true;
}
case Network::_icsneo_netid_t::WiVICommand: {
case Network::_icsneo_netid_t::icsneo_netid_wivi_command: {
result = WiVI::CommandPacket::DecodeToMessage(packet->data);
if(!result) {
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
@ -455,7 +455,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
}
return true;
}
case Network::_icsneo_netid_t::EthPHYControl: {
case Network::_icsneo_netid_t::icsneo_netid_eth_phy_control: {
result = HardwareEthernetPhyRegisterPacket::DecodeToMessage(packet->data, report);
if(!result) {
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
@ -463,7 +463,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
}
return true;
}
case Network::_icsneo_netid_t::ScriptStatus: {
case Network::_icsneo_netid_t::icsneo_netid_script_status: {
result = ScriptStatus::DecodeToMessage(packet->data);
if(!result) {
report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);

8
device/device.cpp
View File

@ -457,7 +457,7 @@ int8_t Device::prepareScriptLoad() {
return false;
}
static std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::CoreMiniPreLoad);
static std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_coremini_preload);
if(!com->sendCommand(Command::CoreMiniPreload))
return false;
@ -1730,7 +1730,7 @@ void Device::handleInternalMessage(std::shared_ptr<Message> message) {
handleNeoVIMessage(std::move(canmsg));
break;
}
case Network::_icsneo_netid_t::DeviceStatus:
case Network::_icsneo_netid_t::icsneo_netid_device_status:
// Device Status format is unique per device, so the devices need to decode it themselves
handleDeviceStatus(rawMessage);
break;
@ -1817,7 +1817,7 @@ std::optional<EthPhyMessage> Device::sendEthPhyMsg(const EthPhyMessage& message,
HardwareEthernetPhyRegisterPacket::EncodeFromMessage(message, bytes, report);
std::shared_ptr<Message> response = com->waitForMessageSync(
[this, bytes](){ return com->sendCommand(Command::PHYControlRegisters, bytes); },
std::make_shared<MessageFilter>(Network::_icsneo_netid_t::EthPHYControl), timeout);
std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_eth_phy_control), timeout);
if(!response) {
report(APIEvent::Type::NoDeviceResponse, APIEvent::Severity::Error);
@ -2023,7 +2023,7 @@ bool Device::readBinaryFile(std::ostream& stream, uint16_t binaryIndex) {
std::vector<uint8_t> arguments(sizeof(ExtendedDataMessage::ExtendedDataHeader));
ExtendedDataMessage::ExtendedDataHeader& parameters = *reinterpret_cast<ExtendedDataMessage::ExtendedDataHeader*>(arguments.data());
auto filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::ExtendedData);
auto filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_extended_data);
for(size_t offset = 0; offset < *size; offset+=ExtendedDataMessage::MaxExtendedDataBufferSize) {
parameters.subCommand = ExtendedDataSubCommand::GenericBinaryRead;

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

@ -610,7 +610,7 @@ uint16_t FlexRay::Controller::CalculateCycleFilter(uint8_t baseCycle, uint8_t cy
}
std::pair<bool, uint32_t> FlexRay::Controller::readRegister(ERAYRegister reg, std::chrono::milliseconds timeout) const {
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(icsneo::Network::_icsneo_netid_t::FlexRayControl);
static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(icsneo::Network::_icsneo_netid_t::icsneo_netid_flexray_control);
if(timeout.count() <= 20)
return {false, 0}; // Out of time!

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

@ -245,9 +245,9 @@ void example3(const std::shared_ptr<icsneo::Device>& rada2b) {
*/
void example4(const std::shared_ptr<icsneo::Device>& rada2b) {
std::shared_ptr<icsneo::I2CMessage> msg = std::make_shared<icsneo::I2CMessage>();
std::shared_ptr<icsneo::MessageFilter> msgFilter = std::make_shared<icsneo::MessageFilter>(icsneo::Network::_icsneo_netid_t::I2C2);
std::shared_ptr<icsneo::MessageFilter> msgFilter = std::make_shared<icsneo::MessageFilter>(icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2);
msg->network = icsneo::Network(icsneo::Network::_icsneo_netid_t::I2C2);
msg->network = icsneo::Network(icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2);
msg->controlBytes.resize(1);
msg->controlBytes[0] = static_cast<uint8_t>(0x17u); // Register address for A2B INTTYPE
msg->dataBytes.resize(1, 0);
@ -261,7 +261,7 @@ void example4(const std::shared_ptr<icsneo::Device>& rada2b) {
if(newMsg->type == icsneo::Message::Type::BusMessage) {
const auto& frame = std::dynamic_pointer_cast<icsneo::BusMessage>(newMsg);
if(frame && frame->network.getNetID() == icsneo::Network::_icsneo_netid_t::I2C2) {
if(frame && frame->network.getNetID() == icsneo::Network::_icsneo_netid_t::icsneo_netid_i2c2) {
const auto& i2cMessage = std::dynamic_pointer_cast<icsneo::I2CMessage>(frame);
if(!i2cMessage) {

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

@ -36,7 +36,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
// Short Ethernet
{
auto frame = std::make_shared<icsneo::EthernetMessage>();
frame->network = icsneo::Network::_icsneo_netid_t::Ethernet;
frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_ethernet;
frames.push_back(frame);
frame->data.resize(ShortEthSize);
std::generate(frame->data.begin(), frame->data.end(), randByteGen);
@ -46,7 +46,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
// Long Ethernet
{
auto frame = std::make_shared<icsneo::EthernetMessage>();
frame->network = icsneo::Network::_icsneo_netid_t::Ethernet;
frame->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_ethernet;
frames.push_back(frame);
frame->data.resize(LongEthSize);
std::generate(frame->data.begin(), frame->data.end(), randByteGen);

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

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

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

@ -114,35 +114,35 @@ public:
icsneo_netid_flexray2b = 83,
icsneo_netid_lin5 = 84,
icsneo_netid_flexray = 85,
FlexRay2 = 86,
OP_Ethernet12 = 87,
I2C = 88,
MOST25 = 90,
MOST50 = 91,
MOST150 = 92,
Ethernet = 93,
GMFSA = 94,
TCP = 95,
HSCAN6 = 96,
HSCAN7 = 97,
LIN6 = 98,
LSFTCAN2 = 99,
LogicalDiskInfo = 187,
WiVICommand = 221,
ScriptStatus = 224,
EthPHYControl = 239,
ExtendedCommand = 240,
ExtendedData = 242,
FlexRayControl = 243,
CoreMiniPreLoad = 244,
HW_COM_Latency_Test = 512,
DeviceStatus = 513,
UDP = 514,
ForwardedMessage = 516,
I2C2 = 517,
I2C3 = 518,
I2C4 = 519,
Ethernet2 = 520,
icsneo_netid_flexray2 = 86,
icsneo_netid_op_ethernet12 = 87,
icsneo_netid_i2c = 88,
icsneo_netid_most25 = 90,
icsneo_netid_most50 = 91,
icsneo_netid_most150 = 92,
icsneo_netid_ethernet = 93,
icsneo_netid_gmfsa = 94,
icsneo_netid_tcp = 95,
icsneo_netid_hscan6 = 96,
icsneo_netid_hscan7 = 97,
icsneo_netid_lin6 = 98,
icsneo_netid_lsftcan2 = 99,
icsneo_netid_logical_disk_info = 187,
icsneo_netid_wivi_command = 221,
icsneo_netid_script_status = 224,
icsneo_netid_eth_phy_control = 239,
icsneo_netid_extended_command = 240,
icsneo_netid_extended_data = 242,
icsneo_netid_flexray_control = 243,
icsneo_netid_coremini_preload = 244,
icsneo_netid_hw_com_latency_test = 512,
icsneo_netid_device_status = 513,
icsneo_netid_udp = 514,
icsneo_netid_forwarded_message = 516,
icsneo_netid_i2c2 = 517,
icsneo_netid_i2c3 = 518,
icsneo_netid_i2c4 = 519,
icsneo_netid_ethernet2 = 520,
A2B1 = 522,
A2B2 = 523,
Ethernet3 = 524,
@ -392,17 +392,17 @@ public:
case 25:
return _icsneo_netid_t::icsneo_netid_cgi;
case 26:
return _icsneo_netid_t::I2C;
return _icsneo_netid_t::icsneo_netid_i2c;
case 27:
return _icsneo_netid_t::icsneo_netid_spi1;
case 28:
return _icsneo_netid_t::icsneo_netid_flexray1a;
case 29:
return _icsneo_netid_t::MOST25;
return _icsneo_netid_t::icsneo_netid_most25;
case 30:
return _icsneo_netid_t::MOST50;
return _icsneo_netid_t::icsneo_netid_most50;
case 31:
return _icsneo_netid_t::MOST150;
return _icsneo_netid_t::icsneo_netid_most150;
case 32:
return _icsneo_netid_t::icsneo_netid_hscan4;
case 33:
@ -428,19 +428,19 @@ public:
case 43:
return _icsneo_netid_t::icsneo_netid_lin5;
case 44:
return _icsneo_netid_t::Ethernet;
return _icsneo_netid_t::icsneo_netid_ethernet;
case 45:
return _icsneo_netid_t::icsneo_netid_ethernet_daq;
case 46:
return _icsneo_netid_t::icsneo_netid_red_app_error;
case 47:
return _icsneo_netid_t::HSCAN6;
return _icsneo_netid_t::icsneo_netid_hscan6;
case 48:
return _icsneo_netid_t::HSCAN7;
return _icsneo_netid_t::icsneo_netid_hscan7;
case 49:
return _icsneo_netid_t::LIN6;
return _icsneo_netid_t::icsneo_netid_lin6;
case 50:
return _icsneo_netid_t::LSFTCAN2;
return _icsneo_netid_t::icsneo_netid_lsftcan2;
}
}
static bool Within(icsneo_netid_t value, icsneo_netid_t min, icsneo_netid_t max) {
@ -505,8 +505,8 @@ public:
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::icsneo_netid_hscan6:
case _icsneo_netid_t::icsneo_netid_hscan7:
case _icsneo_netid_t::DWCAN9:
case _icsneo_netid_t::DWCAN10:
case _icsneo_netid_t::DWCAN11:
@ -521,7 +521,7 @@ public:
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::icsneo_netid_lin6:
case _icsneo_netid_t::LIN7:
case _icsneo_netid_t::LIN8:
case _icsneo_netid_t::LIN9:
@ -536,29 +536,29 @@ public:
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::icsneo_netid_flexray2:
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:
case _icsneo_netid_t::icsneo_netid_most25:
case _icsneo_netid_t::icsneo_netid_most50:
case _icsneo_netid_t::icsneo_netid_most150:
return icsneo_msg_bus_type_most;
case _icsneo_netid_t::icsneo_netid_red:
case _icsneo_netid_t::icsneo_netid_red_oldformat:
case _icsneo_netid_t::icsneo_netid_device:
case _icsneo_netid_t::icsneo_netid_reset_status:
case _icsneo_netid_t::DeviceStatus:
case _icsneo_netid_t::FlexRayControl:
case _icsneo_netid_t::icsneo_netid_device_status:
case _icsneo_netid_t::icsneo_netid_flexray_control:
case _icsneo_netid_t::icsneo_netid_main51:
case _icsneo_netid_t::icsneo_netid_read_settings:
case _icsneo_netid_t::LogicalDiskInfo:
case _icsneo_netid_t::WiVICommand:
case _icsneo_netid_t::ScriptStatus:
case _icsneo_netid_t::EthPHYControl:
case _icsneo_netid_t::CoreMiniPreLoad:
case _icsneo_netid_t::ExtendedCommand:
case _icsneo_netid_t::ExtendedData:
case _icsneo_netid_t::icsneo_netid_logical_disk_info:
case _icsneo_netid_t::icsneo_netid_wivi_command:
case _icsneo_netid_t::icsneo_netid_script_status:
case _icsneo_netid_t::icsneo_netid_eth_phy_control:
case _icsneo_netid_t::icsneo_netid_coremini_preload:
case _icsneo_netid_t::icsneo_netid_extended_command:
case _icsneo_netid_t::icsneo_netid_extended_data:
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:
@ -569,9 +569,9 @@ public:
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::icsneo_netid_ethernet:
case _icsneo_netid_t::icsneo_netid_ethernet_daq:
case _icsneo_netid_t::Ethernet2:
case _icsneo_netid_t::icsneo_netid_ethernet2:
case _icsneo_netid_t::Ethernet3:
case _icsneo_netid_t::icsneo_netid_op_ethernet1:
case _icsneo_netid_t::icsneo_netid_op_ethernet2:
@ -584,14 +584,14 @@ public:
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::icsneo_netid_op_ethernet12:
case _icsneo_netid_t::OP_Ethernet13:
case _icsneo_netid_t::OP_Ethernet14:
case _icsneo_netid_t::OP_Ethernet15:
case _icsneo_netid_t::OP_Ethernet16:
return icsneo_msg_bus_type_ethernet;
case _icsneo_netid_t::icsneo_netid_lsftcan:
case _icsneo_netid_t::LSFTCAN2:
case _icsneo_netid_t::icsneo_netid_lsftcan2:
return icsneo_msg_bus_type_lsftcan;
case _icsneo_netid_t::icsneo_netid_swcan:
case _icsneo_netid_t::icsneo_netid_swcan2:
@ -601,10 +601,10 @@ public:
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:
case _icsneo_netid_t::I2C3:
case _icsneo_netid_t::I2C4:
case _icsneo_netid_t::icsneo_netid_i2c:
case _icsneo_netid_t::icsneo_netid_i2c2:
case _icsneo_netid_t::icsneo_netid_i2c3:
case _icsneo_netid_t::icsneo_netid_i2c4:
return icsneo_msg_bus_type_i2c;
case _icsneo_netid_t::A2B1:
case _icsneo_netid_t::A2B2:
@ -802,9 +802,9 @@ public:
return "LIN 5";
case _icsneo_netid_t::icsneo_netid_flexray:
return "FlexRay";
case _icsneo_netid_t::FlexRay2:
case _icsneo_netid_t::icsneo_netid_flexray2:
return "FlexRay 2";
case _icsneo_netid_t::OP_Ethernet12:
case _icsneo_netid_t::icsneo_netid_op_ethernet12:
return "OP (BR) Ethernet 12";
case _icsneo_netid_t::OP_Ethernet13:
return "OP (BR) Ethernet 13";
@ -814,59 +814,59 @@ public:
return "OP (BR) Ethernet 15";
case _icsneo_netid_t::OP_Ethernet16:
return "OP (BR) Ethernet 16";
case _icsneo_netid_t::I2C:
case _icsneo_netid_t::icsneo_netid_i2c:
return "I2C";
case _icsneo_netid_t::MOST25:
case _icsneo_netid_t::icsneo_netid_most25:
return "MOST25";
case _icsneo_netid_t::MOST50:
case _icsneo_netid_t::icsneo_netid_most50:
return "MOST50";
case _icsneo_netid_t::MOST150:
case _icsneo_netid_t::icsneo_netid_most150:
return "MOST150";
case _icsneo_netid_t::Ethernet:
case _icsneo_netid_t::icsneo_netid_ethernet:
return "Ethernet";
case _icsneo_netid_t::GMFSA:
case _icsneo_netid_t::icsneo_netid_gmfsa:
return "GMFSA";
case _icsneo_netid_t::TCP:
case _icsneo_netid_t::icsneo_netid_tcp:
return "TCP";
case _icsneo_netid_t::HSCAN6:
case _icsneo_netid_t::icsneo_netid_hscan6:
return "HSCAN 6";
case _icsneo_netid_t::HSCAN7:
case _icsneo_netid_t::icsneo_netid_hscan7:
return "HSCAN 7";
case _icsneo_netid_t::LIN6:
case _icsneo_netid_t::icsneo_netid_lin6:
return "LIN 6";
case _icsneo_netid_t::LSFTCAN2:
case _icsneo_netid_t::icsneo_netid_lsftcan2:
return "LSFTCAN 2";
case _icsneo_netid_t::LogicalDiskInfo:
case _icsneo_netid_t::icsneo_netid_logical_disk_info:
return "Logical Disk Information";
case _icsneo_netid_t::WiVICommand:
case _icsneo_netid_t::icsneo_netid_wivi_command:
return "WiVI Command";
case _icsneo_netid_t::ScriptStatus:
case _icsneo_netid_t::icsneo_netid_script_status:
return "Script Status";
case _icsneo_netid_t::CoreMiniPreLoad:
case _icsneo_netid_t::icsneo_netid_coremini_preload:
return "CoreMini PreLoad";
case _icsneo_netid_t::EthPHYControl:
case _icsneo_netid_t::icsneo_netid_eth_phy_control:
return "Ethernet PHY Register Control";
case _icsneo_netid_t::ExtendedCommand:
case _icsneo_netid_t::icsneo_netid_extended_command:
return "Extended Command";
case _icsneo_netid_t::ExtendedData:
case _icsneo_netid_t::icsneo_netid_extended_data:
return "Extended Data";
case _icsneo_netid_t::FlexRayControl:
case _icsneo_netid_t::icsneo_netid_flexray_control:
return "FlexRay Control";
case _icsneo_netid_t::HW_COM_Latency_Test:
case _icsneo_netid_t::icsneo_netid_hw_com_latency_test:
return "HW COM Latency Test";
case _icsneo_netid_t::DeviceStatus:
case _icsneo_netid_t::icsneo_netid_device_status:
return "Device Status";
case _icsneo_netid_t::UDP:
case _icsneo_netid_t::icsneo_netid_udp:
return "UDP";
case _icsneo_netid_t::ForwardedMessage:
case _icsneo_netid_t::icsneo_netid_forwarded_message:
return "Forwarded Message";
case _icsneo_netid_t::I2C2:
case _icsneo_netid_t::icsneo_netid_i2c2:
return "I2C 2";
case _icsneo_netid_t::I2C3:
case _icsneo_netid_t::icsneo_netid_i2c3:
return "I2C 3";
case _icsneo_netid_t::I2C4:
case _icsneo_netid_t::icsneo_netid_i2c4:
return "I2C 4";
case _icsneo_netid_t::Ethernet2:
case _icsneo_netid_t::icsneo_netid_ethernet2:
return "Ethernet 2";
case _icsneo_netid_t::A2B1:
return "A2B 1";
@ -1000,9 +1000,9 @@ public:
return CoreMini::UART2;
case _icsneo_netid_t::icsneo_netid_lin5:
return CoreMini::LIN5;
case _icsneo_netid_t::MOST25:
case _icsneo_netid_t::icsneo_netid_most25:
return CoreMini::MOST25;
case _icsneo_netid_t::MOST50:
case _icsneo_netid_t::icsneo_netid_most50:
return CoreMini::MOST50;
case _icsneo_netid_t::icsneo_netid_flexray1b:
return CoreMini::FlexRay1b;
@ -1010,19 +1010,19 @@ public:
return CoreMini::SWCAN2;
case _icsneo_netid_t::icsneo_netid_ethernet_daq:
return CoreMini::EthernetDAQ;
case _icsneo_netid_t::Ethernet:
case _icsneo_netid_t::icsneo_netid_ethernet:
return CoreMini::Ethernet;
case _icsneo_netid_t::icsneo_netid_flexray2a:
return CoreMini::FlexRay2a;
case _icsneo_netid_t::icsneo_netid_flexray2b:
return CoreMini::FlexRay2b;
case _icsneo_netid_t::HSCAN6:
case _icsneo_netid_t::icsneo_netid_hscan6:
return CoreMini::HSCAN6;
case _icsneo_netid_t::HSCAN7:
case _icsneo_netid_t::icsneo_netid_hscan7:
return CoreMini::HSCAN7;
case _icsneo_netid_t::LIN6:
case _icsneo_netid_t::icsneo_netid_lin6:
return CoreMini::LIN6;
case _icsneo_netid_t::LSFTCAN2:
case _icsneo_netid_t::icsneo_netid_lsftcan2:
return CoreMini::LSFTCAN2;
case _icsneo_netid_t::icsneo_netid_op_ethernet1:
return CoreMini::OP_Ethernet1;
@ -1046,7 +1046,7 @@ public:
return CoreMini::OP_Ethernet10;
case _icsneo_netid_t::icsneo_netid_op_ethernet11:
return CoreMini::OP_Ethernet11;
case _icsneo_netid_t::OP_Ethernet12:
case _icsneo_netid_t::icsneo_netid_op_ethernet12:
return CoreMini::OP_Ethernet12;
case _icsneo_netid_t::OP_Ethernet13:
return CoreMini::OP_Ethernet13;
@ -1056,25 +1056,25 @@ public:
return CoreMini::OP_Ethernet15;
case _icsneo_netid_t::OP_Ethernet16:
return CoreMini::OP_Ethernet16;
case _icsneo_netid_t::TCP:
case _icsneo_netid_t::icsneo_netid_tcp:
return CoreMini::TCPVirtual;
case _icsneo_netid_t::UDP:
case _icsneo_netid_t::icsneo_netid_udp:
return CoreMini::UDPVirtual;
case _icsneo_netid_t::icsneo_netid_flexray:
return CoreMini::FlexRay1;
case _icsneo_netid_t::FlexRay2:
case _icsneo_netid_t::icsneo_netid_flexray2:
return CoreMini::FlexRay2;
case _icsneo_netid_t::ForwardedMessage:
case _icsneo_netid_t::icsneo_netid_forwarded_message:
return CoreMini::ForwardedMessage;
case _icsneo_netid_t::I2C:
case _icsneo_netid_t::icsneo_netid_i2c:
return CoreMini::I2C1;
case _icsneo_netid_t::I2C2:
case _icsneo_netid_t::icsneo_netid_i2c2:
return CoreMini::I2C2;
case _icsneo_netid_t::I2C3:
case _icsneo_netid_t::icsneo_netid_i2c3:
return CoreMini::I2C3;
case _icsneo_netid_t::I2C4:
case _icsneo_netid_t::icsneo_netid_i2c4:
return CoreMini::I2C4;
case _icsneo_netid_t::Ethernet2:
case _icsneo_netid_t::icsneo_netid_ethernet2:
return CoreMini::Ethernet2;
case _icsneo_netid_t::A2B1:
return CoreMini::A2B1;
@ -1207,9 +1207,9 @@ public:
case CoreMini::LIN5:
return _icsneo_netid_t::icsneo_netid_lin5;
case CoreMini::MOST25:
return _icsneo_netid_t::MOST25;
return _icsneo_netid_t::icsneo_netid_most25;
case CoreMini::MOST50:
return _icsneo_netid_t::MOST50;
return _icsneo_netid_t::icsneo_netid_most50;
case CoreMini::FlexRay1b:
return _icsneo_netid_t::icsneo_netid_flexray1b;
case CoreMini::SWCAN2:
@ -1217,19 +1217,19 @@ public:
case CoreMini::EthernetDAQ:
return _icsneo_netid_t::icsneo_netid_ethernet_daq;
case CoreMini::Ethernet:
return _icsneo_netid_t::Ethernet;
return _icsneo_netid_t::icsneo_netid_ethernet;
case CoreMini::FlexRay2a:
return _icsneo_netid_t::icsneo_netid_flexray2a;
case CoreMini::FlexRay2b:
return _icsneo_netid_t::icsneo_netid_flexray2b;
case CoreMini::HSCAN6:
return _icsneo_netid_t::HSCAN6;
return _icsneo_netid_t::icsneo_netid_hscan6;
case CoreMini::HSCAN7:
return _icsneo_netid_t::HSCAN7;
return _icsneo_netid_t::icsneo_netid_hscan7;
case CoreMini::LIN6:
return _icsneo_netid_t::LIN6;
return _icsneo_netid_t::icsneo_netid_lin6;
case CoreMini::LSFTCAN2:
return _icsneo_netid_t::LSFTCAN2;
return _icsneo_netid_t::icsneo_netid_lsftcan2;
case CoreMini::OP_Ethernet1:
return _icsneo_netid_t::icsneo_netid_op_ethernet1;
case CoreMini::OP_Ethernet2:
@ -1253,7 +1253,7 @@ public:
case CoreMini::OP_Ethernet11:
return _icsneo_netid_t::icsneo_netid_op_ethernet11;
case CoreMini::OP_Ethernet12:
return _icsneo_netid_t::OP_Ethernet12;
return _icsneo_netid_t::icsneo_netid_op_ethernet12;
case CoreMini::OP_Ethernet13:
return _icsneo_netid_t::OP_Ethernet13;
case CoreMini::OP_Ethernet14:
@ -1263,25 +1263,25 @@ public:
case CoreMini::OP_Ethernet16:
return _icsneo_netid_t::OP_Ethernet16;
case CoreMini::TCPVirtual:
return _icsneo_netid_t::TCP;
return _icsneo_netid_t::icsneo_netid_tcp;
case CoreMini::UDPVirtual:
return _icsneo_netid_t::UDP;
return _icsneo_netid_t::icsneo_netid_udp;
case CoreMini::FlexRay1:
return _icsneo_netid_t::icsneo_netid_flexray;
case CoreMini::FlexRay2:
return _icsneo_netid_t::FlexRay2;
return _icsneo_netid_t::icsneo_netid_flexray2;
case CoreMini::ForwardedMessage:
return _icsneo_netid_t::ForwardedMessage;
return _icsneo_netid_t::icsneo_netid_forwarded_message;
case CoreMini::I2C1:
return _icsneo_netid_t::I2C;
return _icsneo_netid_t::icsneo_netid_i2c;
case CoreMini::I2C2:
return _icsneo_netid_t::I2C2;
return _icsneo_netid_t::icsneo_netid_i2c2;
case CoreMini::I2C3:
return _icsneo_netid_t::I2C3;
return _icsneo_netid_t::icsneo_netid_i2c3;
case CoreMini::I2C4:
return _icsneo_netid_t::I2C4;
return _icsneo_netid_t::icsneo_netid_i2c4;
case CoreMini::Ethernet2:
return _icsneo_netid_t::Ethernet2;
return _icsneo_netid_t::icsneo_netid_ethernet2;
case CoreMini::A2B1:
return _icsneo_netid_t::A2B1;
case CoreMini::A2B2:

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

@ -23,10 +23,10 @@ public:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_lin2

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

@ -104,9 +104,9 @@ public:
return &(cfg->can4);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can5);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can6);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can7);
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can8);
@ -129,9 +129,9 @@ public:
return &(cfg->canfd4);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd5);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd6);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd7);
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->canfd8);

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

@ -29,16 +29,16 @@ public:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::icsneo_netid_lsftcan,
Network::_icsneo_netid_t::LSFTCAN2,
Network::_icsneo_netid_t::icsneo_netid_lsftcan2,
Network::_icsneo_netid_t::icsneo_netid_swcan,
Network::_icsneo_netid_t::icsneo_netid_swcan2,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_lin2,

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

@ -140,13 +140,13 @@ public:
return &(cfg->can5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can8);
case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
return &(cfg->lsftcan1);
case Network::_icsneo_netid_t::LSFTCAN2:
case Network::_icsneo_netid_t::icsneo_netid_lsftcan2:
return &(cfg->lsftcan2);
default:
return nullptr;
@ -169,9 +169,9 @@ public:
return &(cfg->canfd5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd8);
default:
return nullptr;
@ -198,13 +198,13 @@ public:
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
Network(Network::_icsneo_netid_t::HSCAN7)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
},
{
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
Network(Network::_icsneo_netid_t::HSCAN6)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
}
};
}
@ -224,7 +224,7 @@ public:
return &(cfg->lin4);
case Network::_icsneo_netid_t::icsneo_netid_lin5:
return &(cfg->lin5);
case Network::_icsneo_netid_t::LIN6:
case Network::_icsneo_netid_t::icsneo_netid_lin6:
return &(cfg->lin6);
default:
return nullptr;

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

@ -23,8 +23,8 @@ public:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::DWCAN9,
Network::_icsneo_netid_t::DWCAN10,
Network::_icsneo_netid_t::DWCAN11,
@ -34,8 +34,8 @@ public:
Network::_icsneo_netid_t::DWCAN15,
Network::_icsneo_netid_t::DWCAN16,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::Ethernet3,
Network::_icsneo_netid_t::icsneo_netid_lin,
@ -43,7 +43,7 @@ public:
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::icsneo_netid_lin6,
Network::_icsneo_netid_t::LIN7,
Network::_icsneo_netid_t::LIN8,
};

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

@ -178,9 +178,9 @@ public:
return &(cfg->can5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can8);
default:
return nullptr;
@ -203,9 +203,9 @@ public:
return &(cfg->canfd5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd8);
default:
return nullptr;
@ -218,13 +218,13 @@ public:
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
Network(Network::_icsneo_netid_t::HSCAN7)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
},
{
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
Network(Network::_icsneo_netid_t::HSCAN6)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
}
};
}
@ -244,7 +244,7 @@ public:
return &(cfg->lin4);
case Network::_icsneo_netid_t::icsneo_netid_lin5:
return &(cfg->lin5);
case Network::_icsneo_netid_t::LIN6:
case Network::_icsneo_netid_t::icsneo_netid_lin6:
return &(cfg->lin6);
case Network::_icsneo_netid_t::LIN7:
return &(cfg->lin7);

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

@ -23,8 +23,8 @@ public:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::DWCAN9,
Network::_icsneo_netid_t::DWCAN10,
Network::_icsneo_netid_t::DWCAN11,
@ -33,8 +33,8 @@ public:
Network::_icsneo_netid_t::DWCAN14,
Network::_icsneo_netid_t::DWCAN15,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::Ethernet3,
Network::_icsneo_netid_t::icsneo_netid_lin,
@ -45,7 +45,7 @@ public:
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::icsneo_netid_flexray2,
Network::_icsneo_netid_t::icsneo_netid_flexray2a,
Network::_icsneo_netid_t::icsneo_netid_flexray2b,
};

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

@ -161,9 +161,9 @@ public:
return &(cfg->can5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can8);
default:
return nullptr;
@ -186,9 +186,9 @@ public:
return &(cfg->canfd5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd8);
default:
return nullptr;
@ -201,13 +201,13 @@ public:
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
Network(Network::_icsneo_netid_t::HSCAN7)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
},
{
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
Network(Network::_icsneo_netid_t::HSCAN6)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
}
};
}

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

@ -23,11 +23,11 @@ public:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_lin2

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

@ -117,9 +117,9 @@ public:
return &(cfg->can4);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can5);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can6);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can7);
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->can8);
@ -142,9 +142,9 @@ public:
return &(cfg->canfd4);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd5);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd6);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd7);
case Network::_icsneo_netid_t::icsneo_netid_mscan:
return &(cfg->canfd8);
@ -159,13 +159,13 @@ public:
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
Network(Network::_icsneo_netid_t::HSCAN7)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
},
{
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
Network(Network::_icsneo_netid_t::HSCAN6)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
}
};
}

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

@ -19,16 +19,16 @@ public:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::icsneo_netid_lsftcan,
Network::_icsneo_netid_t::LSFTCAN2,
Network::_icsneo_netid_t::icsneo_netid_lsftcan2,
Network::_icsneo_netid_t::icsneo_netid_swcan,
Network::_icsneo_netid_t::icsneo_netid_swcan2,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::icsneo_netid_lin2,

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

@ -24,15 +24,15 @@ public:
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::A2B1,
Network::_icsneo_netid_t::A2B2,
Network::_icsneo_netid_t::I2C,
Network::_icsneo_netid_t::I2C2,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::icsneo_netid_i2c2,
Network::_icsneo_netid_t::MDIO1,
};

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

@ -15,7 +15,7 @@ public:
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,

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

@ -21,7 +21,7 @@ public:
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,

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

@ -17,7 +17,7 @@ public:
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::_icsneo_netid_t::Ethernet, // Connected to port 6 on the switch
Network::_icsneo_netid_t::icsneo_netid_ethernet, // Connected to port 6 on the switch
Network::_icsneo_netid_t::icsneo_netid_lin
};

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

@ -27,16 +27,16 @@ public:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::icsneo_netid_swcan,
Network::_icsneo_netid_t::icsneo_netid_swcan2,
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
@ -49,7 +49,7 @@ public:
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::icsneo_netid_op_ethernet12,
Network::_icsneo_netid_t::MDIO1,
Network::_icsneo_netid_t::MDIO2,

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

@ -124,9 +124,9 @@ public:
return &(cfg->can5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can8);
default:
return nullptr;
@ -149,9 +149,9 @@ public:
return &(cfg->canfd5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd8);
default:
return nullptr;

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

@ -54,8 +54,8 @@ protected:
Network::_icsneo_netid_t::icsneo_netid_hscan4,
Network::_icsneo_netid_t::icsneo_netid_hscan5,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
@ -65,9 +65,9 @@ protected:
Network::_icsneo_netid_t::icsneo_netid_flexray1a,
Network::_icsneo_netid_t::icsneo_netid_flexray1b,
Network::_icsneo_netid_t::I2C,
Network::_icsneo_netid_t::I2C2,
Network::_icsneo_netid_t::I2C3,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::icsneo_netid_i2c2,
Network::_icsneo_netid_t::icsneo_netid_i2c3,
Network::_icsneo_netid_t::MDIO1,
Network::_icsneo_netid_t::MDIO2,
@ -84,8 +84,8 @@ protected:
Network::_icsneo_netid_t::icsneo_netid_hscan4,
Network::_icsneo_netid_t::icsneo_netid_hscan5,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
@ -94,9 +94,9 @@ protected:
// FlexRay is Receive Only
Network::_icsneo_netid_t::I2C,
Network::_icsneo_netid_t::I2C2,
Network::_icsneo_netid_t::I2C3,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::icsneo_netid_i2c2,
Network::_icsneo_netid_t::icsneo_netid_i2c3,
Network::_icsneo_netid_t::MDIO1,
Network::_icsneo_netid_t::MDIO2,

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

@ -28,8 +28,8 @@ namespace icsneo
Network::_icsneo_netid_t::icsneo_netid_hscan3,
Network::_icsneo_netid_t::icsneo_netid_hscan4,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
@ -47,14 +47,14 @@ namespace icsneo
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::icsneo_netid_lin6,
Network::_icsneo_netid_t::LIN7,
Network::_icsneo_netid_t::LIN8,
Network::_icsneo_netid_t::LIN9,
Network::_icsneo_netid_t::LIN10,
Network::_icsneo_netid_t::I2C,
Network::_icsneo_netid_t::I2C2,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::icsneo_netid_i2c2,
Network::_icsneo_netid_t::MDIO1,
Network::_icsneo_netid_t::MDIO2,

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

@ -205,7 +205,7 @@ namespace icsneo
return &(cfg->lin4);
case Network::_icsneo_netid_t::icsneo_netid_lin5:
return &(cfg->lin5);
case Network::_icsneo_netid_t::LIN6:
case Network::_icsneo_netid_t::icsneo_netid_lin6:
return &(cfg->lin6);
case Network::_icsneo_netid_t::LIN7:
return &(cfg->lin7);

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

@ -22,7 +22,7 @@ public:
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::Ethernet // Connected to port 6 on the switch
Network::_icsneo_netid_t::icsneo_netid_ethernet // Connected to port 6 on the switch
};
return supportedNetworks;
}

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

@ -49,11 +49,11 @@ protected:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::Ethernet3,
Network::_icsneo_netid_t::icsneo_netid_lin,
@ -61,7 +61,7 @@ protected:
Network::_icsneo_netid_t::icsneo_netid_flexray1a,
Network::_icsneo_netid_t::icsneo_netid_flexray1b,
Network::_icsneo_netid_t::I2C,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::MDIO1,
Network::_icsneo_netid_t::MDIO2,
@ -77,18 +77,18 @@ protected:
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_hscan6,
Network::_icsneo_netid_t::icsneo_netid_hscan7,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::Ethernet2,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet2,
Network::_icsneo_netid_t::Ethernet3,
Network::_icsneo_netid_t::icsneo_netid_lin,
// FlexRay is Receive Only
Network::_icsneo_netid_t::I2C,
Network::_icsneo_netid_t::icsneo_netid_i2c,
Network::_icsneo_netid_t::MDIO1,
Network::_icsneo_netid_t::MDIO2,

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

@ -119,9 +119,9 @@ public:
return &(cfg->can5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->can6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->can7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->can8);
default:
return nullptr;
@ -144,9 +144,9 @@ public:
return &(cfg->canfd5);
case Network::_icsneo_netid_t::icsneo_netid_hscan5:
return &(cfg->canfd6);
case Network::_icsneo_netid_t::HSCAN6:
case Network::_icsneo_netid_t::icsneo_netid_hscan6:
return &(cfg->canfd7);
case Network::_icsneo_netid_t::HSCAN7:
case Network::_icsneo_netid_t::icsneo_netid_hscan7:
return &(cfg->canfd8);
default:
return nullptr;
@ -159,13 +159,13 @@ public:
Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan3),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan5),
Network(Network::_icsneo_netid_t::HSCAN7)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan7)
},
{
Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan2),
Network(Network::_icsneo_netid_t::icsneo_netid_hscan4),
Network(Network::_icsneo_netid_t::HSCAN6)
Network(Network::_icsneo_netid_t::icsneo_netid_hscan6)
}
};
}

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

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

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

@ -18,7 +18,7 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,

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

@ -22,7 +22,7 @@ public:
Network::_icsneo_netid_t::icsneo_netid_lin,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,

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

@ -21,7 +21,7 @@ public:
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_mscan,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,

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

@ -22,7 +22,7 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
Network::_icsneo_netid_t::MDIO1,
Network::_icsneo_netid_t::MDIO2,

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

@ -53,7 +53,7 @@ public:
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_lin
};

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

@ -20,7 +20,7 @@ public:
Network::_icsneo_netid_t::icsneo_netid_hscan,
Network::_icsneo_netid_t::icsneo_netid_hscan2,
Network::_icsneo_netid_t::Ethernet,
Network::_icsneo_netid_t::icsneo_netid_ethernet,
Network::_icsneo_netid_t::icsneo_netid_lin
};