From 7c04e00a00883660d3e89f98a4a9d38d5590303e Mon Sep 17 00:00:00 2001
From: Khan <khan@fortiss.org>
Date: Fri, 13 May 2016 10:50:09 +0000
Subject: [PATCH] Generic Calls for reading Sensor and writing to Actuator
based on Pin Numbers.
---
.../raspberry/generator/executable/ActuatorOutExecutable.java | 3 +--
.../raspberry/generator/executable/SensorInExecutable.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/ActuatorOutExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/ActuatorOutExecutable.java
index 5db350ef..ef3db36e 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/ActuatorOutExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/ActuatorOutExecutable.java
@@ -65,8 +65,7 @@ public class ActuatorOutExecutable extends TransmitterExecutableBase<ActuatorOut
public IExpressionTerm getValueWriteAccessor(OutputPort logicalSignal, IExpressionTerm value) {
PinNumber ias = getAnnotation(modelElement, PinNumber.class);
int pinNr = ias.getPinNumber();
- return funcCall("write_" + modelElement.getName(),
- ExpressionModelElementFactory.createVar(pinNr + ""));
+ return funcCall("write_Actuator", ExpressionModelElementFactory.createVar(pinNr + ""));
}
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/SensorInExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/SensorInExecutable.java
index 61375c9a..d63aecf7 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/SensorInExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/SensorInExecutable.java
@@ -71,7 +71,7 @@ public class SensorInExecutable extends ReceiverExecutableBase<SensorIn> impleme
PinNumber ias = getAnnotation(modelElement, PinNumber.class);
int pinNr = ias.getPinNumber();
- return funcCall("read_" + modelElement.getName(),
+ return funcCall("read_Sensor",// + modelElement.getName()
ExpressionModelElementFactory.createVar(pinNr + ""));
}
--
GitLab