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:
@@ -48,59 +48,59 @@ 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::DWCAN_01,
|
||||
Network::NetID::DWCAN_08,
|
||||
Network::NetID::DWCAN_02,
|
||||
Network::NetID::DWCAN_03,
|
||||
Network::NetID::DWCAN_04,
|
||||
Network::NetID::DWCAN_05,
|
||||
|
||||
Network::NetID::Ethernet,
|
||||
Network::NetID::Ethernet2,
|
||||
Network::NetID::ETHERNET_01,
|
||||
Network::NetID::ETHERNET_02,
|
||||
|
||||
Network::NetID::OP_Ethernet1,
|
||||
Network::NetID::OP_Ethernet2,
|
||||
Network::NetID::AE_01,
|
||||
Network::NetID::AE_02,
|
||||
|
||||
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::I2C2,
|
||||
Network::NetID::I2C3,
|
||||
Network::NetID::I2C_01,
|
||||
Network::NetID::I2C_02,
|
||||
Network::NetID::I2C_03,
|
||||
|
||||
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::DWCAN_01,
|
||||
Network::NetID::DWCAN_08,
|
||||
Network::NetID::DWCAN_02,
|
||||
Network::NetID::DWCAN_03,
|
||||
Network::NetID::DWCAN_04,
|
||||
Network::NetID::DWCAN_05,
|
||||
|
||||
Network::NetID::Ethernet,
|
||||
Network::NetID::Ethernet2,
|
||||
Network::NetID::ETHERNET_01,
|
||||
Network::NetID::ETHERNET_02,
|
||||
|
||||
Network::NetID::OP_Ethernet1,
|
||||
Network::NetID::OP_Ethernet2,
|
||||
Network::NetID::AE_01,
|
||||
Network::NetID::AE_02,
|
||||
|
||||
Network::NetID::LIN,
|
||||
Network::NetID::LIN_01,
|
||||
|
||||
// FlexRay is Receive Only
|
||||
|
||||
Network::NetID::I2C,
|
||||
Network::NetID::I2C2,
|
||||
Network::NetID::I2C3,
|
||||
Network::NetID::I2C_01,
|
||||
Network::NetID::I2C_02,
|
||||
Network::NetID::I2C_03,
|
||||
|
||||
Network::NetID::MDIO1,
|
||||
Network::NetID::MDIO2,
|
||||
Network::NetID::MDIO_01,
|
||||
Network::NetID::MDIO_02,
|
||||
};
|
||||
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
|
||||
}
|
||||
|
||||
@@ -68,9 +68,9 @@ typedef struct {
|
||||
|
||||
LIN_SETTINGS lin1;
|
||||
|
||||
OP_ETH_GENERAL_SETTINGS opEthGen;
|
||||
OP_ETH_SETTINGS opEth1;
|
||||
OP_ETH_SETTINGS opEth2;
|
||||
AE_GENERAL_SETTINGS aeGen;
|
||||
AE_SETTINGS ae_01;
|
||||
AE_SETTINGS ae_02;
|
||||
|
||||
SERDESCAM_SETTINGS serdescam1;
|
||||
SERDESPOC_SETTINGS serdespoc;
|
||||
@@ -101,17 +101,17 @@ 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);
|
||||
default:
|
||||
return nullptr;
|
||||
@@ -122,17 +122,17 @@ 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);
|
||||
default:
|
||||
return nullptr;
|
||||
@@ -142,14 +142,14 @@ public:
|
||||
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)
|
||||
},
|
||||
{
|
||||
Network(Network::NetID::MSCAN),
|
||||
Network(Network::NetID::HSCAN5)
|
||||
Network(Network::NetID::DWCAN_08),
|
||||
Network(Network::NetID::DWCAN_05)
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -159,7 +159,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;
|
||||
|
||||
Reference in New Issue
Block a user