From d7ce4c4f71c1d6c60caf6cea14228dd93fddfd07 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Fri, 27 Apr 2018 11:01:57 +0200
Subject: [PATCH] Cherry-picked SVN branch multideploy.
---
.../ui/AF3PlatformRaspberryUIActivator.java | 10 +-
.../ui/editpart/EditPartFactory.java | 21 +-
.../raspberry/ui/handler/BrickletHandler.java | 10 +-
.../raspberry/ui/handler/CanBusHandler.java | 8 +-
.../ui/handler/CanConnectorHandler.java | 8 +-
.../ui/handler/ConsoleOutputHandler.java | 10 +-
.../ui/handler/GamepadReceiverHandler.java | 10 +-
.../ui/handler/PWMActuatorHandler.java | 10 +-
.../ui/handler/RaspberryPiHandler.java | 8 +-
.../ui/handler/RumblepadReceiverHandler.java | 10 +-
.../RumblepadSimpleRumbleFeatureHandler.java | 10 +-
.../ActuatorDigitsPropertySection.java | 10 +-
.../ActuatorPWMPropertySection.java | 10 +-
.../BoundedIntPositiveZeroValidator.java | 8 +-
...spberryPiExecutionUnitPropertySection.java | 28 +-
.../ui/properties/UIDUnitPropertySection.java | 10 +-
.../ui/prototype/ProtoypeProvider.java | 74 +++-
.../raspberry/compose/CanBusCompositor.java | 8 +-
.../compose/CanToRaspberryCompositor.java | 8 +-
.../compose/RaspberryPiCompositor.java | 27 +-
.../compose/RaspberryToCanCompositor.java | 8 +-
.../executable/CanBusExecutable.java | 8 +-
.../executable/CanConnectorExecutable.java | 8 +-
.../executable/CanTransmissionCatalog.java | 104 ++++-
.../executable/HeaderCopyGenerator.java | 27 +-
.../generator/executable/MainGenerator.java | 411 ++++++++++++++----
.../executable/PWMActuatorExecutable.java | 8 +-
.../executable/RaspberryPIExecutable.java | 129 ++++--
.../executable/gamepad/Button1Executable.java | 8 +-
.../executable/gamepad/Button2Executable.java | 8 +-
.../executable/gamepad/Button3Executable.java | 8 +-
.../executable/gamepad/Button4Executable.java | 8 +-
.../gamepad/ButtonL1Executable.java | 8 +-
.../gamepad/ButtonL2Executable.java | 8 +-
.../gamepad/ButtonR1Executable.java | 8 +-
.../gamepad/ButtonR2Executable.java | 8 +-
.../gamepad/Left_StickXExecutable.java | 8 +-
.../gamepad/Left_StickYExecutable.java | 8 +-
.../gamepad/Right_StickXExecutable.java | 8 +-
.../gamepad/Right_StickYExecutable.java | 8 +-
.../rumblepad/ButtonAExecutable.java | 8 +-
.../rumblepad/ButtonBExecutable.java | 8 +-
.../rumblepad/ButtonHomeExecutable.java | 8 +-
.../rumblepad/ButtonL1Executable.java | 8 +-
.../rumblepad/ButtonL3Executable.java | 8 +-
.../rumblepad/ButtonR1Executable.java | 8 +-
.../rumblepad/ButtonR3Executable.java | 8 +-
.../rumblepad/ButtonSelectExecutable.java | 8 +-
.../rumblepad/ButtonStartExecutable.java | 8 +-
.../rumblepad/ButtonXExecutable.java | 8 +-
.../rumblepad/ButtonYExecutable.java | 8 +-
.../rumblepad/DPadDownExecutable.java | 8 +-
.../rumblepad/DPadLeftExecutable.java | 8 +-
.../rumblepad/DPadRightExecutable.java | 8 +-
.../rumblepad/DPadUpExecutable.java | 8 +-
.../rumblepad/L2PositionExecutable.java | 8 +-
.../rumblepad/Left_StickXExecutable.java | 8 +-
.../rumblepad/Left_StickYExecutable.java | 8 +-
.../rumblepad/R2PositionExecutable.java | 8 +-
.../rumblepad/Right_StickXExecutable.java | 8 +-
.../rumblepad/Right_StickYExecutable.java | 8 +-
.../SimpleRumbleFeatureExecutable.java | 2 +-
.../generator/templates/MainFile.stg | 109 -----
.../generator/templates/RasPiCTemplates.java | 37 +-
.../templates/SingleUnitMainFile.stg | 14 +-
.../transform/CanBusTransformation.java | 8 +-
...nBusTransmissionCatalogTransformation.java | 14 +-
.../transform/CanConnectorTransformation.java | 8 +-
...ctorTransmissionCatalogTransformation.java | 12 +-
.../transform/PWMActuatorTransformation.java | 8 +-
.../transform/RaspberryPITransformation.java | 8 +-
.../gamepad/Button1Transformation.java | 8 +-
.../gamepad/Button2Transformation.java | 8 +-
.../gamepad/Button3Transformation.java | 8 +-
.../gamepad/Button4Transformation.java | 8 +-
.../gamepad/ButtonL1Transformation.java | 8 +-
.../gamepad/ButtonL2Transformation.java | 8 +-
.../gamepad/ButtonR1Transformation.java | 8 +-
.../gamepad/ButtonR2Transformation.java | 8 +-
.../gamepad/Left_StickXTransformation.java | 8 +-
.../gamepad/Left_StickYTransformation.java | 8 +-
.../gamepad/Right_StickXTransformation.java | 8 +-
.../gamepad/Right_StickYTransformation.java | 8 +-
.../rumblepad/ButtonATransformation.java | 8 +-
.../rumblepad/ButtonBTransformation.java | 8 +-
.../rumblepad/ButtonHomeTransformation.java | 8 +-
.../rumblepad/ButtonL1Transformation.java | 8 +-
.../rumblepad/ButtonL3Transformation.java | 8 +-
.../rumblepad/ButtonR1Transformation.java | 8 +-
.../rumblepad/ButtonR3Transformation.java | 8 +-
.../rumblepad/ButtonSelectTransformation.java | 8 +-
.../rumblepad/ButtonStartTransformation.java | 8 +-
.../rumblepad/ButtonXTransformation.java | 8 +-
.../rumblepad/ButtonYTransformation.java | 8 +-
.../rumblepad/DPadDownTransformation.java | 8 +-
.../rumblepad/DPadLeftTransformation.java | 8 +-
.../rumblepad/DPadRightTransformation.java | 8 +-
.../rumblepad/DPadUpTransformation.java | 8 +-
.../rumblepad/L2PositionTransformation.java | 8 +-
.../rumblepad/Left_StickXTransformation.java | 8 +-
.../rumblepad/Left_StickYTransformation.java | 8 +-
.../rumblepad/R2PositionTransformation.java | 8 +-
.../rumblepad/Right_StickXTransformation.java | 8 +-
.../rumblepad/Right_StickYTransformation.java | 8 +-
.../SimpleRumbleFeatureTransformation.java | 2 +-
.../util/RaspberryModelElementFactory.java | 103 ++++-
106 files changed, 1157 insertions(+), 697 deletions(-)
delete mode 100644 org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/MainFile.stg
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/AF3PlatformRaspberryUIActivator.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/AF3PlatformRaspberryUIActivator.java
index d7f7ab7c..5e791e1a 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/AF3PlatformRaspberryUIActivator.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/AF3PlatformRaspberryUIActivator.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: AF3PlatformRaspberryUIActivator.java 16069 2016-03-04 13:51:41Z zverlov $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -25,9 +25,9 @@ import org.osgi.framework.BundleContext;
* The activator class controls the plug-in life cycle.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * RED Hash: 250D9EED7E36588B51D8F1B3F968B2FB
+ * @author $Author: zverlov $
+ * @version $Rev: 16069 $
+ * @ConQAT.Rating RED Hash: 250D9EED7E36588B51D8F1B3F968B2FB
*/
public class AF3PlatformRaspberryUIActivator extends AbstractUIPlugin {
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/editpart/EditPartFactory.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/editpart/EditPartFactory.java
index 54e22556..edc2c63c 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/editpart/EditPartFactory.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/editpart/EditPartFactory.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,7 +26,14 @@ import org.fortiss.af3.platform.raspberry.model.CanConnector;
import org.fortiss.af3.platform.raspberry.model.ConsoleOutput;
import org.fortiss.af3.platform.raspberry.model.RaspberryPi;
import org.fortiss.af3.platform.raspberry.model.brick.UIDUnit;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraYawAngle;
import org.fortiss.af3.platform.raspberry.model.gamepad.GamepadReceiverBase;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlInput;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlOutput;
import org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeStrong;
import org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeWeak;
import org.fortiss.af3.platform.raspberry.model.rumblepad.RumblepadReceiverBase;
@@ -40,9 +47,9 @@ import org.fortiss.tooling.kernel.ui.extension.IEditPartFactory;
/**
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class EditPartFactory implements IEditPartFactory {
@@ -69,7 +76,11 @@ public class EditPartFactory implements IEditPartFactory {
model instanceof ConsoleOutput || model instanceof GamepadReceiverBase ||
model instanceof RumblepadReceiverBase || model instanceof SimpleRumbleFeature ||
model instanceof RumbleMagnitudeWeak || model instanceof RumbleMagnitudeStrong ||
- model instanceof UIDUnit) {
+ model instanceof UIDUnit || model instanceof MotorControlInput ||
+ model instanceof MotorControlOutput || model instanceof CameraDistanceLeft ||
+ model instanceof CameraDistanceRight || model instanceof CameraYawAngle ||
+ model instanceof CameraDetectionStateLeft ||
+ model instanceof CameraDetectionStateRight) {
return new StickyPlatformConnectorUnitEditPart((PlatformConnectorUnit)model);
}
return null;
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/BrickletHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/BrickletHandler.java
index 91871337..cd5240ab 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/BrickletHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/BrickletHandler.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: BrickletHandler.java 23956 2018-04-11 14:15:25Z barner $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHa
* Handler for {@link UIDUnit}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
+ * @author $Author: barner $
+ * @version $Rev: 23956 $
+ * @ConQAT.Rating GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
*/
public class BrickletHandler extends NamedCommentedModelElementHandlerBase<UIDUnit> {
/** {@inheritDoc} */
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanBusHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanBusHandler.java
index 832efcf5..6abb6989 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanBusHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanBusHandler.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -31,9 +31,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.ModelElementHandlerBase;
* {@link IModelElementHandler} for {@link CanBus}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public class CanBusHandler extends ModelElementHandlerBase<CanBus> {
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanConnectorHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanConnectorHandler.java
index 245906d4..d3a100a4 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanConnectorHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanConnectorHandler.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.ModelElementHandlerBase;
* {@link IModelElementHandler} for {@link CanConnector}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class CanConnectorHandler extends ModelElementHandlerBase<CanConnector> {
/** {@inheritDoc} */
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/ConsoleOutputHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/ConsoleOutputHandler.java
index 0ef8971c..4c1bf53f 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/ConsoleOutputHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/ConsoleOutputHandler.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: ConsoleOutputHandler.java 23956 2018-04-11 14:15:25Z barner $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHa
* Handler for {@link ConsoleOutput}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
+ * @author $Author: barner $
+ * @version $Rev: 23956 $
+ * @ConQAT.Rating GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
*/
public class ConsoleOutputHandler extends NamedCommentedModelElementHandlerBase<ConsoleOutput> {
/** {@inheritDoc} */
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/GamepadReceiverHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/GamepadReceiverHandler.java
index 6605832e..ce08ca3e 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/GamepadReceiverHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/GamepadReceiverHandler.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: GamepadReceiverHandler.java 23956 2018-04-11 14:15:25Z barner $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHa
* Handler for {@link GamepadReceiverBase}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
+ * @author $Author: barner $
+ * @version $Rev: 23956 $
+ * @ConQAT.Rating GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
*/
public class GamepadReceiverHandler extends
NamedCommentedModelElementHandlerBase<GamepadReceiverBase> {
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/PWMActuatorHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/PWMActuatorHandler.java
index a7cf8e6a..db4eca88 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/PWMActuatorHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/PWMActuatorHandler.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: PWMActuatorHandler.java 23956 2018-04-11 14:15:25Z barner $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -28,9 +28,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHa
* Handler for {@link GenericReceiver}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
+ * @author $Author: barner $
+ * @version $Rev: 23956 $
+ * @ConQAT.Rating GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
*/
public class PWMActuatorHandler extends NamedCommentedModelElementHandlerBase<ActuatorPWM> {
/** {@inheritDoc} */
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RaspberryPiHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RaspberryPiHandler.java
index 12d1e44a..470c2a5c 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RaspberryPiHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RaspberryPiHandler.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -31,9 +31,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.ModelElementHandlerBase;
* {@link IModelElementHandler} for {@link RaspberryPi}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public class RaspberryPiHandler extends ModelElementHandlerBase<RaspberryPi> {
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadReceiverHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadReceiverHandler.java
index 731762e7..be83410e 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadReceiverHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadReceiverHandler.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: RumblepadReceiverHandler.java 23956 2018-04-11 14:15:25Z barner $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHa
* Handler for {@link RumblepadReceiverBase}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
+ * @author $Author: barner $
+ * @version $Rev: 23956 $
+ * @ConQAT.Rating GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
*/
public class RumblepadReceiverHandler extends
NamedCommentedModelElementHandlerBase<RumblepadReceiverBase> {
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadSimpleRumbleFeatureHandler.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadSimpleRumbleFeatureHandler.java
index fbcc918e..8ae512b5 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadSimpleRumbleFeatureHandler.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadSimpleRumbleFeatureHandler.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: RumblepadSimpleRumbleFeatureHandler.java 23956 2018-04-11 14:15:25Z barner $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHa
* Handler for {@link SimpleRumbleFeature}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
+ * @author $Author: barner $
+ * @version $Rev: 23956 $
+ * @ConQAT.Rating GREEN Hash: D80CF94CBBADB4627AAEDA1F34ABF0A5
*/
public class RumblepadSimpleRumbleFeatureHandler extends
NamedCommentedModelElementHandlerBase<SimpleRumbleFeature> {
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorDigitsPropertySection.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorDigitsPropertySection.java
index e282e012..8cdbb8a5 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorDigitsPropertySection.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorDigitsPropertySection.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: ActuatorDigitsPropertySection.java 22342 2017-11-30 13:18:55Z hoelzl $
| |
-| |
-| Copyright 2013 fortiss GmbH |
+| Copyright 2013 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -33,9 +33,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
* Property section for {@link ActuatorDigits}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: 9E768B733BD37201F97399293FA0DFA7
+ * @author $Author: hoelzl $
+ * @version $Rev: 22342 $
+ * @ConQAT.Rating GREEN Hash: 9E768B733BD37201F97399293FA0DFA7
*/
public class ActuatorDigitsPropertySection extends PropertySectionBase {
/** The actuator model element. */
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorPWMPropertySection.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorPWMPropertySection.java
index 3b581d46..04ce6f1e 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorPWMPropertySection.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorPWMPropertySection.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: ActuatorPWMPropertySection.java 21071 2017-10-09 13:06:34Z hoelzl $
| |
-| |
-| Copyright 2013 fortiss GmbH |
+| Copyright 2013 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -35,9 +35,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
* Property section for {@link ActuatorPWM}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: 9E768B733BD37201F97399293FA0DFA7
+ * @author $Author: hoelzl $
+ * @version $Rev: 21071 $
+ * @ConQAT.Rating GREEN Hash: 9E768B733BD37201F97399293FA0DFA7
*/
public class ActuatorPWMPropertySection extends PropertySectionBase {
/** The actuator. */
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/BoundedIntPositiveZeroValidator.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/BoundedIntPositiveZeroValidator.java
index 4c31787d..8eda208d 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/BoundedIntPositiveZeroValidator.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/BoundedIntPositiveZeroValidator.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: BoundedIntPositiveZeroValidator.java 21071 2017-10-09 13:06:34Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -25,9 +25,9 @@ import org.fortiss.tooling.base.ui.databinding.NumberPositiveZeroValidator;
* A {@link NumberPositiveZeroValidator} with boundary checking for int values.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 21071 $
+ * @ConQAT.Rating RED Hash:
*/
public class BoundedIntPositiveZeroValidator extends NumberPositiveZeroValidator {
/** The lower bound. */
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/RaspberryPiExecutionUnitPropertySection.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/RaspberryPiExecutionUnitPropertySection.java
index b067d1b4..bd503478 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/RaspberryPiExecutionUnitPropertySection.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/RaspberryPiExecutionUnitPropertySection.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: RaspberryPiExecutionUnitPropertySection.java 22964 2018-01-26 12:22:51Z hoelzl $
| |
-| |
-| Copyright 2013 fortiss GmbH |
+| Copyright 2013 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -39,9 +39,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
* Property section for {@link RaspberryPi}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: 9E768B733BD37201F97399293FA0DFA7
+ * @author $Author: hoelzl $
+ * @version $Rev: 22964 $
+ * @ConQAT.Rating GREEN Hash: 9E768B733BD37201F97399293FA0DFA7
*/
public class RaspberryPiExecutionUnitPropertySection extends PropertySectionBase {
/** The execution unit. */
@@ -54,6 +54,10 @@ public class RaspberryPiExecutionUnitPropertySection extends PropertySectionBase
private Text ipAddressText;
/** The coordinator flag button. */
private Button coordinatorFlagButton;
+ /** The camera server IP address widget. */
+ private Text cameraServerAddressText;
+ /** The camera server IP port widget. */
+ private Text cameraServerPortText;
/** {@inheritDoc} */
@Override
@@ -64,7 +68,9 @@ public class RaspberryPiExecutionUnitPropertySection extends PropertySectionBase
coordinatorFlagButton = getWidgetFactory().createButton(composite, "", SWT.CHECK);
createFormEntry(coordinatorFlagButton, "Coordinator Unit");
coordinatorFlagButton.setSelection(false);
- ipAddressText = createDecoratedText("IP Address");
+ ipAddressText = createDecoratedText("Unit IP Address");
+ cameraServerAddressText = createDecoratedText("Camera Server IP Address");
+ cameraServerPortText = createDecoratedText("Camera Server IP Port");
}
/** {@inheritDoc} */
@@ -98,5 +104,15 @@ public class RaspberryPiExecutionUnitPropertySection extends PropertySectionBase
modelObservable =
observeValue(unit, RaspberryPiModelPackage.Literals.RASPBERRY_PI__COORDINATOR_UNIT);
dbc.bindValue(observeSelection(coordinatorFlagButton), modelObservable);
+
+ modelObservable =
+ observeValue(unit,
+ RaspberryPiModelPackage.Literals.RASPBERRY_PI__CAMERA_SERVER_ADDRESS);
+ dbc.bindValue(observeText(cameraServerAddressText, SWT.Modify), modelObservable);
+
+ modelObservable =
+ observeValue(unit,
+ RaspberryPiModelPackage.Literals.RASPBERRY_PI__CAMERA_SERVER_PORT);
+ dbc.bindValue(observeText(cameraServerPortText, SWT.Modify), modelObservable);
}
}
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/UIDUnitPropertySection.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/UIDUnitPropertySection.java
index eca44fc0..908e1a9d 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/UIDUnitPropertySection.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/UIDUnitPropertySection.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: UIDUnitPropertySection.java 22342 2017-11-30 13:18:55Z hoelzl $
| |
-| |
-| Copyright 2013 fortiss GmbH |
+| Copyright 2013 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -33,9 +33,9 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
* Property section for {@link UIDUnit}s.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * GREEN Hash: 9E768B733BD37201F97399293FA0DFA7
+ * @author $Author: hoelzl $
+ * @version $Rev: 22342 $
+ * @ConQAT.Rating GREEN Hash: 9E768B733BD37201F97399293FA0DFA7
*/
public class UIDUnitPropertySection extends PropertySectionBase {
/** The unit. */
diff --git a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/prototype/ProtoypeProvider.java b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/prototype/ProtoypeProvider.java
index 6b0d3a5c..e3186e53 100644
--- a/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/prototype/ProtoypeProvider.java
+++ b/org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/prototype/ProtoypeProvider.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -36,8 +36,16 @@ import org.fortiss.af3.platform.raspberry.model.brick.ActuatorDigits;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityXSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityYSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityZSensor;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonBActuator;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonGActuator;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonRActuator;
import org.fortiss.af3.platform.raspberry.model.brick.LaserRangeSensor;
import org.fortiss.af3.platform.raspberry.model.brick.UltraSonicSensor;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraYawAngle;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button1;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button2;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button3;
@@ -50,6 +58,8 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Left_StickX_Position;
import org.fortiss.af3.platform.raspberry.model.gamepad.Left_StickY_Position;
import org.fortiss.af3.platform.raspberry.model.gamepad.Right_StickX_Position;
import org.fortiss.af3.platform.raspberry.model.gamepad.Right_StickY_Position;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlInput;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlOutput;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonA;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonB;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonHome;
@@ -75,9 +85,9 @@ import org.fortiss.tooling.kernel.extension.data.PrototypeCategory;
/**
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ProtoypeProvider extends PrototypeProviderBase {
@@ -89,6 +99,10 @@ public class ProtoypeProvider extends PrototypeProviderBase {
protected final static String RUMBLEPAD = "Rumblepad";
/** Category for brick elements. */
protected final static String BRICK = "Bricklets";
+ /** Category for motor control elements. */
+ protected final static String MOTOR_CONTROL = "Motor Control";
+ /** Category for camera server elements. */
+ protected final static String CAMERA_SERVER = "Camera Server";
/** {@inheritDoc} */
@Override
@@ -99,6 +113,8 @@ public class ProtoypeProvider extends PrototypeProviderBase {
registerPrototypeCategory(prototypeCategory, GAMEPAD);
registerPrototypeCategory(prototypeCategory, RUMBLEPAD);
registerPrototypeCategory(prototypeCategory, BRICK);
+ registerPrototypeCategory(prototypeCategory, MOTOR_CONTROL);
+ registerPrototypeCategory(prototypeCategory, CAMERA_SERVER);
CanBus bus = RaspberryModelElementFactory.createCanBus();
setNodeBounds(bus,
@@ -125,6 +141,19 @@ public class ProtoypeProvider extends PrototypeProviderBase {
setConnectorPosition(digits, 0, 0);
registerPrototype("Segment_Digits", digits, BRICK);
+ LEDButtonRActuator ledRButton = RaspberryModelElementFactory.createLEDButtonRActuator();
+ setNodePosition(ledRButton, 0, 0);
+ setConnectorPosition(ledRButton, 0, 0);
+ registerPrototype("LED_Button_red", ledRButton, BRICK);
+ LEDButtonGActuator ledGButton = RaspberryModelElementFactory.createLEDButtonGActuator();
+ setNodePosition(ledGButton, 0, 0);
+ setConnectorPosition(ledGButton, 0, 0);
+ registerPrototype("LED_Button_green", ledGButton, BRICK);
+ LEDButtonBActuator ledBButton = RaspberryModelElementFactory.createLEDButtonBActuator();
+ setNodePosition(ledBButton, 0, 0);
+ setConnectorPosition(ledBButton, 0, 0);
+ registerPrototype("LED_Button_blue", ledBButton, BRICK);
+
Button1 button1 = RaspberryModelElementFactory.createButton1();
setNodePosition(button1, 0, 0);
setConnectorPosition(button1, 0, 0);
@@ -351,5 +380,42 @@ public class ProtoypeProvider extends PrototypeProviderBase {
setNodePosition(rmw, 0, 0);
setConnectorPosition(rmw, 0, 0);
registerPrototype(rmw.getName(), rmw, RUMBLEPAD);
+
+ MotorControlInput mci = RaspberryModelElementFactory.createMotorControlInput();
+ setNodePosition(mci, 0, 0);
+ setConnectorPosition(mci, 0, 0);
+ registerPrototype(mci.getName(), mci, MOTOR_CONTROL);
+
+ MotorControlOutput mco = RaspberryModelElementFactory.createMotorControlOutput();
+ setNodePosition(mco, 0, 0);
+ setConnectorPosition(mco, 0, 0);
+ registerPrototype(mco.getName(), mco, MOTOR_CONTROL);
+
+ CameraDistanceLeft cdl = RaspberryModelElementFactory.createCameraDistanceLeft();
+ setNodePosition(cdl, 0, 0);
+ setConnectorPosition(cdl, 0, 0);
+ registerPrototype(cdl.getName(), cdl, CAMERA_SERVER);
+
+ CameraDistanceRight cdr = RaspberryModelElementFactory.createCameraDistanceRight();
+ setNodePosition(cdr, 0, 0);
+ setConnectorPosition(cdr, 0, 0);
+ registerPrototype(cdr.getName(), cdr, CAMERA_SERVER);
+
+ CameraDetectionStateLeft cdsl =
+ RaspberryModelElementFactory.createCameraDetectionStateLeft();
+ setNodePosition(cdsl, 0, 0);
+ setConnectorPosition(cdsl, 0, 0);
+ registerPrototype(cdsl.getName(), cdsl, CAMERA_SERVER);
+
+ CameraDetectionStateRight cdsr =
+ RaspberryModelElementFactory.createCameraDetectionStateRight();
+ setNodePosition(cdsr, 0, 0);
+ setConnectorPosition(cdsr, 0, 0);
+ registerPrototype(cdsr.getName(), cdsr, CAMERA_SERVER);
+
+ CameraYawAngle cya = RaspberryModelElementFactory.createCameraYawAngle();
+ setNodePosition(cya, 0, 0);
+ setConnectorPosition(cya, 0, 0);
+ registerPrototype(cya.getName(), cya, CAMERA_SERVER);
}
}
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java
index d7b52955..1a3e29f9 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.CanConnector;
/**
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class CanBusCompositor extends
PlatformArchitectureElementCompositorBase<IPlatformArchitectureElement> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanToRaspberryCompositor.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanToRaspberryCompositor.java
index 9326fa51..ef580fef 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanToRaspberryCompositor.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanToRaspberryCompositor.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -32,9 +32,9 @@ import org.fortiss.tooling.kernel.extension.data.IConnectionCompositionContext;
* Connection compositor for {@link RaspberryPi} to {@link CanBus} connections.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class CanToRaspberryCompositor implements
IConnectionCompositor<IHierarchicElement, CanConnector, CanConnector> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java
index 5411698f..a6381f98 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -33,9 +33,19 @@ import org.fortiss.af3.platform.raspberry.model.brick.ActuatorDigits;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityXSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityYSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityZSensor;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonBActuator;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonGActuator;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonRActuator;
import org.fortiss.af3.platform.raspberry.model.brick.LaserRangeSensor;
import org.fortiss.af3.platform.raspberry.model.brick.UltraSonicSensor;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraYawAngle;
import org.fortiss.af3.platform.raspberry.model.gamepad.GamepadReceiverBase;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlInput;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlOutput;
import org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeStrong;
import org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeWeak;
import org.fortiss.af3.platform.raspberry.model.rumblepad.RumblepadReceiverBase;
@@ -46,9 +56,9 @@ import org.fortiss.tooling.kernel.extension.data.Prototype;
/**
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class RaspberryPiCompositor extends
PlatformArchitectureElementCompositorBase<IPlatformArchitectureElement> {
@@ -77,8 +87,13 @@ public class RaspberryPiCompositor extends
AccelerationYSensor.class, AccelerationZSensor.class,
AngularVelocityXSensor.class, AngularVelocityYSensor.class,
AngularVelocityZSensor.class, ActuatorDigits.class,
- RumblepadReceiverBase.class, SimpleRumbleFeature.class,
- RumbleMagnitudeStrong.class, RumbleMagnitudeWeak.class);
+ LEDButtonRActuator.class, LEDButtonGActuator.class,
+ LEDButtonBActuator.class, RumblepadReceiverBase.class,
+ SimpleRumbleFeature.class, RumbleMagnitudeStrong.class,
+ RumbleMagnitudeWeak.class, MotorControlInput.class,
+ MotorControlOutput.class, CameraDistanceLeft.class,
+ CameraDistanceRight.class, CameraYawAngle.class,
+ CameraDetectionStateLeft.class, CameraDetectionStateRight.class);
if(container != null) {
final boolean instanceOfAny = isInstanceOfAny(container, RaspberryPi.class);
return instanceOfAny && instanceOfAny2;
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryToCanCompositor.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryToCanCompositor.java
index fe714b3a..7c18a6de 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryToCanCompositor.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryToCanCompositor.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -32,9 +32,9 @@ import org.fortiss.tooling.kernel.extension.data.IConnectionCompositionContext;
* Connection compositor for {@link RaspberryPi} to {@link CanBus} connections.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class RaspberryToCanCompositor implements
IConnectionCompositor<IHierarchicElement, CanConnector, CanConnector> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanBusExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanBusExecutable.java
index 3905768c..d8f0d797 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanBusExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanBusExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -32,9 +32,9 @@ import org.fortiss.af3.platform.raspberry.model.CanBus;
* Executable for {@link CanBus}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class CanBusExecutable extends TransmissionUnitExecutableBase<TransmissionUnit> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanConnectorExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanConnectorExecutable.java
index 2f7e9c5e..0260fd55 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanConnectorExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanConnectorExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -34,9 +34,9 @@ import org.fortiss.af3.platform.raspberry.model.CanConnector;
* Executable for {@link CanConnector}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class CanConnectorExecutable extends TransceiverExecutableBase<CanConnector> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanTransmissionCatalog.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanTransmissionCatalog.java
index 08de3e50..774bccbe 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanTransmissionCatalog.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/CanTransmissionCatalog.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -17,39 +17,99 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.raspberry.generator.executable;
-import java.util.ArrayList;
-import java.util.List;
+import static org.fortiss.af3.component.utils.ComponentArchitectureUtils.findSourcePort;
+
+import java.util.HashMap;
-import org.fortiss.af3.deployment.generator.DeploymentExecutableTransformationContext;
-import org.fortiss.af3.deployment.generator.Transmission;
+import org.fortiss.af3.component.model.Component;
+import org.fortiss.af3.component.model.InputPort;
+import org.fortiss.af3.component.model.OutputPort;
+import org.fortiss.af3.component.model.Port;
import org.fortiss.af3.deployment.generator.TransmissionCatalog;
-import org.fortiss.af3.generator.common.model.c.CSourcePackage;
+import org.fortiss.af3.deployment.model.ComponentAllocation;
+import org.fortiss.af3.deployment.model.Deployment;
+import org.fortiss.af3.platform.raspberry.model.RaspberryPi;
/**
* Can Transmission Catalog
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author hoelzl
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class CanTransmissionCatalog extends TransmissionCatalog {
+ /** Mapping from atomic component to deployed execution unit. */
+ private HashMap<Component, RaspberryPi> componentToRaspberry = new HashMap<>();
+ /** Mapping from execution unit to CAN IDs. */
+ private HashMap<RaspberryPi, Integer> raspberryCanId = new HashMap<>();
+ /** Counter for raspberry CAN IDs. */
+ private int canIdCounter = 0xF;
+ /** Mapping from atomic input port to atomic output port. */
+ private HashMap<InputPort, OutputPort> atomicInputToOutput = new HashMap<>();
+
+ /** Constructor. */
+ public CanTransmissionCatalog(Deployment deployment) {
+ for(ComponentAllocation ca : deployment.getComponentAllocations()) {
+ RaspberryPi raspi = (RaspberryPi)ca.getExecutionUnit();
+ if(ca.getComponent().getSubComponents().isEmpty()) {
+ analyzeAtomic(ca.getComponent(), raspi);
+ continue;
+ }
+ for(Component atomic : ca.getComponent().findAtomicComponents()) {
+ analyzeAtomic(atomic, raspi);
+ }
+ }
+ }
- /** Stores the transmissions contained in this catalog. */
- private final List<Transmission> transmissions = new ArrayList<Transmission>();
+ /** Analyzes the given component. */
+ private void analyzeAtomic(Component component, RaspberryPi raspi) {
+ componentToRaspberry.put(component, raspi);
+ if(!raspberryCanId.containsKey(raspi)) {
+ raspberryCanId.put(raspi, canIdCounter++);
+ }
+ for(InputPort inport : component.getInputPorts()) {
+ Port sourcePort = findSourcePort(null, inport);
+ if(sourcePort instanceof OutputPort) {
+ atomicInputToOutput.put(inport, (OutputPort)sourcePort);
+ }
+ }
+ }
+
+ /** Returns whether this input port is connected to a remote source. */
+ public boolean hasRemoteSource(InputPort inport) {
+ OutputPort outport = atomicInputToOutput.get(inport);
+ if(outport == null) {
+ return false;
+ }
+ RaspberryPi inPi = componentToRaspberry.get(inport.getComponent());
+ RaspberryPi outPi = componentToRaspberry.get(outport.getComponent());
+ return inPi != outPi;
+ }
+
+ /** Returns whether the given output port is needed remotely. */
+ public boolean isOutputNeededRemotely(OutputPort outport) {
+ return atomicInputToOutput.containsValue(outport);
+ }
+
+ /** Returns the atomic (remote) source port for this input port. */
+ public OutputPort getSourcePort(InputPort inport) {
+ return atomicInputToOutput.get(inport);
+ }
+
+ /** Returns the {@link RaspberryPi} for the given port. */
+ public RaspberryPi getRaspberryPi(Port port) {
+ return getRaspberryPi(port.getComponent());
+ }
- /** Adds the given transmission to the catalog. */
- @Override
- public void addTransmission(Transmission transmission) {
- transmissions.add(transmission);
+ /** Returns the {@link RaspberryPi} for the given component. */
+ public RaspberryPi getRaspberryPi(Component component) {
+ return componentToRaspberry.get(component);
}
- /**
- * Here the one can create additional SourcePackages which are common for all ECUs.
- * It won't be used in the current release.
- */
- @Override
- public CSourcePackage getSourcePackage(DeploymentExecutableTransformationContext ctx) {
- return null;
+ /** Returns the CAN id for the given {@link RaspberryPi}. */
+ public int getCanId(RaspberryPi raspi) {
+ return raspberryCanId.get(raspi);
}
}
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/HeaderCopyGenerator.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/HeaderCopyGenerator.java
index 8b6dff8e..ae7b0233 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/HeaderCopyGenerator.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/HeaderCopyGenerator.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: HeaderCopyGenerator.java 23938 2018-04-10 11:29:55Z eder $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -17,7 +17,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.raspberry.generator.executable;
-import static org.fortiss.af3.generator.common.utils.SourceModelElementFactory.createByteContentUnitForPluginFile;
+import static org.fortiss.af3.generator.common.utils.SourceModelElementFactory.createByteContentUnitForPluginFileInRCP;
import org.fortiss.af3.generator.common.model.c.CSourcePackage;
import org.fortiss.af3.generator.common.model.source.ByteContentUnit;
@@ -27,14 +27,17 @@ import org.fortiss.af3.platform.raspberry.AF3PlatformRaspberryActivator;
* Class for copying the header files to the target folder.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: eder $
+ * @version $Rev: 23938 $
+ * @ConQAT.Rating RED Hash:
*/
final class HeaderCopyGenerator {
/** Adds the header files to the given target {@link CSourcePackage}. */
public static void copyHeaderFiles(CSourcePackage incLibPack) throws Exception {
incLibPack.addUnit(copyAF3Hal("af3.h"));
+ incLibPack.addUnit(copyAF3Hal("af3_component.h"));
+ incLibPack.addUnit(copyAF3Hal("af3_component_remote_proxy.h"));
+ incLibPack.addUnit(copyAF3Hal("camera_client.h"));
incLibPack.addUnit(copyAF3Hal("cancatalog.h"));
incLibPack.addUnit(copyAF3Hal("caninbox.h"));
incLibPack.addUnit(copyAF3Hal("canoutbox.h"));
@@ -42,6 +45,7 @@ final class HeaderCopyGenerator {
incLibPack.addUnit(copyAF3Hal("canthread.h"));
incLibPack.addUnit(copyAF3Hal("debugprint.h"));
incLibPack.addUnit(copyAF3Hal("gamepad.h"));
+ incLibPack.addUnit(copyAF3Hal("listutil.h"));
incLibPack.addUnit(copyAF3Hal("rumblepad.h"));
incLibPack.addUnit(copyAF3Hal("protocol_can.h"));
incLibPack.addUnit(copyAF3Hal("protocol_control_center.h"));
@@ -53,23 +57,30 @@ final class HeaderCopyGenerator {
incLibPack.addUnit(copyBrick("ip_connection.h"));
incLibPack.addUnit(copyBrick("bricklet_distance_us.h"));
incLibPack.addUnit(copyBrick("bricklet_laser_range_finder.h"));
+ incLibPack.addUnit(copyBrick("bricklet_rgb_led_button.h"));
incLibPack.addUnit(copyBrick("brick_imu_v2.h"));
incLibPack.addUnit(copyBrick("bricklet_segment_display_4x7.h"));
+ incLibPack.addUnit(copyDataHal("data.h"));
+ }
+
+ /** Copies the AF3 HAL header file. */
+ private static ByteContentUnit copyDataHal(String header) throws Exception {
+ return copyHeader("data", header);
}
/** Copies the AF3 HAL header file. */
private static ByteContentUnit copyAF3Hal(String header) throws Exception {
- return copyHeader("af3pihal/", header);
+ return copyHeader("af3pihal", header);
}
/** Copies the brick header file. */
private static ByteContentUnit copyBrick(String header) throws Exception {
- return copyHeader("brick/", header);
+ return copyHeader("brick", header);
}
/** Copies the header file from the plugin path. */
private static ByteContentUnit copyHeader(String subDir, String headerName) throws Exception {
- return createByteContentUnitForPluginFile(AF3PlatformRaspberryActivator.PLUGIN_ID,
+ return createByteContentUnitForPluginFileInRCP(AF3PlatformRaspberryActivator.PLUGIN_ID,
"code-gen-hal/inc/" + subDir, headerName, false);
}
}
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/MainGenerator.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/MainGenerator.java
index 3cc1fd34..e56edfbc 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/MainGenerator.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/MainGenerator.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: MainGenerator.java 23939 2018-04-10 12:20:41Z eder $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -17,9 +17,9 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.raspberry.generator.executable;
-import static org.fortiss.af3.platform.raspberry.generator.templates.RasPiCTemplates.getMainCFile;
import static org.fortiss.af3.platform.raspberry.generator.templates.RasPiCTemplates.getSingleUnitMainCFile;
+import java.util.HashMap;
import java.util.List;
import org.conqat.lib.commons.collections.Pair;
@@ -33,6 +33,7 @@ import org.fortiss.af3.platform.model.PlatformConnectorUnit;
import org.fortiss.af3.platform.model.Receiver;
import org.fortiss.af3.platform.model.Transmitter;
import org.fortiss.af3.platform.raspberry.model.ActuatorPWM;
+import org.fortiss.af3.platform.raspberry.model.ConsoleOutput;
import org.fortiss.af3.platform.raspberry.model.RaspberryPi;
import org.fortiss.af3.platform.raspberry.model.brick.AccelerationXSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AccelerationYSensor;
@@ -41,8 +42,17 @@ import org.fortiss.af3.platform.raspberry.model.brick.ActuatorDigits;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityXSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityYSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityZSensor;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonBActuator;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonGActuator;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonRActuator;
import org.fortiss.af3.platform.raspberry.model.brick.LaserRangeSensor;
+import org.fortiss.af3.platform.raspberry.model.brick.UIDUnit;
import org.fortiss.af3.platform.raspberry.model.brick.UltraSonicSensor;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraYawAngle;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button1;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button2;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button3;
@@ -50,6 +60,8 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Button4;
import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonL2;
import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonR2;
import org.fortiss.af3.platform.raspberry.model.gamepad.GamepadReceiverBase;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlInput;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlOutput;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonA;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonB;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonHome;
@@ -63,6 +75,8 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.DPadRight;
import org.fortiss.af3.platform.raspberry.model.rumblepad.DPadUp;
import org.fortiss.af3.platform.raspberry.model.rumblepad.L2_Position;
import org.fortiss.af3.platform.raspberry.model.rumblepad.R2_Position;
+import org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeStrong;
+import org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeWeak;
import org.fortiss.af3.platform.raspberry.model.rumblepad.RumblepadReceiverBase;
import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
@@ -70,9 +84,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Separate class for generating the main.c file.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: eder $
+ * @version $Rev: 23939 $
+ * @ConQAT.Rating RED Hash:
*/
class MainGenerator {
private static final int WAITING_SLEEP_IN_MICROS = 250;
@@ -81,13 +95,27 @@ class MainGenerator {
private List<Pair<PlatformConnectorUnit, Port>> deployedPorts;
private ITransformationContext context;
+ /** LED_Button UIDs to RGB value array. */
+ private HashMap<String, String[]> ledButtons = new HashMap<>();
+
+ /** LED_Button UIDs to RGB local variable array. */
+ private HashMap<String, String[]> ledButtonsLocalVariable = new HashMap<>();
+
+ private boolean useCamera;
private boolean useGamepad;
private boolean useRumblepad;
private boolean useDigits;
+ private boolean useLEDButton;
private boolean usePWM;
private boolean useUS;
private boolean useLaser;
private boolean useACC;
+ private boolean useConsole;
+ private boolean useRumble;
+ private OutputPort rumbleWeakPort = null;
+ private OutputPort rumbleStrongPort = null;
+ private int nrOfUsSensors = 0;
+ private boolean useVesc;
/** Constructor. */
public MainGenerator(RaspberryPi executionUnit,
@@ -98,10 +126,12 @@ class MainGenerator {
this.deployedPorts = deployedPorts;
this.context = context;
for(Pair<PlatformConnectorUnit, Port> p : deployedPorts) {
- if(!useGamepad && p.getFirst() instanceof GamepadReceiverBase) {
+ if(!useGamepad && (p.getFirst() instanceof GamepadReceiverBase)) {
useGamepad = true;
}
- if(!useRumblepad && p.getFirst() instanceof RumblepadReceiverBase) {
+ if(!useRumblepad && p.getFirst() instanceof RumblepadReceiverBase ||
+ p.getFirst() instanceof RumbleMagnitudeWeak ||
+ p.getFirst() instanceof RumbleMagnitudeStrong) {
useRumblepad = true;
}
if(!usePWM && p.getFirst() instanceof ActuatorPWM) {
@@ -116,6 +146,12 @@ class MainGenerator {
if(!useDigits && p.getFirst() instanceof ActuatorDigits) {
useDigits = true;
}
+ if((p.getFirst() instanceof LEDButtonRActuator ||
+ p.getFirst() instanceof LEDButtonGActuator || p.getFirst() instanceof LEDButtonBActuator)) {
+ extractRGBforLEDButton(p);
+ useLEDButton = true;
+
+ }
if(!useACC &&
(p.getFirst() instanceof AccelerationXSensor ||
p.getFirst() instanceof AccelerationYSensor ||
@@ -124,28 +160,31 @@ class MainGenerator {
p.getFirst() instanceof AngularVelocityYSensor || p.getFirst() instanceof AngularVelocityZSensor)) {
useACC = true;
}
- }
- }
+ if(!useConsole && p instanceof ConsoleOutput) {
+ useConsole = true;
+ }
- /** Creates the main.c file for deployments with distributed execution units. */
- public AbstractUnit createMain() {
- String includes = createIncludes(deployedComponents, deployedPorts);
- // TODO: compute syncBox sizef
- int syncBoxSize = 0;
- // TODO: syncbox code
- String initCode = createInitCode(deployedComponents);
- String workerCode = createWorkerCode(deployedComponents, deployedPorts);
- return getMainCFile(executionUnit.getName(), executionUnit.isCoordinatorUnit(),
- executionUnit.getCanCoordinationID(), executionUnit.getCycleTime(),
- WAITING_SLEEP_IN_MICROS, includes, syncBoxSize, "// TODO\n", initCode, workerCode);
+ if(!useVesc &&
+ (p.getFirst() instanceof MotorControlOutput || p.getFirst() instanceof MotorControlInput)) {
+ useVesc = true;
+ }
+
+ if(!useCamera &&
+ (p.getFirst() instanceof CameraYawAngle ||
+ p.getFirst() instanceof CameraDistanceLeft ||
+ p.getFirst() instanceof CameraDistanceRight || p.getFirst() instanceof CameraDetectionStateLeft) ||
+ p.getFirst() instanceof CameraDetectionStateRight) {
+ useCamera = true;
+ }
+ }
}
/** Creates the main.c file for deployments with a single execution units. */
public AbstractUnit createSingleUnitMain() {
String includes = createIncludes(deployedComponents, deployedPorts);
String initCode = createInitCode(deployedComponents);
+ String sensorVariables = createVariables(deployedComponents, deployedPorts);
String workerCode = createWorkerCode(deployedComponents, deployedPorts);
- String sensorVariables = createSensorVariables(deployedComponents, deployedPorts);
return getSingleUnitMainCFile(executionUnit.getName(), executionUnit.getCycleTime(),
includes, initCode, workerCode, sensorVariables);
}
@@ -158,6 +197,9 @@ class MainGenerator {
Component c = p.getSecond();
sb.append("#include <" + c.getName() + "_ID_" + c.getId() + ".h>\n");
}
+ if(useCamera) {
+ sb.append("#include <camera_client.h>\n");
+ }
if(useGamepad) {
sb.append("#include <gamepad.h>\n");
}
@@ -167,7 +209,7 @@ class MainGenerator {
if(usePWM) {
sb.append("#include <temp_actuator.h>\n");
}
- if(useUS || useLaser || useDigits || useACC) {
+ if(useUS || useLaser || useDigits || useACC || useLEDButton) {
sb.append("#include <ip_connection.h>\n");
}
if(useUS) {
@@ -182,6 +224,13 @@ class MainGenerator {
if(useDigits) {
sb.append("#include <bricklet_segment_display_4x7.h>\n");
}
+ if(useLEDButton) {
+ sb.append("#include <bricklet_rgb_led_button.h>\n");
+ }
+ if(useVesc) {
+ sb.append("#include <commands.h>\n");
+ sb.append("#include <hal.h>\n");
+ }
sb.append("#include <stdio.h>\n");
return sb.toString();
}
@@ -190,6 +239,10 @@ class MainGenerator {
private String createWorkerCode(List<Pair<ExecutionUnit, Component>> deployedComponents,
List<Pair<PlatformConnectorUnit, Port>> deployedPorts) {
StringBuilder sb = new StringBuilder();
+ if(useUS || useLaser || useACC) {
+ // Get Current time for the sensors
+ sb.append("uint64_t curr_time = time_util_get_current_micros();\n");
+ }
for(Pair<PlatformConnectorUnit, Port> p : deployedPorts) {
if(p.getFirst() instanceof Receiver && p.getSecond() instanceof InputPort) {
sb.append(createReadCode((Receiver)p.getFirst(), (InputPort)p.getSecond()));
@@ -204,31 +257,18 @@ class MainGenerator {
sb.append(createWriteCode((Transmitter)p.getFirst(), (OutputPort)p.getSecond()));
}
}
+ if(useRumble) {
+ sb.append(createRumbleCode());
+ }
return sb.toString();
}
/** Create the Sensor Variables and functions. */
- private String createSensorVariables(List<Pair<ExecutionUnit, Component>> deployedComponents,
+ private String createVariables(List<Pair<ExecutionUnit, Component>> deployedComponents,
List<Pair<PlatformConnectorUnit, Port>> deployedPorts) {
StringBuilder sb = new StringBuilder();
- sb.append("float Q = 0.022;\n");
- sb.append("float R = 0.917;\n");
- sb.append("float estimates[9] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};\n");
- sb.append("float last_p[9] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};\n");
- sb.append("float kalman_filter(float value, int sensor) {\n");
- sb.append("if(sensor < 0 || sensor > 8) return -1;");
- sb.append("float temp_est = estimates[sensor];\n");
- sb.append("float p_temp = last_p[sensor] + Q;\n");
- sb.append("float K = p_temp * (1.0*(p_temp + R));\n");
- sb.append("float est = temp_est + K * (value - temp_est);\n");
- sb.append("float P = (1-K)*p_temp;\n");
- sb.append("last_p[sensor] = P;\n");
- sb.append("estimates[sensor] = est;\n");
- sb.append("return est;\n");
- sb.append("}\n\n");
if(usePWM) {
- sb.append("int pwm_engine_fd = -1;\n");
- sb.append("int pwm_steering_fd = -1;\n");
+ sb.append("int maestro_fd = -1;\n");
}
if(useDigits) {
sb.append("SegmentDisplay4x7 segment_display;\n");
@@ -246,31 +286,59 @@ class MainGenerator {
sb.append("}\n");
sb.append("}\n\n");
}
+ if(useLEDButton) {
+ // for(Pair<PlatformConnectorUnit, Port> p : deployedPorts) {
+ for(String uid : ledButtons.keySet()) {
+ sb.append("RGBLEDButton rlb_" + uid + ";\n");
+ }
+ for(String[] arr : ledButtonsLocalVariable.values()) {
+ for(String var : arr) {
+ sb.append("uint8_t " + var + " = 0;\n");
+ }
+ }
+ // extractRGBforLEDButton(p);
+ // }
+ }
if(useUS) {
sb.append("uint16_t ultra_sonic_A;\n");
sb.append("uint64_t us_A_last_cb_time = 0;\n");
sb.append("char* uid_us_A = \"zpW\";\n");
sb.append("void us_A_callback(uint16_t distance, void *data) {\n");
- sb.append("ultra_sonic_A = kalman_filter(distance, 0);\n");
+ sb.append("ultra_sonic_A = distance;\n");
sb.append("us_A_last_cb_time = time_util_get_current_micros();\n");
sb.append("}\n");
sb.append("uint16_t ultra_sonic_B;\n");
sb.append("uint64_t us_B_last_cb_time = 0;\n");
sb.append("char* uid_us_B = \"zqN\";\n");
sb.append("void us_B_callback(uint16_t distance, void *data) {\n");
+ sb.append("ultra_sonic_B = distance;\n");
sb.append("us_B_last_cb_time = time_util_get_current_micros();\n");
- sb.append("ultra_sonic_B = kalman_filter(distance, 1);\n");
sb.append("}\n\n");
}
if(useLaser) {
sb.append("int16_t laser_distance;\n");
sb.append("uint64_t laser_last_cb_time = 0;\n");
sb.append("void laser_callback(uint16_t distance, void *data) {\n");
- sb.append("laser_distance = kalman_filter(distance, 2);\n");
+ sb.append("laser_distance = distance;\n");
sb.append("laser_last_cb_time = time_util_get_current_micros();\n");
sb.append("}\n\n");
}
if(useACC) {
+ sb.append("float Q = 0.022;\n");
+ sb.append("float R = 0.917;\n");
+ sb.append("float estimates[9] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0};\n");
+ sb.append("float last_p[9] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0};\n");
+ sb.append("float kalman_filter(float value, int sensor) {\n");
+ sb.append("if(sensor < 0 || sensor > 5) return -1;\n");
+ sb.append("float temp_est = estimates[sensor];\n");
+ sb.append("float p_temp = last_p[sensor] + Q;\n");
+ sb.append("float K = p_temp * (1.0/(p_temp + R));\n");
+ sb.append("float est = temp_est + K * (value - temp_est);\n");
+ sb.append("float P = (1-K)*p_temp;\n");
+ sb.append("last_p[sensor] = P;\n");
+ sb.append("estimates[sensor] = est;\n");
+ sb.append("return est;\n");
+ sb.append("}\n\n");
sb.append("float acceleration_X, acceleration_Y, acceleration_Z;\n");
sb.append("uint64_t acc_last_cb_time = 0;\n");
sb.append("void acc_callback(int16_t x, int16_t y, int16_t z, void* data) {\n");
@@ -278,26 +346,65 @@ class MainGenerator {
sb.append("abs(y - acceleration_Y) > 2 * 10 * 100 ||\n");
sb.append("abs(z - acceleration_Z) > 2 * 10 * 100)\n");
sb.append(" return;\n");
- sb.append("acceleration_X = kalman_filter(x, 3) / 100.0;\n");
- sb.append("acceleration_Y = kalman_filter(y, 4) / 100.0;\n");
- sb.append("acceleration_Z = kalman_filter(z, 5) / 100.0;\n");
+ sb.append("acceleration_X = kalman_filter(x, 0) / 100.0;\n");
+ sb.append("acceleration_Y = kalman_filter(y, 1) / 100.0;\n");
+ sb.append("acceleration_Z = kalman_filter(z, 2) / 100.0;\n");
sb.append("acc_last_cb_time = time_util_get_current_micros();\n");
sb.append("}\n\n");
sb.append("float angularVelocity_X, angularVelocity_Y, angularVelocity_Z;\n");
sb.append("uint64_t angV_last_cb_time = 0;\n");
sb.append("void angV_callback(int16_t x, int16_t y, int16_t z, void* data) {\n");
- sb.append("angularVelocity_X = kalman_filter(x, 6) / 16;\n");
- sb.append("angularVelocity_Y = kalman_filter(y, 7) / 16;\n");
- sb.append("angularVelocity_Z = kalman_filter(z, 8) / 16;\n");
+ sb.append("angularVelocity_X = kalman_filter(x, 3) / 16;\n");
+ sb.append("angularVelocity_Y = kalman_filter(y, 4) / 16;\n");
+ sb.append("angularVelocity_Z = kalman_filter(z, 5) / 16;\n");
sb.append("angV_last_cb_time = time_util_get_current_micros();\n");
sb.append("}\n\n");
}
return sb.toString();
}
+ /**
+ * @param p
+ */
+ private void extractRGBforLEDButton(Pair<PlatformConnectorUnit, Port> p) {
+ final String UNKNOWN = "unknown";
+ String uid = UNKNOWN;
+ int rgb = -1;
+ if(p.getFirst() instanceof LEDButtonRActuator) {
+ LEDButtonRActuator sensor = (LEDButtonRActuator)p.getFirst();
+ uid = sensor.getUniqueBrickletID();
+ rgb = 0;
+ }
+ if(p.getFirst() instanceof LEDButtonGActuator) {
+ LEDButtonGActuator sensor = (LEDButtonGActuator)p.getFirst();
+ uid = sensor.getUniqueBrickletID();
+ rgb = 1;
+ }
+ if(p.getFirst() instanceof LEDButtonBActuator) {
+ LEDButtonBActuator sensor = (LEDButtonBActuator)p.getFirst();
+ uid = sensor.getUniqueBrickletID();
+ rgb = 2;
+ }
+ if(!uid.equals(UNKNOWN) && !ledButtons.containsKey(uid)) {
+ String[] rgbArray = new String[3];
+ rgbArray[rgb] = portName(p.getSecond());
+ ledButtons.put(uid, rgbArray);
+ String[] localVar = new String[3];
+ localVar[rgb] =
+ "rgbButton_" + uid + "_lastValue_" + (rgb == 0 ? "r" : rgb == 1 ? "g" : "b");
+ ledButtonsLocalVariable.put(uid, localVar);
+ } else if(ledButtons.containsKey(uid)) {
+ String[] rgbArray = ledButtons.get(uid);
+ rgbArray[rgb] = portName(p.getSecond());
+ String[] localVar = ledButtonsLocalVariable.get(uid);
+ localVar[rgb] =
+ "rgbButton_" + uid + "_lastValue_" + (rgb == 0 ? "r" : rgb == 1 ? "g" : "b");
+ }
+ }
+
/** Returns the port and ID identifier. */
private String portName(Port port) {
- return port.getName() + "_ID_" + port.getId();
+ return port.getName().replace(' ', '_') + "_ID_" + port.getId();
}
/** Creates the read code for the given receiver and port. */
@@ -307,11 +414,11 @@ class MainGenerator {
String result = "if(!noval_" + portName(outport) + ") {\n";
if(act.getChannelID() == 0) {
result +=
- "temp_actuator_device_set_target(pwm_engine_fd, 0, (uint16_t)" +
+ "temp_actuator_device_set_target(maestro_fd, 0, (uint16_t)" +
portName(outport) + ");\n";
} else {
result +=
- "temp_actuator_device_set_target(pwm_steering_fd, 0, (uint16_t)" +
+ "temp_actuator_device_set_target(maestro_fd, 1, (uint16_t)" +
portName(outport) + ");\n";
}
result += "}\n";
@@ -326,26 +433,126 @@ class MainGenerator {
result += "}\n";
return result;
}
+ if(transmitter instanceof LEDButtonRActuator) {
+ // TODO(JE): if a red actuator port is found the previously saved rgb values are used.
+ LEDButtonRActuator digits = (LEDButtonRActuator)transmitter;
+ String uniqueBrickletID = digits.getUniqueBrickletID();
+ String[] rgb = ledButtons.get(uniqueBrickletID);
+ String[] localRgbValue = ledButtonsLocalVariable.get(uniqueBrickletID);
+
+ String result =
+ "if(!noval_" + portName(outport) + " && (" + rgb[0] + " != " +
+ localRgbValue[0] + " || " + rgb[1] + " != " + localRgbValue[1] +
+ " || " + rgb[2] + " != " + localRgbValue[2] + ")) {\n";
+ result +=
+ "rgb_led_button_set_color(&rlb_" + uniqueBrickletID + ", " + rgb[0] + ", " +
+ rgb[1] + ", " + rgb[2] + " );\n";
+ result += localRgbValue[0] + " = " + rgb[0] + ";\n";
+ result += localRgbValue[1] + " = " + rgb[1] + ";\n";
+ result += localRgbValue[2] + " = " + rgb[2] + ";\n";
+ result += "}\n";
+ return result;
+ }
+ if(transmitter instanceof ConsoleOutput) {
+ String result = "\tif(!noval_" + portName(outport) + ") {\n";
+ result +=
+ "\t\tprintf(\"" + outport.getName() + " = %i\\n\", " + portName(outport) +
+ ");\n";
+ result += "\t} else {\n";
+ result += "\t\tprintf(\"" + outport.getName() + " = NoVal\\n\");\n";
+ result += "\t}\n";
+ return result;
+ }
+ if(transmitter instanceof RumbleMagnitudeWeak) {
+ useRumble = true;
+ rumbleWeakPort = outport;
+ }
+ if(transmitter instanceof RumbleMagnitudeStrong) {
+ useRumble = true;
+ rumbleStrongPort = outport;
+ }
+ if(transmitter instanceof MotorControlOutput) {
+ String result = "if(!noval_" + portName(outport) + ") {\n";
+ result += "setVelocity(" + portName(outport) + ");\n";
+ result += "}\n";
+ return result;
+ }
return "";
}
+ /** Creates Code for Rumble */
+ private String createRumbleCode() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("rumblepad_set_rumble(");
+ if(rumbleStrongPort != null) {
+ sb.append("!noval_" + portName(rumbleStrongPort) + " ? " + portName(rumbleStrongPort) +
+ " : 0, ");
+ } else {
+ sb.append("0, ");
+ }
+ if(rumbleWeakPort != null) {
+ sb.append("!noval_" + portName(rumbleWeakPort) + " ? " + portName(rumbleWeakPort) +
+ " : 0, ");
+ } else {
+ sb.append("0, ");
+ }
+ sb.append("cycle_time * 0.9, 0);\n");
+ return sb.toString();
+ }
+
/** Creates the read code for the given receiver and port. */
private String createReadCode(Receiver receiver, InputPort inport) {
+ if(receiver instanceof CameraDistanceLeft) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append(portName(inport)).append(" = camera_client_get_distance_left();\n");
+ return sb.toString();
+ }
+ if(receiver instanceof CameraDistanceRight) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append(portName(inport)).append(" = camera_client_get_distance_right();\n");
+ return sb.toString();
+ }
+ if(receiver instanceof CameraDetectionStateLeft) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append(portName(inport)).append(" = camera_client_get_detection_state_left();\n");
+ return sb.toString();
+ }
+ if(receiver instanceof CameraDetectionStateRight) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append(portName(inport)).append(" = camera_client_get_detection_state_right();\n");
+ return sb.toString();
+ }
+ if(receiver instanceof CameraYawAngle) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append(portName(inport)).append(" = camera_client_get_yaw_angle();\n");
+ return sb.toString();
+ }
if(receiver instanceof UltraSonicSensor) {
StringBuilder sb = new StringBuilder();
UltraSonicSensor sensor = (UltraSonicSensor)receiver;
- sb.append("float diff_A = (curr_time - us_A_last_cb_time) / (1.0 * SECONDS_IN_MICROS);\n");
- sb.append("float diff_B = (curr_time - us_B_last_cb_time) / (1.0 * SECONDS_IN_MICROS);\n");
- sb.append("noval_" + portName(inport) + " = false;\n");
- sb.append("if (!strcmp(\"" + sensor.getUniqueBrickletID() +
- "\", uid_us_A) && diff_A < 1.0) {\n");
- sb.append(portName(inport) + " = ultra_sonic_A;\n");
- sb.append("} else if (!strcmp(\"" + sensor.getUniqueBrickletID() +
- "\", uid_us_B) && diff_B < 1.0) {\n");
- sb.append(portName(inport) + " = ultra_sonic_B;\n");
- sb.append("} else {\n");
- sb.append("noval_" + portName(inport) + " = true;\n");
- sb.append("}\n");
+ if(nrOfUsSensors == 0) {
+ sb.append("noval_" + portName(inport) + " = true;\n");
+ sb.append("if (!strcmp(\"" + sensor.getUniqueBrickletID() + "\", uid_us_A)) {\n");
+ sb.append("float diff_A = (curr_time - us_A_last_cb_time) / (1.0 * SECONDS_IN_MICROS);\n");
+ sb.append("if (diff_A < 1.0) {\n");
+ sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append(portName(inport) + " = ultra_sonic_A;\n}\n");
+ sb.append("}\n");
+ } else if(nrOfUsSensors == 1) {
+ sb.append("noval_" + portName(inport) + " = true;\n");
+ sb.append("if (!strcmp(\"" + sensor.getUniqueBrickletID() + "\", uid_us_B)){\n");
+ sb.append("float diff_B = (curr_time - us_B_last_cb_time) / (1.0 * SECONDS_IN_MICROS);\n");
+ sb.append("if (diff_B < 1.0) {\n");
+ sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append(portName(inport) + " = ultra_sonic_B;\n}\n");
+ sb.append("}\n");
+ }
+ nrOfUsSensors++;
return sb.toString();
}
if(receiver instanceof LaserRangeSensor) {
@@ -353,7 +560,11 @@ class MainGenerator {
sb.append("float diff_laser = (curr_time - laser_last_cb_time) / (1.0 * SECONDS_IN_MICROS);\n");
sb.append("if (diff_laser < 1.0) {\n");
sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append("if(laser_distance == 1){\n");
+ sb.append(portName(inport) + " = 4000;\n");
+ sb.append("} else {\n");
sb.append(portName(inport) + " = laser_distance;\n");
+ sb.append("}\n");
sb.append("} else {\n");
sb.append("noval_" + portName(inport) + " = true;\n");
sb.append("}\n");
@@ -425,6 +636,12 @@ class MainGenerator {
sb.append("}\n");
return sb.toString();
}
+ if(receiver instanceof MotorControlInput) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("noval_" + portName(inport) + " = false;\n");
+ sb.append(portName(inport) + " = getVelocity();\n");
+ return sb.toString();
+ }
if(receiver instanceof Button1) {
return gamepadReadCode("gamepad_get_button_state", "GAMEPAD_BUTTON_1", inport);
}
@@ -546,6 +763,11 @@ class MainGenerator {
private String createInitCode(List<Pair<ExecutionUnit, Component>> deployedComponents) {
int createdUsSensors = 0;
StringBuilder sb = new StringBuilder();
+ if(useCamera) {
+ String addr = executionUnit.getCameraServerAddress();
+ String port = executionUnit.getCameraServerPort();
+ sb.append("camera_client_initialize(\"" + addr + "\", \"" + port + "\");\n");
+ }
if(useUS || useLaser || useDigits || useACC) {
sb.append("IPConnection brick_connection;\n");
sb.append("ipcon_create(&brick_connection);\n");
@@ -555,6 +777,7 @@ class MainGenerator {
sb.append("}\n\n");
}
if(useUS) {
+ System.out.println("useUs");
for(Pair<PlatformConnectorUnit, Port> p : deployedPorts) {
if(createdUsSensors >= 2)
break;
@@ -567,7 +790,7 @@ class MainGenerator {
sensor.getUniqueBrickletID() + "\", &brick_connection);\n");
sb.append("distance_us_register_callback(&DistanceUS_A, DISTANCE_US_CALLBACK_DISTANCE, (void*)us_A_callback, NULL);\n");
sb.append("distance_us_set_distance_callback_period(&DistanceUS_A, 10);\n");
- } else {
+ } else if(createdUsSensors == 1) {
sb.append("DistanceUS DistanceUS_B;\n");
sb.append("uid_us_B = \"" + sensor.getUniqueBrickletID() + "\";\n");
sb.append("distance_us_create(&DistanceUS_B, \"" +
@@ -575,30 +798,63 @@ class MainGenerator {
sb.append("distance_us_register_callback(&DistanceUS_B, DISTANCE_US_CALLBACK_DISTANCE, (void*)us_B_callback, NULL);\n");
sb.append("distance_us_set_distance_callback_period(&DistanceUS_B, 10);\n");
}
+ createdUsSensors++;
}
}
}
if(useLaser) {
- sb.append("LaserRangeFinder laser;\n");
- sb.append("laser_range_finder_create(&laser, \"CQ9\", &brick_connection);\n");
- sb.append("laser_range_finder_enable_laser(&laser);\n");
- sb.append("laser_range_finder_register_callback(&laser, LASER_RANGE_FINDER_CALLBACK_DISTANCE, (void*)laser_callback, NULL);\n");
- sb.append("laser_range_finder_set_distance_callback_period(&laser, 10);\n");
+ for(Pair<PlatformConnectorUnit, Port> p : deployedPorts) {
+ if(p.getFirst() instanceof LaserRangeSensor) {
+ LaserRangeSensor sensor = (LaserRangeSensor)p.getFirst();
+ sb.append("LaserRangeFinder laser;\n");
+ sb.append("laser_range_finder_create(&laser, \"" +
+ sensor.getUniqueBrickletID() + "\", &brick_connection);\n");
+ sb.append("laser_range_finder_enable_laser(&laser);\n");
+ sb.append("laser_range_finder_register_callback(&laser, LASER_RANGE_FINDER_CALLBACK_DISTANCE, (void*)laser_callback, NULL);\n");
+ sb.append("laser_range_finder_set_distance_callback_period(&laser, 10);\n");
+ break;
+ }
+ }
}
if(useDigits) {
- sb.append("segment_display_4x7_create(&segment_display, \"wNK\", &brick_connection);\n");
+ for(Pair<PlatformConnectorUnit, Port> p : deployedPorts) {
+ if(p.getFirst() instanceof ActuatorDigits) {
+ ActuatorDigits sensor = (ActuatorDigits)p.getFirst();
+ sb.append("segment_display_4x7_create(&segment_display, \"" +
+ sensor.getUniqueBrickletID() + "\", &brick_connection);\n");
+ break;
+ }
+ }
+ }
+ if(useLEDButton) {
+ for(String uid : ledButtons.keySet()) {
+ sb.append("rgb_led_button_create(&rlb_" + uid + ", \"" + uid +
+ "\", &brick_connection);\n");
+ }
+ // break; TODO(JE): those break statements only allow one element of each type!
}
if(useACC) {
sb.append("IMUV2 imu;\n");
- sb.append("imu_v2_create(&imu, \"6xCD6s\", &brick_connection);\n");
+ for(Pair<PlatformConnectorUnit, Port> p : deployedPorts) {
+ if(p.getFirst() instanceof AccelerationXSensor ||
+ p.getFirst() instanceof AccelerationYSensor ||
+ p.getFirst() instanceof AccelerationZSensor ||
+ p.getFirst() instanceof AngularVelocityXSensor ||
+ p.getFirst() instanceof AngularVelocityYSensor ||
+ p.getFirst() instanceof AngularVelocityZSensor) {
+ UIDUnit sensor = (UIDUnit)p.getFirst();
+ sb.append("imu_v2_create(&imu, \"" + sensor.getUniqueBrickletID() +
+ "\", &brick_connection);\n");
+ break;
+ }
+ }
sb.append("imu_v2_register_callback(&imu, IMU_V2_CALLBACK_LINEAR_ACCELERATION, (void*)acc_callback, NULL);\n");
sb.append("imu_v2_set_linear_acceleration_period(&imu, 5);\n");
sb.append("imu_v2_register_callback(&imu, IMU_V2_CALLBACK_ANGULAR_VELOCITY, (void*)angV_callback, NULL);\n");
sb.append("imu_v2_set_angular_velocity_period(&imu, 5);\n");
}
if(usePWM) {
- sb.append("pwm_steering_fd = temp_actuator_initialize(\"/dev/ttyACM0\");\n");
- sb.append("pwm_engine_fd = temp_actuator_initialize(\"/dev/ttyACM2\");\n\n");
+ sb.append("maestro_fd = temp_actuator_initialize(\"/dev/Maestro0\");\n");
}
if(useGamepad) {
sb.append("gamepad_configuration_t* gamepad_config = malloc(sizeof(gamepad_configuration_t));\n");
@@ -610,18 +866,21 @@ class MainGenerator {
sb.append("gamepad_initialize(gamepad_config);\n\n");
}
if(useRumblepad) {
- sb.append("while(access(\"/dev/input/js0\", F_OK) == -1) {\n");
+ sb.append("while(access(\"/dev/input/event0\", F_OK) == -1) {\n");
sb.append("sleep(1);\n");
sb.append("printf(\"Could not access gamepad device. Trying again in 1s.\\n\");\n");
sb.append("}\n");
sb.append("rumblepad_configuration_t* rumblepad_config = malloc(sizeof(rumblepad_configuration_t));\n");
- sb.append("rumblepad_config->device_id = \"/dev/input/js0\";\n");
+ sb.append("rumblepad_config->device_id = \"/dev/input/event0\";\n");
sb.append("rumblepad_config->waiting_sleep_in_micros = " + WAITING_SLEEP_IN_MICROS +
";\n");
sb.append("rumblepad_config->axis_callback = NULL;\n");
sb.append("rumblepad_config->button_callback = NULL;\n");
sb.append("rumblepad_initialize(rumblepad_config);\n\n");
}
+ if(useVesc) {
+ sb.append("initUSB(\"/dev/vesc\", B115200);\n");
+ }
for(Pair<ExecutionUnit, Component> p : deployedComponents) {
Component c = p.getSecond();
sb.append(makeCall("init", c));
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/PWMActuatorExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/PWMActuatorExecutable.java
index bd220f8f..faabcd8e 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/PWMActuatorExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/PWMActuatorExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -29,9 +29,9 @@ import org.fortiss.af3.platform.raspberry.model.ActuatorPWM;
* Executable for {@link ActuatorPWM}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class PWMActuatorExecutable extends TransmitterExecutableBase<ActuatorPWM> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/RaspberryPIExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/RaspberryPIExecutable.java
index ccaed0f8..0c57efb4 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/RaspberryPIExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/RaspberryPIExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -17,37 +17,38 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.raspberry.generator.executable;
+import static org.fortiss.af3.component.utils.ComponentArchitectureUtils.isAtomicComponent;
import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.createDataDictionary;
-import static org.fortiss.af3.generator.common.utils.CLanguageModelElementFacade.addUserHeaderInclude;
import static org.fortiss.af3.generator.common.utils.CLanguageModelElementFactory.createCSourcePackage;
-import static org.fortiss.af3.generator.common.utils.SourceModelElementFactory.createByteContentUnitForPluginFile;
+import static org.fortiss.af3.generator.common.utils.SourceModelElementFactory.createByteContentUnitForPluginFileInRCP;
import static org.fortiss.af3.platform.raspberry.generator.executable.HeaderCopyGenerator.copyHeaderFiles;
import static org.fortiss.af3.platform.raspberry.generator.templates.RasPiCTemplates.getConfigureFile;
import static org.fortiss.af3.platform.raspberry.generator.templates.RasPiCTemplates.getEclipseProjectFile;
import static org.fortiss.af3.platform.raspberry.generator.templates.RasPiCTemplates.getMakedefsFile;
+import static org.fortiss.af3.platform.utils.PlatformArchitectureUtils.findAtomicTransmissionUnits;
import static org.fortiss.tooling.kernel.utils.KernelModelElementUtils.getRootElement;
import static org.fortiss.tooling.kernel.utils.LoggingUtils.error;
import static org.fortiss.tooling.kernel.utils.TransformationUtils.createTransformedObjectFor;
-import java.io.IOException;
-import java.net.URISyntaxException;
+import java.util.ArrayList;
import java.util.List;
import org.conqat.lib.commons.collections.Pair;
import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.component.model.Port;
import org.fortiss.af3.component.model.generator.ComponentProgram;
+import org.fortiss.af3.deployment.generator.DeploymentExecutableTransformationContext;
+import org.fortiss.af3.deployment.model.Deployment;
import org.fortiss.af3.expression.model.DataDictionary;
import org.fortiss.af3.expression.model.terms.IExpressionTerm;
import org.fortiss.af3.generator.common.model.c.AF3GeneratorCommonLanguagesCFactory;
import org.fortiss.af3.generator.common.model.c.CSourcePackage;
-import org.fortiss.af3.generator.common.model.source.AbstractUnit;
-import org.fortiss.af3.generator.common.model.source.ByteContentUnit;
-import org.fortiss.af3.generator.common.model.source.SourceUnit;
import org.fortiss.af3.platform.language.executable.ExecutionUnitExecutableBase;
import org.fortiss.af3.platform.model.ExecutionUnit;
import org.fortiss.af3.platform.model.PlatformConnectorUnit;
+import org.fortiss.af3.platform.model.TransmissionUnit;
import org.fortiss.af3.platform.raspberry.AF3PlatformRaspberryActivator;
+import org.fortiss.af3.platform.raspberry.model.CanBus;
import org.fortiss.af3.platform.raspberry.model.RaspberryPi;
import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
import org.fortiss.tooling.kernel.extension.exception.ChainTransformationFailedException;
@@ -57,9 +58,9 @@ import org.fortiss.tooling.kernel.extension.exception.ChainTransformationFailedE
*
* @author eder
* @author hoelzl
- * @author eder $
- * 18709 $
- * RED Hash:
+ * @author $Author: eder $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class RaspberryPIExecutable extends ExecutionUnitExecutableBase<RaspberryPi, CSourcePackage> {
/** Folder name for library source files. */
@@ -74,6 +75,8 @@ public class RaspberryPIExecutable extends ExecutionUnitExecutableBase<Raspberry
/** Default library names extended with brick. */
// Note that the order is important (GCC linker crap!)
private static final String LIB_NAMES_WITH_BRICK = "brick " + LIB_NAMES;
+ /** Default library names extended with vesc. */
+ private static final String LIB_NAMES_WITH_VESC = LIB_NAMES_WITH_BRICK + " vesc";
/** Constructor. */
public RaspberryPIExecutable(RaspberryPi modelElement) {
@@ -85,17 +88,47 @@ public class RaspberryPIExecutable extends ExecutionUnitExecutableBase<Raspberry
protected CSourcePackage createExecutionUnitSourcePackage(String name,
List<Pair<ExecutionUnit, Component>> deployedComponents,
List<Pair<PlatformConnectorUnit, Port>> deployedPorts, ITransformationContext context) {
+ Deployment deployment = null;
+ CanTransmissionCatalog catalog = null;
+ if(context instanceof DeploymentExecutableTransformationContext) {
+ DeploymentExecutableTransformationContext dContext =
+ (DeploymentExecutableTransformationContext)context;
+ deployment = dContext.getDeploymentExecutable().getDeployment();
+ List<TransmissionUnit> tus =
+ findAtomicTransmissionUnits(modelElement.getPlatformArchitecture());
+ if(!tus.isEmpty() && tus.get(0) instanceof CanBus) {
+ catalog =
+ (CanTransmissionCatalog)dContext.getDeploymentExecutable()
+ .getTransmissionCatalog(tus.get(0));
+ }
+ }
// create the result package
CSourcePackage sourcePackage = createCSourcePackage();
sourcePackage.setBaseLocation(name);
try {
addDataDictionaryCode(context, sourcePackage);
- addLogicalComponentCode(deployedComponents, context, sourcePackage);
+ List<Component> atomics = new ArrayList<Component>();
+ for(Pair<ExecutionUnit, Component> p : deployedComponents) {
+ if(p.getFirst() != modelElement) {
+ continue;
+ }
+ Component c = p.getSecond();
+ if(isAtomicComponent(c)) {
+ atomics.add(c);
+ } else {
+ atomics.addAll(c.findAtomicComponents());
+ }
+ }
+ if(catalog != null) {
+ addLogicalComponentCode(atomics, context, sourcePackage);
+ } else {
+ addLogicalComponentCodeSingleUnit(deployedComponents, context, sourcePackage);
+ }
addEclipseCProjectFiles(sourcePackage, modelElement.getName());
- addStaticLibraries(sourcePackage);
- addConfigureAndMakedefsFiles(sourcePackage, modelElement.getName(),
- LIB_NAMES_WITH_BRICK);
- addMainFile(sourcePackage, deployedComponents, deployedPorts, context);
+ addStaticLibrariesAndCode(sourcePackage);
+ addConfigureAndMakedefsFiles(sourcePackage, modelElement.getName(), LIB_NAMES_WITH_VESC);
+ addMainFile(deployment, catalog, sourcePackage, atomics, deployedComponents,
+ deployedPorts, context);
} catch(Exception ex) {
error(AF3PlatformRaspberryActivator.getDefault(), ex.getMessage(), ex);
ex.printStackTrace();
@@ -104,13 +137,21 @@ public class RaspberryPIExecutable extends ExecutionUnitExecutableBase<Raspberry
}
/** Creates the main file by using the {@link MainGenerator} helper class. */
- private void addMainFile(CSourcePackage sourcePackage,
+ private void addMainFile(Deployment deployment, CanTransmissionCatalog catalog,
+ CSourcePackage sourcePackage, List<Component> atomics,
List<Pair<ExecutionUnit, Component>> deployedComponents,
List<Pair<PlatformConnectorUnit, Port>> deployedPorts, ITransformationContext context) {
CSourcePackage srcGenPack = (CSourcePackage)sourcePackage.getSrcGenPackage();
- MainGenerator mg =
- new MainGenerator(modelElement, deployedComponents, deployedPorts, context);
- srcGenPack.addUnit(mg.createSingleUnitMain());
+ if(catalog != null) {
+ MultiUnitMainGenerator mg =
+ new MultiUnitMainGenerator(deployment, catalog, modelElement, atomics,
+ deployedComponents, deployedPorts, context);
+ srcGenPack.addUnit(mg.createMultiUnitMain());
+ } else {
+ MainGenerator mg =
+ new MainGenerator(modelElement, deployedComponents, deployedPorts, context);
+ srcGenPack.addUnit(mg.createSingleUnitMain());
+ }
}
/** Adds the build process files: configure and Makedefs. */
@@ -121,11 +162,13 @@ public class RaspberryPIExecutable extends ExecutionUnitExecutableBase<Raspberry
}
/** Adds the library code need by the deployment code generator. */
- private void addStaticLibraries(CSourcePackage sourcePackage) throws Exception {
+ private void addStaticLibrariesAndCode(CSourcePackage sourcePackage) throws Exception {
CSourcePackage srcLib =
AF3GeneratorCommonLanguagesCFactory.eINSTANCE.createCSourcePackage();
srcLib.setBaseLocation(SRC_LIB_SUB_PACKAGE_NAME);
sourcePackage.getSubPackages().add(srcLib);
+ srcLib.addUnit(createByteContentUnitForPluginFileInRCP(
+ AF3PlatformRaspberryActivator.PLUGIN_ID, "code-gen-hal/src", "data.c", false));
CSourcePackage incLib =
AF3GeneratorCommonLanguagesCFactory.eINSTANCE.createCSourcePackage();
@@ -135,24 +178,33 @@ public class RaspberryPIExecutable extends ExecutionUnitExecutableBase<Raspberry
CSourcePackage lib = AF3GeneratorCommonLanguagesCFactory.eINSTANCE.createCSourcePackage();
lib.setBaseLocation(LIB_SUB_PACKAGE_NAME);
sourcePackage.getSubPackages().add(lib);
- lib.addUnit(getStaticLibraryUnit("libbrick.a"));
- lib.addUnit(getStaticLibraryUnit("libaf3pihal.a"));
+ lib.addUnit(createByteContentUnitForPluginFileInRCP(
+ AF3PlatformRaspberryActivator.PLUGIN_ID, "code-gen-hal/lib", "libbrick.a", false));
+ lib.addUnit(createByteContentUnitForPluginFileInRCP(
+ AF3PlatformRaspberryActivator.PLUGIN_ID, "code-gen-hal/lib", "libaf3pihal.a", false));
copyHeaderFiles(incLib);
}
- /** Creates a {@link ByteContentUnit} for the given static library. */
- private AbstractUnit getStaticLibraryUnit(String libName) throws Exception {
- return createByteContentUnitForPluginFile(AF3PlatformRaspberryActivator.PLUGIN_ID,
- "code-gen-hal/lib", libName, false);
- }
-
/** Adds auxiliary files for Eclipse C project. */
private void addEclipseCProjectFiles(CSourcePackage sourcePackage, String projectName) {
sourcePackage.addUnit(getEclipseProjectFile(projectName));
}
/** Creates the code for all deployed components. */
- private void addLogicalComponentCode(List<Pair<ExecutionUnit, Component>> deployedComponents,
+ private void addLogicalComponentCode(List<Component> deployedAtomics,
+ ITransformationContext context, CSourcePackage sourcePackage)
+ throws ChainTransformationFailedException {
+ for(Component cmp : deployedAtomics) {
+ ComponentProgram cprog =
+ createTransformedObjectFor(cmp, ComponentProgram.class, context);
+ CSourcePackage cPack = createTransformedObjectFor(cprog, CSourcePackage.class, context);
+ cPack.mergeInto(sourcePackage);
+ }
+ }
+
+ /** Creates the code for all deployed components. */
+ private void addLogicalComponentCodeSingleUnit(
+ List<Pair<ExecutionUnit, Component>> deployedComponents,
ITransformationContext context, CSourcePackage sourcePackage)
throws ChainTransformationFailedException {
for(Pair<ExecutionUnit, Component> pair : deployedComponents) {
@@ -179,23 +231,6 @@ public class RaspberryPIExecutable extends ExecutionUnitExecutableBase<Raspberry
ddPackage.mergeInto(sourcePackage);
}
- private static void addFilesWithReference(CSourcePackage pkg, SourceUnit source,
- String fileWithoutExtension) throws IOException, URISyntaxException {
- addFile(pkg, "src/" + fileWithoutExtension + ".c");
- addFile(pkg, "inc/" + fileWithoutExtension + ".h");
- addSystemCReference(source, fileWithoutExtension);
- }
-
- private static void addFile(CSourcePackage pkg, String file) throws IOException,
- URISyntaxException {
- pkg.addUnit(createByteContentUnitForPluginFile(AF3PlatformRaspberryActivator.PLUGIN_ID,
- "lib", file, false));
- }
-
- private static void addSystemCReference(SourceUnit source, String reference) {
- addUserHeaderInclude(source, reference);
- }
-
/** {@inheritDoc} */
@Override
public IExpressionTerm getInitialization() {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button1Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button1Executable.java
index e684acc1..a7e9f72c 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button1Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button1Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Button1;
* Executable for {@link Button1}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Button1Executable extends ReceiverExecutableBase<Button1> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button2Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button2Executable.java
index eb6da979..7b91f000 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button2Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button2Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Button2;
* Executable for {@link Button2}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Button2Executable extends ReceiverExecutableBase<Button2> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button3Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button3Executable.java
index a6160f3c..60274cf3 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button3Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button3Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Button3;
* Executable for {@link Button3}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Button3Executable extends ReceiverExecutableBase<Button3> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button4Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button4Executable.java
index 0a50eced..b93fff5d 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button4Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Button4Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Button4;
* Executable for {@link Button4}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Button4Executable extends ReceiverExecutableBase<Button4> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL1Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL1Executable.java
index eae74e53..1424b482 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL1Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL1Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonL1;
* Executable for {@link ButtonL1}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonL1Executable extends ReceiverExecutableBase<ButtonL1> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL2Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL2Executable.java
index 632a4706..b62543f8 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL2Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonL2Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonL2;
* Executable for {@link ButtonL2}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonL2Executable extends ReceiverExecutableBase<ButtonL2> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR1Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR1Executable.java
index cfb9c14b..841bc943 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR1Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR1Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonR1;
* Executable for {@link ButtonR1}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonR1Executable extends ReceiverExecutableBase<ButtonR1> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR2Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR2Executable.java
index f8e7d6f2..5a0d5639 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR2Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/ButtonR2Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonR2;
* Executable for {@link ButtonR2}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonR2Executable extends ReceiverExecutableBase<ButtonR2> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickXExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickXExecutable.java
index cbac998a..9c86424c 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickXExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickXExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Left_StickX_Position;
* Executable for {@link Left_StickX_Position}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Left_StickXExecutable extends ReceiverExecutableBase<Left_StickX_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickYExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickYExecutable.java
index 06189cf2..3372b1b8 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickYExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Left_StickYExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Left_StickY_Position;
* Executable for {@link Left_StickY_Position}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Left_StickYExecutable extends ReceiverExecutableBase<Left_StickY_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickXExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickXExecutable.java
index 5e073407..7858cb4e 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickXExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickXExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Right_StickX_Position;
* Executable for {@link Right_StickX_Position}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Right_StickXExecutable extends ReceiverExecutableBase<Right_StickX_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickYExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickYExecutable.java
index 7f35f053..79174689 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickYExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/Right_StickYExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Right_StickY_Position;
* Executable for {@link Right_StickY_Position}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Right_StickYExecutable extends ReceiverExecutableBase<Right_StickY_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonAExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonAExecutable.java
index 4d799a24..272e3f6a 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonAExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonAExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonAExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonA;
* Executable for {@link ButtonA}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonAExecutable extends ReceiverExecutableBase<ButtonA> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonBExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonBExecutable.java
index 5d6468de..953cd639 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonBExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonBExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonBExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonB;
* Executable for {@link ButtonB}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonBExecutable extends ReceiverExecutableBase<ButtonB> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonHomeExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonHomeExecutable.java
index 27dcf8e4..10acd77c 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonHomeExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonHomeExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonHomeExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonHome;
* Executable for {@link ButtonHome}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonHomeExecutable extends ReceiverExecutableBase<ButtonHome> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonL1Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonL1Executable.java
index c159bbcd..8fbc896b 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonL1Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonL1Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonL1Executable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonL1;
* Executable for {@link ButtonL1}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonL1Executable extends ReceiverExecutableBase<ButtonL1> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonL3Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonL3Executable.java
index 0f0a76d2..279bf759 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonL3Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonL3Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonL3Executable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonL3;
* Executable for {@link ButtonL3}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonL3Executable extends ReceiverExecutableBase<ButtonL3> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonR1Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonR1Executable.java
index 75ed04c4..982357f5 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonR1Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonR1Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonR1Executable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonR1;
* Executable for {@link ButtonR1}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonR1Executable extends ReceiverExecutableBase<ButtonR1> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonR3Executable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonR3Executable.java
index aca29447..109802ec 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonR3Executable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonR3Executable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonR3Executable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonR3;
* Executable for {@link ButtonR3}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonR3Executable extends ReceiverExecutableBase<ButtonR3> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonSelectExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonSelectExecutable.java
index 91c2bce9..ad8d9d96 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonSelectExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonSelectExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonSelectExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonSelect;
* Executable for {@link ButtonSelect}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonSelectExecutable extends ReceiverExecutableBase<ButtonSelect> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonStartExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonStartExecutable.java
index cd99cc7a..c877fad2 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonStartExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonStartExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonStartExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonStart;
* Executable for {@link ButtonStart}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonStartExecutable extends ReceiverExecutableBase<ButtonStart> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonXExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonXExecutable.java
index b95ea852..dc0bf489 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonXExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonXExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonXExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonX;
* Executable for {@link ButtonX}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonXExecutable extends ReceiverExecutableBase<ButtonX> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonYExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonYExecutable.java
index 2badc477..8bb0d1dd 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonYExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/ButtonYExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonYExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonY;
* Executable for {@link ButtonY}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonYExecutable extends ReceiverExecutableBase<ButtonY> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadDownExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadDownExecutable.java
index 415dd99a..6d6c3c72 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadDownExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadDownExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: DPadDownExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.DPadDown;
* Executable for {@link DPadDown}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class DPadDownExecutable extends ReceiverExecutableBase<DPadDown> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadLeftExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadLeftExecutable.java
index ba18741d..135b1cd5 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadLeftExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadLeftExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: DPadLeftExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.DPadLeft;
* Executable for {@link DPadLeft}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class DPadLeftExecutable extends ReceiverExecutableBase<DPadLeft> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadRightExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadRightExecutable.java
index 02e3b01b..df14a788 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadRightExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadRightExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: DPadRightExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.DPadRight;
* Executable for {@link DPadRight}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class DPadRightExecutable extends ReceiverExecutableBase<DPadRight> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadUpExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadUpExecutable.java
index 47f9305f..c875f70f 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadUpExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/DPadUpExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: DPadUpExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.DPadUp;
* Executable for {@link DPadUp}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class DPadUpExecutable extends ReceiverExecutableBase<DPadUp> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/L2PositionExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/L2PositionExecutable.java
index be55500d..50c51ccb 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/L2PositionExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/L2PositionExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: L2PositionExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.L2_Position;
* Executable for {@link L2_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class L2PositionExecutable extends ReceiverExecutableBase<L2_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Left_StickXExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Left_StickXExecutable.java
index 52960bd2..5b75461e 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Left_StickXExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Left_StickXExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: Left_StickXExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.Left_StickX_Position;
* Executable for {@link Left_StickX_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class Left_StickXExecutable extends ReceiverExecutableBase<Left_StickX_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Left_StickYExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Left_StickYExecutable.java
index 9f9a490c..4ef4a4c4 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Left_StickYExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Left_StickYExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: Left_StickYExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.Left_StickY_Position;
* Executable for {@link Left_StickY_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class Left_StickYExecutable extends ReceiverExecutableBase<Left_StickY_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/R2PositionExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/R2PositionExecutable.java
index 9a9a4807..8bb178f7 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/R2PositionExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/R2PositionExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: R2PositionExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.R2_Position;
* Executable for {@link R2_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class R2PositionExecutable extends ReceiverExecutableBase<R2_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Right_StickXExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Right_StickXExecutable.java
index 895f7c72..f47ed581 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Right_StickXExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Right_StickXExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: Right_StickXExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.Right_StickX_Position;
* Executable for {@link Right_StickX_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class Right_StickXExecutable extends ReceiverExecutableBase<Right_StickX_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Right_StickYExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Right_StickYExecutable.java
index 9ce14652..8651bd01 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Right_StickYExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/Right_StickYExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: Right_StickYExecutable.java 22461 2017-12-07 12:52:48Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -28,9 +28,9 @@ import org.fortiss.af3.platform.raspberry.model.rumblepad.Right_StickY_Position;
* Executable for {@link Right_StickY_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22461 $
+ * @ConQAT.Rating RED Hash:
*/
public class Right_StickYExecutable extends ReceiverExecutableBase<Right_StickY_Position> {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/SimpleRumbleFeatureExecutable.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/SimpleRumbleFeatureExecutable.java
index 2fe11dac..38e514fc 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/SimpleRumbleFeatureExecutable.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/SimpleRumbleFeatureExecutable.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: SimpleRumbleFeatureExecutable.java 22478 2017-12-08 09:55:32Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/MainFile.stg b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/MainFile.stg
deleted file mode 100644
index 62dd488c..00000000
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/MainFile.stg
+++ /dev/null
@@ -1,109 +0,0 @@
-group MainFile;
-
-MainFile(UNIT_NAME,
- COORDINATOR_OR_WORKER,
- CAN_ID_UNIT_DONE,
- CYCLE_TIME_IN_MILLIS,
- WAITING_SLEEPTIME_IN_MICROS,
- SYSTEM_INCLUDES,
- SYNC_BOX_SIZE,
- SYNC_BOX_SETUP_CODE,
- SYSTEM_INIT_CODE,
- WORKER_CODE) ::= <<
-// due to current data dictionary declaration of GENTYPE_boolean
-// system include must be first
-$SYSTEM_INCLUDES$
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <unistd.h>
-
-#include <af3.h>
-#include <cancatalog.h>
-#include <caninbox.h>
-#include <canoutbox.h>
-#include <debugprint.h>
-#include <protocol_control_center.h>
-#include <protocol_coordinator.h>
-#include <protocol_factory.h>
-
-
-#define WAITING_SLEEPTIME_IN_MICROS (uint64_t)$WAITING_SLEEPTIME_IN_MICROS$
-
-#define STOP_AT_LOGICAL_CLOCK (uint64_t)0 // run infinitely
-
-#define BRICK_HOST "localhost"
-#define BRICK_PORT 4223
-
-#define CAN_ID_GLOBAL_SHUTDOWN 0x00
-#define CAN_ID_COORDINATOR_CLOCK 0x01
-#define CAN_ID_UNIT_DONE $CAN_ID_UNIT_DONE$
-
-static const char* can_device = "can0";
-static can_inbox_t* app_inbox = NULL;
-static can_inbox_t* sync_inbox= NULL;
-static can_outbox_t* app_outbox = NULL;
-
-static uint64_t step = 0;
-
-static void worker() {
- step++;
- $WORKER_CODE$
-}
-
-int global_debug_print_level = DEBUG_PRINT_LEVEL_NONE;
-
-int main(int argc, char** argv) {
- // initialize CAN interface with catalog implementation
- can_catalog_initialize(can_device, $WAITING_SLEEPTIME_IN_MICROS$);
-
- // set AF3 unit name used when communicating with CC
- af3_set_execution_unit_identifier("$UNIT_NAME$");
- // TODO: initialize ControlCenter connection
-
- // snychronization message box
- sync_inbox = can_inbox_create("$UNIT_NAME$_sync_inbox", $SYNC_BOX_SIZE$);
- $SYNC_BOX_SETUP_CODE$
-
- // application message boxes
- app_inbox = can_inbox_create("$UNIT_NAME$_app_inbox", 1);
- app_outbox = can_outbox_create("$UNIT_NAME$_sensor_app_outbox");
-
- protocol_can_config_t* can_config = protocol_can_config_create(
- $CAN_ID_UNIT_DONE$,
- CAN_ID_COORDINATOR_CLOCK,
- CAN_ID_GLOBAL_SHUTDOWN);
-
- protocol_worker_clock_config_t* clock_config = protocol_worker_clock_config_create(
- $CYCLE_TIME_IN_MILLIS$,
- STOP_AT_LOGICAL_CLOCK,
- $WAITING_SLEEPTIME_IN_MICROS$);
-
- protocol_worker_computation_config_t* computation_config = protocol_worker_computation_config_create(
- "$UNIT_NAME$",
- worker,
- sync_inbox,
- app_inbox,
- app_outbox,
- 0);
-
- $SYSTEM_INIT_CODE$
-
-#if $COORDINATOR_OR_WORKER$
- int result = protocol_coordinator_main(can_config, clock_config, computation_config);
-#else
- int result = protocol_worker_main(can_config, clock_config, computation_config);
-#endif
- debug_print(DEBUG_PRINT_LEVEL_NONE, "$UNIT_NAME$ main() returned %i.\n", result);
-
- // clean up
- can_inbox_destroy(sync_inbox);
- can_inbox_destroy(app_inbox);
- can_outbox_destroy(app_outbox);
- free(can_config);
- free(clock_config);
- free(computation_config);
-
- return result;
-}
->>
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/RasPiCTemplates.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/RasPiCTemplates.java
index 5c8fed75..ac965698 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/RasPiCTemplates.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/RasPiCTemplates.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: RasPiCTemplates.java 22813 2018-01-12 15:25:51Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -34,27 +34,30 @@ import org.fortiss.af3.generator.common.model.source.StaticContentSourceUnit;
* Templates used by the RasPi C code generator.
*
* @author hoelzl
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22813 $
+ * @ConQAT.Rating RED Hash:
*/
public final class RasPiCTemplates {
/** Returns the 'main.c' file configured using the given arguments. */
- public static AbstractUnit getMainCFile(String unitName, boolean coordinatorOrWorker,
- int canIdUnitDone, int cycletimeInMillis, int waitingSleepInMicros,
- String systemIncludes, int syncBoxSize, String syncBoxSetupCode, String systemInitCode,
- String workerCode) {
- StringTemplate template = makeTemplate("MainFile.stg", "MainFile");
+ public static AbstractUnit getMultiUnitMainCFile(String unitName, boolean coordinatorOrWorker,
+ int canIdLocalUnit, String sensorVariables, String systemInitCode,
+ String remoteUnitSetupCode, String systemIncludes, String componentPorts,
+ String componentSetup, String componentImpl, int cycletimeInMillis,
+ int threadSleepTimeInMicros) {
+ StringTemplate template = makeTemplate("MultiUnitMainFile.stg", "MainFile");
template.setAttribute("UNIT_NAME", unitName);
- template.setAttribute("COORDINATOR_OR_WORKER", coordinatorOrWorker ? 1 : 0);
- template.setAttribute("CAN_ID_UNIT_DONE", canIdUnitDone);
- template.setAttribute("CYCLE_TIME_IN_MILLIS", cycletimeInMillis);
- template.setAttribute("WAITING_SLEEPTIME_IN_MICROS", waitingSleepInMicros);
- template.setAttribute("SYSTEM_INCLUDES", systemIncludes);
- template.setAttribute("SYNC_BOX_SIZE", syncBoxSize);
- template.setAttribute("SYNC_BOX_SETUP_CODE", syncBoxSetupCode);
+ template.setAttribute("COORDINATOR_OR_WORKER", coordinatorOrWorker ? "1" : "0");
+ template.setAttribute("CAN_ID_LOCAL_UNIT", canIdLocalUnit);
+ template.setAttribute("SENSOR_VARIABLES", sensorVariables);
template.setAttribute("SYSTEM_INIT_CODE", systemInitCode);
- template.setAttribute("WORKER_CODE", workerCode);
+ template.setAttribute("REMOTE_UNIT_SETUP_CODE", remoteUnitSetupCode);
+ template.setAttribute("SYSTEM_INCLUDES", systemIncludes);
+ template.setAttribute("COMPONENT_PORTS", componentPorts);
+ template.setAttribute("COMPONENT_SETUP", componentSetup);
+ template.setAttribute("COMPONENT_IMPL", componentImpl);
+ template.setAttribute("CYCLE_TIME_IN_MILLIS", cycletimeInMillis);
+ template.setAttribute("THREAD_SLEEPTIME_IN_MICROS", threadSleepTimeInMicros);
StaticContentSourceUnit unit =
createStaticContentSourceUnit("main.c", template.toString(), false);
return unit;
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/SingleUnitMainFile.stg b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/SingleUnitMainFile.stg
index 68f43664..7bde6d53 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/SingleUnitMainFile.stg
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/templates/SingleUnitMainFile.stg
@@ -24,16 +24,16 @@ $SYSTEM_INCLUDES$
#define BRICK_PORT 4223
static uint64_t step = 0;
+int global_debug_print_level = DEBUG_PRINT_LEVEL_NONE;
+const int cycle_time = $CYCLE_TIME_IN_MILLIS$;
$SENSOR_VARIABLES$
static void worker() {
- uint64_t curr_time = time_util_get_current_micros();
step++;
$WORKER_CODE$
}
-int global_debug_print_level = DEBUG_PRINT_LEVEL_NONE;
static uint64_t start_time_in_micros;
static uint64_t delta_time_in_micros;
@@ -41,26 +41,22 @@ static uint64_t local_logical_clock;
int main(int argc, char** argv) {
local_logical_clock = 1;
- // set AF3 unit name used when communicating with CC
- af3_set_execution_unit_identifier("$UNIT_NAME$");
- uint32_t cycle_time = $CYCLE_TIME_IN_MILLIS$;
- // TODO: initialize ControlCenter connection
$SYSTEM_INIT_CODE$
start_time_in_micros = time_util_get_current_micros();
while(local_logical_clock != STOP_AT_LOGICAL_CLOCK) {
worker();
delta_time_in_micros = time_util_get_elapsed_micros_since(start_time_in_micros);
- if(delta_time_in_micros > $CYCLE_TIME_IN_MILLIS$ * MILLIS_IN_MICROS) {
+ if(delta_time_in_micros > cycle_time * MILLIS_IN_MICROS) {
debug_print(DEBUG_PRINT_LEVEL_FEW, "Remaining cycle time negative! Deadline broken. Shutting down.\n");
return -1;
}
- uint64_t remaining_time_in_micros = $CYCLE_TIME_IN_MILLIS$ * MILLIS_IN_MICROS - delta_time_in_micros;
+ uint64_t remaining_time_in_micros = cycle_time * MILLIS_IN_MICROS - delta_time_in_micros;
time_util_sleep_micros(remaining_time_in_micros);
// increase logical clock
local_logical_clock++;
// increase start time
- start_time_in_micros += $CYCLE_TIME_IN_MILLIS$ * MILLIS_IN_MICROS;
+ start_time_in_micros += cycle_time * MILLIS_IN_MICROS;
}
return 0;
}
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanBusTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanBusTransformation.java
index 3dff5916..e486ff8a 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanBusTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanBusTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link CanBus}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class CanBusTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanBusTransmissionCatalogTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanBusTransmissionCatalogTransformation.java
index 29fce4ea..92f178f3 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanBusTransmissionCatalogTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanBusTransmissionCatalogTransformation.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: GenericTransmisstionUnitTransmissionCatalogTransformation.java 5274 2012-08-02 07:54:11Z mou $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -17,6 +17,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.raspberry.generator.transform;
+import org.fortiss.af3.deployment.generator.DeploymentTransformationContext;
import org.fortiss.af3.deployment.generator.TransmissionCatalog;
import org.fortiss.af3.platform.model.generic.GenericTransmissionUnit;
import org.fortiss.af3.platform.raspberry.generator.executable.CanTransmissionCatalog;
@@ -28,9 +29,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* {@link TransmissionCatalog} generator for {@link GenericTransmissionUnit}.
*
* @author hoelzl
- * @author mou $
- * 5274 $
- * GREEN Hash: C4318B1D240DC4CACC2BB0311CB2B23A
+ * @author $Author: mou $
+ * @version $Rev: 5274 $
+ * @ConQAT.Rating GREEN Hash: C4318B1D240DC4CACC2BB0311CB2B23A
*/
public class CanBusTransmissionCatalogTransformation implements ITransformationProvider {
@@ -56,6 +57,7 @@ public class CanBusTransmissionCatalogTransformation implements ITransformationP
/** {@inheritDoc} */
@Override
public Object transform(Object source, ITransformationContext context) {
- return new CanTransmissionCatalog();
+ DeploymentTransformationContext dContext = (DeploymentTransformationContext)context;
+ return new CanTransmissionCatalog(dContext.getDeployment());
}
}
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanConnectorTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanConnectorTransformation.java
index 10655ac1..c1384349 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanConnectorTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanConnectorTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link CanConnector}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class CanConnectorTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanConnectorTransmissionCatalogTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanConnectorTransmissionCatalogTransformation.java
index 0141b527..a0280b74 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanConnectorTransmissionCatalogTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/CanConnectorTransmissionCatalogTransformation.java
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------+
+$Id: GenericTransceiverTransmissionCatalogTransformation.java 5274 2012-08-02 07:54:11Z mou $
| |
-| |
-| Copyright 2011 fortiss GmbH |
+| Copyright 2011 ForTISS GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
@@ -28,9 +28,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* {@link TransmissionCatalog} generator for {@link GenericTransceiver}.
*
* @author hoelzl
- * @author mou $
- * 5274 $
- * GREEN Hash: 99AE1800CB3BA900FDB2FD75FC254AD4
+ * @author $Author: mou $
+ * @version $Rev: 5274 $
+ * @ConQAT.Rating GREEN Hash: 99AE1800CB3BA900FDB2FD75FC254AD4
*/
public class CanConnectorTransmissionCatalogTransformation implements ITransformationProvider {
@@ -56,6 +56,6 @@ public class CanConnectorTransmissionCatalogTransformation implements ITransform
/** {@inheritDoc} */
@Override
public Object transform(Object source, ITransformationContext context) {
- return new CanTransmissionCatalog();
+ return new TransmissionCatalog();
}
}
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/PWMActuatorTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/PWMActuatorTransformation.java
index 93d95edc..3edc3262 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/PWMActuatorTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/PWMActuatorTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ActuatorPWM}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class PWMActuatorTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/RaspberryPITransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/RaspberryPITransformation.java
index c15041e4..dabce839 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/RaspberryPITransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/RaspberryPITransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation from {@link RaspberryPi} to {@link RaspberryPIExecutable}.
*
* @author eder
- * @author eder $
- * 18709 $
- * RED Hash:
+ * @author $Author: eder $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class RaspberryPITransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button1Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button1Transformation.java
index 4c55f03d..e45b89e2 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button1Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button1Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Button1}
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Button1Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button2Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button2Transformation.java
index 48665d21..8e3e58cf 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button2Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button2Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Button2}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Button2Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button3Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button3Transformation.java
index 7bd3bb50..c599e6c4 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button3Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button3Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Button3}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Button3Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button4Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button4Transformation.java
index febb5b9e..a5e9affb 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button4Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Button4Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Button4}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Button4Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonL1Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonL1Transformation.java
index 1bbcd2a3..55a3f76a 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonL1Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonL1Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonL1}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonL1Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonL2Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonL2Transformation.java
index bc09f391..2b358b73 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonL2Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonL2Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonL2}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonL2Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonR1Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonR1Transformation.java
index e83f5899..ccfbbef4 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonR1Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonR1Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonR1}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonR1Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonR2Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonR2Transformation.java
index 4d0a04f9..3e66560c 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonR2Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/ButtonR2Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonR2}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonR2Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Left_StickXTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Left_StickXTransformation.java
index e03c38b8..90c1713f 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Left_StickXTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Left_StickXTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Left_StickX_Position}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Left_StickXTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Left_StickYTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Left_StickYTransformation.java
index 6512b1b6..2d322eaf 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Left_StickYTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Left_StickYTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Left_StickY_Position}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Left_StickYTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Right_StickXTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Right_StickXTransformation.java
index e82f7478..984b3312 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Right_StickXTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Right_StickXTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Right_StickX_Position}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Right_StickXTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Right_StickYTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Right_StickYTransformation.java
index c2891a8c..ba6b02da 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Right_StickYTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/gamepad/Right_StickYTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -27,9 +27,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Right_StickY_Position}.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class Right_StickYTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonATransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonATransformation.java
index 8d479e90..44c73ea8 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonATransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonATransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonATransformation.java 22478 2017-12-08 09:55:32Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonA}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22478 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonATransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonBTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonBTransformation.java
index 50bfe340..88b6d45a 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonBTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonBTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonBTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonB}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonBTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonHomeTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonHomeTransformation.java
index 0e05088f..4b082c5a 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonHomeTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonHomeTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonHomeTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonHome}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonHomeTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonL1Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonL1Transformation.java
index fa33af40..7f18916b 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonL1Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonL1Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonL1Transformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonL1}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonL1Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonL3Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonL3Transformation.java
index 70aac793..d112e154 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonL3Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonL3Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonL3Transformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonL3}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonL3Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonR1Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonR1Transformation.java
index 84b96cd2..7d4a13ec 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonR1Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonR1Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonR1Transformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonR1}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonR1Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonR3Transformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonR3Transformation.java
index b047cd20..615f2f84 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonR3Transformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonR3Transformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonR3Transformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonR3}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonR3Transformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonSelectTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonSelectTransformation.java
index a818ff44..dcaa6a8b 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonSelectTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonSelectTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonSelectTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonSelect}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonSelectTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonStartTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonStartTransformation.java
index 932e2209..299d9fd7 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonStartTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonStartTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonStartTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonStart}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonStartTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonXTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonXTransformation.java
index 608c1f31..9a3c3430 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonXTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonXTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonXTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonX}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonXTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonYTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonYTransformation.java
index 36e2e9c8..efe2eabc 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonYTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/ButtonYTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: ButtonYTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link ButtonY}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class ButtonYTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadDownTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadDownTransformation.java
index 2020f063..fe13e92a 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadDownTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadDownTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: DPadDownTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link DPadDown}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class DPadDownTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadLeftTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadLeftTransformation.java
index c659da21..37f9a608 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadLeftTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadLeftTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: DPadLeftTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link DPadLeft}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class DPadLeftTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadRightTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadRightTransformation.java
index 5abe650c..dc66da3b 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadRightTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadRightTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: DPadRightTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link DPadRight}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class DPadRightTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadUpTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadUpTransformation.java
index 0a9a1b27..9d42e00a 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadUpTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/DPadUpTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: DPadUpTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link DPadUp}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class DPadUpTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/L2PositionTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/L2PositionTransformation.java
index 82235a42..e01c6d33 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/L2PositionTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/L2PositionTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: L2PositionTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link L2_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class L2PositionTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Left_StickXTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Left_StickXTransformation.java
index 22ce0123..4e938c47 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Left_StickXTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Left_StickXTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: Left_StickXTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Left_StickX_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class Left_StickXTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Left_StickYTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Left_StickYTransformation.java
index 1afbd567..f28dc5bc 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Left_StickYTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Left_StickYTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: Left_StickYTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Left_StickY_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class Left_StickYTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/R2PositionTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/R2PositionTransformation.java
index c7d348fa..47e23fbc 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/R2PositionTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/R2PositionTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: R2PositionTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link R2_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class R2PositionTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Right_StickXTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Right_StickXTransformation.java
index 52ad0d91..5a53880b 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Right_StickXTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Right_StickXTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: Right_StickXTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Right_StickX_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class Right_StickXTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Right_StickYTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Right_StickYTransformation.java
index 81f1cd3f..b2b03e94 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Right_StickYTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/Right_StickYTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: Right_StickYTransformation.java 22462 2017-12-07 13:24:17Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -26,9 +26,9 @@ import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
* Transformation for {@link Right_StickY_Position}.
*
* @author eder
- * @author reaboi $
- * 23332 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 22462 $
+ * @ConQAT.Rating RED Hash:
*/
public class Right_StickYTransformation implements ITransformationProvider {
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/SimpleRumbleFeatureTransformation.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/SimpleRumbleFeatureTransformation.java
index 556cb581..955ef307 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/SimpleRumbleFeatureTransformation.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/transform/rumblepad/SimpleRumbleFeatureTransformation.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: SimpleRumbleFeatureTransformation.java 22478 2017-12-08 09:55:32Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/util/RaspberryModelElementFactory.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/util/RaspberryModelElementFactory.java
index 710bbf88..0e7705ee 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/util/RaspberryModelElementFactory.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/util/RaspberryModelElementFactory.java
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------+
-| |
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| |
| Copyright 2017 fortiss GmbH |
| |
@@ -33,8 +33,17 @@ import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityXSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityYSensor;
import org.fortiss.af3.platform.raspberry.model.brick.AngularVelocityZSensor;
import org.fortiss.af3.platform.raspberry.model.brick.BrickFactory;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonBActuator;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonGActuator;
+import org.fortiss.af3.platform.raspberry.model.brick.LEDButtonRActuator;
import org.fortiss.af3.platform.raspberry.model.brick.LaserRangeSensor;
import org.fortiss.af3.platform.raspberry.model.brick.UltraSonicSensor;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDetectionStateRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceLeft;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraDistanceRight;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraFactory;
+import org.fortiss.af3.platform.raspberry.model.camera.CameraYawAngle;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button1;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button2;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button3;
@@ -48,6 +57,9 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Left_StickX_Position;
import org.fortiss.af3.platform.raspberry.model.gamepad.Left_StickY_Position;
import org.fortiss.af3.platform.raspberry.model.gamepad.Right_StickX_Position;
import org.fortiss.af3.platform.raspberry.model.gamepad.Right_StickY_Position;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlInput;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorControlOutput;
+import org.fortiss.af3.platform.raspberry.model.motorcontrol.MotorcontrolFactory;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonA;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonB;
import org.fortiss.af3.platform.raspberry.model.rumblepad.ButtonHome;
@@ -73,9 +85,9 @@ import org.fortiss.tooling.base.utils.LayoutModelElementFactory;
* Model Element for RaspberryPi and related models.
*
* @author eder
- * @author hoelzl $
- * 18709 $
- * RED Hash:
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
*/
public class RaspberryModelElementFactory {
@@ -293,6 +305,33 @@ public class RaspberryModelElementFactory {
return ad;
}
+ /** Creates an {@link LEDButtonRActuator} for controlling red color. */
+ public static LEDButtonRActuator createLEDButtonRActuator() {
+ LEDButtonRActuator led = BrickFactory.eINSTANCE.createLEDButtonRActuator();
+ led.setName("LED_Button_Red");
+ led.setUniqueBrickletID("");
+ createConnectorLayout(led);
+ return led;
+ }
+
+ /** Creates an {@link LEDButtonRActuator} for controlling green color. */
+ public static LEDButtonGActuator createLEDButtonGActuator() {
+ LEDButtonGActuator led = BrickFactory.eINSTANCE.createLEDButtonGActuator();
+ led.setName("LED_Button_Green");
+ led.setUniqueBrickletID("");
+ createConnectorLayout(led);
+ return led;
+ }
+
+ /** Creates an {@link LEDButtonRActuator} for controlling blue color. */
+ public static LEDButtonBActuator createLEDButtonBActuator() {
+ LEDButtonBActuator led = BrickFactory.eINSTANCE.createLEDButtonBActuator();
+ led.setName("LED_Button_Blue");
+ led.setUniqueBrickletID("");
+ createConnectorLayout(led);
+ return led;
+ }
+
/** Creates a {@link ButtonA}. */
public static ButtonA createRumbleButtonA() {
ButtonA button = RumblepadFactory.eINSTANCE.createButtonA();
@@ -496,4 +535,60 @@ public class RaspberryModelElementFactory {
createConnectorLayout(rumble);
return rumble;
}
+
+ /** Creates a {@link MotorControlInput}. */
+ public static MotorControlInput createMotorControlInput() {
+ MotorControlInput mci = MotorcontrolFactory.eINSTANCE.createMotorControlInput();
+ mci.setName("MotorControlInput");
+ createConnectorLayout(mci);
+ return mci;
+ }
+
+ /** Creates a {@link MotorControlInput}. */
+ public static MotorControlOutput createMotorControlOutput() {
+ MotorControlOutput mco = MotorcontrolFactory.eINSTANCE.createMotorControlOutput();
+ mco.setName("MotorControlOutput");
+ createConnectorLayout(mco);
+ return mco;
+ }
+
+ /** Creates a {@link CameraDistanceLeft}. */
+ public static CameraDistanceLeft createCameraDistanceLeft() {
+ CameraDistanceLeft cdl = CameraFactory.eINSTANCE.createCameraDistanceLeft();
+ cdl.setName("CameraDistanceLeft");
+ createConnectorLayout(cdl);
+ return cdl;
+ }
+
+ /** Creates a {@link CameraDistanceRight}. */
+ public static CameraDistanceRight createCameraDistanceRight() {
+ CameraDistanceRight cdr = CameraFactory.eINSTANCE.createCameraDistanceRight();
+ cdr.setName("CameraDistanceRight");
+ createConnectorLayout(cdr);
+ return cdr;
+ }
+
+ /** Creates a {@link CameraDetectionStateLeft}. */
+ public static CameraDetectionStateLeft createCameraDetectionStateLeft() {
+ CameraDetectionStateLeft cdsl = CameraFactory.eINSTANCE.createCameraDetectionStateLeft();
+ cdsl.setName("CameraDetectionStateLeft");
+ createConnectorLayout(cdsl);
+ return cdsl;
+ }
+
+ /** Creates a {@link CameraDetectionStateRight}. */
+ public static CameraDetectionStateRight createCameraDetectionStateRight() {
+ CameraDetectionStateRight cdsr = CameraFactory.eINSTANCE.createCameraDetectionStateRight();
+ cdsr.setName("CameraDetectionStateRight");
+ createConnectorLayout(cdsr);
+ return cdsr;
+ }
+
+ /** Creates a {@link CameraYawAngle}. */
+ public static CameraYawAngle createCameraYawAngle() {
+ CameraYawAngle cya = CameraFactory.eINSTANCE.createCameraYawAngle();
+ cya.setName("CameraYawAngle");
+ createConnectorLayout(cya);
+ return cya;
+ }
}
--
GitLab