Skip to content
Snippets Groups Projects
Commit 30241373 authored by René Paris's avatar René Paris
Browse files

Merge remote-tracking branch 'origin/indicator-state-output-in-fmu-log' into develop

parents 73d14769 626d0e70
No related branches found
No related tags found
3 merge requests!266Merge develop into main for v1.2,!260Feat/integration for release,!257publish indicator state information in the fmu log even if the indicator state is activated via Scenario
...@@ -163,7 +163,7 @@ void ChannelDefinitionParser<FMI>::AddInputChannel(const std::string& inputType, ...@@ -163,7 +163,7 @@ void ChannelDefinitionParser<FMI>::AddInputChannel(const std::string& inputType,
{ {
std::get<FMI>(fmuRealInputs).emplace_back(fmuInputType, additionalParameter, valueReference); std::get<FMI>(fmuRealInputs).emplace_back(fmuInputType, additionalParameter, valueReference);
} }
else if (variableTypeInFmu == VariableType::Int) else if (variableTypeInFmu == VariableType::Int || variableTypeInFmu == VariableType::Enum)
{ {
std::get<FMI>(fmuIntegerInputs).emplace_back(fmuInputType, additionalParameter, valueReference); std::get<FMI>(fmuIntegerInputs).emplace_back(fmuInputType, additionalParameter, valueReference);
} }
...@@ -282,4 +282,4 @@ void ChannelDefinitionParser<FMI>::Log(CbkLogLevel logLevel, const char *file, i ...@@ -282,4 +282,4 @@ void ChannelDefinitionParser<FMI>::Log(CbkLogLevel logLevel, const char *file, i
{ {
callbacks->Log(logLevel, file, line, message); callbacks->Log(logLevel, file, line, message);
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment