Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for ROS serialization #1755

Merged
merged 1 commit into from
May 20, 2023
Merged

Fix for ROS serialization #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions org.lflang/src/org/lflang/federated/extensions/CExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.LinkedHashMap;
import java.util.List;

import org.lflang.ASTUtils;
Expand All @@ -49,7 +48,6 @@
import org.lflang.federated.launcher.RtiConfig;
import org.lflang.federated.serialization.FedROS2CPPSerialization;
import org.lflang.generator.CodeBuilder;
import org.lflang.generator.GeneratorUtils;
import org.lflang.generator.LFGeneratorContext;
import org.lflang.generator.ReactionInstance;
import org.lflang.generator.ReactorInstance;
Expand Down Expand Up @@ -505,6 +503,7 @@ public String generatePreamble(
includes.pr("#ifdef __cplusplus\n"
+ "}\n"
+ "#endif");
includes.pr(generateSerializationIncludes(federate, fileConfig));
}

return includes.toString();
Expand Down Expand Up @@ -537,8 +536,6 @@ protected String makePreamble(
size_t _lf_action_table_size = %1$s;
""".formatted(numOfNetworkActions));

code.pr(generateSerializationPreamble(federate, fileConfig));

code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));

code.pr(generateInitializeTriggers(federate, errorReporter));
Expand All @@ -551,8 +548,8 @@ protected String makePreamble(
/**
* Generate preamble code needed for enabled serializers of the federate.
*/
protected String generateSerializationPreamble(FederateInstance federate, FedFileConfig fileConfig) {
return CExtensionUtils.generateSerializationPreamble(federate, fileConfig);
protected String generateSerializationIncludes(FederateInstance federate, FedFileConfig fileConfig) {
return CExtensionUtils.generateSerializationIncludes(federate, fileConfig);
}

/**
Expand Down
3 changes: 1 addition & 2 deletions org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.lflang.federated.serialization.FedROS2CPPSerialization;
import org.lflang.federated.serialization.SupportedSerializers;
import org.lflang.generator.CodeBuilder;
import org.lflang.generator.GeneratorBase;
import org.lflang.generator.ReactorInstance;
import org.lflang.generator.c.CTypes;
import org.lflang.generator.c.CUtil;
Expand Down Expand Up @@ -547,7 +546,7 @@ public static String surroundWithIfFederatedDecentralized(String code) {
/**
* Generate preamble code needed for enabled serializers of the federate.
*/
public static String generateSerializationPreamble(
public static String generateSerializationIncludes(
FederateInstance federate,
FedFileConfig fileConfig
) {
Expand Down
2 changes: 1 addition & 1 deletion org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class PythonExtension extends CExtension {
protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig) throws IOException {}

@Override
protected String generateSerializationPreamble(FederateInstance federate, FedFileConfig fileConfig) {
protected String generateSerializationIncludes(FederateInstance federate, FedFileConfig fileConfig) {
CodeBuilder code = new CodeBuilder();
for (SupportedSerializers serialization : federate.enabledSerializers) {
switch (serialization) {
Expand Down