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 83d6cb1d3fcbf3ff8c5ef862fce293cbf4c0a4a2..5cde1ec494eb86e94fa209dd0406fdd70ad76f91 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 @@ -17,6 +17,8 @@ $Id$ +--------------------------------------------------------------------------*/ package org.fortiss.af3.platform.raspberry.generator.executable; +import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall; + import org.fortiss.af3.component.model.OutputPort; import org.fortiss.af3.expression.model.terms.IExpressionTerm; import org.fortiss.af3.platform.language.executable.IInitializableExecutable; @@ -45,30 +47,26 @@ public class ActuatorOutExecutable extends TransmitterExecutableBase<ActuatorOut /** {@inheritDoc} */ @Override - public IExpressionTerm getValueWriteAccessor(OutputPort logicalSignal, IExpressionTerm value) { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getInitialization() { + return funcCall("init_" + modelElement.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getNoValWriteAccessor(OutputPort logicalSignal) { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getTermination() { + return funcCall("term_" + modelElement.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getTermination() { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getValueWriteAccessor(OutputPort logicalSignal, IExpressionTerm value) { + return funcCall("write_" + modelElement.getName(), value); } /** {@inheritDoc} */ @Override - public IExpressionTerm getInitialization() { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getNoValWriteAccessor(OutputPort logicalSignal) { + return funcCall("set_noval_" + modelElement.getName()); } } diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/BusExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/BusExecutable.java index 252a6ce58767292bd38a4792ed8471a6c2feff76..1f555bbc01f08012e116589d1952836acf9c4007 100644 --- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/BusExecutable.java +++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/BusExecutable.java @@ -26,7 +26,6 @@ import org.fortiss.af3.generator.common.model.source.SourcePackage; import org.fortiss.af3.platform.language.executable.TransmissionUnitExecutableBase; import org.fortiss.af3.platform.model.ExecutionUnit; import org.fortiss.af3.platform.model.TransmissionUnit; -import org.fortiss.tooling.kernel.extension.data.ITransformationContext; /** * @@ -49,7 +48,7 @@ public class BusExecutable extends TransmissionUnitExecutableBase<TransmissionUn @Override public void createAllFiles(SourcePackage pack, Map<ExecutionUnit, List<Port>> euPortsPair, Map<ExecutionUnit, List<Component>> euComponentList, Component topComponent, - int deploymentID, ITransformationContext context) { + int deploymentID) { // TODO Auto-generated method stub } 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 c19fd395b95fa8b2d77d69082e4f1090ae9a69d1..47a574cf9dacf9c3f8cba65fabbb29bcf7d8c312 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 @@ -17,6 +17,8 @@ $Id$ +--------------------------------------------------------------------------*/ package org.fortiss.af3.platform.raspberry.generator.executable; +import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall; + import org.fortiss.af3.component.model.InputPort; import org.fortiss.af3.component.model.OutputPort; import org.fortiss.af3.expression.model.terms.IExpressionTerm; @@ -48,44 +50,38 @@ public class BusMasterPortExecutable extends TransceiverExecutableBase<BusMaster /** {@inheritDoc} */ @Override - public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getInitialization() { + return funcCall("init_" + modelElement.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getValueWriteAccessor(OutputPort logicalSignal, IExpressionTerm value) { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getTermination() { + return funcCall("term_" + modelElement.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getNoValWriteAccessor(OutputPort logicalSignal) { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getValueWriteAccessor(OutputPort logicalSignal, IExpressionTerm value) { + return funcCall("write_" + modelElement.getName() + "_" + logicalSignal.getName(), value); } /** {@inheritDoc} */ @Override - public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) { + return funcCall("read_" + modelElement.getName() + "_" + logicalSignal.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getTermination() { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getNoValWriteAccessor(OutputPort logicalSignal) { + return funcCall("set_noval_" + modelElement.getName() + "_" + logicalSignal.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getInitialization() { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) { + return funcCall("is_noval_" + modelElement.getName() + "_" + logicalSignal.getName()); } } diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/CANBusExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/CANBusExecutable.java index 7ad0777f21d53264c94644a3a0055c5d63b486f8..9b5a4a573cd562a876aad1342963c5fbbcbf5d5c 100644 --- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/CANBusExecutable.java +++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/CANBusExecutable.java @@ -26,7 +26,6 @@ import org.fortiss.af3.generator.common.model.source.SourcePackage; import org.fortiss.af3.platform.language.executable.TransmissionUnitExecutableBase; import org.fortiss.af3.platform.model.ExecutionUnit; import org.fortiss.af3.platform.model.TransmissionUnit; -import org.fortiss.tooling.kernel.extension.data.ITransformationContext; /** * @@ -49,7 +48,7 @@ public class CANBusExecutable extends TransmissionUnitExecutableBase<Transmissio @Override public void createAllFiles(SourcePackage pack, Map<ExecutionUnit, List<Port>> euPortsPair, Map<ExecutionUnit, List<Component>> euComponentList, Component topComponent, - int deploymentID, ITransformationContext context) { + int deploymentID) { // TODO Auto-generated method stub } diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/CoreExecutable.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/CoreExecutable.java index d4c8c4a71e6b814277ea48851114a967faa6ac98..d4dcdcba8b19c05b7d291da4e722a0b48f2e0276 100644 --- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/CoreExecutable.java +++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/CoreExecutable.java @@ -71,6 +71,7 @@ import org.fortiss.af3.platform.language.executable.ITerminatableExecutable; import org.fortiss.af3.platform.language.executable.IWritableExecutable; import org.fortiss.af3.platform.language.executable.IWritableExecutableWithNoValSupport; import org.fortiss.af3.platform.model.ExecutionUnit; +import org.fortiss.af3.platform.model.GenericPlatformUnit; import org.fortiss.af3.platform.model.PlatformConnectorUnit; import org.fortiss.af3.platform.model.generic.GenericReceiver; import org.fortiss.af3.platform.model.generic.GenericTransceiver; @@ -116,7 +117,8 @@ public class CoreExecutable extends ExecutionUnitExecutableBase<Core, CSourcePac /* need to check if all annotations are set */ CSourcePackage sourcePackage = createCSourcePackage(); - sourcePackage.setBaseLocation("app/" + name); + String dirName = ((GenericPlatformUnit)modelElement.eContainer()).getName(); + sourcePackage.setBaseLocation(dirName + "/" + name); // Fill the the two helper sets. Sets are used to ensure uniqueness of platform connectors. Set<PlatformConnectorUnit> usedUnits = new HashSet<PlatformConnectorUnit>(); 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 fa3912b04a883e8aec7e18103e9e5edcb4544207..3e2beec99db69bd61cb4783da1f2a16d20c67b06 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 @@ -17,6 +17,8 @@ $Id$ +--------------------------------------------------------------------------*/ package org.fortiss.af3.platform.raspberry.generator.executable; +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.language.executable.IInitializableExecutable; @@ -45,30 +47,25 @@ public class SensorInExecutable extends ReceiverExecutableBase<SensorIn> impleme /** {@inheritDoc} */ @Override - public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getInitialization() { + return funcCall("init_" + modelElement.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getTermination() { + return funcCall("term_" + modelElement.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getTermination() { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getValueReadAccessor(InputPort logicalSignal) { + return funcCall("read_" + modelElement.getName()); } /** {@inheritDoc} */ @Override - public IExpressionTerm getInitialization() { - // TODO Auto-generated method stub - return null; + public IExpressionTerm getNoValGuardAccessor(InputPort logicalSignal) { + return funcCall("is_noval_" + modelElement.getName()); } - }