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

FIRE3: Fix termination groups

Browse Source
This commit is contained in:
David Rebbe
2026-06-25 16:59:09 -04:00
committed by Kyle Schwarz
parent 4b9cf1a37f
commit 3d99898598
4 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/device/tree/neovifire3/neovifire3settings.h
+16 -5
View File
@@ -262,18 +262,29 @@ public:
} }
virtual std::vector<TerminationGroup> getTerminationGroups() const override { virtual std::vector<TerminationGroup> getTerminationGroups() const override {
// FIRE3 has two physical termination banks: DW CAN 01-08 and DW CAN 09-16.
// Termination within a bank is actually independent (any number may be
// enabled at once).
return { return {
{ {
Network(Network::NetID::DWCAN_01), Network(Network::NetID::DWCAN_01),
Network(Network::NetID::DWCAN_02),
Network(Network::NetID::DWCAN_03), Network(Network::NetID::DWCAN_03),
Network(Network::NetID::DWCAN_04),
Network(Network::NetID::DWCAN_05), Network(Network::NetID::DWCAN_05),
Network(Network::NetID::DWCAN_07) Network(Network::NetID::DWCAN_06),
Network(Network::NetID::DWCAN_07),
Network(Network::NetID::DWCAN_08)
}, },
{ {
Network(Network::NetID::DWCAN_08), Network(Network::NetID::DWCAN_09),
Network(Network::NetID::DWCAN_02), Network(Network::NetID::DWCAN_10),
Network(Network::NetID::DWCAN_04), Network(Network::NetID::DWCAN_11),
Network(Network::NetID::DWCAN_06) Network(Network::NetID::DWCAN_12),
Network(Network::NetID::DWCAN_13),
Network(Network::NetID::DWCAN_14),
Network(Network::NetID::DWCAN_15),
Network(Network::NetID::DWCAN_16)
} }
}; };
} }
include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h
+15 -5
View File
@@ -213,18 +213,28 @@ public:
} }
virtual std::vector<TerminationGroup> getTerminationGroups() const override { virtual std::vector<TerminationGroup> getTerminationGroups() const override {
// FIRE3 FlexRay has two physical termination banks: DW CAN 01-08 and
// DW CAN 09-15 (DW CAN 16 is used by FlexRay). Termination within a bank is
// actually independent (any number may be enabled at once).
return { return {
{ {
Network(Network::NetID::DWCAN_01), Network(Network::NetID::DWCAN_01),
Network(Network::NetID::DWCAN_02),
Network(Network::NetID::DWCAN_03), Network(Network::NetID::DWCAN_03),
Network(Network::NetID::DWCAN_04),
Network(Network::NetID::DWCAN_05), Network(Network::NetID::DWCAN_05),
Network(Network::NetID::DWCAN_07) Network(Network::NetID::DWCAN_06),
Network(Network::NetID::DWCAN_07),
Network(Network::NetID::DWCAN_08)
}, },
{ {
Network(Network::NetID::DWCAN_08), Network(Network::NetID::DWCAN_09),
Network(Network::NetID::DWCAN_02), Network(Network::NetID::DWCAN_10),
Network(Network::NetID::DWCAN_04), Network(Network::NetID::DWCAN_11),
Network(Network::NetID::DWCAN_06) Network(Network::NetID::DWCAN_12),
Network(Network::NetID::DWCAN_13),
Network(Network::NetID::DWCAN_14),
Network(Network::NetID::DWCAN_15)
} }
}; };
} }
include/icsneo/device/tree/neovifire3t1slin/neovifire3t1slinsettings.h
+8 -7
View File
@@ -222,18 +222,19 @@ public:
} }
virtual std::vector<TerminationGroup> getTerminationGroups() const override { virtual std::vector<TerminationGroup> getTerminationGroups() const override {
// FIRE3 T1S-LIN has a single physical termination bank: DW CAN 01-08.
// Termination within the bank is actually independent (any number may be
// enabled at once).
return { return {
{ {
Network(Network::NetID::DWCAN_01), Network(Network::NetID::DWCAN_01),
Network(Network::NetID::DWCAN_03),
Network(Network::NetID::DWCAN_05),
Network(Network::NetID::DWCAN_07)
},
{
Network(Network::NetID::DWCAN_08),
Network(Network::NetID::DWCAN_02), Network(Network::NetID::DWCAN_02),
Network(Network::NetID::DWCAN_03),
Network(Network::NetID::DWCAN_04), Network(Network::NetID::DWCAN_04),
Network(Network::NetID::DWCAN_06) Network(Network::NetID::DWCAN_05),
Network(Network::NetID::DWCAN_06),
Network(Network::NetID::DWCAN_07),
Network(Network::NetID::DWCAN_08)
} }
}; };
} }
include/icsneo/device/tree/neovired2/neovired2settings.h
+8 -7
View File
@@ -175,18 +175,19 @@ public:
} }
virtual std::vector<TerminationGroup> getTerminationGroups() const override { virtual std::vector<TerminationGroup> getTerminationGroups() const override {
// RED2 has a single physical termination bank: DW CAN 01-08. Termination
// within the bank is actually independent (any number may be enabled at
// once).
return { return {
{ {
Network(Network::NetID::DWCAN_01), Network(Network::NetID::DWCAN_01),
Network(Network::NetID::DWCAN_03),
Network(Network::NetID::DWCAN_05),
Network(Network::NetID::DWCAN_07)
},
{
Network(Network::NetID::DWCAN_08),
Network(Network::NetID::DWCAN_02), Network(Network::NetID::DWCAN_02),
Network(Network::NetID::DWCAN_03),
Network(Network::NetID::DWCAN_04), Network(Network::NetID::DWCAN_04),
Network(Network::NetID::DWCAN_06) Network(Network::NetID::DWCAN_05),
Network(Network::NetID::DWCAN_06),
Network(Network::NetID::DWCAN_07),
Network(Network::NetID::DWCAN_08)
} }
}; };
} }