sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

All: Update network names

Browse Source 
Updates all network names, the new format is <id>_<%02d>.
This commit is contained in:
Kyle Schwarz
2025-04-17 20:57:46 +00:00
parent e88cd244c8
commit 8b680f2b64
134 changed files with 2107 additions and 20559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/device/tree/neovifire2/neovifire2.h
+21 -21
View File
@@ -23,32 +23,32 @@ 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::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::LSFTCAN,
Network::NetID::LSFTCAN2,
Network::NetID::LSFTCAN_01,
Network::NetID::LSFTCAN_02,
Network::NetID::SWCAN,
Network::NetID::SWCAN2,
Network::NetID::SWCAN_01,
Network::NetID::SWCAN_02,
Network::NetID::Ethernet,
Network::NetID::ETHERNET_01,
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::ISO9141,
Network::NetID::ISO9141_2,
Network::NetID::ISO9141_3,
Network::NetID::ISO9141_4
Network::NetID::ISO9141_01,
Network::NetID::ISO9141_02,
Network::NetID::ISO9141_03,
Network::NetID::ISO9141_04
};
return supportedNetworks;
}
include/icsneo/device/tree/neovifire2/neovifire2settings.h
+35 -35
View File
@@ -81,7 +81,7 @@ typedef struct {
uint16_t idle_wakeup_network_enables_1;
uint16_t idle_wakeup_network_enables_2;
/* reserved for HSCAN6/7, LSFT2, etc.. */
/* reserved for DWCAN_06/7, LSFT2, etc.. */
uint16_t network_enables_3;
uint16_t idle_wakeup_network_enables_3;
@@ -128,25 +128,25 @@ 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);
case Network::NetID::LSFTCAN:
case Network::NetID::LSFTCAN_01:
return &(cfg->lsftcan1);
case Network::NetID::LSFTCAN2:
case Network::NetID::LSFTCAN_02:
return &(cfg->lsftcan2);
default:
return nullptr;
@@ -157,21 +157,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;
@@ -183,9 +183,9 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::SWCAN:
case Network::NetID::SWCAN_01:
return &(cfg->swcan1);
case Network::NetID::SWCAN2:
case Network::NetID::SWCAN_02:
return &(cfg->swcan2);
default:
return nullptr;
@@ -195,16 +195,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)
}
};
}
@@ -214,17 +214,17 @@ 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);
case Network::NetID::LIN5:
case Network::NetID::LIN_05:
return &(cfg->lin5);
case Network::NetID::LIN6:
case Network::NetID::LIN_06:
return &(cfg->lin6);
default:
return nullptr;