@@ -231,12 +231,12 @@ static auto getSignalExtendedValueType(const G_Network& gnet, const G_Message& m
231
231
}
232
232
return extended_value_type;
233
233
}
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 )
235
235
{
236
236
std::vector<std::unique_ptr<ISignalMultiplexerValue>> signal_multiplexer_values;
237
237
for (const auto & gsmv : gnet.signal_multiplexer_values )
238
238
{
239
- if (gsmv.signal_name == s. name )
239
+ if (gsmv.signal_name == s && gsmv. message_id == m )
240
240
{
241
241
auto switch_name = gsmv.switch_name ;
242
242
std::vector<ISignalMultiplexerValue::Range> value_ranges;
@@ -263,7 +263,7 @@ static auto getSignals(const G_Network& gnet, const G_Message& m)
263
263
auto extended_value_type = getSignalExtendedValueType (gnet, m, s);
264
264
auto multiplexer_indicator = ISignal::EMultiplexer::NoMux;
265
265
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 );
267
267
uint64_t multiplexer_switch_value = 0 ;
268
268
if (s.multiplexer_indicator )
269
269
{
0 commit comments