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

Cherry-picked SVN branch multideploy.

parent 7d258387
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 203 additions and 95 deletions
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/AF3PlatformRaspberryUIActivator.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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 {
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/editpart/EditPartFactory.java
+ 16
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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;
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/BrickletHandler.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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} */
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanBusHandler.java
+ 4
− 4
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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> {
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/CanConnectorHandler.java
+ 4
− 4
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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} */
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/ConsoleOutputHandler.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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} */
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/GamepadReceiverHandler.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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> {
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/PWMActuatorHandler.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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} */
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RaspberryPiHandler.java
+ 4
− 4
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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> {
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadReceiverHandler.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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> {
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/handler/RumblepadSimpleRumbleFeatureHandler.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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> {
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorDigitsPropertySection.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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. */
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/ActuatorPWMPropertySection.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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. */
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/BoundedIntPositiveZeroValidator.java
+ 4
− 4
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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. */
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/RaspberryPiExecutionUnitPropertySection.java
+ 22
− 6
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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);
}
}
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/properties/UIDUnitPropertySection.java
+ 5
− 5
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
$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. */
......
org.fortiss.af3.platform.raspberry.ui/src/org/fortiss/af3/platform/raspberry/ui/prototype/ProtoypeProvider.java
+ 70
− 4
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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);
}
}
org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java
+ 4
− 4
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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> {
......
org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/CanToRaspberryCompositor.java
+ 4
− 4
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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> {
......
org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java
+ 21
− 6
View file @ d7ce4c4f
/*--------------------------------------------------------------------------+
| |
$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;
......
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