From 5e6d8fe456b0e51cd33f98cebfcc2de5fbbb72d6 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Tue, 29 May 2018 11:30:53 +0200
Subject: [PATCH] Added model elements for control center upstream and
downstream.
Signed-off-by: Florian Hoelzl <hoelzl@fortiss.org>
---
.../model/raspberry.ecore | 9 ++++++++
.../model/raspberry.genmodel | 7 ++++++
.../af3/platform/raspberry/util/.ratings | 2 +-
.../util/RaspberryModelElementFactory.java | 23 ++++++++++++++++++-
4 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/org.fortiss.af3.platform.raspberry/model/raspberry.ecore b/org.fortiss.af3.platform.raspberry/model/raspberry.ecore
index 2a877409..e922c606 100644
--- a/org.fortiss.af3.platform.raspberry/model/raspberry.ecore
+++ b/org.fortiss.af3.platform.raspberry/model/raspberry.ecore
@@ -9,6 +9,10 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="cycleTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="cameraServerAddress" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="cameraServerPort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="controlcenterServerAddress"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="controlcenterServerPort"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CanBus" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//TransmissionUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="CanConnector" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transceiver"/>
@@ -99,4 +103,9 @@
<eClassifiers xsi:type="ecore:EClass" name="CameraDetectionStateLeft" eSuperTypes="#//RaspberryPiReceiverBase"/>
<eClassifiers xsi:type="ecore:EClass" name="CameraDetectionStateRight" eSuperTypes="#//RaspberryPiReceiverBase"/>
</eSubpackages>
+ <eSubpackages name="controlcenter" nsURI="http://www.fortiss.org/af3/platform/raspberry/controlcenter"
+ nsPrefix="org-fortiss-af3-platform-raspberry-camera-controlcenter">
+ <eClassifiers xsi:type="ecore:EClass" name="ControlCenterUpstreamOutput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ControlCenterDownstreamInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
+ </eSubpackages>
</ecore:EPackage>
diff --git a/org.fortiss.af3.platform.raspberry/model/raspberry.genmodel b/org.fortiss.af3.platform.raspberry/model/raspberry.genmodel
index 5976ed64..5e98fec3 100644
--- a/org.fortiss.af3.platform.raspberry/model/raspberry.genmodel
+++ b/org.fortiss.af3.platform.raspberry/model/raspberry.genmodel
@@ -14,6 +14,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute raspberry.ecore#//RaspberryPi/cycleTime"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute raspberry.ecore#//RaspberryPi/cameraServerAddress"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute raspberry.ecore#//RaspberryPi/cameraServerPort"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute raspberry.ecore#//RaspberryPi/controlcenterServerAddress"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute raspberry.ecore#//RaspberryPi/controlcenterServerPort"/>
</genClasses>
<genClasses ecoreClass="raspberry.ecore#//CanBus"/>
<genClasses ecoreClass="raspberry.ecore#//CanConnector"/>
@@ -100,5 +102,10 @@
<genClasses ecoreClass="raspberry.ecore#//camera/CameraDetectionStateLeft"/>
<genClasses ecoreClass="raspberry.ecore#//camera/CameraDetectionStateRight"/>
</nestedGenPackages>
+ <nestedGenPackages prefix="Controlcenter" basePackage="org.fortiss.af3.platform.raspberry.model"
+ disposableProviderFactory="true" ecorePackage="raspberry.ecore#//controlcenter">
+ <genClasses ecoreClass="raspberry.ecore#//controlcenter/ControlCenterUpstreamOutput"/>
+ <genClasses ecoreClass="raspberry.ecore#//controlcenter/ControlCenterDownstreamInput"/>
+ </nestedGenPackages>
</genPackages>
</genmodel:GenModel>
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/util/.ratings b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/util/.ratings
index 2680873f..eb618c2b 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/util/.ratings
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/util/.ratings
@@ -1 +1 @@
-RaspberryModelElementFactory.java 9b7ade7589599a68300771aa0f7304f0ea358ff0 YELLOW
+RaspberryModelElementFactory.java d7e8e51854ec9c643e1cbee07e5326d119519d44 YELLOW
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 9b7ade75..d7e8e518 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
@@ -42,6 +42,9 @@ 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.controlcenter.ControlCenterDownstreamInput;
+import org.fortiss.af3.platform.raspberry.model.controlcenter.ControlCenterUpstreamOutput;
+import org.fortiss.af3.platform.raspberry.model.controlcenter.ControlcenterFactory;
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;
@@ -534,7 +537,7 @@ public class RaspberryModelElementFactory {
return mci;
}
- /** Creates a {@link MotorControlInput}. */
+ /** Creates a {@link MotorControlOutput}. */
public static MotorControlOutput createMotorControlOutput() {
MotorControlOutput mco = MotorcontrolFactory.eINSTANCE.createMotorControlOutput();
mco.setName("MotorControlOutput");
@@ -581,4 +584,22 @@ public class RaspberryModelElementFactory {
createConnectorLayout(cya);
return cya;
}
+
+ /** Creates a {@link ControlCenterDownstreamInput}. */
+ public static ControlCenterDownstreamInput createControlCenterDownstreamInput() {
+ ControlCenterDownstreamInput cci =
+ ControlcenterFactory.eINSTANCE.createControlCenterDownstreamInput();
+ cci.setName("ControlCenterInput");
+ createConnectorLayout(cci);
+ return cci;
+ }
+
+ /** Creates a {@link ControlCenterUpstreamOutput}. */
+ public static ControlCenterUpstreamOutput createControlCenterUpstreamOutput() {
+ ControlCenterUpstreamOutput cco =
+ ControlcenterFactory.eINSTANCE.createControlCenterUpstreamOutput();
+ cco.setName("ControlCenterOutput");
+ createConnectorLayout(cco);
+ return cco;
+ }
}
--
GitLab