ET_TRUE / ET_FALSE

6 files changed, 15 insertions, 15 deletions

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
index afb46cc7b..b94b1b29b 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
@@ -169,7 +169,7 @@ class CExtensions implements ILanguageExtension {
 	}
 
 	override String booleanConstant(boolean b) {
-		if (b) "TRUE" else "FALSE"
+		if (b) "ET_TRUE" else "ET_FALSE"
 	}
 	
 	override String pointerLiteral() { "*" }
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend
index 375033868..dcfafe6dd 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend
@@ -282,7 +282,7 @@ class NodeGen {
 			else {
 				printf("type quit to exit\n");
 				fflush(stdout);
-				while (TRUE) {
+				while (ET_TRUE) {
 					char line[64];
 		
 					if (fgets(line, 64, stdin) != NULL) {
@@ -716,7 +716,7 @@ class NodeGen {
 							else
 						«ENDIF»
 						if (msg->evtID == etSystemProtocol_IN_terminate)
-							return FALSE;
+							return ET_FALSE;
 						break;
 					«FOR ai : dispatchedInstances»
 						
@@ -779,7 +779,7 @@ class NodeGen {
 						break;
 				}
 				ET_MSC_LOGGER_SYNC_EXIT
-				return TRUE;
+				return ET_TRUE;
 			}
 		«ENDFOR»
 		'''
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend
index ca03d681c..ef051e32a 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend
@@ -73,12 +73,12 @@ class NodeRunnerGen {
 		 */
 		
 		int main(int argc, char** argv) {
-			etBool runAsTest = FALSE;
+			etBool runAsTest = ET_FALSE;
 		
 			if (argc>1 && strcmp(argv[1], "-headless")==0)
-				runAsTest = TRUE;
+				runAsTest = ET_TRUE;
 			if (argc>1 && strcmp(argv[1], "-run_as_test")==0)
-				runAsTest = TRUE;
+				runAsTest = ET_TRUE;
 		
 			etUserEntry(); /* platform specific */
 			
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
index f05e2c507..09834e5ec 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
@@ -273,9 +273,9 @@ public class CExtensions implements ILanguageExtension {
   public String booleanConstant(final boolean b) {
     String _xifexpression = null;
     if (b) {
-      _xifexpression = "TRUE";
+      _xifexpression = "ET_TRUE";
     } else {
-      _xifexpression = "FALSE";
+      _xifexpression = "ET_FALSE";
     }
     return _xifexpression;
   }
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
index 24149d9af..1f7d5d2f4 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
@@ -747,7 +747,7 @@ public class NodeGen {
       _builder.append("fflush(stdout);");
       _builder.newLine();
       _builder.append("\t\t");
-      _builder.append("while (TRUE) {");
+      _builder.append("while (ET_TRUE) {");
       _builder.newLine();
       _builder.append("\t\t\t");
       _builder.append("char line[64];");
@@ -2401,7 +2401,7 @@ public class NodeGen {
           _builder.append("if (msg->evtID == etSystemProtocol_IN_terminate)");
           _builder.newLine();
           _builder.append("\t\t\t\t");
-          _builder.append("return FALSE;");
+          _builder.append("return ET_FALSE;");
           _builder.newLine();
           _builder.append("\t\t\t");
           _builder.append("break;");
@@ -2825,7 +2825,7 @@ public class NodeGen {
           _builder.append("ET_MSC_LOGGER_SYNC_EXIT");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("return TRUE;");
+          _builder.append("return ET_TRUE;");
           _builder.newLine();
           _builder.append("}");
           _builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java
index c5c6896e5..f5fcdcb9d 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java
@@ -155,20 +155,20 @@ public class NodeRunnerGen {
       _builder.append("int main(int argc, char** argv) {");
       _builder.newLine();
       _builder.append("\t");
-      _builder.append("etBool runAsTest = FALSE;");
+      _builder.append("etBool runAsTest = ET_FALSE;");
       _builder.newLine();
       _builder.newLine();
       _builder.append("\t");
       _builder.append("if (argc>1 && strcmp(argv[1], \"-headless\")==0)");
       _builder.newLine();
       _builder.append("\t\t");
-      _builder.append("runAsTest = TRUE;");
+      _builder.append("runAsTest = ET_TRUE;");
       _builder.newLine();
       _builder.append("\t");
       _builder.append("if (argc>1 && strcmp(argv[1], \"-run_as_test\")==0)");
       _builder.newLine();
       _builder.append("\t\t");
-      _builder.append("runAsTest = TRUE;");
+      _builder.append("runAsTest = ET_TRUE;");
       _builder.newLine();
       _builder.newLine();
       _builder.append("\t");