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:
@@ -15,7 +15,7 @@ public:
|
||||
if(cfg == nullptr)
|
||||
return nullptr;
|
||||
switch(net.getNetID()) {
|
||||
case Network::NetID::HSCAN:
|
||||
case Network::NetID::DWCAN_01:
|
||||
return &(cfg->can1);
|
||||
default:
|
||||
return nullptr;
|
||||
|
||||
@@ -16,9 +16,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;
|
||||
@@ -29,9 +29,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;
|
||||
@@ -40,8 +40,8 @@ public:
|
||||
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{ Network(Network::NetID::HSCAN) },
|
||||
{ Network(Network::NetID::HSCAN2) }
|
||||
{ Network(Network::NetID::DWCAN_01) },
|
||||
{ Network(Network::NetID::DWCAN_02) }
|
||||
};
|
||||
}
|
||||
|
||||
@@ -50,7 +50,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;
|
||||
|
||||
@@ -15,9 +15,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;
|
||||
@@ -28,9 +28,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;
|
||||
@@ -39,8 +39,8 @@ public:
|
||||
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{ Network(Network::NetID::HSCAN) },
|
||||
{ Network(Network::NetID::HSCAN2) }
|
||||
{ Network(Network::NetID::DWCAN_01) },
|
||||
{ Network(Network::NetID::DWCAN_02) }
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -16,9 +16,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;
|
||||
@@ -29,9 +29,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;
|
||||
@@ -43,7 +43,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;
|
||||
|
||||
@@ -16,13 +16,13 @@ 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);
|
||||
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;
|
||||
@@ -33,13 +33,13 @@ 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);
|
||||
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;
|
||||
@@ -49,12 +49,12 @@ public:
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{
|
||||
Network(Network::NetID::HSCAN),
|
||||
Network(Network::NetID::HSCAN3)
|
||||
Network(Network::NetID::DWCAN_01),
|
||||
Network(Network::NetID::DWCAN_03)
|
||||
},
|
||||
{
|
||||
Network(Network::NetID::HSCAN2),
|
||||
Network(Network::NetID::HSCAN4)
|
||||
Network(Network::NetID::DWCAN_02),
|
||||
Network(Network::NetID::DWCAN_04)
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -64,7 +64,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;
|
||||
|
||||
@@ -16,9 +16,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;
|
||||
@@ -29,9 +29,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;
|
||||
@@ -40,8 +40,8 @@ public:
|
||||
|
||||
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
|
||||
return {
|
||||
{ Network(Network::NetID::HSCAN) },
|
||||
{ Network(Network::NetID::HSCAN2) }
|
||||
{ Network(Network::NetID::DWCAN_01) },
|
||||
{ Network(Network::NetID::DWCAN_02) }
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ public:
|
||||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::NetID::HSCAN
|
||||
Network::NetID::DWCAN_01
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@ public:
|
||||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
Network::NetID::HSCAN,
|
||||
Network::NetID::HSCAN2
|
||||
Network::NetID::DWCAN_01,
|
||||
Network::NetID::DWCAN_02
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
@@ -50,12 +50,12 @@ public:
|
||||
|
||||
static 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::LIN
|
||||
Network::NetID::LIN_01
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
@@ -23,10 +23,10 @@ public:
|
||||
|
||||
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
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
@@ -17,12 +17,12 @@ public:
|
||||
|
||||
static 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::LIN
|
||||
Network::NetID::LIN_01
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user