Skip to content
Snippets Groups Projects
Commit 5e6d8fe4 authored by Florian Hölzl's avatar Florian Hölzl
Browse files

Added model elements for control center upstream and downstream.

parent 6733b12e
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......@@ -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>
RaspberryModelElementFactory.java 9b7ade7589599a68300771aa0f7304f0ea358ff0 YELLOW
RaspberryModelElementFactory.java d7e8e51854ec9c643e1cbee07e5326d119519d44 YELLOW
......@@ -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;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment