Skip to content
Snippets Groups Projects
Commit b1edbfc4 authored by Hernan Ponce de Leon's avatar Hernan Ponce de Leon
Browse files

Extracted a super type for brick models


Issue-Ref: 3701
Signed-off-by: default avatarHernan Ponce de Leon <ponce@fortiss.org>
parent 43e3068e
No related branches found
No related tags found
No related merge requests found
......@@ -76,7 +76,10 @@
modelElementClass="org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeWeak">
</modelElementClass>
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.brick.UIDUnit">
modelElementClass="org.fortiss.af3.platform.raspberry.model.brick.UIDReceiver">
</modelElementClass>
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.brick.UIDTtransmitter">
</modelElementClass>
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.controlcenter.ControlCenterDownstreamInput">
......
......@@ -46,20 +46,22 @@
<eClassifiers xsi:type="ecore:EClass" name="UIDUnit" abstract="true" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="uniqueBrickletID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="UltraSonicSensor" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="LaserRangeSensor" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="AccelerationXSensor" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="AccelerationYSensor" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="AccelerationZSensor" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="AngularVelocityXSensor" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="AngularVelocityYSensor" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="AngularVelocityZSensor" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="ActuatorDigits" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter #//brick/UIDUnit">
<eClassifiers xsi:type="ecore:EClass" name="UltraSonicSensor" eSuperTypes="#//brick/UIDReceiver"/>
<eClassifiers xsi:type="ecore:EClass" name="LaserRangeSensor" eSuperTypes="#//brick/UIDReceiver"/>
<eClassifiers xsi:type="ecore:EClass" name="AccelerationXSensor" eSuperTypes="#//brick/UIDReceiver"/>
<eClassifiers xsi:type="ecore:EClass" name="AccelerationYSensor" eSuperTypes="#//brick/UIDReceiver"/>
<eClassifiers xsi:type="ecore:EClass" name="AccelerationZSensor" eSuperTypes="#//brick/UIDReceiver"/>
<eClassifiers xsi:type="ecore:EClass" name="AngularVelocityXSensor" eSuperTypes="#//brick/UIDReceiver"/>
<eClassifiers xsi:type="ecore:EClass" name="AngularVelocityYSensor" eSuperTypes="#//brick/UIDReceiver"/>
<eClassifiers xsi:type="ecore:EClass" name="AngularVelocityZSensor" eSuperTypes="#//brick/UIDReceiver"/>
<eClassifiers xsi:type="ecore:EClass" name="ActuatorDigits" eSuperTypes="#//brick/UIDTtransmitter">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="showHexValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LEDButtonRActuator" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="LEDButtonGActuator" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="LEDButtonBActuator" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter #//brick/UIDUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="LEDButtonRActuator" eSuperTypes="#//brick/UIDTtransmitter"/>
<eClassifiers xsi:type="ecore:EClass" name="LEDButtonGActuator" eSuperTypes="#//brick/UIDTtransmitter"/>
<eClassifiers xsi:type="ecore:EClass" name="LEDButtonBActuator" eSuperTypes="#//brick/UIDTtransmitter"/>
<eClassifiers xsi:type="ecore:EClass" name="UIDReceiver" abstract="true" eSuperTypes="#//brick/UIDUnit platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver"/>
<eClassifiers xsi:type="ecore:EClass" name="UIDTtransmitter" abstract="true" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter #//brick/UIDUnit"/>
</eSubpackages>
<eSubpackages name="rumblepad" nsURI="http://www.fortiss.org/af3/platform/raspberry/rumblepad"
nsPrefix="org-fortiss-af3-platform-raspberry-rumblepad">
......
......@@ -2,8 +2,7 @@
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.fortiss.af3.platform.raspberry/generated-src"
modelPluginID="org.fortiss.af3.platform.raspberry" modelName="Raspberry" importerID="org.eclipse.emf.importer.ecore"
containmentProxies="true" arrayAccessors="true" complianceLevel="7.0" copyrightFields="false"
usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.allocation/model/allocation.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.timing/model/timing.genmodel#//model">
containmentProxies="true" complianceLevel="7.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.allocation/model/allocation.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.timing/model/timing.genmodel#//model">
<foreignModel>raspberry.ecore</foreignModel>
<genPackages prefix="RaspberryPiModel" basePackage="org.fortiss.af3.platform.raspberry"
disposableProviderFactory="true" ecorePackage="raspberry.ecore#/">
......@@ -60,6 +59,8 @@
<genClasses ecoreClass="raspberry.ecore#//brick/LEDButtonRActuator"/>
<genClasses ecoreClass="raspberry.ecore#//brick/LEDButtonGActuator"/>
<genClasses ecoreClass="raspberry.ecore#//brick/LEDButtonBActuator"/>
<genClasses image="false" ecoreClass="raspberry.ecore#//brick/UIDReceiver"/>
<genClasses ecoreClass="raspberry.ecore#//brick/UIDTtransmitter"/>
</nestedGenPackages>
<nestedGenPackages prefix="Rumblepad" basePackage="org.fortiss.af3.platform.raspberry.model"
disposableProviderFactory="true" ecorePackage="raspberry.ecore#//rumblepad">
......
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