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:
@@ -17,37 +17,37 @@ public:
|
||||
|
||||
static const std::vector<Network>& GetSupportedNetworks() {
|
||||
static std::vector<Network> supportedNetworks = {
|
||||
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::DWCAN9,
|
||||
Network::NetID::DWCAN10,
|
||||
Network::NetID::DWCAN11,
|
||||
Network::NetID::DWCAN12,
|
||||
Network::NetID::DWCAN13,
|
||||
Network::NetID::DWCAN14,
|
||||
Network::NetID::DWCAN15,
|
||||
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::DWCAN_09,
|
||||
Network::NetID::DWCAN_10,
|
||||
Network::NetID::DWCAN_11,
|
||||
Network::NetID::DWCAN_12,
|
||||
Network::NetID::DWCAN_13,
|
||||
Network::NetID::DWCAN_14,
|
||||
Network::NetID::DWCAN_15,
|
||||
|
||||
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::LIN2,
|
||||
Network::NetID::LIN3,
|
||||
Network::NetID::LIN4,
|
||||
Network::NetID::LIN_01,
|
||||
Network::NetID::LIN_02,
|
||||
Network::NetID::LIN_03,
|
||||
Network::NetID::LIN_04,
|
||||
|
||||
Network::NetID::FlexRay,
|
||||
Network::NetID::FlexRay1a,
|
||||
Network::NetID::FlexRay1b,
|
||||
Network::NetID::FlexRay2,
|
||||
Network::NetID::FlexRay2a,
|
||||
Network::NetID::FlexRay2b,
|
||||
Network::NetID::FLEXRAY_01,
|
||||
Network::NetID::FLEXRAY_01A,
|
||||
Network::NetID::FLEXRAY_01B,
|
||||
Network::NetID::FLEXRAY_02,
|
||||
Network::NetID::FLEXRAY_02A,
|
||||
Network::NetID::FLEXRAY_02B,
|
||||
};
|
||||
return supportedNetworks;
|
||||
}
|
||||
|
||||
@@ -149,21 +149,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;
|
||||
@@ -174,21 +174,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;
|
||||
@@ -198,16 +198,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)
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -217,13 +217,13 @@ public:
|
||||
if(cfg == nullptr)
|
||||
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);
|
||||
default:
|
||||
return nullptr;
|
||||
|
||||
Reference in New Issue
Block a user