Commit 4895dabe authored by Johannes Eder's avatar Johannes Eder

YELLOW

Issue-Ref: 3867
Issue-Url: https://af3-developer.fortiss.org/issues/3867Signed-off-by: Johannes Eder's avatarJohannes Eder <eder@fortiss.org>
parent 6abfad54
......@@ -69,9 +69,6 @@
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.rumblepad.RumblepadReceiverBase">
</modelElementClass>
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.rumblepad.SimpleRumbleFeature">
</modelElementClass>
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeStrong">
</modelElementClass>
......@@ -356,9 +353,6 @@
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.rumblepad.Right_StickY_Position">
</modelElementClass>
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.rumblepad.SimpleRumbleFeature">
</modelElementClass>
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.rumblepad.RumbleMagnitudeStrong">
</modelElementClass>
......
ModelsConferenceBoardEditPartFactory.java bb702737e6bbfc046a0cf1c08b63cd5ef56a1762 YELLOW
RaspberryPiEditPartFactory.java 7b69c0a1670e3bf987ff2a93ec4f259e02c6fee3 YELLOW
RaspberryPiEditPartFactory.java 2a32df869a8f793dd49e42bc74007b7890f31ce6 YELLOW
......@@ -44,7 +44,6 @@ 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;
import org.fortiss.af3.platform.raspberry.model.rumblepad.SimpleRumbleFeature;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VInput;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VOuput;
import org.fortiss.af3.platform.ui.DefaultStyle;
......@@ -76,13 +75,12 @@ public class RaspberryPiEditPartFactory implements IEditPartFactory {
return new TransmissionUnitDefaultEditPart((CanBus)model);
} else if(model instanceof CanConnector || model instanceof ActuatorPWM ||
model instanceof ConsoleOutput || model instanceof GamepadReceiverBase ||
model instanceof RumblepadReceiverBase || model instanceof SimpleRumbleFeature ||
model instanceof RumbleMagnitudeWeak || model instanceof RumbleMagnitudeStrong ||
model instanceof UIDUnit || model instanceof MotorControlInput ||
model instanceof MotorControlOutput || model instanceof CameraConnected ||
model instanceof CameraLastUpdate || model instanceof CameraDistanceLeft ||
model instanceof CameraDistanceRight || model instanceof CameraYawAngle ||
model instanceof CameraDetectionStateLeft ||
model instanceof RumblepadReceiverBase || model instanceof RumbleMagnitudeWeak ||
model instanceof RumbleMagnitudeStrong || model instanceof UIDUnit ||
model instanceof MotorControlInput || model instanceof MotorControlOutput ||
model instanceof CameraConnected || model instanceof CameraLastUpdate ||
model instanceof CameraDistanceLeft || model instanceof CameraDistanceRight ||
model instanceof CameraYawAngle || model instanceof CameraDetectionStateLeft ||
model instanceof CameraDetectionStateRight ||
model instanceof CameraRoverRecognized || model instanceof CameraRoverID ||
model instanceof CameraRoverDistance || model instanceof CameraCurveDetected ||
......
/*-------------------------------------------------------------------------+
| Copyright 2018 fortiss GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.raspberry.ui.handler;
import org.fortiss.af3.platform.raspberry.model.rumblepad.SimpleRumbleFeature;
/** {@link IconModelElementHandlerBase} for {@link SimpleRumbleFeature}s. */
public class RumblepadSimpleRumbleFeatureHandler
extends IconModelElementHandlerBase<SimpleRumbleFeature> {
/** Constructor. */
public RumblepadSimpleRumbleFeatureHandler() {
super("icons/gamepad.png");
}
}
MCBElementsHandler.java 4db9f4c0f41111b1faf7f1573a2b7510435e6d3a YELLOW
MCBProtoypeProvider.java b7a36acb49af9b2f256d538256e2128d7217f31f YELLOW
ProtoypeProvider.java c44007a1810e2b5c34d5e539f0c9b0780704e733 YELLOW
ProtoypeProvider.java 0e3f99fdfc06b4573c0a96fcddc38623770a2f72 YELLOW
......@@ -77,7 +77,6 @@ import static org.fortiss.af3.platform.raspberry.util.RaspberryModelElementFacto
import static org.fortiss.af3.platform.raspberry.util.RaspberryModelElementFactory.createRumbleR2Position;
import static org.fortiss.af3.platform.raspberry.util.RaspberryModelElementFactory.createRumbleRightStickX;
import static org.fortiss.af3.platform.raspberry.util.RaspberryModelElementFactory.createRumbleRightStickY;
import static org.fortiss.af3.platform.raspberry.util.RaspberryModelElementFactory.createRumbleSimpleRumbleFeaturePosition;
import static org.fortiss.af3.platform.raspberry.util.RaspberryModelElementFactory.createUltraSonicSensor;
import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_HEIGHT;
import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_WIDTH;
......@@ -148,7 +147,6 @@ 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.SimpleRumbleFeature;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VFollowerInput;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VFollowerOutput;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VFusePlatoonInput;
......@@ -479,11 +477,6 @@ public class ProtoypeProvider extends PrototypeProviderBase {
setConnectorPosition(rpbh, 0, 0);
registerPrototype(rpbh.getName(), rpbh, RUMBLEPAD);
SimpleRumbleFeature srf = createRumbleSimpleRumbleFeaturePosition();
setNodePosition(srf, 0, 0);
setConnectorPosition(srf, 0, 0);
registerPrototype(srf.getName(), srf, RUMBLEPAD);
RumbleMagnitudeStrong rms = createRumbleMagnitudeStrong();
setNodePosition(rms, 0, 0);
setConnectorPosition(rms, 0, 0);
......
raspberry.ecore f8450bfd10b90c035410e0ac0317a3c4c3424076 YELLOW
raspberry.ecore 57652dd3e1897a56d62b5e095712540a23a94b02 YELLOW
......@@ -88,7 +88,6 @@
<eClassifiers xsi:type="ecore:EClass" name="ButtonStart" eSuperTypes="#//rumblepad/RumblepadReceiverBase"/>
<eClassifiers xsi:type="ecore:EClass" name="ButtonSelect" eSuperTypes="#//rumblepad/RumblepadReceiverBase"/>
<eClassifiers xsi:type="ecore:EClass" name="ButtonHome" eSuperTypes="#//rumblepad/RumblepadReceiverBase"/>
<eClassifiers xsi:type="ecore:EClass" name="SimpleRumbleFeature" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter"/>
<eClassifiers xsi:type="ecore:EClass" name="RumbleMagnitudeStrong" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter"/>
<eClassifiers xsi:type="ecore:EClass" name="RumbleMagnitudeWeak" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter"/>
</eSubpackages>
......
......@@ -86,7 +86,6 @@
<genClasses ecoreClass="raspberry.ecore#//rumblepad/ButtonStart"/>
<genClasses ecoreClass="raspberry.ecore#//rumblepad/ButtonSelect"/>
<genClasses ecoreClass="raspberry.ecore#//rumblepad/ButtonHome"/>
<genClasses ecoreClass="raspberry.ecore#//rumblepad/SimpleRumbleFeature"/>
<genClasses ecoreClass="raspberry.ecore#//rumblepad/RumbleMagnitudeStrong"/>
<genClasses ecoreClass="raspberry.ecore#//rumblepad/RumbleMagnitudeWeak"/>
</nestedGenPackages>
......
CanBusCompositor.java fe2eabdab375daec6ccb47cb3fb8452112717854 YELLOW
CanToRaspberryCompositor.java 927a741f55da203b96939f8620c5c9ba5cd3f046 YELLOW
RaspberryPiCompositor.java 8a4ba0c67c56b781719e3ced71d1418132e45370 YELLOW
RaspberryPiCompositor.java 52c4a6dbc673bbb548aff89b870b60ad4b51fd6e YELLOW
RaspberryToCanCompositor.java 7180ea9d371143bdc70ca75170a58d9162289b66 YELLOW
......@@ -56,7 +56,6 @@ 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;
import org.fortiss.af3.platform.raspberry.model.rumblepad.SimpleRumbleFeature;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VInput;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VOuput;
import org.fortiss.tooling.kernel.extension.data.IElementCompositionContext;
......@@ -88,10 +87,10 @@ public class RaspberryPiCompositor
AccelerationYSensor.class, AccelerationZSensor.class, AngularVelocityXSensor.class,
AngularVelocityYSensor.class, AngularVelocityZSensor.class, ActuatorDigits.class,
LEDButtonRActuator.class, LEDButtonGActuator.class, LEDButtonBActuator.class,
RumblepadReceiverBase.class, SimpleRumbleFeature.class, RumbleMagnitudeStrong.class,
RumbleMagnitudeWeak.class, MotorControlInput.class, MotorControlOutput.class,
CameraConnected.class, CameraLastUpdate.class, CameraDistanceLeft.class,
CameraDistanceRight.class, CameraYawAngle.class, CameraDetectionStateLeft.class,
RumblepadReceiverBase.class, RumbleMagnitudeStrong.class, RumbleMagnitudeWeak.class,
MotorControlInput.class, MotorControlOutput.class, CameraConnected.class,
CameraLastUpdate.class, CameraDistanceLeft.class, CameraDistanceRight.class,
CameraYawAngle.class, CameraDetectionStateLeft.class,
CameraDetectionStateRight.class, CameraRoverRecognized.class, CameraRoverID.class,
CameraRoverDistance.class, CameraCurveDetected.class, CameraCurveRadius.class,
ControlCenterDownstreamInput.class, ControlCenterUpstreamOutput.class,
......
/*-------------------------------------------------------------------------+
| Copyright 2018 fortiss GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.raspberry.generator.extension.rumblepad;
import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.funcCall;
import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.intConst;
import org.fortiss.af3.component.model.OutputPort;
import org.fortiss.af3.expression.model.terms.FunctionCall;
import org.fortiss.af3.expression.model.terms.IExpressionTerm;
import org.fortiss.af3.platform.language.executable.IWritableExecutable;
import org.fortiss.af3.platform.raspberry.model.rumblepad.SimpleRumbleFeature;
/** Executable for {@link SimpleRumbleFeature}. */
// TODO: this is outdated code
public class SimpleRumbleFeatureGeneratorExtension extends
RumblepadGeneratorExtensionBase<SimpleRumbleFeature> implements IWritableExecutable {
/** Constructor. */
public SimpleRumbleFeatureGeneratorExtension(SimpleRumbleFeature modelElement) {
super(modelElement);
}
/** {@inheritDoc} */
@Override
public IExpressionTerm getValueWriteAccessor(OutputPort logicalSignal, IExpressionTerm value) {
FunctionCall fc = funcCall("rumblepad_set_rumble", value, value);
fc.getArguments().add(intConst(500));
fc.getArguments().add(intConst(0));
return fc;
}
}
/*-------------------------------------------------------------------------+
| Copyright 2018 fortiss GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.raspberry.generator.transform.rumblepad;
import org.fortiss.af3.platform.raspberry.generator.extension.rumblepad.SimpleRumbleFeatureGeneratorExtension;
import org.fortiss.af3.platform.raspberry.generator.framework.RasPiGeneratorTransformationBase;
import org.fortiss.af3.platform.raspberry.model.rumblepad.SimpleRumbleFeature;
/** Transformation for {@link SimpleRumbleFeature}. */
public class SimpleRumbleFeatureTransformation extends RasPiGeneratorTransformationBase {
/** Constructor. */
public SimpleRumbleFeatureTransformation() {
super(SimpleRumbleFeature.class, SimpleRumbleFeatureGeneratorExtension.class);
}
}
RaspberryModelElementFactory.java edefaf7e0fa5122e787d73a2006a67ca60d27d5e YELLOW
RaspberryModelElementFactory.java a5a1b9a5bcdf4aef9484aff6f81a116d7d379abe YELLOW
......@@ -86,7 +86,6 @@ 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.RumblepadFactory;
import org.fortiss.af3.platform.raspberry.model.rumblepad.SimpleRumbleFeature;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VFollowerInput;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VFollowerOutput;
import org.fortiss.af3.platform.raspberry.model.v2v.V2VFusePlatoonInput;
......@@ -540,14 +539,6 @@ public class RaspberryModelElementFactory {
return button;
}
/** Creates a {@link SimpleRumbleFeature}. */
public static SimpleRumbleFeature createRumbleSimpleRumbleFeaturePosition() {
SimpleRumbleFeature rumble = RumblepadFactory.eINSTANCE.createSimpleRumbleFeature();
rumble.setName("SimpleRumbleFeature");
createConnectorLayout(rumble);
return rumble;
}
/** Creates a {@link RumbleMagnitudeStrong}. */
public static RumbleMagnitudeStrong createRumbleMagnitudeStrong() {
RumbleMagnitudeStrong rumble = RumblepadFactory.eINSTANCE.createRumbleMagnitudeStrong();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment