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/communication/network.h
+921 -921
View File
File diff suppressed because it is too large Load Diff
include/icsneo/device/idevicesettings.h
+16 -16
View File
@@ -46,12 +46,12 @@ enum
LISTEN_ALL = 7
};
enum OPEthLinkMode
enum AELinkMode
{
OPETH_LINK_INVALID = -1,
OPETH_LINK_AUTO = 0,
OPETH_LINK_MASTER,
OPETH_LINK_SLAVE
AE_LINK_INVALID = -1,
AE_LINK_AUTO = 0,
AE_LINK_MASTER,
AE_LINK_SLAVE
};
enum EthLinkSpeed
@@ -70,7 +70,7 @@ typedef struct
uint8_t linkStatus;
uint8_t linkFullDuplex;
uint8_t linkSpeed; // see EthLinkSpeed
int8_t linkMode; // for automotive networks - see OPEthLinkMode
int8_t linkMode; // for automotive networks - see AELinkMode
} EthernetNetworkStatus;
typedef struct
@@ -124,7 +124,7 @@ typedef struct ETHERNET_SETTINGS_t
} ETHERNET_SETTINGS;
#define ETHERNET_SETTINGS_SIZE 8
typedef struct OP_ETH_GENERAL_SETTINGS_t
typedef struct AE_GENERAL_SETTINGS_t
{
uint8_t ucInterfaceType;
uint8_t reserved0[3];
@@ -143,15 +143,15 @@ typedef struct OP_ETH_GENERAL_SETTINGS_t
} flags;
unsigned uFlags;
};
} OP_ETH_GENERAL_SETTINGS;
#define OP_ETH_GENERAL_SETTINGS_SIZE 20
static_assert(sizeof(OP_ETH_GENERAL_SETTINGS) == OP_ETH_GENERAL_SETTINGS_SIZE, "OP_ETH_GENERAL_SETTINGS is the wrong size!");
} AE_GENERAL_SETTINGS;
#define AE_GENERAL_SETTINGS_SIZE 20
static_assert(sizeof(AE_GENERAL_SETTINGS) == AE_GENERAL_SETTINGS_SIZE, "AE_GENERAL_SETTINGS is the wrong size!");
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4201) // nameless struct/union
#endif
typedef struct OP_ETH_SETTINGS_t
typedef struct AE_SETTINGS_t
{
uint8_t ucConfigMode;
unsigned char preemption_en;
@@ -168,9 +168,9 @@ typedef struct OP_ETH_SETTINGS_t
};
unsigned char reserved0[14];
};
} OP_ETH_SETTINGS;
#define OP_ETH_SETTINGS_SIZE 16
static_assert(sizeof(OP_ETH_SETTINGS) == OP_ETH_SETTINGS_SIZE, "OP_ETH_SETTINGS is the wrong size!");
} AE_SETTINGS;
#define AE_SETTINGS_SIZE 16
static_assert(sizeof(AE_SETTINGS) == AE_SETTINGS_SIZE, "AE_SETTINGS is the wrong size!");
#ifdef _MSC_VER
#pragma warning(pop)
#endif
@@ -854,7 +854,7 @@ public:
*/
bool setLINCommanderResponseTimeFor(Network net, uint8_t bits);
virtual bool setPhyMode(uint8_t index, OPEthLinkMode mode) {
virtual bool setPhyMode(uint8_t index, AELinkMode mode) {
(void)index, (void)mode;
return false;
}
@@ -869,7 +869,7 @@ public:
return false;
}
virtual std::optional<OPEthLinkMode> getPhyMode(uint8_t index) {
virtual std::optional<AELinkMode> getPhyMode(uint8_t index) {
(void)index;
report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
return std::nullopt;
include/icsneo/device/tree/etherbadge/etherbadge.h
+3 -3
View File
@@ -19,9 +19,9 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::LIN,
Network::NetID::OP_Ethernet1
Network::NetID::DWCAN_01,
Network::NetID::LIN_01,
Network::NetID::AE_01
};
return supportedNetworks;
}
include/icsneo/device/tree/etherbadge/etherbadgesettings.h
+3 -3
View File
@@ -71,7 +71,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;
@@ -82,7 +82,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::HSCAN:
case Network::NetID::DWCAN_01:
return &(cfg->canfd1);
default:
return nullptr;
@@ -93,7 +93,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;
include/icsneo/device/tree/neoobd2pro/neoobd2pro.h
+2 -2
View File
@@ -16,8 +16,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;
}
include/icsneo/device/tree/neoobd2sim/neoobd2sim.h
+2 -2
View File
@@ -16,8 +16,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;
}
include/icsneo/device/tree/neoviconnect/neoviconnect.h
+11 -11
View File
@@ -17,19 +17,19 @@ 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::Ethernet,
Network::NetID::ETHERNET_01,
Network::NetID::LIN,
Network::NetID::LIN2
Network::NetID::LIN_01,
Network::NetID::LIN_02
};
return supportedNetworks;
}
include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h
+18 -18
View File
@@ -94,21 +94,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::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);
case Network::NetID::HSCAN5:
case Network::NetID::DWCAN_05:
return &(cfg->can5);
case Network::NetID::HSCAN6:
case Network::NetID::DWCAN_06:
return &(cfg->can6);
case Network::NetID::HSCAN7:
case Network::NetID::DWCAN_07:
return &(cfg->can7);
case Network::NetID::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->can8);
default:
return nullptr;
@@ -119,21 +119,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::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);
case Network::NetID::HSCAN5:
case Network::NetID::DWCAN_05:
return &(cfg->canfd5);
case Network::NetID::HSCAN6:
case Network::NetID::DWCAN_06:
return &(cfg->canfd6);
case Network::NetID::HSCAN7:
case Network::NetID::DWCAN_07:
return &(cfg->canfd7);
case Network::NetID::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->canfd8);
default:
return nullptr;
@@ -144,9 +144,9 @@ 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);
default:
return nullptr;
include/icsneo/device/tree/neovifire/neovifire.h
+10 -10
View File
@@ -16,19 +16,19 @@ 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::DWCAN_01,
Network::NetID::DWCAN_08,
Network::NetID::DWCAN_02,
Network::NetID::DWCAN_03,
Network::NetID::LSFTCAN,
Network::NetID::LSFTCAN_01,
Network::NetID::SWCAN,
Network::NetID::SWCAN_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
};
return supportedNetworks;
}
include/icsneo/device/tree/neovifire/neovifiresettings.h
+10 -10
View File
@@ -105,15 +105,15 @@ 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::LSFTCAN:
case Network::NetID::LSFTCAN_01:
return &(cfg->lsftcan);
default:
return nullptr;
@@ -125,7 +125,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::SWCAN:
case Network::NetID::SWCAN_01:
return &(cfg->swcan);
default:
return nullptr;
@@ -136,13 +136,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;
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;
include/icsneo/device/tree/neovifire3/neovifire3.h
+27 -27
View File
@@ -17,35 +17,35 @@ 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::DWCAN16,
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::DWCAN_16,
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::LIN5,
Network::NetID::LIN6,
Network::NetID::LIN7,
Network::NetID::LIN8,
Network::NetID::LIN_01,
Network::NetID::LIN_02,
Network::NetID::LIN_03,
Network::NetID::LIN_04,
Network::NetID::LIN_05,
Network::NetID::LIN_06,
Network::NetID::LIN_07,
Network::NetID::LIN_08,
};
return supportedNetworks;
}
include/icsneo/device/tree/neovifire3/neovifire3settings.h
+32 -32
View File
@@ -166,21 +166,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;
@@ -191,21 +191,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;
@@ -215,16 +215,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)
}
};
}
@@ -234,21 +234,21 @@ 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);
case Network::NetID::LIN7:
case Network::NetID::LIN_07:
return &(cfg->lin7);
case Network::NetID::LIN8:
case Network::NetID::LIN_08:
return &(cfg->lin8);
default:
return nullptr;
include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h
+28 -28
View File
@@ -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;
}
include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h
+28 -28
View File
@@ -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;
include/icsneo/device/tree/neovired2/neovired2.h
+12 -12
View File
@@ -17,20 +17,20 @@ 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::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::ETHERNET_01,
Network::NetID::ETHERNET_02,
Network::NetID::LIN,
Network::NetID::LIN2
Network::NetID::LIN_01,
Network::NetID::LIN_02
};
return supportedNetworks;
}
include/icsneo/device/tree/neovired2/neovired2settings.h
+26 -26
View File
@@ -107,21 +107,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::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);
case Network::NetID::HSCAN5:
case Network::NetID::DWCAN_05:
return &(cfg->can5);
case Network::NetID::HSCAN6:
case Network::NetID::DWCAN_06:
return &(cfg->can6);
case Network::NetID::HSCAN7:
case Network::NetID::DWCAN_07:
return &(cfg->can7);
case Network::NetID::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->can8);
default:
return nullptr;
@@ -132,21 +132,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::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);
case Network::NetID::HSCAN5:
case Network::NetID::DWCAN_05:
return &(cfg->canfd5);
case Network::NetID::HSCAN6:
case Network::NetID::DWCAN_06:
return &(cfg->canfd6);
case Network::NetID::HSCAN7:
case Network::NetID::DWCAN_07:
return &(cfg->canfd7);
case Network::NetID::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->canfd8);
default:
return nullptr;
@@ -156,16 +156,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)
}
};
}
@@ -175,9 +175,9 @@ 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);
default:
return nullptr;
include/icsneo/device/tree/plasion/plasion.h
+20 -20
View File
@@ -13,29 +13,29 @@ class Plasion : public Device {
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::FlexRay
Network::NetID::FLEXRAY_01
};
return supportedNetworks;
}
@@ -51,8 +51,8 @@ protected:
virtual bool isSupportedTXNetwork(const Network&) const override { return true; }
virtual void setupExtensions() override {
std::vector<Network> flexRayControllers;
flexRayControllers.push_back(Network::NetID::FlexRay);
flexRayControllers.push_back(Network::NetID::FlexRay); // TODO Becomes FlexRay2 if not in coldstart mode
flexRayControllers.push_back(Network::NetID::FLEXRAY_01);
flexRayControllers.push_back(Network::NetID::FLEXRAY_01); // TODO Becomes FlexRay2 if not in coldstart mode
addExtension(std::make_shared<FlexRay::Extension>(*this, flexRayControllers));
}
include/icsneo/device/tree/rada2b/rada2b.h
+9 -9
View File
@@ -21,20 +21,20 @@ 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,
Network::NetID::A2B1,
Network::NetID::A2B2,
Network::NetID::A2B_01,
Network::NetID::A2B_02,
Network::NetID::I2C,
Network::NetID::I2C2,
Network::NetID::I2C_01,
Network::NetID::I2C_02,
Network::NetID::MDIO1,
Network::NetID::MDIO_01,
};
return supportedNetworks;
}
include/icsneo/device/tree/rada2b/rada2bsettings.h
+5 -5
View File
@@ -104,9 +104,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;
@@ -117,9 +117,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;
@@ -131,7 +131,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;
include/icsneo/device/tree/radcomet/radcomet2.h
+2 -2
View File
@@ -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;
}
include/icsneo/device/tree/radcomet/radcometbase.h
+10 -10
View File
@@ -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;
}
include/icsneo/device/tree/radcomet/radcometsettings.h
+6 -6
View File
@@ -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;
include/icsneo/device/tree/radcomet3/radcomet3.h
+14 -14
View File
@@ -18,24 +18,24 @@ 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::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4,
Network::NetID::OP_Ethernet5,
Network::NetID::OP_Ethernet6,
Network::NetID::OP_Ethernet7,
Network::NetID::AE_01,
Network::NetID::AE_02,
Network::NetID::AE_03,
Network::NetID::AE_04,
Network::NetID::AE_05,
Network::NetID::AE_06,
Network::NetID::AE_07,
Network::NetID::LIN,
Network::NetID::ISO9141,
Network::NetID::LIN_01,
Network::NetID::ISO9141_01,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
};
return supportedNetworks;
}
include/icsneo/device/tree/radcomet3/radcomet3settings.h
+6 -6
View File
@@ -45,10 +45,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;
@@ -92,9 +92,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;
@@ -105,9 +105,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;
include/icsneo/device/tree/radepsilon/radepsilon.h
+4 -4
View File
@@ -15,12 +15,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, // Connected to port 6 on the switch
Network::NetID::ETHERNET_01, // Connected to port 6 on the switch
Network::NetID::LIN
Network::NetID::LIN_01
};
return supportedNetworks;
}
include/icsneo/device/tree/radepsilon/radepsilonsettings.h
+14 -14
View File
@@ -90,9 +90,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;
@@ -103,9 +103,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;
@@ -117,14 +117,14 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LIN:
case Network::NetID::LIN_01:
return &(cfg->lin1);
default:
return nullptr;
}
}
bool setPhyMode(uint8_t index, OPEthLinkMode mode) override {
bool setPhyMode(uint8_t index, AELinkMode mode) override {
if (index > RADEPSILON_MAX_PHY) {
report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
return false;
@@ -138,13 +138,13 @@ public:
default:
report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
return false;
case OPETH_LINK_AUTO:
case AE_LINK_AUTO:
epsilonMode = EpsilonPhyMode::Auto;
break;
case OPETH_LINK_SLAVE:
case AE_LINK_SLAVE:
epsilonMode = EpsilonPhyMode::Slave;
break;
case OPETH_LINK_MASTER:
case AE_LINK_MASTER:
epsilonMode = EpsilonPhyMode::Master;
break;
@@ -194,7 +194,7 @@ public:
return true;
}
std::optional<OPEthLinkMode> getPhyMode(uint8_t index) override {
std::optional<AELinkMode> getPhyMode(uint8_t index) override {
if (index > RADEPSILON_MAX_PHY) {
report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
return std::nullopt;
@@ -203,19 +203,19 @@ public:
if (cfg == nullptr) {
return std::nullopt;
}
OPEthLinkMode mode;
AELinkMode mode;
switch (static_cast<EpsilonPhyMode>(cfg->switchSettings.phyMode[index])) {
default:
report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
return std::nullopt;
case EpsilonPhyMode::Auto:
mode = OPETH_LINK_AUTO;
mode = AE_LINK_AUTO;
break;
case EpsilonPhyMode::Slave:
mode = OPETH_LINK_SLAVE;
mode = AE_LINK_SLAVE;
break;
case EpsilonPhyMode::Master:
mode = OPETH_LINK_MASTER;
mode = AE_LINK_MASTER;
break;
}
return std::make_optional(mode);
include/icsneo/device/tree/radepsilonxl/radepsilonxl.h
+4 -4
View File
@@ -15,12 +15,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, // Connected to port 6 on the switch
Network::NetID::ETHERNET_01,
Network::NetID::LIN
Network::NetID::LIN_01
};
return supportedNetworks;
}
include/icsneo/device/tree/radgalaxy/radgalaxy.h
+30 -30
View File
@@ -21,41 +21,41 @@ 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::SWCAN,
Network::NetID::SWCAN2,
Network::NetID::SWCAN_01,
Network::NetID::SWCAN_02,
Network::NetID::LIN,
Network::NetID::LIN_01,
Network::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::ETHERNET_01,
Network::NetID::ETHERNET_02,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4,
Network::NetID::OP_Ethernet5,
Network::NetID::OP_Ethernet6,
Network::NetID::OP_Ethernet7,
Network::NetID::OP_Ethernet8,
Network::NetID::OP_Ethernet9,
Network::NetID::OP_Ethernet10,
Network::NetID::OP_Ethernet11,
Network::NetID::OP_Ethernet12,
Network::NetID::AE_01,
Network::NetID::AE_02,
Network::NetID::AE_03,
Network::NetID::AE_04,
Network::NetID::AE_05,
Network::NetID::AE_06,
Network::NetID::AE_07,
Network::NetID::AE_08,
Network::NetID::AE_09,
Network::NetID::AE_10,
Network::NetID::AE_11,
Network::NetID::AE_12,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO3,
Network::NetID::MDIO4,
Network::NetID::MDIO5,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
Network::NetID::MDIO_03,
Network::NetID::MDIO_04,
Network::NetID::MDIO_05,
};
return supportedNetworks;
}
include/icsneo/device/tree/radgalaxy/radgalaxysettings.h
+32 -32
View File
@@ -14,19 +14,19 @@ namespace icsneo {
typedef struct {
uint16_t perf_en;
OP_ETH_GENERAL_SETTINGS opEthGen;
OP_ETH_SETTINGS opEth1;
OP_ETH_SETTINGS opEth2;
OP_ETH_SETTINGS opEth3;
OP_ETH_SETTINGS opEth4;
OP_ETH_SETTINGS opEth5;
OP_ETH_SETTINGS opEth6;
OP_ETH_SETTINGS opEth7;
OP_ETH_SETTINGS opEth8;
OP_ETH_SETTINGS opEth9;
OP_ETH_SETTINGS opEth10;
OP_ETH_SETTINGS opEth11;
OP_ETH_SETTINGS opEth12;
AE_GENERAL_SETTINGS aeGen;
AE_SETTINGS ae_01;
AE_SETTINGS ae_02;
AE_SETTINGS ae_03;
AE_SETTINGS ae_04;
AE_SETTINGS ae_05;
AE_SETTINGS ae_06;
AE_SETTINGS ae_07;
AE_SETTINGS ae_08;
AE_SETTINGS ae_09;
AE_SETTINGS ae_10;
AE_SETTINGS ae_11;
AE_SETTINGS ae_12;
CAN_SETTINGS can1;
CANFD_SETTINGS canfd1;
@@ -112,21 +112,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;
@@ -137,21 +137,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;
@@ -162,9 +162,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;
@@ -176,7 +176,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;
include/icsneo/device/tree/radgalaxy2/radgalaxy2.h
+32 -32
View File
@@ -21,43 +21,43 @@ 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::LIN,
Network::NetID::LIN2,
Network::NetID::LIN_01,
Network::NetID::LIN_02,
Network::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::NetID::ETHERNET_01,
Network::NetID::ETHERNET_02,
Network::NetID::ETHERNET_03,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4,
Network::NetID::OP_Ethernet5,
Network::NetID::OP_Ethernet6,
Network::NetID::OP_Ethernet7,
Network::NetID::OP_Ethernet8,
Network::NetID::OP_Ethernet9,
Network::NetID::OP_Ethernet10,
Network::NetID::OP_Ethernet11,
Network::NetID::OP_Ethernet12,
Network::NetID::AE_01,
Network::NetID::AE_02,
Network::NetID::AE_03,
Network::NetID::AE_04,
Network::NetID::AE_05,
Network::NetID::AE_06,
Network::NetID::AE_07,
Network::NetID::AE_08,
Network::NetID::AE_09,
Network::NetID::AE_10,
Network::NetID::AE_11,
Network::NetID::AE_12,
Network::NetID::ISO9141,
Network::NetID::ISO9141_2,
Network::NetID::ISO9141_01,
Network::NetID::ISO9141_02,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO3,
Network::NetID::MDIO4,
Network::NetID::MDIO5,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
Network::NetID::MDIO_03,
Network::NetID::MDIO_04,
Network::NetID::MDIO_05,
};
return supportedNetworks;
}
include/icsneo/device/tree/radgalaxy2/radgalaxy2settings.h
+35 -35
View File
@@ -74,23 +74,23 @@ typedef struct {
LIN_SETTINGS lin1;
OP_ETH_GENERAL_SETTINGS opEthGen;
OP_ETH_SETTINGS opEth1;
OP_ETH_SETTINGS opEth2;
OP_ETH_SETTINGS opEth3;
OP_ETH_SETTINGS opEth4;
OP_ETH_SETTINGS opEth5;
OP_ETH_SETTINGS opEth6;
OP_ETH_SETTINGS opEth7;
OP_ETH_SETTINGS opEth8;
OP_ETH_SETTINGS opEth9;
OP_ETH_SETTINGS opEth10;
OP_ETH_SETTINGS opEth11;
OP_ETH_SETTINGS opEth12;
OP_ETH_SETTINGS opEth13;
OP_ETH_SETTINGS opEth14;
OP_ETH_SETTINGS opEth15;
OP_ETH_SETTINGS opEth16;
AE_GENERAL_SETTINGS aeGen;
AE_SETTINGS ae_01;
AE_SETTINGS ae_02;
AE_SETTINGS ae_03;
AE_SETTINGS ae_04;
AE_SETTINGS ae_05;
AE_SETTINGS ae_06;
AE_SETTINGS ae_07;
AE_SETTINGS ae_08;
AE_SETTINGS ae_09;
AE_SETTINGS ae_10;
AE_SETTINGS ae_11;
AE_SETTINGS ae_12;
AE_SETTINGS ae_13;
AE_SETTINGS ae_14;
AE_SETTINGS ae_15;
AE_SETTINGS ae_16;
ETHERNET10G_SETTINGS ethernet10g;
ETHERNET10G_SETTINGS ethernet10g_2;
@@ -124,21 +124,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;
@@ -149,21 +149,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;
@@ -175,9 +175,9 @@ 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);
default:
return nullptr;
include/icsneo/device/tree/radgigastar/radgigastar.h
+34 -34
View File
@@ -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());
}
include/icsneo/device/tree/radgigastar/radgigastarsettings.h
+22 -22
View File
@@ -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;
include/icsneo/device/tree/radgigastar2/radgigastar2.h
+38 -38
View File
@@ -23,50 +23,50 @@ namespace icsneo
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,
Network::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::ETHERNET_01,
Network::NetID::ETHERNET_02,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4,
Network::NetID::OP_Ethernet5,
Network::NetID::OP_Ethernet6,
Network::NetID::OP_Ethernet7,
Network::NetID::OP_Ethernet8,
Network::NetID::OP_Ethernet9,
Network::NetID::OP_Ethernet10,
Network::NetID::AE_01,
Network::NetID::AE_02,
Network::NetID::AE_03,
Network::NetID::AE_04,
Network::NetID::AE_05,
Network::NetID::AE_06,
Network::NetID::AE_07,
Network::NetID::AE_08,
Network::NetID::AE_09,
Network::NetID::AE_10,
Network::NetID::LIN,
Network::NetID::LIN2,
Network::NetID::LIN3,
Network::NetID::LIN4,
Network::NetID::LIN5,
Network::NetID::LIN6,
Network::NetID::LIN7,
Network::NetID::LIN8,
Network::NetID::LIN9,
Network::NetID::LIN10,
Network::NetID::LIN_01,
Network::NetID::LIN_02,
Network::NetID::LIN_03,
Network::NetID::LIN_04,
Network::NetID::LIN_05,
Network::NetID::LIN_06,
Network::NetID::LIN_07,
Network::NetID::LIN_08,
Network::NetID::LIN_09,
Network::NetID::LIN_10,
Network::NetID::I2C,
Network::NetID::I2C2,
Network::NetID::I2C_01,
Network::NetID::I2C_02,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
Network::NetID::SPI1,
Network::NetID::SPI2,
Network::NetID::SPI3,
Network::NetID::SPI4,
Network::NetID::SPI5,
Network::NetID::SPI6,
Network::NetID::SPI7,
Network::NetID::SPI8,
Network::NetID::SPI_01,
Network::NetID::SPI_02,
Network::NetID::SPI_03,
Network::NetID::SPI_04,
Network::NetID::SPI_05,
Network::NetID::SPI_06,
Network::NetID::SPI_07,
Network::NetID::SPI_08,
};
return supportedNetworks;
}
include/icsneo/device/tree/radgigastar2/radgigastar2settings.h
+25 -25
View File
@@ -89,12 +89,12 @@ namespace icsneo
ETHERNET_SETTINGS2 ethernet1;
ETHERNET_SETTINGS2 ethernet2;
// Ethernet General
OP_ETH_GENERAL_SETTINGS opEthGen;
AE_GENERAL_SETTINGS aeGen;
// 100/1000T1
ETHERNET_SETTINGS2 ethT1;
OP_ETH_SETTINGS opEth1;
AE_SETTINGS ae_01;
ETHERNET_SETTINGS2 ethT12;
OP_ETH_SETTINGS opEth2;
AE_SETTINGS ae_02;
// 10T1S
ETHERNET_SETTINGS2 ethT1s1;
ETHERNET10T1S_SETTINGS t1s1;
@@ -147,13 +147,13 @@ namespace icsneo
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;
@@ -166,13 +166,13 @@ namespace icsneo
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;
@@ -182,10 +182,10 @@ namespace icsneo
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)}};
}
const LIN_SETTINGS *getLINSettingsFor(Network net) const override
@@ -195,25 +195,25 @@ namespace icsneo
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);
case Network::NetID::LIN7:
case Network::NetID::LIN_07:
return &(cfg->lin7);
case Network::NetID::LIN8:
case Network::NetID::LIN_08:
return &(cfg->lin8);
case Network::NetID::LIN9:
case Network::NetID::LIN_09:
return &(cfg->lin9);
case Network::NetID::LIN10:
case Network::NetID::LIN_10:
return &(cfg->lin10);
default:
return nullptr;
include/icsneo/device/tree/radjupiter/radjupiter.h
+4 -4
View File
@@ -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::LIN,
Network::NetID::LIN_01,
Network::NetID::Ethernet // Connected to port 6 on the switch
Network::NetID::ETHERNET_01 // Connected to port 6 on the switch
};
return supportedNetworks;
}
include/icsneo/device/tree/radjupiter/radjupitersettings.h
+5 -5
View File
@@ -97,9 +97,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;
@@ -110,9 +110,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;
@@ -123,7 +123,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;
include/icsneo/device/tree/radmars/radmars.h
+32 -32
View File
@@ -44,55 +44,55 @@ 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::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::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::NetID::ETHERNET_01,
Network::NetID::ETHERNET_02,
Network::NetID::ETHERNET_03,
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::I2C_01,
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::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::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::NetID::ETHERNET_01,
Network::NetID::ETHERNET_02,
Network::NetID::ETHERNET_03,
Network::NetID::LIN,
Network::NetID::LIN_01,
// FlexRay is Receive Only
Network::NetID::I2C,
Network::NetID::I2C_01,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
};
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
}
include/icsneo/device/tree/radmars/radmarssettings.h
+25 -25
View File
@@ -107,21 +107,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;
@@ -132,21 +132,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;
@@ -156,16 +156,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)
}
};
}
@@ -175,7 +175,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;
include/icsneo/device/tree/radmoon2/radmoon2base.h
+2 -2
View File
@@ -18,8 +18,8 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
};
return supportedNetworks;
}
include/icsneo/device/tree/radmoon2/radmoon2settings.h
+2 -2
View File
@@ -14,8 +14,8 @@ namespace icsneo {
typedef struct {
uint16_t perf_en;
OP_ETH_GENERAL_SETTINGS opEthGen;
OP_ETH_SETTINGS opEth1;
AE_GENERAL_SETTINGS aeGen;
AE_SETTINGS ae_01;
uint16_t network_enables;
uint16_t network_enables_2;
include/icsneo/device/tree/radmoon3/radmoon3.h
+3 -3
View File
@@ -17,9 +17,9 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::Ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::MDIO1
Network::NetID::ETHERNET_01,
Network::NetID::AE_01,
Network::NetID::MDIO_01
};
return supportedNetworks;
}
include/icsneo/device/tree/radmoonduo/radmoonduo.h
+2 -2
View File
@@ -16,9 +16,9 @@ public:
ICSNEO_FINDABLE_DEVICE(RADMoonDuo, DeviceType::RADMoonDuo, "MD");
static const std::vector<Network>& GetSupportedNetworks() {
// If Converter1 Target is set to USB/CM, OP_Ethernet2 will be exposed to the PC
// If Converter1 Target is set to USB/CM, AE_02 will be exposed to the PC
static std::vector<Network> supportedNetworks = {
Network::NetID::OP_Ethernet2
Network::NetID::AE_02
};
return supportedNetworks;
}
include/icsneo/device/tree/radmoonduo/radmoonduosettings.h
+1 -1
View File
@@ -17,7 +17,7 @@ enum RadMoonDuoConverterMode {
};
typedef struct {
// OPETH_LINK_AUTO/MASTER/SLAVE
// AE_LINK_AUTO/MASTER/SLAVE
uint8_t linkMode0;
uint8_t linkMode1;
// USB/CM or RJ45 selection (RadMoonDuoConverterMode)
include/icsneo/device/tree/radmoont1s/radmoont1s.h
+4 -4
View File
@@ -18,13 +18,13 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::Ethernet,
Network::NetID::ETHERNET_01,
Network::NetID::OP_Ethernet1,
Network::NetID::AE_01,
Network::NetID::MDIO1,
Network::NetID::MDIO_01,
Network::NetID::SPI1,
Network::NetID::SPI_01,
};
return supportedNetworks;
}
include/icsneo/device/tree/radmoont1s/radmoont1ssettings.h
+1 -1
View File
@@ -28,7 +28,7 @@ typedef struct {
// Ethernet 10/100/1000
ETHERNET_SETTINGS2 ethernet;
// Ethernet General
OP_ETH_GENERAL_SETTINGS opEthGen;
AE_GENERAL_SETTINGS aeGen;
// 10T1S
ETHERNET_SETTINGS2 ethT1s;
ETHERNET10T1S_SETTINGS t1s;
include/icsneo/device/tree/radpluto/radpluto.h
+8 -8
View File
@@ -17,17 +17,17 @@ 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::LIN,
Network::NetID::LIN_01,
Network::NetID::Ethernet,
Network::NetID::ETHERNET_01,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4
Network::NetID::AE_01,
Network::NetID::AE_02,
Network::NetID::AE_03,
Network::NetID::AE_04
};
return supportedNetworks;
}
include/icsneo/device/tree/radpluto/radplutosettings.h
+5 -5
View File
@@ -83,9 +83,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;
@@ -96,9 +96,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;
@@ -110,7 +110,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;
include/icsneo/device/tree/radstar2/radstar2.h
+7 -7
View File
@@ -18,16 +18,16 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::DWCAN_01,
Network::NetID::DWCAN_08,
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::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
};
return supportedNetworks;
}
include/icsneo/device/tree/radstar2/radstar2settings.h
+8 -8
View File
@@ -14,9 +14,9 @@ namespace icsneo {
typedef struct {
uint16_t perf_en;
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;
CAN_SETTINGS can1;
CANFD_SETTINGS canfd1;
@@ -78,9 +78,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::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->can2);
default:
return nullptr;
@@ -91,9 +91,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::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->canfd2);
default:
return nullptr;
@@ -105,7 +105,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;
include/icsneo/device/tree/radsupermoon/radsupermoon.h
+4 -4
View File
@@ -22,10 +22,10 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::Ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::ETHERNET_01,
Network::NetID::AE_01,
Network::NetID::MDIO_01,
Network::NetID::MDIO_02,
};
return supportedNetworks;
}
include/icsneo/device/tree/radsupermoon/radsupermoonsettings.h
+2 -2
View File
@@ -14,8 +14,8 @@ namespace icsneo {
typedef struct {
uint16_t perf_en;
OP_ETH_GENERAL_SETTINGS opEthGen;
OP_ETH_SETTINGS opEth1;
AE_GENERAL_SETTINGS aeGen;
AE_SETTINGS ae_01;
uint16_t network_enables;
uint16_t network_enables_2;
include/icsneo/device/tree/valuecan3/valuecan3.h
+2 -2
View File
@@ -16,8 +16,8 @@ public:
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN,
Network::NetID::MSCAN
Network::NetID::DWCAN_01,
Network::NetID::DWCAN_08
};
return supportedNetworks;
}
include/icsneo/device/tree/valuecan3/valuecan3settings.h
+2 -2
View File
@@ -41,9 +41,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::MSCAN:
case Network::NetID::DWCAN_08:
return &(cfg->can2);
default:
return nullptr;
include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h
+1 -1
View File
@@ -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;
include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h
+7 -7
View File
@@ -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;
include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h
+6 -6
View File
@@ -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) }
};
}
include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h
+5 -5
View File
@@ -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;
include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h
+13 -13
View File
@@ -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;
include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h
+6 -6
View File
@@ -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) }
};
}
include/icsneo/device/tree/valuecan4/valuecan4-1.h
+1 -1
View File
@@ -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;
}
include/icsneo/device/tree/valuecan4/valuecan4-2.h
+2 -2
View File
@@ -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;
}
include/icsneo/device/tree/valuecan4/valuecan4-2el.h
+4 -4
View File
@@ -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;
}
include/icsneo/device/tree/valuecan4/valuecan4-4.h
+4 -4
View File
@@ -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;
}
include/icsneo/device/tree/valuecan4/valuecan4industrial.h
+4 -4
View File
@@ -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;
}
include/icsneo/device/tree/vividcan/vividcansettings.h
+5 -5
View File
@@ -52,9 +52,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::LSFTCAN:
case Network::NetID::LSFTCAN_01:
return &(cfg->lsftcan1);
default:
return nullptr;
@@ -65,7 +65,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::LSFTCAN:
case Network::NetID::LSFTCAN_01:
return &(cfg->lsftcan1);
default:
return nullptr;
@@ -76,7 +76,7 @@ public:
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
case Network::NetID::SWCAN:
case Network::NetID::SWCAN_01:
return &(cfg->swcan1);
default:
return nullptr;
@@ -85,7 +85,7 @@ public:
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{ Network(Network::NetID::HSCAN) }
{ Network(Network::NetID::DWCAN_01) }
};
}
include/icsneo/icsnVC40.h
+143 -148
View File
@@ -62,10 +62,10 @@ typedef unsigned __int64 uint64_t;
/* Network IDs -- value of NetworkID member of icsSpyMessage */
#define NETID_DEVICE 0
#define NETID_HSCAN 1
#define NETID_MSCAN 2
#define NETID_SWCAN 3
#define NETID_LSFTCAN 4
#define NETID_DWCAN_01 1
#define NETID_DWCAN_08 2
#define NETID_SWCAN_01 3
#define NETID_LSFTCAN_01 4
#define NETID_FORDSCP 5
#define NETID_J1708 6
#define NETID_AUX 7
@@ -75,21 +75,21 @@ typedef unsigned __int64 uint64_t;
#define NETID_MAIN51 11
#define NETID_RED 12
#define NETID_SCI 13
#define NETID_ISO2 14
#define NETID_ISO9141_02 14
#define NETID_ISO14230 15
#define NETID_LIN 16
#define NETID_OP_ETHERNET1 17
#define NETID_OP_ETHERNET2 18
#define NETID_OP_ETHERNET3 19
#define NETID_ISO3 41
#define NETID_HSCAN2 42
#define NETID_HSCAN3 44
#define NETID_OP_ETHERNET4 45
#define NETID_OP_ETHERNET5 46
#define NETID_ISO4 47
#define NETID_LIN2 48
#define NETID_LIN3 49
#define NETID_LIN4 50
#define NETID_LIN_01 16
#define NETID_AE_01 17
#define NETID_AE_02 18
#define NETID_AE_03 19
#define NETID_ISO9141_03 41
#define NETID_DWCAN_02 42
#define NETID_DWCAN_03 44
#define NETID_AE_04 45
#define NETID_AE_05 46
#define NETID_ISO9141_04 47
#define NETID_LIN_02 48
#define NETID_LIN_03 49
#define NETID_LIN_04 50
#define NETID_MOST 51
#define NETID_RED_APP_ERROR 52
#define NETID_CGI 53
@@ -100,44 +100,44 @@ typedef unsigned __int64 uint64_t;
#define NETID_3G_READ_DATALINK_CM_RX_MSG 58
#define NETID_3G_LOGGING_OVERFLOW 59
#define NETID_3G_READ_SETTINGS_EX 60
#define NETID_HSCAN4 61
#define NETID_HSCAN5 62
#define NETID_DWCAN_04 61
#define NETID_DWCAN_05 62
#define NETID_RS232 63
#define NETID_UART 64
#define NETID_UART2 65
#define NETID_UART3 66
#define NETID_UART4 67
#define NETID_SWCAN2 68
#define NETID_UART_01 64
#define NETID_UART_02 65
#define NETID_UART_03 66
#define NETID_UART_04 67
#define NETID_SWCAN_02 68
#define NETID_ETHERNET_DAQ 69
#define NETID_DATA_TO_HOST 70
#define NETID_TEXTAPI_TO_HOST 71
#define NETID_SPI1 72
#define NETID_OP_ETHERNET6 73
#define NETID_SPI_01 72
#define NETID_AE_06 73
#define NETID_RED_VBAT 74
#define NETID_OP_ETHERNET7 75
#define NETID_OP_ETHERNET8 76
#define NETID_OP_ETHERNET9 77
#define NETID_OP_ETHERNET10 78
#define NETID_OP_ETHERNET11 79
#define NETID_FLEXRAY1A 80
#define NETID_FLEXRAY1B 81
#define NETID_FLEXRAY2A 82
#define NETID_FLEXRAY2B 83
#define NETID_LIN5 84
#define NETID_FLEXRAY 85
#define NETID_FLEXRAY2 86
#define NETID_OP_ETHERNET12 87
#define NETID_I2C1 88
#define NETID_MOST25 90
#define NETID_MOST50 91
#define NETID_MOST150 92
#define NETID_ETHERNET 93
#define NETID_AE_07 75
#define NETID_AE_08 76
#define NETID_AE_09 77
#define NETID_AE_10 78
#define NETID_AE_11 79
#define NETID_FLEXRAY_01A 80
#define NETID_FLEXRAY_01B 81
#define NETID_FLEXRAY_02A 82
#define NETID_FLEXRAY_02B 83
#define NETID_LIN_05 84
#define NETID_FLEXRAY_01 85
#define NETID_FLEXRAY_02 86
#define NETID_AE_12 87
#define NETID_I2C_01 88
#define NETID_MOST_25 90
#define NETID_MOST_50 91
#define NETID_MOST_150 92
#define NETID_ETHERNET_01 93
#define NETID_GMFSA 94
#define NETID_TCP 95
#define NETID_HSCAN6 96
#define NETID_HSCAN7 97
#define NETID_LIN6 98
#define NETID_LSFTCAN2 99
#define NETID_DWCAN_06 96
#define NETID_DWCAN_07 97
#define NETID_LIN_06 98
#define NETID_LSFTCAN_02 99
/**
* To the next person to add a network, please make it 523!
*/
@@ -146,19 +146,19 @@ typedef unsigned __int64 uint64_t;
#define NETID_UDP 514
#define NETID_AUTOSAR 515
#define NETID_FORWARDED_MESSAGE 516
#define NETID_I2C2 517
#define NETID_I2C3 518
#define NETID_I2C4 519
#define NETID_ETHERNET2 520
#define NETID_I2C_02 517
#define NETID_I2C_03 518
#define NETID_I2C_04 519
#define NETID_ETHERNET_02 520
#define NETID_ETHERNET_TX_WRAP 521
#define NETID_A2B_01 522
#define NETID_A2B_02 523
#define NETID_ETHERNET3 524
#define NETID_ETHERNET_03 524
#define NETID_ISM_LOGGER 525
#define NETID_CAN_SWITCH 526
#define NETID_WBMS 532
#define NETID_WBMS2 533
#define NETID_WBMS_01 532
#define NETID_WBMS_02 533
#define NETID_DWCAN_09 534
#define NETID_DWCAN_10 535
#define NETID_DWCAN_11 536
@@ -169,7 +169,7 @@ typedef unsigned __int64 uint64_t;
#define NETID_DWCAN_16 541
#define NETID_LIN_07 542
#define NETID_LIN_08 543
#define NETID_SPI2 544
#define NETID_SPI_02 544
#define NETID_MDIO_01 545
#define NETID_MDIO_02 546
#define NETID_MDIO_03 547
@@ -259,16 +259,16 @@ typedef unsigned __int64 uint64_t;
#define DEVICECOUNT_FOR_EXPLORER 45 //this value will be checked by the NeoViExplorer after #6453!
#define ISO15765_2_NETWORK_HSCAN 0x01
#define ISO15765_2_NETWORK_MSCAN 0x02
#define ISO15765_2_NETWORK_HSCAN2 0x04
#define ISO15765_2_NETWORK_HSCAN3 0x08
#define ISO15765_2_NETWORK_SWCAN 0x10
#define ISO15765_2_NETWORK_HSCAN4 0x14
#define ISO15765_2_NETWORK_HSCAN5 0x18
#define ISO15765_2_NETWORK_HSCAN6 0x1C
#define ISO15765_2_NETWORK_HSCAN7 0x20
#define ISO15765_2_NETWORK_SWCAN2 0x24
#define ISO15765_2_NETWORK_DWCAN_01 0x01
#define ISO15765_2_NETWORK_DWCAN_08 0x02
#define ISO15765_2_NETWORK_DWCAN_02 0x04
#define ISO15765_2_NETWORK_DWCAN_03 0x08
#define ISO15765_2_NETWORK_SWCAN_01 0x10
#define ISO15765_2_NETWORK_DWCAN_04 0x14
#define ISO15765_2_NETWORK_DWCAN_05 0x18
#define ISO15765_2_NETWORK_DWCAN_06 0x1C
#define ISO15765_2_NETWORK_DWCAN_07 0x20
#define ISO15765_2_NETWORK_SWCAN_02 0x24
#define PLASMA_SLAVE1_OFFSET 100
#define PLASMA_SLAVE2_OFFSET 200
@@ -381,7 +381,7 @@ typedef unsigned __int64 uint64_t;
#define SPY_STATUS2_ERROR_FRAME 0x20000
#define SPY_STATUS2_END_OF_LONG_MESSAGE 0x100000
/* I2C Specific - check protocol before handling */
/* I2C_01 Specific - check protocol before handling */
#define SPY_STATUS2_I2C_ERR_TIMEOUT 0x200000
#define SPY_STATUS2_I2C_ERR_NACK 0x400000
#define SPY_STATUS2_I2C_DIR_READ 0x800000
@@ -426,8 +426,8 @@ typedef unsigned __int64 uint64_t;
#define SPY_STATUS2_MOST_MHP_CONTROL_DATA 0x4000000 /* MOST HIGH Control Data */
#define SPY_STATUS2_MOST_I2S_DUMP 0x8000000
#define SPY_STATUS2_MOST_TOO_SHORT 0x10000000
#define SPY_STATUS2_MOST_MOST50 0x20000000 /* absence of MOST50 and MOST150 implies it's MOST25 */
#define SPY_STATUS2_MOST_MOST150 0x40000000
#define SPY_STATUS2_MOST_MOST_50 0x20000000 /* absence of MOST_50 and MOST_150 implies it's MOST_25 */
#define SPY_STATUS2_MOST_MOST_150 0x40000000
#define SPY_STATUS2_MOST_CHANGED_PAR 0x80000000 /* first byte in ack reflects what changed. */
/* Ethernet Specific - check protocol before handling */
@@ -465,7 +465,7 @@ typedef unsigned __int64 uint64_t;
#define SPY_STATUS3_CANFD_BRS 0x10
/* Configuration Array constants */
/* HSCAN neoVI or ValueCAN */
/* DWCAN_01 neoVI or ValueCAN */
#define NEO_CFG_MPIC_HS_CAN_CNF1 (512 + 10)
#define NEO_CFG_MPIC_HS_CAN_CNF2 (512 + 9)
#define NEO_CFG_MPIC_HS_CAN_CNF3 (512 + 8)
@@ -477,14 +477,14 @@ typedef unsigned __int64 uint64_t;
#define NEO_CFG_MPIC_MS_CAN_CNF3 (512 + 20)
/* med speed neoVI CAN */
#define NEO_CFG_MPIC_SW_CAN_CNF1 (512 + 34)
#define NEO_CFG_MPIC_SW_CAN_CNF2 (512 + 33)
#define NEO_CFG_MPIC_SW_CAN_CNF3 (512 + 32)
#define NEO_CFG_MPIC_SWCAN_CNF1 (512 + 34)
#define NEO_CFG_MPIC_SWCAN_CNF2 (512 + 33)
#define NEO_CFG_MPIC_SWCAN_CNF3 (512 + 32)
/* med speed neoVI CAN */
#define NEO_CFG_MPIC_LSFT_CAN_CNF1 (512 + 46)
#define NEO_CFG_MPIC_LSFT_CAN_CNF2 (512 + 45)
#define NEO_CFG_MPIC_LSFT_CAN_CNF3 (512 + 44)
#define NEO_CFG_MPIC_LSFTCAN_CNF1 (512 + 46)
#define NEO_CFG_MPIC_LSFTCAN_CNF2 (512 + 45)
#define NEO_CFG_MPIC_LSFTCAN_CNF3 (512 + 44)
/* Constants used to calculate timestamps */
#define NEOVI_TIMESTAMP_2 0.1048576
@@ -1146,7 +1146,7 @@ typedef struct _SNeoMostGatewaySettings
} SNeoMostGatewaySettings;
#define SNeoMostGatewaySettings_SIZE 4
/* ucInterfaceType in OP_ETH_GENERAL_SETTINGS */
/* ucInterfaceType in AE_GENERAL_SETTINGS */
enum
{
OPETH_FUNC_TAP = 0,
@@ -1157,7 +1157,7 @@ enum
OPETH_FUNC_RAW_MEDIA_CONVERTER2_LOW_LATENCY,
};
typedef struct OP_ETH_GENERAL_SETTINGS_t
typedef struct AE_GENERAL_SETTINGS_t
{
uint8_t ucInterfaceType;
uint8_t reserved0[3];
@@ -1179,8 +1179,8 @@ typedef struct OP_ETH_GENERAL_SETTINGS_t
} flags;
uint32_t uFlags;
};
} OP_ETH_GENERAL_SETTINGS;
#define OP_ETH_GENERAL_SETTINGS_SIZE 20
} AE_GENERAL_SETTINGS;
#define AE_GENERAL_SETTINGS_SIZE 20
typedef struct SRAD_GPTP_SETTINGS_s
{
@@ -1205,23 +1205,23 @@ typedef struct SRAD_GPTP_SETTINGS_s
typedef struct SRAD_GPTP_AND_TAP_SETTINGS_s
{
RAD_GPTP_SETTINGS gPTP;
OP_ETH_GENERAL_SETTINGS tap;
AE_GENERAL_SETTINGS tap;
} RAD_GPTP_AND_TAP_SETTINGS;
#define RAD_GPTP_AND_TAP_SETTINGS_SIZE 40
typedef struct HW_ETH_SETTINGS_t
{
OP_ETH_GENERAL_SETTINGS General_Settings;
AE_GENERAL_SETTINGS General_Settings;
} HW_ETH_SETTINGS;
#define HW_ETH_SETTINGS_SIZE 20
/* ucConfigMode in OP_ETH_SETTINGS */
typedef enum _opEthLinkMode
/* ucConfigMode in AE_SETTINGS */
typedef enum _AELinkMode
{
OPETH_LINK_AUTO = 0,
OPETH_LINK_MASTER,
OPETH_LINK_SLAVE
} opEthLinkMode;
AE_LINK_AUTO = 0,
AE_LINK_MASTER,
AE_LINK_SLAVE
} AELinkMode;
enum
{
@@ -1229,7 +1229,7 @@ enum
OPETH_MAC_SPOOF_SRC_ADDR = 1,
};
typedef struct OP_ETH_SETTINGS_t
typedef struct AE_SETTINGS_t
{
uint8_t ucConfigMode;
unsigned char preemption_en;
@@ -1248,8 +1248,8 @@ typedef struct OP_ETH_SETTINGS_t
};
unsigned char reserved0[14];
};
} OP_ETH_SETTINGS;
#define OP_ETH_SETTINGS_SIZE 16
} AE_SETTINGS;
#define AE_SETTINGS_SIZE 16
typedef struct ETHERNET_SETTINGS_t
{
@@ -1907,7 +1907,7 @@ typedef struct SERDESGEN_SETTINGS_t
typedef struct _RadMoonDuoConverterSettings
{
// OPETH_LINK_AUTO/MASTER/SLAVE
// AE_LINK_AUTO/MASTER/SLAVE
uint8_t linkMode0;
uint8_t linkMode1;
// USB/CM or RJ45 selection
@@ -2213,7 +2213,7 @@ typedef struct _SCyanSettings
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;
@@ -2354,7 +2354,7 @@ typedef struct _SECUSettings
*/
uint32_t ecu_id;
uint16_t selected_network; // not supported yet - default to HSCAN
uint16_t selected_network; // not supported yet - default to DWCAN_01
CAN_SETTINGS can1;
CAN_SETTINGS can2;
@@ -2404,7 +2404,7 @@ typedef struct _SPendantSettings
/* see SECUSettings */
uint32_t ecu_id;
uint16_t selected_network; /* not supported yet - default to HSCAN */
uint16_t selected_network; /* not supported yet - default to DWCAN_01 */
CAN_SETTINGS can1;
CAN_SETTINGS can2;
@@ -2454,7 +2454,7 @@ typedef struct _SIEVBSettings
/* see SECUSettings */
uint32_t ecu_id;
uint16_t selected_network; /* not supported yet - default to HSCAN */
uint16_t selected_network; /* not supported yet - default to DWCAN_01 */
CAN_SETTINGS can1;
LIN_SETTINGS lin1;
@@ -2557,19 +2557,19 @@ typedef struct _SRADGalaxySettings
{
uint16_t perf_en;
OP_ETH_GENERAL_SETTINGS opEthGen;
OP_ETH_SETTINGS opEth1;
OP_ETH_SETTINGS opEth2;
OP_ETH_SETTINGS opEth3;
OP_ETH_SETTINGS opEth4;
OP_ETH_SETTINGS opEth5;
OP_ETH_SETTINGS opEth6;
OP_ETH_SETTINGS opEth7;
OP_ETH_SETTINGS opEth8;
OP_ETH_SETTINGS opEth9;
OP_ETH_SETTINGS opEth10;
OP_ETH_SETTINGS opEth11;
OP_ETH_SETTINGS opEth12;
AE_GENERAL_SETTINGS aeGen;
AE_SETTINGS ae_01;
AE_SETTINGS ae_02;
AE_SETTINGS ae_03;
AE_SETTINGS ae_04;
AE_SETTINGS ae_05;
AE_SETTINGS ae_06;
AE_SETTINGS ae_07;
AE_SETTINGS ae_08;
AE_SETTINGS ae_09;
AE_SETTINGS ae_10;
AE_SETTINGS ae_11;
AE_SETTINGS ae_12;
CAN_SETTINGS can1;
CANFD_SETTINGS canfd1;
@@ -2643,10 +2643,9 @@ typedef struct _SRADStar2Settings
{
uint16_t perf_en;
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;
CAN_SETTINGS can1;
CANFD_SETTINGS canfd1;
CAN_SETTINGS can2;
@@ -2701,9 +2700,8 @@ typedef struct _SRADSuperMoonSettings
{
uint16_t perf_en;
OP_ETH_GENERAL_SETTINGS opEthGen;
OP_ETH_SETTINGS opEth1;
AE_GENERAL_SETTINGS aeGen;
AE_SETTINGS ae_01;
uint16_t network_enables;
uint16_t network_enables_2;
uint16_t network_enabled_on_boot;
@@ -2798,9 +2796,8 @@ typedef struct _SRADMoon2Settings
{
uint16_t perf_en;
OP_ETH_GENERAL_SETTINGS opEthGen;
OP_ETH_SETTINGS opEth1;
AE_GENERAL_SETTINGS aeGen;
AE_SETTINGS ae_01;
uint16_t network_enables;
uint16_t network_enables_2;
uint16_t network_enabled_on_boot;
@@ -2979,10 +2976,9 @@ typedef struct _SRADGigastarSettings
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;
LOGGER_SETTINGS logger;
@@ -3062,23 +3058,23 @@ typedef struct _SRADGalaxy2Settings
LIN_SETTINGS lin1;
OP_ETH_GENERAL_SETTINGS opEthGen;
OP_ETH_SETTINGS opEth1;
OP_ETH_SETTINGS opEth2;
OP_ETH_SETTINGS opEth3;
OP_ETH_SETTINGS opEth4;
OP_ETH_SETTINGS opEth5;
OP_ETH_SETTINGS opEth6;
OP_ETH_SETTINGS opEth7;
OP_ETH_SETTINGS opEth8;
OP_ETH_SETTINGS opEth9;
OP_ETH_SETTINGS opEth10;
OP_ETH_SETTINGS opEth11;
OP_ETH_SETTINGS opEth12;
OP_ETH_SETTINGS opEth13;
OP_ETH_SETTINGS opEth14;
OP_ETH_SETTINGS opEth15;
OP_ETH_SETTINGS opEth16;
AE_GENERAL_SETTINGS aeGen;
AE_SETTINGS ae_01;
AE_SETTINGS ae_02;
AE_SETTINGS ae_03;
AE_SETTINGS ae_04;
AE_SETTINGS ae_05;
AE_SETTINGS ae_06;
AE_SETTINGS ae_07;
AE_SETTINGS ae_08;
AE_SETTINGS ae_09;
AE_SETTINGS ae_10;
AE_SETTINGS ae_11;
AE_SETTINGS ae_12;
AE_SETTINGS ae_13;
AE_SETTINGS ae_14;
AE_SETTINGS ae_15;
AE_SETTINGS ae_16;
ETHERNET10G_SETTINGS ethernet10g;
ETHERNET10G_SETTINGS ethernet10g_2;
@@ -3161,8 +3157,7 @@ typedef struct _CmProbeSettings
// uint16_t perf_en;
// ETHERNET_SETTINGS eth1; // 16 bytes
// OP_ETH_SETTINGS opEth1;
// AE_SETTINGS ae_01;
uint16_t network_enables;
// uint16_t misc_io_initial_ddr;
@@ -4564,10 +4559,10 @@ typedef struct _SRADCometSettings
// 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;
@@ -5232,7 +5227,7 @@ typedef struct _ethernetNetworkStatus_t
uint8_t linkStatus;
uint8_t linkFullDuplex;
uint8_t linkSpeed; // see ethLinkSpeed
uint8_t linkMode; // for automotive networks - see opEthLinkMode
uint8_t linkMode; // for automotive networks - see AELinkMode
} ethernetNetworkStatus_t;
#pragma pack(pop)
@@ -5495,8 +5490,8 @@ CHECK_STRUCT_SIZE(SRedSettings);
CHECK_STRUCT_SIZE(STextAPISettings);
CHECK_STRUCT_SIZE(stChipVersions);
CHECK_STRUCT_SIZE(SNeoMostGatewaySettings);
CHECK_STRUCT_SIZE(OP_ETH_GENERAL_SETTINGS);
CHECK_STRUCT_SIZE(OP_ETH_SETTINGS);
CHECK_STRUCT_SIZE(AE_GENERAL_SETTINGS);
CHECK_STRUCT_SIZE(AE_SETTINGS);
CHECK_STRUCT_SIZE(ETHERNET_SETTINGS);
CHECK_STRUCT_SIZE(ETHERNET_SETTINGS2);
CHECK_STRUCT_SIZE(ETHERNET10G_SETTINGS);
include/icsneo/icsneoc.h
+3 -3
View File
@@ -310,8 +310,8 @@ extern bool DLLExport icsneo_removeMessageCallback(const neodevice_t* device, in
* \returns The netid if the call succeeds, ICSNEO_NETID_INVALID otherwise
*
* This function is designed so that networks can be enumerated without knowledge of the specific
* device. For instance, on a ValueCAN 4-2, the second CAN network is ICSNEO_NETID_HSCAN2, while
* on a neoVI FIRE the second CAN network is ICSNEO_NETID_MSCAN.
* device. For instance, on a ValueCAN 4-2, the second CAN network is ICSNEO_NETID_DWCAN_02, while
* on a neoVI FIRE the second CAN network is ICSNEO_NETID_DWCAN_08.
*/
extern neonetid_t DLLExport icsneo_getNetworkByNumber(const neodevice_t* device, neonettype_t type, unsigned int number);
@@ -536,7 +536,7 @@ extern bool DLLExport icsneo_setFDBaudrate(const neodevice_t* device, neonetid_t
* ``` C
* neomessage_can_t mySendMessage = {}; // Zero all before use
* uint8_t myData[3] = { 0xAA, 0xBB, 0xCC }; // Either heap or stack allocated is okay
* mySendMessage.netid = ICSNEO_NETID_HSCAN;
* mySendMessage.netid = ICSNEO_NETID_DWCAN_01;
* mySendMessage.arbid = 0x1c5001c5;
* mySendMessage.length = 3;
* mySendMessage.data = myData;