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:
@@ -22,8 +22,8 @@ public:
|
||||
|
||||
const std::vector<Network>& GetSupportedNetworks() override {
|
||||
static std::vector<Network> supportedNetworks = RADCometBase::GetSupportedNetworks();
|
||||
supportedNetworks.push_back(Network::NetID::OP_Ethernet3);
|
||||
supportedNetworks.push_back(Network::NetID::MDIO4);
|
||||
supportedNetworks.push_back(Network::NetID::AE_03);
|
||||
supportedNetworks.push_back(Network::NetID::MDIO_04);
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,20 +12,20 @@ class RADCometBase : public Device {
|
||||
public:
|
||||
virtual const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::NetID::HSCAN,
|
||||
Network::NetID::HSCAN2,
|
||||
Network::NetID::DWCAN_01,
|
||||
Network::NetID::DWCAN_02,
|
||||
|
||||
Network::NetID::Ethernet,
|
||||
Network::NetID::ETHERNET_01,
|
||||
|
||||
Network::NetID::OP_Ethernet1,
|
||||
Network::NetID::OP_Ethernet2,
|
||||
Network::NetID::AE_01,
|
||||
Network::NetID::AE_02,
|
||||
|
||||
Network::NetID::LIN,
|
||||
Network::NetID::ISO9141,
|
||||
Network::NetID::LIN_01,
|
||||
Network::NetID::ISO9141_01,
|
||||
|
||||
Network::NetID::MDIO1,
|
||||
Network::NetID::MDIO2,
|
||||
Network::NetID::MDIO3,
|
||||
Network::NetID::MDIO_01,
|
||||
Network::NetID::MDIO_02,
|
||||
Network::NetID::MDIO_03,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
@@ -59,10 +59,10 @@ typedef struct {
|
||||
// Ethernet 10/100/1000
|
||||
ETHERNET_SETTINGS2 ethernet;
|
||||
// Ethernet General
|
||||
OP_ETH_GENERAL_SETTINGS opEthGen;
|
||||
AE_GENERAL_SETTINGS aeGen;
|
||||
// 100/1000T1
|
||||
ETHERNET_SETTINGS2 ethT1;
|
||||
OP_ETH_SETTINGS opEth1;
|
||||
AE_SETTINGS ae_01;
|
||||
// 10T1S
|
||||
ETHERNET_SETTINGS2 ethT1s1;
|
||||
ETHERNET10T1S_SETTINGS t1s1;
|
||||
@@ -95,9 +95,9 @@ public:
|
||||
if(cfg == nullptr)
|
||||
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);
|
||||
default:
|
||||
return nullptr;
|
||||
@@ -108,9 +108,9 @@ public:
|
||||
if(cfg == nullptr)
|
||||
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);
|
||||
default:
|
||||
return nullptr;
|
||||
|
||||
Reference in New Issue
Block a user