sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

All: Update network names

Browse Source 
Updates all network names, the new format is <id>_<%02d>.
This commit is contained in:
Kyle Schwarz
2025-04-17 20:57:46 +00:00
parent e88cd244c8
commit 8b680f2b64
134 changed files with 2107 additions and 20559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/device/tree/radmars/radmars.h
+32 -32
View File
@@ -44,55 +44,55 @@ protected:
void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
static std::vector<Network> supportedRxNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
Network::NetID::DWCAN_01,
Network::NetID::DWCAN_08,
Network::NetID::DWCAN_02,
Network::NetID::DWCAN_03,
Network::NetID::DWCAN_04,
Network::NetID::DWCAN_05,
Network::NetID::DWCAN_06,
Network::NetID::DWCAN_07,
Network::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::NetID::ETHERNET_01,
Network::NetID::ETHERNET_02,
Network::NetID::ETHERNET_03,
Network::NetID::LIN,
Network::NetID::LIN_01,
Network::NetID::FlexRay1a,
Network::NetID::FlexRay1b,
Network::NetID::FLEXRAY_01A,
Network::NetID::FLEXRAY_01B,
Network::NetID::I2C,
Network::NetID::I2C_01,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
};
rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end());
}
void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override {
static std::vector<Network> supportedTxNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::HSCAN2,
Network::NetID::HSCAN3,
Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
Network::NetID::DWCAN_01,
Network::NetID::DWCAN_08,
Network::NetID::DWCAN_02,
Network::NetID::DWCAN_03,
Network::NetID::DWCAN_04,
Network::NetID::DWCAN_05,
Network::NetID::DWCAN_06,
Network::NetID::DWCAN_07,
Network::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::NetID::ETHERNET_01,
Network::NetID::ETHERNET_02,
Network::NetID::ETHERNET_03,
Network::NetID::LIN,
Network::NetID::LIN_01,
// FlexRay is Receive Only
Network::NetID::I2C,
Network::NetID::I2C_01,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
};
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
}
include/icsneo/device/tree/radmars/radmarssettings.h
+25 -25
View File
@@ -107,21 +107,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::NetID::DWCAN_01:
return &(cfg->can1);
case Network::NetID::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->can2);
case Network::NetID::HSCAN2:
case Network::NetID::DWCAN_02:
return &(cfg->can3);
case Network::NetID::HSCAN3:
case Network::NetID::DWCAN_03:
return &(cfg->can4);
case Network::NetID::HSCAN4:
case Network::NetID::DWCAN_04:
return &(cfg->can5);
case Network::NetID::HSCAN5:
case Network::NetID::DWCAN_05:
return &(cfg->can6);
case Network::NetID::HSCAN6:
case Network::NetID::DWCAN_06:
return &(cfg->can7);
case Network::NetID::HSCAN7:
case Network::NetID::DWCAN_07:
return &(cfg->can8);
default:
return nullptr;
@@ -132,21 +132,21 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::NetID::DWCAN_01:
return &(cfg->canfd1);
case Network::NetID::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->canfd2);
case Network::NetID::HSCAN2:
case Network::NetID::DWCAN_02:
return &(cfg->canfd3);
case Network::NetID::HSCAN3:
case Network::NetID::DWCAN_03:
return &(cfg->canfd4);
case Network::NetID::HSCAN4:
case Network::NetID::DWCAN_04:
return &(cfg->canfd5);
case Network::NetID::HSCAN5:
case Network::NetID::DWCAN_05:
return &(cfg->canfd6);
case Network::NetID::HSCAN6:
case Network::NetID::DWCAN_06:
return &(cfg->canfd7);
case Network::NetID::HSCAN7:
case Network::NetID::DWCAN_07:
return &(cfg->canfd8);
default:
return nullptr;
@@ -156,16 +156,16 @@ public:
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{
Network(Network::NetID::HSCAN),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN5),
Network(Network::NetID::HSCAN7)
Network(Network::NetID::DWCAN_01),
Network(Network::NetID::DWCAN_03),
Network(Network::NetID::DWCAN_05),
Network(Network::NetID::DWCAN_07)
},
{
Network(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4),
Network(Network::NetID::HSCAN6)
Network(Network::NetID::DWCAN_08),
Network(Network::NetID::DWCAN_02),
Network(Network::NetID::DWCAN_04),
Network(Network::NetID::DWCAN_06)
}
};
}
@@ -175,7 +175,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::NetID::LIN_01:
return &(cfg->lin1);
default:
return nullptr;