diff --git a/org.fortiss.af3.platform.raspberry/trunk/lib/inc/CanConnector.h b/org.fortiss.af3.platform.raspberry/trunk/lib/inc/CanConnector.h
index 65a758921ec8ea615f147e225bebf6af1a0963b6..978d29a9a1960401271f842ec38e34b30025f2bb 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/lib/inc/CanConnector.h
+++ b/org.fortiss.af3.platform.raspberry/trunk/lib/inc/CanConnector.h
@@ -18,7 +18,7 @@ void finish_input_CanConnector();
 void prepare_output_CanConnector();
 void finish_output_CanConnector();
 
-// NOVAL
+// noval
 GEN_TYPE_boolean can_is_noval(PORT_T port);
 GEN_TYPE_boolean can_set_noval(PORT_T port);
 
diff --git a/org.fortiss.af3.platform.raspberry/trunk/lib/inc/Gamepad.h b/org.fortiss.af3.platform.raspberry/trunk/lib/inc/Gamepad.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..68042e86ca4c4c13df61a53fa86d5c6b97b7c373 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/lib/inc/Gamepad.h
+++ b/org.fortiss.af3.platform.raspberry/trunk/lib/inc/Gamepad.h
@@ -0,0 +1,42 @@
+#ifndef __GAMEPAD_H
+#define __GAMEPAD_H
+
+#include "inc-gen/data_dictionary.h"
+
+// worker
+void gp_worker();
+
+// init, term
+void gp_init();
+void gp_term();
+
+// noval
+GEN_TYPE_boolean gp_btn1_is_noval();
+GEN_TYPE_boolean gp_btn2_is_noval();
+GEN_TYPE_boolean gp_btn3_is_noval();
+GEN_TYPE_boolean gp_btn4_is_noval();
+GEN_TYPE_boolean gp_btnL1_is_noval();
+GEN_TYPE_boolean gp_btnL2_is_noval();
+GEN_TYPE_boolean gp_btnR1_is_noval();
+GEN_TYPE_boolean gp_btnR2_is_noval();
+GEN_TYPE_boolean gp_btnLX_is_noval();
+GEN_TYPE_boolean gp_btnLY_is_noval();
+GEN_TYPE_boolean gp_btnRX_is_noval();
+GEN_TYPE_boolean gp_btnRY_is_noval();
+
+
+// readers
+GEN_TYPE_boolean gp_btn1_read();
+GEN_TYPE_boolean gp_btn2_read();
+GEN_TYPE_boolean gp_btn3_read();
+GEN_TYPE_boolean gp_btn4_read();
+GEN_TYPE_boolean gp_btnL1_read();
+GEN_TYPE_boolean gp_btnL2_read();
+GEN_TYPE_boolean gp_btnR1_read();
+GEN_TYPE_boolean gp_btnR2_read();
+GEN_TYPE_double gp_btnLX_read();
+GEN_TYPE_double gp_btnLY_read();
+GEN_TYPE_double gp_btnRX_read();
+GEN_TYPE_double gp_btnRY_read();
+
+#endif // __GAMEPAD_H
diff --git a/org.fortiss.af3.platform.raspberry/trunk/lib/inc/LaserRangeFinder.h b/org.fortiss.af3.platform.raspberry/trunk/lib/inc/LaserRangeFinder.h
index a73e206a85b5b3ae62b0fd85bf7974fe183a3c5a..75cab869e37abf5e33b9a9ee2b1b6e53dc0a1d5d 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/lib/inc/LaserRangeFinder.h
+++ b/org.fortiss.af3.platform.raspberry/trunk/lib/inc/LaserRangeFinder.h
@@ -15,6 +15,6 @@ void lrf_term();
 
 // getters
 GEN_TYPE_boolean lrf_is_noval();
-GEN_TYPE_int lrf_get_distance();
+GEN_TYPE_int lrf_read();
 
 #endif // __LASERRANGEFINDER_H
