From b1fcd8e329b6cbb0ae6fa1f21847dbf3d05ce1a6 Mon Sep 17 00:00:00 2001
From: Helge Brueger <noreply@fortiss.org>
Date: Mon, 5 Jun 2017 21:33:08 +0000
Subject: [PATCH] Added empty functions for gamepad buttons and references in
codegen refs 7863
---
.../trunk/lib/inc/CanConnector.h | 2 +-
.../trunk/lib/inc/Gamepad.h | 42 ++++++
.../trunk/lib/inc/LaserRangeFinder.h | 2 +-
.../trunk/lib/src/CanConnector.c | 2 +-
.../trunk/lib/src/Gamepad.c | 125 ++++++++++++++++++
.../trunk/lib/src/LaserRangeFinder.c | 2 +-
.../LaserRangeFinderSensorExecutable.java | 2 +-
.../executable/gamepad/Button1Executable.java | 10 +-
.../executable/gamepad/Button2Executable.java | 10 +-
.../executable/gamepad/Button3Executable.java | 10 +-
.../executable/gamepad/Button4Executable.java | 10 +-
.../gamepad/ButtonL1Executable.java | 10 +-
.../gamepad/ButtonL2Executable.java | 10 +-
.../gamepad/ButtonR1Executable.java | 10 +-
.../gamepad/ButtonR2Executable.java | 10 +-
.../gamepad/Left_StickXExecutable.java | 10 +-
.../gamepad/Left_StickYExecutable.java | 10 +-
.../gamepad/Right_StickXExecutable.java | 10 +-
.../gamepad/Right_StickYExecutable.java | 10 +-
19 files changed, 244 insertions(+), 53 deletions(-)
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 65a75892..978d29a9 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 e69de29b..68042e86 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 a73e206a..75cab869 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 8e84952e..d6842f1f 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 e69de29b..56c426a2 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 0aaff79a..af773b6f 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 0b16b400..6fa57e26 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 11be1a64..bb216285 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 d5aa1fa1..4926a0a5 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 442714da..75c8149e 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 b3ce7f9f..b8f99e8c 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 fa2ada7c..3fb2b780 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 dfc31cd8..0e5a0645 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 cb506734..4761f167 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 2d5e6ea4..59d42182 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 d2b8670d..c2d30bc1 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 b34b1dd4..8516209e 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 c0dce609..5d684e9d 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 d2a0bdb2..afcb06d9 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");
}
}
--
GitLab