mirror of
https://github.com/intrepidcs/libicsneo.git
synced 2026-08-05 01:18:36 +02:00
All: Update network names
Updates all network names, the new format is <id>_<%02d>.
This commit is contained in:
@@ -23,50 +23,50 @@ namespace icsneo
|
||||
static const std::vector<Network> &GetSupportedNetworks()
|
||||
{
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::NetID::HSCAN,
|
||||
Network::NetID::HSCAN2,
|
||||
Network::NetID::HSCAN3,
|
||||
Network::NetID::HSCAN4,
|
||||
Network::NetID::DWCAN_01,
|
||||
Network::NetID::DWCAN_02,
|
||||
Network::NetID::DWCAN_03,
|
||||
Network::NetID::DWCAN_04,
|
||||
|
||||
Network::NetID::Ethernet,
|
||||
Network::NetID::Ethernet2,
|
||||
Network::NetID::ETHERNET_01,
|
||||
Network::NetID::ETHERNET_02,
|
||||
|
||||
Network::NetID::OP_Ethernet1,
|
||||
Network::NetID::OP_Ethernet2,
|
||||
Network::NetID::OP_Ethernet3,
|
||||
Network::NetID::OP_Ethernet4,
|
||||
Network::NetID::OP_Ethernet5,
|
||||
Network::NetID::OP_Ethernet6,
|
||||
Network::NetID::OP_Ethernet7,
|
||||
Network::NetID::OP_Ethernet8,
|
||||
Network::NetID::OP_Ethernet9,
|
||||
Network::NetID::OP_Ethernet10,
|
||||
Network::NetID::AE_01,
|
||||
Network::NetID::AE_02,
|
||||
Network::NetID::AE_03,
|
||||
Network::NetID::AE_04,
|
||||
Network::NetID::AE_05,
|
||||
Network::NetID::AE_06,
|
||||
Network::NetID::AE_07,
|
||||
Network::NetID::AE_08,
|
||||
Network::NetID::AE_09,
|
||||
Network::NetID::AE_10,
|
||||
|
||||
Network::NetID::LIN,
|
||||
Network::NetID::LIN2,
|
||||
Network::NetID::LIN3,
|
||||
Network::NetID::LIN4,
|
||||
Network::NetID::LIN5,
|
||||
Network::NetID::LIN6,
|
||||
Network::NetID::LIN7,
|
||||
Network::NetID::LIN8,
|
||||
Network::NetID::LIN9,
|
||||
Network::NetID::LIN10,
|
||||
Network::NetID::LIN_01,
|
||||
Network::NetID::LIN_02,
|
||||
Network::NetID::LIN_03,
|
||||
Network::NetID::LIN_04,
|
||||
Network::NetID::LIN_05,
|
||||
Network::NetID::LIN_06,
|
||||
Network::NetID::LIN_07,
|
||||
Network::NetID::LIN_08,
|
||||
Network::NetID::LIN_09,
|
||||
Network::NetID::LIN_10,
|
||||
|
||||
Network::NetID::I2C,
|
||||
Network::NetID::I2C2,
|
||||
Network::NetID::I2C_01,
|
||||
Network::NetID::I2C_02,
|
||||
|
||||
Network::NetID::MDIO1,
|
||||
Network::NetID::MDIO2,
|
||||
Network::NetID::MDIO_01,
|
||||
Network::NetID::MDIO_02,
|
||||
|
||||
Network::NetID::SPI1,
|
||||
Network::NetID::SPI2,
|
||||
Network::NetID::SPI3,
|
||||
Network::NetID::SPI4,
|
||||
Network::NetID::SPI5,
|
||||
Network::NetID::SPI6,
|
||||
Network::NetID::SPI7,
|
||||
Network::NetID::SPI8,
|
||||
Network::NetID::SPI_01,
|
||||
Network::NetID::SPI_02,
|
||||
Network::NetID::SPI_03,
|
||||
Network::NetID::SPI_04,
|
||||
Network::NetID::SPI_05,
|
||||
Network::NetID::SPI_06,
|
||||
Network::NetID::SPI_07,
|
||||
Network::NetID::SPI_08,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
@@ -89,12 +89,12 @@ namespace icsneo
|
||||
ETHERNET_SETTINGS2 ethernet1;
|
||||
ETHERNET_SETTINGS2 ethernet2;
|
||||
// Ethernet General
|
||||
OP_ETH_GENERAL_SETTINGS opEthGen;
|
||||
AE_GENERAL_SETTINGS aeGen;
|
||||
// 100/1000T1
|
||||
ETHERNET_SETTINGS2 ethT1;
|
||||
OP_ETH_SETTINGS opEth1;
|
||||
AE_SETTINGS ae_01;
|
||||
ETHERNET_SETTINGS2 ethT12;
|
||||
OP_ETH_SETTINGS opEth2;
|
||||
AE_SETTINGS ae_02;
|
||||
// 10T1S
|
||||
ETHERNET_SETTINGS2 ethT1s1;
|
||||
ETHERNET10T1S_SETTINGS t1s1;
|
||||
@@ -147,13 +147,13 @@ namespace icsneo
|
||||
return nullptr;
|
||||
switch (net.getNetID())
|
||||
{
|
||||
case Network::NetID::HSCAN:
|
||||
case Network::NetID::DWCAN_01:
|
||||
return &(cfg->can1);
|
||||
case Network::NetID::HSCAN2:
|
||||
case Network::NetID::DWCAN_02:
|
||||
return &(cfg->can2);
|
||||
case Network::NetID::HSCAN3:
|
||||
case Network::NetID::DWCAN_03:
|
||||
return &(cfg->can3);
|
||||
case Network::NetID::HSCAN4:
|
||||
case Network::NetID::DWCAN_04:
|
||||
return &(cfg->can4);
|
||||
default:
|
||||
return nullptr;
|
||||
@@ -166,13 +166,13 @@ namespace icsneo
|
||||
return nullptr;
|
||||
switch (net.getNetID())
|
||||
{
|
||||
case Network::NetID::HSCAN:
|
||||
case Network::NetID::DWCAN_01:
|
||||
return &(cfg->canfd1);
|
||||
case Network::NetID::HSCAN2:
|
||||
case Network::NetID::DWCAN_02:
|
||||
return &(cfg->canfd2);
|
||||
case Network::NetID::HSCAN3:
|
||||
case Network::NetID::DWCAN_03:
|
||||
return &(cfg->canfd3);
|
||||
case Network::NetID::HSCAN4:
|
||||
case Network::NetID::DWCAN_04:
|
||||
return &(cfg->canfd4);
|
||||
default:
|
||||
return nullptr;
|
||||
@@ -182,10 +182,10 @@ namespace icsneo
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override
|
||||
{
|
||||
return {
|
||||
{Network(Network::NetID::HSCAN)},
|
||||
{Network(Network::NetID::HSCAN2)},
|
||||
{Network(Network::NetID::HSCAN3)},
|
||||
{Network(Network::NetID::HSCAN4)}};
|
||||
{Network(Network::NetID::DWCAN_01)},
|
||||
{Network(Network::NetID::DWCAN_02)},
|
||||
{Network(Network::NetID::DWCAN_03)},
|
||||
{Network(Network::NetID::DWCAN_04)}};
|
||||
}
|
||||
|
||||
const LIN_SETTINGS *getLINSettingsFor(Network net) const override
|
||||
@@ -195,25 +195,25 @@ namespace icsneo
|
||||
return nullptr;
|
||||
switch (net.getNetID())
|
||||
{
|
||||
case Network::NetID::LIN:
|
||||
case Network::NetID::LIN_01:
|
||||
return &(cfg->lin1);
|
||||
case Network::NetID::LIN2:
|
||||
case Network::NetID::LIN_02:
|
||||
return &(cfg->lin2);
|
||||
case Network::NetID::LIN3:
|
||||
case Network::NetID::LIN_03:
|
||||
return &(cfg->lin3);
|
||||
case Network::NetID::LIN4:
|
||||
case Network::NetID::LIN_04:
|
||||
return &(cfg->lin4);
|
||||
case Network::NetID::LIN5:
|
||||
case Network::NetID::LIN_05:
|
||||
return &(cfg->lin5);
|
||||
case Network::NetID::LIN6:
|
||||
case Network::NetID::LIN_06:
|
||||
return &(cfg->lin6);
|
||||
case Network::NetID::LIN7:
|
||||
case Network::NetID::LIN_07:
|
||||
return &(cfg->lin7);
|
||||
case Network::NetID::LIN8:
|
||||
case Network::NetID::LIN_08:
|
||||
return &(cfg->lin8);
|
||||
case Network::NetID::LIN9:
|
||||
case Network::NetID::LIN_09:
|
||||
return &(cfg->lin9);
|
||||
case Network::NetID::LIN10:
|
||||
case Network::NetID::LIN_10:
|
||||
return &(cfg->lin10);
|
||||
default:
|
||||
return nullptr;
|
||||
|
||||
Reference in New Issue
Block a user