From f8708eddb8d8d9a414500e567accb99cb4cdd09c Mon Sep 17 00:00:00 2001
From: Khan <khan@fortiss.org>
Date: Tue, 24 May 2016 09:38:02 +0000
Subject: [PATCH] changes in format for function calls:
read_<peripheral>(pinNr) -> read_<peripheral>(pinNr, varName)
write_<peripheral>(pinNr) -> write_<peripheral>(pinNr, varName)
---
.../executable/ActuatorOutExecutable.java | 8 +++--
.../executable/BusMasterPortExecutable.java | 35 +++----------------
.../executable/SensorInExecutable.java | 12 ++++---
3 files changed, 18 insertions(+), 37 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 42527fef..e8beeace 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
@@ -63,10 +63,12 @@ public class ActuatorOutExecutable extends TransmitterExecutableBase<ActuatorOut
/** {@inheritDoc} */
@Override
+ /* generates call: write_Actuator(pinNr, varName) */
public IExpressionTerm getValueWriteAccessor(OutputPort logicalSignal, IExpressionTerm value) {
PinNumber ias = getAnnotation(modelElement, PinNumber.class);
int pinNr = ias.getPinNumber();
- return funcCall("write_Actuator", ExpressionModelElementFactory.createVar(pinNr + ""));
+ return funcCall("write_Actuator", ExpressionModelElementFactory.createVar(pinNr + ""),
+ ExpressionModelElementFactory.createVar(logicalSignal.getName() + ""));
}
@@ -78,11 +80,13 @@ public class ActuatorOutExecutable extends TransmitterExecutableBase<ActuatorOut
/** {@inheritDoc} */
@Override
+ /* generates call: write_Actuator(pinNr, varName) */
public IExpressionTerm getValueWriteAccessor(OutputPort logicalSignal, IExpressionTerm value,
Deployment depl) {
PinNumber ias = getAnnotation(modelElement, PinNumber.class);
int pinNr = ias.getPinNumber();
- return funcCall("write_Actuator", ExpressionModelElementFactory.createVar(pinNr + ""));
+ return funcCall("write_Actuator", ExpressionModelElementFactory.createVar(pinNr + ""),
+ ExpressionModelElementFactory.createVar(logicalSignal.getName() + ""));
}
/** {@inheritDoc} */
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/BusMasterPortExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/BusMasterPortExecutable.java
index a533cb50..abdd3a78 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/BusMasterPortExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/BusMasterPortExecutable.java
@@ -31,7 +31,6 @@ import org.fortiss.af3.expression.model.terms.IExpressionTerm;
import org.fortiss.af3.expression.utils.ExpressionModelElementFactory;
import org.fortiss.af3.platform.language.executable.TransceiverExecutableBase;
import org.fortiss.af3.platform.model.ExecutionUnit;
-import org.fortiss.af3.platform.model.IPlatformArchitectureElement;
import org.fortiss.af3.platform.raspberry.generator.executable.interfaces.IReadExecutableWithNoValSupport;
import org.fortiss.af3.platform.raspberry.generator.executable.interfaces.ITermExecutable;
import org.fortiss.af3.platform.raspberry.generator.executable.interfaces.IWriteExecutableWithNoValSupport;
@@ -61,18 +60,13 @@ public class BusMasterPortExecutable extends TransceiverExecutableBase<BusMaster
/** {@inheritDoc} */
@Override
public IExpressionTerm getInitialization(Deployment depl) {
- int coreId = getParentCoreId(depl);
-
- return funcCall("init_" + modelElement.getName(),
- ExpressionModelElementFactory.createVar(coreId + ""));
+ return funcCall("init_" + modelElement.getName());
}
/** {@inheritDoc} */
@Override
public IExpressionTerm getTermination(Deployment depl) {
- int coreId = getParentCoreId(depl);
- return funcCall("term_" + modelElement.getName(),
- ExpressionModelElementFactory.createVar(coreId + ""));
+ return funcCall("term_" + modelElement.getName());
}
/** {@inheritDoc} */
@@ -107,7 +101,7 @@ public class BusMasterPortExecutable extends TransceiverExecutableBase<BusMaster
/** {@inheritDoc} */
@Override
public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) {
- return funcCall("is_noval_" + modelElement.getName());// + "_" + logicalSignal.getName()
+ return funcCall("is_noval_" + modelElement.getName());
}
/** {@inheritDoc} */
@@ -124,11 +118,7 @@ public class BusMasterPortExecutable extends TransceiverExecutableBase<BusMaster
return null;
}
- /**
- * @param logicalSignal
- * @return
- * returns core ID
- */
+ /** Gets the address for the core that drives the Input Port */
private int getSourceCoreAddress(InputPort logicalSignal, Deployment depl) {
EList<Channel> channels = logicalSignal.getIncomingChannels();
@@ -139,11 +129,7 @@ public class BusMasterPortExecutable extends TransceiverExecutableBase<BusMaster
return ias.getCoreAddress();// sourceCore.getId();
}
- /**
- * @param logicalSignal
- * @return
- * returns core ID
- */
+ /** Gets the address for the core that acts as sink for the Output Port */
private int getTargetCoreAddress(OutputPort logicalSignal, Deployment depl) {
EList<Channel> channels = logicalSignal.getOutgoingChannels();
// get one of the channels, usually only one channel will be connected per output port
@@ -160,17 +146,6 @@ public class BusMasterPortExecutable extends TransceiverExecutableBase<BusMaster
return null;
}
- /**
- * @param depl
- * @return
- * returns parent core ID
- */
- private int getParentCoreId(Deployment depl) {
- IPlatformArchitectureElement parentElement = modelElement.getPlatformElement();
- CoreAddress ias = getAnnotation(parentElement, CoreAddress.class);
- return ias.getCoreAddress();
- }
-
/** {@inheritDoc} */
@Override
public IExpressionTerm getTermination() {
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 f4519c30..7ea678c2 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
@@ -52,7 +52,7 @@ public class SensorInExecutable extends ReceiverExecutableBase<SensorIn> impleme
/** {@inheritDoc} */
@Override
public IExpressionTerm getInitialization() {
- return funcCall("init_Sensor");// + modelElement.getName()
+ return funcCall("init_Sensor");
}
/** {@inheritDoc} */
@@ -63,11 +63,12 @@ public class SensorInExecutable extends ReceiverExecutableBase<SensorIn> impleme
/** {@inheritDoc} */
@Override
+ /* generates call: read_Sensor(pinNr, varName) */
public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) {
PinNumber ias = getAnnotation(modelElement, PinNumber.class);
int pinNr = ias.getPinNumber();
-
- return funcCall("read_Sensor", ExpressionModelElementFactory.createVar(pinNr + ""));
+ return funcCall("read_Sensor", ExpressionModelElementFactory.createVar(pinNr + ""),
+ ExpressionModelElementFactory.createVar(logicalSignal.getName() + ""));
}
/** {@inheritDoc} */
@@ -78,11 +79,12 @@ public class SensorInExecutable extends ReceiverExecutableBase<SensorIn> impleme
/** {@inheritDoc} */
@Override
+ /* generates call: read_Sensor(pinNr, varName) */
public IExpressionTerm getValueReadAccessor(InputPort logicalSignal, Deployment depl) {
PinNumber ias = getAnnotation(modelElement, PinNumber.class);
int pinNr = ias.getPinNumber();
-
- return funcCall("read_Sensor", ExpressionModelElementFactory.createVar(pinNr + ""));
+ return funcCall("read_Sensor", ExpressionModelElementFactory.createVar(pinNr + ""),
+ ExpressionModelElementFactory.createVar(logicalSignal.getName() + ""));
}
/** {@inheritDoc} */
--
GitLab