diff --git a/org.fortiss.af3.platform.raspberry/trunk/lib/src/CanConnector.c b/org.fortiss.af3.platform.raspberry/trunk/lib/src/CanConnector.c
index 8e84952eefffeab8f73b6e1014b035a93f5e9123..d6842f1f3815ceeeab3514322d115db728cff915 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/lib/src/CanConnector.c
+++ b/org.fortiss.af3.platform.raspberry/trunk/lib/src/CanConnector.c
@@ -26,7 +26,7 @@ void finish_output_CanConnector() {
 
 }
 
-// NOVAL
+// noval
 GEN_TYPE_boolean can_is_noval(PORT_T port) {
     return true;
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/lib/src/Gamepad.c b/org.fortiss.af3.platform.raspberry/trunk/lib/src/Gamepad.c
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..56c426a2b2fe8000e71d3cc42643c2ed0fdca9a4 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/lib/src/Gamepad.c
+++ b/org.fortiss.af3.platform.raspberry/trunk/lib/src/Gamepad.c
@@ -0,0 +1,125 @@
+
+#include "inc/Gamepad.h"
+
+// worker
+void gp_worker() {
+    // do background work, read from gamepad, write to variables
+    while(1) {}
+}
+
+// init, term
+GEN_TYPE_boolean gp_initialized = false;
+GEN_TYPE_boolean gp_terminated = false;
+
+void gp_init() {
+    // important, since all btns are accessing the same method
+    if(gp_initialized) return;
+
+    // TODO initialize...
+}
+
+void gp_term() {
+    // important, since all btns are accessing the same method
+    if(gp_terminated) return;
+
+    // TODO terminate...
+}
+
+// noval
+GEN_TYPE_boolean gp_btn1_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btn2_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btn3_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btn4_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btnL1_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btnL2_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btnR1_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btnR2_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btnLX_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btnLY_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btnRX_is_noval() {
+    return true;
+}
+
+GEN_TYPE_boolean gp_btnRY_is_noval() {
+    return true;
+}
+
+// readers
+GEN_TYPE_boolean gp_btn1_read() {
+    return false;
+}
+
+GEN_TYPE_boolean gp_btn2_read() {
+    return false;
+}
+
+GEN_TYPE_boolean gp_btn3_read() {
+    return false;
+}
+
+GEN_TYPE_boolean gp_btn4_read() {
+    return false;
+}
+
+GEN_TYPE_boolean gp_btnL1_read() {
+    return false;
+}
+
+GEN_TYPE_boolean gp_btnL2_read() {
+    return false;
+}
+
+GEN_TYPE_boolean gp_btnR1_read() {
+    return false;
+}
+
+GEN_TYPE_boolean gp_btnR2_read() {
+    return false;
+}
+
+GEN_TYPE_double gp_btnLX_read() {
+    return 0.0;
+}
+
+GEN_TYPE_double gp_btnLY_read() {
+    return 0.0;
+}
+
+GEN_TYPE_double gp_btnRX_read() {
+    return 0.0;
+}
+
+GEN_TYPE_double gp_btnRY_read() {
+    return 0.0;
+}
+
diff --git a/org.fortiss.af3.platform.raspberry/trunk/lib/src/LaserRangeFinder.c b/org.fortiss.af3.platform.raspberry/trunk/lib/src/LaserRangeFinder.c
index 0aaff79aa1201b918dfdb1a3f17b4994b9e0428a..af773b6ff20cf3ca55574d92e691e4f2c1a5ddd0 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/lib/src/LaserRangeFinder.c
+++ b/org.fortiss.af3.platform.raspberry/trunk/lib/src/LaserRangeFinder.c
@@ -18,7 +18,7 @@ GEN_TYPE_boolean lrf_is_noval() {
     return false;
 }
 
-GEN_TYPE_int lrf_get_distance() {
+GEN_TYPE_int lrf_read() {
     char bytes[5];
     int n_read = 0;
 
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/LaserRangeFinderSensorExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/LaserRangeFinderSensorExecutable.java
index 0b16b400d9c2405f3f4f2f630778cb1d6b9ea3a9..6fa57e26dc2859e7d660b05abd535a97bafdea5c 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/LaserRangeFinderSensorExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/LaserRangeFinderSensorExecutable.java
@@ -61,6 +61,6 @@ public class LaserRangeFinderSensorExecutable extends GenericReceiverExecutable
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return funcCall("lrf_get_distance");
+		return funcCall("lrf_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button1Executable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button1Executable.java
index 11be1a6459f51002525e0e0ea868d5e1d04d7fde..bb21628552ba603d5143013292242b3601654490 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button1Executable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button1Executable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class Button1Executable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btn1_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btn1_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button2Executable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button2Executable.java
index d5aa1fa1ad8fc421a254d76135755f3f45b8fe1a..4926a0a5261be7ef9d326045a3d19e2cf0dea2f6 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button2Executable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button2Executable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class Button2Executable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btn2_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btn2_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button3Executable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button3Executable.java
index 442714daeaf3ea1396620baad9f01a096f6be1ce..75c8149eed510b25030a3c8b65b26bd3e745e9a1 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button3Executable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button3Executable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class Button3Executable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btn3_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btn3_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button4Executable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button4Executable.java
index b3ce7f9fde0b596a7351b14fdac904a57adb2d7a..b8f99e8c97854392c86e163ab7022c3955386400 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button4Executable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button4Executable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class Button4Executable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btn4_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btn4_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL1Executable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL1Executable.java
index fa2ada7c4af9365f914df51e5cf1dbd963899341..3fb2b780f892cf0abd866360e53615dc43e2f4f8 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL1Executable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL1Executable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class ButtonL1Executable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btnL1_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btnL1_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL2Executable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL2Executable.java
index dfc31cd88f64f9b7ecd5a0b3d16925b34ec1e15a..0e5a0645b4f233b6218c0877dc409b0b3d16a6bd 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL2Executable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL2Executable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class ButtonL2Executable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btnL2_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btnL2_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR1Executable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR1Executable.java
index cb506734cc34bbda70e1166c189ff54df70132a5..4761f1671eae32f2d010b03f2912f8bea10af049 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR1Executable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR1Executable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class ButtonR1Executable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btnR1_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btnR1_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR2Executable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR2Executable.java
index 2d5e6ea40acd995d6d2e9f0139090dde3c22a3aa..59d42182af0797c5d4352ec4b37f78c1a0655f30 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR2Executable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR2Executable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class ButtonR2Executable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btnR2_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btnR2_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickXExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickXExecutable.java
index d2b8670d0e5259956767c75dffccdd42199c175c..c2d30bc1aa603fcb5e55253fb9146d68e6af3ccf 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickXExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickXExecutable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class Left_StickXExecutable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btnLX_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btnLX_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickYExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickYExecutable.java
index b34b1dd4b6f71e4a976fe98b4c83b2c92469a654..8516209ebb56777b00859bf38627decd0ac00fdd 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickYExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickYExecutable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class Left_StickYExecutable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btnLY_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btnLY_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickXExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickXExecutable.java
index c0dce60956294c97b806a0de3aadf3b58c8d9a97..5d684e9d3b8068f691c6bd70af4124e65ff56fdf 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickXExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickXExecutable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class Right_StickXExecutable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btnRX_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btnRX_read");
 	}
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickYExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickYExecutable.java
index d2a0bdb2d0bb53a9001eb92689f2f3cbd37b22e3..afcb06d97f53c9737b738802381587240f0fb6f0 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickYExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickYExecutable.java
@@ -17,6 +17,8 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.platform.raspberry.generator.executable.gamepad;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
+
 import org.fortiss.af3.component.model.InputPort;
 import org.fortiss.af3.expression.model.terms.IExpressionTerm;
 import org.fortiss.af3.platform.generic.generator.executable.GenericReceiverExecutable;
@@ -41,24 +43,24 @@ public class Right_StickYExecutable extends GenericReceiverExecutable {
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getInitialization() {
-		return super.getInitialization();
+		return funcCall("gp_init");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
-		return super.getNoValGuardAccessor(logicalSignal);
+		return funcCall("gp_btnRY_is_noval");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getTermination() {
-		return super.getTermination();
+		return funcCall("gp_term");
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
-		return super.getValueReadAccessor(logicalSignal);
+		return funcCall("gp_btnRY_read");
 	}
 }