Skip to content

Commit 54ce78a

Browse files
authored
Merge pull request #117 from bytebeamio/group_sg_mul_val
group multiplexer values by message id as well
2 parents 1d6ab9f + 7961eab commit 54ce78a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/libdbcppp/DBCAST2Network.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,12 @@ static auto getSignalExtendedValueType(const G_Network& gnet, const G_Message& m
231231
}
232232
return extended_value_type;
233233
}
234-
static auto getSignalMultiplexerValues(const G_Network& gnet, const G_Signal& s)
234+
static auto getSignalMultiplexerValues(const G_Network& gnet, const std::string& s, const uint64_t m)
235235
{
236236
std::vector<std::unique_ptr<ISignalMultiplexerValue>> signal_multiplexer_values;
237237
for (const auto& gsmv : gnet.signal_multiplexer_values)
238238
{
239-
if (gsmv.signal_name == s.name)
239+
if (gsmv.signal_name == s && gsmv.message_id == m)
240240
{
241241
auto switch_name = gsmv.switch_name;
242242
std::vector<ISignalMultiplexerValue::Range> value_ranges;
@@ -263,7 +263,7 @@ static auto getSignals(const G_Network& gnet, const G_Message& m)
263263
auto extended_value_type = getSignalExtendedValueType(gnet, m, s);
264264
auto multiplexer_indicator = ISignal::EMultiplexer::NoMux;
265265
auto comment = getComment(gnet, m, s);
266-
auto signal_multiplexer_values = getSignalMultiplexerValues(gnet, s);
266+
auto signal_multiplexer_values = getSignalMultiplexerValues(gnet, s.name, m.id);
267267
uint64_t multiplexer_switch_value = 0;
268268
if (s.multiplexer_indicator)
269269
{

0 commit comments

Comments
 (0)