From 07e214067f7c24a0fbb3f745abb0c085b1c2082d Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Thu, 4 Apr 2019 15:11:51 +0200
Subject: [PATCH] Revert "Merge branch 'master_clone' into 'master'"
This reverts commit 30bb31d31d8d4ddd484b403d5f828ad22010b284, reversing
changes made to aa61b9d1255839b7604131c9d0b164dfb4839dfd.
---
MPSoC/Makefile.forsoclib | 4 +-
.../elntranslator/toELN/TopCellGenerator.java | 27 ++-------
.../toSysCAMS/TopCellGenerator.java | 28 ++--------
.../TopCellGeneratorCluster.java | 23 ++------
.../ClusterCodeRodrigo.java} | 6 +-
.../HeaderRodrigo.java} | 0
.../MakefileCodeRodrigo.java} | 8 +--
.../PrimitiveCodeRodrigo.java} | 6 +-
.../TopCellGeneratorRodrigo.java} | 55 +++++++------------
src/main/java/ui/GTURTLEModeling.java | 5 +-
.../JDialogELNExecutableCodeGeneration.java | 4 +-
...DialogSysCAMSExecutableCodeGeneration.java | 9 +--
12 files changed, 56 insertions(+), 119 deletions(-)
rename src/main/java/syscamstranslator/{toSysCAMSSoclib/ClusterCodeSoclib.java => toSysCAMS_rodrigo/ClusterCodeRodrigo.java} (97%)
rename src/main/java/syscamstranslator/{toSysCAMSSoclib/HeaderSoclib.java => toSysCAMS_rodrigo/HeaderRodrigo.java} (100%)
rename src/main/java/syscamstranslator/{toSysCAMSSoclib/MakefileCodeSoclib.java => toSysCAMS_rodrigo/MakefileCodeRodrigo.java} (95%)
rename src/main/java/syscamstranslator/{toSysCAMSSoclib/PrimitiveCodeSoclib.java => toSysCAMS_rodrigo/PrimitiveCodeRodrigo.java} (96%)
rename src/main/java/syscamstranslator/{toSysCAMSSoclib/TopCellGeneratorSoclib.java => toSysCAMS_rodrigo/TopCellGeneratorRodrigo.java} (74%)
diff --git a/MPSoC/Makefile.forsoclib b/MPSoC/Makefile.forsoclib
index 92efe42353..a7abb1e606 100755
--- a/MPSoC/Makefile.forsoclib
+++ b/MPSoC/Makefile.forsoclib
@@ -18,8 +18,8 @@ updateruntime:
cp mutekh/libmwmr/include/mwmr/mwmr.h mutekh/examples/avatar
cp mutekh/libsyscams/*.c mutekh/examples/avatar
cp mutekh/libsyscams/*.h mutekh/examples/avatar
- cp src/*.c mutekh/MPSoC/mutekh/examples/avatar
- cp src/*.h mutekh/MPSoC/mutekh/examples/avatar
+ cp src/*.c ~/TTool/MPSoC/mutekh/examples/avatar
+ cp src/*.h ~/TTool/MPSoC/mutekh/examples/avatar
updategeneratedcode:
diff --git a/src/main/java/elntranslator/toELN/TopCellGenerator.java b/src/main/java/elntranslator/toELN/TopCellGenerator.java
index d80e64324b..44ccd478c4 100644
--- a/src/main/java/elntranslator/toELN/TopCellGenerator.java
+++ b/src/main/java/elntranslator/toELN/TopCellGenerator.java
@@ -62,11 +62,8 @@ import elntranslator.*;
public class TopCellGenerator {
public static ELNSpecification eln;
- //private final static String GENERATED_PATH1 = "generated_CPP" + File.separator;
- //private final static String GENERATED_PATH2 = "generated_H" + File.separator;
-
- private String GENERATED_PATH1 = "generated_CPP" + File.separator;
- private String GENERATED_PATH2 = "generated_H" + File.separator;
+ private final static String GENERATED_PATH1 = "generated_CPP" + File.separator;
+ private final static String GENERATED_PATH2 = "generated_H" + File.separator;
public TopCellGenerator(ELNSpecification _eln) {
eln = _eln;
@@ -96,19 +93,13 @@ public class TopCellGenerator {
return (top);
}
- public void saveFile(String path, Boolean standalone) {
+ public void saveFile(String path) {
ELNTCluster cluster = TopCellGenerator.eln.getCluster();
LinkedList<ELNTConnector> connectorsModule = TopCellGenerator.eln.getAllConnectorsInModule();
LinkedList<ELNTConnector> connectorsCluster = TopCellGenerator.eln.getAllConnectorsInCluster();
String top;
- if(standalone){
-
- GENERATED_PATH1 = "";
- GENERATED_PATH2 = "";
- }
-
try {
// Save file .cpp
System.err.println(path + GENERATED_PATH1 + cluster.getName() + ".cpp");
@@ -120,19 +111,13 @@ public class TopCellGenerator {
ex.printStackTrace();
}
// Save files .h
- saveFileModule(path, cluster, connectorsModule, standalone);
+ saveFileModule(path, cluster, connectorsModule);
}
- public void saveFileModule(String path, ELNTCluster cluster, List<ELNTConnector> connectors, Boolean standalone) {
+ public void saveFileModule(String path, ELNTCluster cluster, List<ELNTConnector> connectors) {
LinkedList<ELNTModule> modules = cluster.getModule();
String code;
-
- if(standalone){
-
- GENERATED_PATH1 = "";
- GENERATED_PATH2 = "";
- }
for (ELNTModule module : modules) {
try {
@@ -146,4 +131,4 @@ public class TopCellGenerator {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java b/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
index ad82e10c6b..07a99113fb 100644
--- a/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
+++ b/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
@@ -61,12 +61,9 @@ import java.util.LinkedList;
public class TopCellGenerator {
public static SysCAMSSpecification syscams;
- //private final static String GENERATED_PATH1 = "generated_CPP" + File.separator;
- //private final static String GENERATED_PATH2 = "generated_H" + File.separator;
-
- private String GENERATED_PATH1 = "generated_CPP" + File.separator;
- private String GENERATED_PATH2 = "generated_H" + File.separator;
-
+ private final static String GENERATED_PATH1 = "generated_CPP" + File.separator;
+ private final static String GENERATED_PATH2 = "generated_H" + File.separator;
+
public TopCellGenerator(SysCAMSSpecification sys) {
syscams = sys;
}
@@ -97,19 +94,12 @@ public class TopCellGenerator {
return (top);
}
- public void saveFile(String path, Boolean standalone) {
+ public void saveFile(String path) {
SysCAMSTCluster cluster = TopCellGenerator.syscams.getCluster();
LinkedList<SysCAMSTConnector> connectors = TopCellGenerator.syscams.getAllConnectorCluster();
String top;
- if(standalone){
-
- GENERATED_PATH1 = "";
- GENERATED_PATH2 = "";
- }
-
-
try {
// Save file .cpp
System.err.println(path + GENERATED_PATH1 + cluster.getClusterName() + ".cpp");
@@ -121,19 +111,13 @@ public class TopCellGenerator {
ex.printStackTrace();
}
// Save files .h
- saveFileBlock(path, cluster, standalone);
+ saveFileBlock(path, cluster);
}
- public void saveFileBlock(String path, SysCAMSTCluster c, Boolean standalone) {
+ public void saveFileBlock(String path, SysCAMSTCluster c) {
String headerTDF, headerDE, codeTDF, codeDE;
LinkedList<SysCAMSTBlockTDF> tdf = c.getBlockTDF();
LinkedList<SysCAMSTBlockDE> de = c.getBlockDE();
-
- if(standalone){
-
- GENERATED_PATH1 = "";
- GENERATED_PATH2 = "";
- }
for (SysCAMSTBlockTDF t : tdf) {
try {
diff --git a/src/main/java/syscamstranslator/toSysCAMSCluster/TopCellGeneratorCluster.java b/src/main/java/syscamstranslator/toSysCAMSCluster/TopCellGeneratorCluster.java
index 7f6a6282c9..ccdc017d7b 100644
--- a/src/main/java/syscamstranslator/toSysCAMSCluster/TopCellGeneratorCluster.java
+++ b/src/main/java/syscamstranslator/toSysCAMSCluster/TopCellGeneratorCluster.java
@@ -63,10 +63,9 @@ import java.util.LinkedList;
public class TopCellGeneratorCluster {
public static SysCAMSSpecification syscams;
- private String GENERATED_PATH1 = "generated_CPP" + File.separator;
- private String GENERATED_PATH2 = "generated_H" + File.separator;
-
-
+ private final static String GENERATED_PATH1 = "generated_CPP" + File.separator;
+ private final static String GENERATED_PATH2 = "generated_H" + File.separator;
+
public TopCellGeneratorCluster(SysCAMSSpecification sys) {
syscams = sys;
}
@@ -97,17 +96,12 @@ public class TopCellGeneratorCluster {
return (top);
}
- public void saveFile(String path, Boolean standalone) {
+ public void saveFile(String path) {
SysCAMSTCluster cluster = TopCellGeneratorCluster.syscams.getCluster();
LinkedList<SysCAMSTConnector> connectors = TopCellGeneratorCluster.syscams.getAllConnectorsCluster4Soclib();
String top;
- if(standalone){
- GENERATED_PATH1 = "";
- GENERATED_PATH2 = "";
- }
-
try {
// Save file .cpp
System.err.println(path + GENERATED_PATH1 + cluster.getClusterName() + "_tdf.h");
@@ -119,18 +113,13 @@ public class TopCellGeneratorCluster {
ex.printStackTrace();
}
// Save files .h
- saveFileBlock(path, cluster, standalone);
+ saveFileBlock(path, cluster);
}
- public void saveFileBlock(String path, SysCAMSTCluster c, Boolean standalone) {
+ public void saveFileBlock(String path, SysCAMSTCluster c) {
String headerTDF, headerDE, codeTDF, codeDE;
LinkedList<SysCAMSTBlockTDF> tdf = c.getBlockTDF();
LinkedList<SysCAMSTBlockDE> de = c.getBlockDE();
-
- if(standalone){
- GENERATED_PATH1 = "";
- GENERATED_PATH2 = "";
- }
for (SysCAMSTBlockTDF t : tdf) {
try {
diff --git a/src/main/java/syscamstranslator/toSysCAMSSoclib/ClusterCodeSoclib.java b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/ClusterCodeRodrigo.java
similarity index 97%
rename from src/main/java/syscamstranslator/toSysCAMSSoclib/ClusterCodeSoclib.java
rename to src/main/java/syscamstranslator/toSysCAMS_rodrigo/ClusterCodeRodrigo.java
index 73bd3aa4b5..fa186bc8d1 100644
--- a/src/main/java/syscamstranslator/toSysCAMSSoclib/ClusterCodeSoclib.java
+++ b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/ClusterCodeRodrigo.java
@@ -50,19 +50,19 @@ import java.util.LinkedList;
import syscamstranslator.*;
/**
- * Class ClusterCodeSoclib
+ * Class ClusterCodeRodrigo
* Principal code of a cluster component
* Creation: 14/05/2018
* @version 1.0 14/05/2018
* @author Irina Kit Yan LEE
*/
-public class ClusterCodeSoclib {
+public class ClusterCodeRodrigo {
static private String corpsCluster;
private final static String CR = "\n";
private final static String CR2 = "\n\n";
- ClusterCodeSoclib() {}
+ ClusterCodeRodrigo() {}
public static String getClusterCode(SysCAMSTCluster cluster, LinkedList<SysCAMSTConnector> connectors) {
int nb_con = 0;
diff --git a/src/main/java/syscamstranslator/toSysCAMSSoclib/HeaderSoclib.java b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/HeaderRodrigo.java
similarity index 100%
rename from src/main/java/syscamstranslator/toSysCAMSSoclib/HeaderSoclib.java
rename to src/main/java/syscamstranslator/toSysCAMS_rodrigo/HeaderRodrigo.java
diff --git a/src/main/java/syscamstranslator/toSysCAMSSoclib/MakefileCodeSoclib.java b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/MakefileCodeRodrigo.java
similarity index 95%
rename from src/main/java/syscamstranslator/toSysCAMSSoclib/MakefileCodeSoclib.java
rename to src/main/java/syscamstranslator/toSysCAMS_rodrigo/MakefileCodeRodrigo.java
index 4021cf7d67..0482f7b278 100644
--- a/src/main/java/syscamstranslator/toSysCAMSSoclib/MakefileCodeSoclib.java
+++ b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/MakefileCodeRodrigo.java
@@ -50,21 +50,21 @@ import java.util.LinkedList;
import syscamstranslator.*;
/**
- * Class MakefileCodeSoclib Principal code of a makefile Creation: 02/06/2018
+ * Class MakefileCodeRodrigo Principal code of a makefile Creation: 02/06/2018
*
* @version 1.0 02/06/2018
* @author Irina Kit Yan LEE
*/
-public class MakefileCodeSoclib {
+public class MakefileCodeRodrigo {
static private String corpsMakefile;
private final static String CR = "\n";
private final static String CR2 = "\n\n";
- MakefileCodeSoclib() {
+ MakefileCodeRodrigo() {
}
- public static String getMakefileCodeSoclib(LinkedList<SysCAMSTCluster> clusters) {
+ public static String getMakefileCodeRodrigo(LinkedList<SysCAMSTCluster> clusters) {
if (clusters != null) {
corpsMakefile = "# Compiler and linker flags" + CR + "CXXFLAGS = -g -Wall -I. $(SYSTEMC_INCLUDE_DIRS)" + CR
+ "LDFLAGS = $(SYSTEMC_LIBRARY_DIRS)" + CR2 + "# List of all ecutables to be compiled" + CR
diff --git a/src/main/java/syscamstranslator/toSysCAMSSoclib/PrimitiveCodeSoclib.java b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/PrimitiveCodeRodrigo.java
similarity index 96%
rename from src/main/java/syscamstranslator/toSysCAMSSoclib/PrimitiveCodeSoclib.java
rename to src/main/java/syscamstranslator/toSysCAMS_rodrigo/PrimitiveCodeRodrigo.java
index be3ae8a5eb..ef1f58c8cd 100644
--- a/src/main/java/syscamstranslator/toSysCAMSSoclib/PrimitiveCodeSoclib.java
+++ b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/PrimitiveCodeRodrigo.java
@@ -50,20 +50,20 @@ import java.util.LinkedList;
import syscamstranslator.*;
/**
- * Class PrimitiveCodeSoclib
+ * Class PrimitiveCodeRodrigo
* Principal code of a primive component
* Creation: 14/05/2018
* @version 1.0 14/05/2018
* @author Irina Kit Yan LEE
*/
-public class PrimitiveCodeSoclib {
+public class PrimitiveCodeRodrigo {
static private String corpsPrimitiveTDF;
static private String corpsPrimitiveDE;
private final static String CR = "\n";
private final static String CR2 = "\n\n";
- PrimitiveCodeSoclib() {}
+ PrimitiveCodeRodrigo() {}
public static String getPrimitiveCodeTDF(SysCAMSTBlockTDF tdf) {
corpsPrimitiveTDF = "";
diff --git a/src/main/java/syscamstranslator/toSysCAMSSoclib/TopCellGeneratorSoclib.java b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/TopCellGeneratorRodrigo.java
similarity index 74%
rename from src/main/java/syscamstranslator/toSysCAMSSoclib/TopCellGeneratorSoclib.java
rename to src/main/java/syscamstranslator/toSysCAMS_rodrigo/TopCellGeneratorRodrigo.java
index 3a203848ca..0d24c64c61 100644
--- a/src/main/java/syscamstranslator/toSysCAMSSoclib/TopCellGeneratorSoclib.java
+++ b/src/main/java/syscamstranslator/toSysCAMS_rodrigo/TopCellGeneratorRodrigo.java
@@ -58,15 +58,13 @@ import java.util.LinkedList;
* @author Irina Kit Yan LEE
*/
-public class TopCellGeneratorSoclib {
+public class TopCellGeneratorRodrigo {
public static SysCAMSSpecification syscams;
-
- private String GENERATED_PATH1 = "generated_CPP" + File.separator;
- private String GENERATED_PATH2 = "generated_H" + File.separator;
-
-
- public TopCellGeneratorSoclib(SysCAMSSpecification sys) {
+ private final static String GENERATED_PATH1 = "generated_CPP" + File.separator;
+ private final static String GENERATED_PATH2 = "generated_H" + File.separator;
+
+ public TopCellGeneratorRodrigo(SysCAMSSpecification sys) {
syscams = sys;
}
@@ -74,43 +72,37 @@ public class TopCellGeneratorSoclib {
if (c == null) {
System.out.println("***Warning: require at least one cluster***");
}
- if (TopCellGeneratorSoclib.syscams.getNbBlockTDF() == 0) {
+ if (TopCellGeneratorRodrigo.syscams.getNbBlockTDF() == 0) {
System.out.println("***Warning: require at least one TDF block***");
}
- if (TopCellGeneratorSoclib.syscams.getNbPortTDF() == 0) {
+ if (TopCellGeneratorRodrigo.syscams.getNbPortTDF() == 0) {
System.out.println("***Warning: require at least one TDF port***");
}
- if (TopCellGeneratorSoclib.syscams.getNbBlockDE() == 0) {
+ if (TopCellGeneratorRodrigo.syscams.getNbBlockDE() == 0) {
System.out.println("***Warning: require at least one DE block***");
}
- if (TopCellGeneratorSoclib.syscams.getNbPortDE() == 0) {
+ if (TopCellGeneratorRodrigo.syscams.getNbPortDE() == 0) {
System.out.println("***Warning: require at least one DE port***");
}
- if (TopCellGeneratorSoclib.syscams.getNbPortConverter() == 0) {
+ if (TopCellGeneratorRodrigo.syscams.getNbPortConverter() == 0) {
System.out.println("***Warning: require at least one converter port***");
}
- if (TopCellGeneratorSoclib.syscams.getNbConnectorCluster() == 0) {
+ if (TopCellGeneratorRodrigo.syscams.getNbConnectorCluster() == 0) {
System.out.println("***Warning: require at least one connector***");
}
- String top = HeaderSoclib.getClusterHeader(c) + ClusterCodeSoclib.getClusterCode(c, connectors);
+ String top = HeaderRodrigo.getClusterHeader(c) + ClusterCodeRodrigo.getClusterCode(c, connectors);
return (top);
}
- public void saveFile(String path, Boolean standalone) {
- SysCAMSTCluster cluster = TopCellGeneratorSoclib.syscams.getCluster();
- LinkedList<SysCAMSTConnector> connectors = TopCellGeneratorSoclib.syscams.getAllConnectorCluster();
+ public void saveFile(String path) {
+ SysCAMSTCluster cluster = TopCellGeneratorRodrigo.syscams.getCluster();
+ LinkedList<SysCAMSTConnector> connectors = TopCellGeneratorRodrigo.syscams.getAllConnectorCluster();
String top;
- if(standalone){
- GENERATED_PATH1 = "";
- GENERATED_PATH2 = "";
- }
-
try {
// Save file .cpp
-
- System.err.println(path + GENERATED_PATH1 + cluster.getClusterName() + "_tdf.h");
+ System.err.println(path + GENERATED_PATH1 + cluster.getClusterName() + "_tdf.h");
FileWriter fw = new FileWriter(path + GENERATED_PATH1 + "/" + cluster.getClusterName() + "_tdf.h");
top = generateTopCell(cluster, connectors);
fw.write(top);
@@ -122,23 +114,18 @@ public class TopCellGeneratorSoclib {
saveFileBlock(path, cluster);
}
- public void saveFileBlock(String path, SysCAMSTCluster c, Boolean standalone) {
+ public void saveFileBlock(String path, SysCAMSTCluster c) {
String headerTDF, headerDE, codeTDF, codeDE;
LinkedList<SysCAMSTBlockTDF> tdf = c.getBlockTDF();
LinkedList<SysCAMSTBlockDE> de = c.getBlockDE();
-
- if(standalone){
- GENERATED_PATH1 = "";
- GENERATED_PATH2 = "";
- }
for (SysCAMSTBlockTDF t : tdf) {
try {
System.err.println(path + GENERATED_PATH2 + t.getName() + "_tdf.h");
FileWriter fw = new FileWriter(path + GENERATED_PATH2 + "/" + t.getName() + "_tdf.h");
- headerTDF = HeaderSoclib.getPrimitiveHeaderTDF(t);
+ headerTDF = HeaderRodrigo.getPrimitiveHeaderTDF(t);
fw.write(headerTDF);
- codeTDF = PrimitiveCodeSoclib.getPrimitiveCodeTDF(t);
+ codeTDF = PrimitiveCodeRodrigo.getPrimitiveCodeTDF(t);
fw.write(codeTDF);
fw.close();
} catch (Exception ex) {
@@ -149,9 +136,9 @@ public class TopCellGeneratorSoclib {
try {
System.err.println(path + GENERATED_PATH2 + t.getName() + "_tdf.h");
FileWriter fw = new FileWriter(path + GENERATED_PATH2 + "/" + t.getName() + "_tdf.h");
- headerDE = HeaderSoclib.getPrimitiveHeaderDE(t);
+ headerDE = HeaderRodrigo.getPrimitiveHeaderDE(t);
fw.write(headerDE);
- codeDE = PrimitiveCodeSoclib.getPrimitiveCodeDE(t);
+ codeDE = PrimitiveCodeRodrigo.getPrimitiveCodeDE(t);
fw.write(codeDE);
fw.close();
} catch (Exception ex) {
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 80a152de55..bf434c3004 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -107,7 +107,6 @@ import ui.procsd.ProCSDComponent;
import ui.procsd.ProactiveCSDPanel;
import ui.prosmd.ProactiveSMDPanel;
import ui.req.RequirementDiagramPanel;
-import ui.syscams.SysCAMSComponentTaskDiagramPanel;
import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
import ui.tmlad.*;
import ui.tmlcd.TMLTaskDiagramPanel;
@@ -6482,10 +6481,10 @@ public class GTURTLEModeling {
((AvatarADPanel) tdp).setConnectorsToFront();
}
- if(tdp instanceof SysCAMSComponentTaskDiagramPanel) {
+ /*if(tdp instanceof SysCAMSComponentTaskDiagramPanel) {
//TraceManager.addDev("Connectors...");
((SysCAMSComponentTaskDiagramPanel) tdp).setConnectorsToFront();
- }
+ }*/
}
// AVATAR
diff --git a/src/main/java/ui/window/JDialogELNExecutableCodeGeneration.java b/src/main/java/ui/window/JDialogELNExecutableCodeGeneration.java
index 80366ab9f5..3ef7014b1d 100644
--- a/src/main/java/ui/window/JDialogELNExecutableCodeGeneration.java
+++ b/src/main/java/ui/window/JDialogELNExecutableCodeGeneration.java
@@ -500,8 +500,6 @@ public class JDialogELNExecutableCodeGeneration extends javax.swing.JFrame imple
// String list;//, data;
// hasError = false;
- Boolean standalone = true; //are there any GPIO blocks? Currently ELN is always standalone and has no direct connection to SocLib (via TDF: yes)
-
try {
if (jp1.getSelectedIndex() == 0) {
jta.append("Generating executable code (ELN version)\n");
@@ -533,7 +531,7 @@ public class JDialogELNExecutableCodeGeneration extends javax.swing.JFrame imple
pathCode = code2.getText();
System.err.println("ELN TOPCELL : " + elnSpec.getCluster().getName() + "saved in " + code2.getText());
- topCellGenerator.saveFile(pathCode, standalone);
+ topCellGenerator.saveFile(pathCode);
jta.append("Code saved\n");
} catch (Exception e) {
diff --git a/src/main/java/ui/window/JDialogSysCAMSExecutableCodeGeneration.java b/src/main/java/ui/window/JDialogSysCAMSExecutableCodeGeneration.java
index 8fc324ade5..c5c80dd073 100644
--- a/src/main/java/ui/window/JDialogSysCAMSExecutableCodeGeneration.java
+++ b/src/main/java/ui/window/JDialogSysCAMSExecutableCodeGeneration.java
@@ -509,8 +509,6 @@ public class JDialogSysCAMSExecutableCodeGeneration extends javax.swing.JFrame i
// String list;//, data;
hasError = false;
- Boolean standalone = true; //are there any GPIO blocks?
-
try {
if (jp1.getSelectedIndex() == 0) {
Vector<SysCAMSComponentTaskDiagramPanel> syscamsDiagramPanels = mgui.getListSysCAMSPanel();
@@ -542,9 +540,6 @@ public class JDialogSysCAMSExecutableCodeGeneration extends javax.swing.JFrame i
}
for(SysCAMSTBlockGPIO2VCI gpioBlock : gpioBlocks) {
nbPorts += gpioBlock.getPortDE().size();
- standalone=false;
-
-
}
if(nbPorts != (allConnectors.size()*2)) {
jta.append("Error: There are unconnected ports.\n");
@@ -681,8 +676,8 @@ public class JDialogSysCAMSExecutableCodeGeneration extends javax.swing.JFrame i
pathCode = code2.getText();
System.err.println("SYSCAMS TOPCELL : " + syscalsspec.getCluster().getClusterName() + "saved in " + code2.getText());
- topCellGenerator.saveFile(pathCode,standalone);
- topCellGeneratorCluster.saveFile(pathCode,standalone);
+ topCellGenerator.saveFile(pathCode);
+ topCellGeneratorCluster.saveFile(pathCode);
jta.append("Code saved\n");
} catch (Exception e) {
--
GitLab