diff --git a/include/icsneo/device/tree/neovifire3/neovifire3settings.h b/include/icsneo/device/tree/neovifire3/neovifire3settings.h index b46835f..f39de86 100644 --- a/include/icsneo/device/tree/neovifire3/neovifire3settings.h +++ b/include/icsneo/device/tree/neovifire3/neovifire3settings.h @@ -262,18 +262,29 @@ public: } virtual std::vector 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 { { Network(Network::NetID::DWCAN_01), + Network(Network::NetID::DWCAN_02), Network(Network::NetID::DWCAN_03), + Network(Network::NetID::DWCAN_04), 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_02), - Network(Network::NetID::DWCAN_04), - Network(Network::NetID::DWCAN_06) + Network(Network::NetID::DWCAN_09), + Network(Network::NetID::DWCAN_10), + Network(Network::NetID::DWCAN_11), + 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) } }; } diff --git a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h index cb610f2..4acaf2d 100644 --- a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h +++ b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h @@ -213,18 +213,28 @@ public: } virtual std::vector 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 { { Network(Network::NetID::DWCAN_01), + Network(Network::NetID::DWCAN_02), Network(Network::NetID::DWCAN_03), + Network(Network::NetID::DWCAN_04), 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_02), - Network(Network::NetID::DWCAN_04), - Network(Network::NetID::DWCAN_06) + Network(Network::NetID::DWCAN_09), + Network(Network::NetID::DWCAN_10), + Network(Network::NetID::DWCAN_11), + Network(Network::NetID::DWCAN_12), + Network(Network::NetID::DWCAN_13), + Network(Network::NetID::DWCAN_14), + Network(Network::NetID::DWCAN_15) } }; } diff --git a/include/icsneo/device/tree/neovifire3t1slin/neovifire3t1slinsettings.h b/include/icsneo/device/tree/neovifire3t1slin/neovifire3t1slinsettings.h index 80a5bd1..b30e7ee 100644 --- a/include/icsneo/device/tree/neovifire3t1slin/neovifire3t1slinsettings.h +++ b/include/icsneo/device/tree/neovifire3t1slin/neovifire3t1slinsettings.h @@ -222,18 +222,19 @@ public: } virtual std::vector 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 { { 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_03), 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) } }; } diff --git a/include/icsneo/device/tree/neovired2/neovired2settings.h b/include/icsneo/device/tree/neovired2/neovired2settings.h index d2c90da..ff64ea8 100644 --- a/include/icsneo/device/tree/neovired2/neovired2settings.h +++ b/include/icsneo/device/tree/neovired2/neovired2settings.h @@ -175,18 +175,19 @@ public: } virtual std::vector 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 { { 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_03), 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) } }; }