Commit 737a1617 authored by Manuel Schrick's avatar Manuel Schrick
Browse files

added workaround for bug in models, fixed bug in pom causing Travis not being able to build

parent 4376e8f5
......@@ -5,7 +5,7 @@
<g transform="translate(40 40)">
<rect
id="40"
id="42"
width="400"
height="440"
style="fill:white;stroke:black;stroke-width:2;fill-opacity:1.0;stroke-opacity:1.0"/>
......@@ -23,10 +23,10 @@
</g>
</svg><!-- Component: leftMotor -->
<g transform="translate(120 80)">
<g transform="translate(120 200)">
<rect
data-name="testManuelSchrick.bumperBot.actuators.leftMotor"
id="41"
id="44"
width="200"
height="80"
style="fill:white;stroke:black;stroke-width:2;fill-opacity:1.0;stroke-opacity:1.0"
......@@ -44,10 +44,10 @@
leftMotor
</text>
</g><!-- Component: rightMotor -->
<g transform="translate(120 200)">
<g transform="translate(120 80)">
<rect
data-name="testManuelSchrick.bumperBot.actuators.rightMotor"
id="42"
id="43"
width="200"
height="80"
style="fill:white;stroke:black;stroke-width:2;fill-opacity:1.0;stroke-opacity:1.0"
......@@ -72,9 +72,9 @@
</defs><line
stroke-linecap="square"
x1="40"
y1="240"
y1="120"
x2="110"
y2="240"
y2="120"
style="stroke:rgb(0, 0,0);
stroke-width:2;
marker-end: url(#0,0,0)
......@@ -83,9 +83,9 @@
<line
stroke-linecap="square"
x1="40"
y1="120"
y1="240"
x2="110"
y2="120"
y2="240"
style="stroke:rgb(0, 0,0);
stroke-width:2;
marker-end: url(#0,0,0)
......@@ -95,23 +95,23 @@
<!-- Small box indicating a port -->
<rect id="port" x="0" y="0" width="20" height="20"
style="fill:white;stroke:rgb(0,0,0);stroke-width:1;fill-opacity:1.0;stroke-opacity:1.0"/>
</defs><use x="30" y="230" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="26" y="240" transform="rotate(0,26,240)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
</defs><use x="30" y="110" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="26" y="120" transform="rotate(0,26,120)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
rightMotorCmd
</text>
<use x="30" y="110" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="26" y="120" transform="rotate(0,26,120)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
<use x="30" y="230" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="26" y="240" transform="rotate(0,26,240)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
leftMotorCmd
</text>
<use x="110" y="110" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="132" y="120" transform="rotate(0,132,120)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
<use x="110" y="230" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="132" y="240" transform="rotate(0,132,240)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
cmd
</text>
<use x="110" y="230" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="132" y="240" transform="rotate(0,132,240)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
<use x="110" y="110" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="132" y="120" transform="rotate(0,132,120)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
cmd
</text>
......
......@@ -44,8 +44,8 @@
data="testManuelSchrick.bumperBot.controller.svg"
type="image/svg+xml"
id="svg"
width="1110"
height="1320">
width="1020"
height="960">
</object>
</body>
......
......@@ -6,8 +6,8 @@
<rect
id="22"
width="950"
height="1160"
width="860"
height="800"
style="fill:white;stroke:black;stroke-width:2;fill-opacity:1.0;stroke-opacity:1.0"/>
<text
......@@ -26,9 +26,9 @@
<g transform="translate(490 320)">
<rect
data-name="testManuelSchrick.bumperBot.controller.bumpControl"
id="24"
id="25"
width="200"
height="560"
height="320"
style="fill:white;stroke:black;stroke-width:2;fill-opacity:1.0;stroke-opacity:1.0"
onmouseout="this.style.stroke = '#000000'; this.style['stroke-width'] = 2; this.style.cursor='default';"
/>
......@@ -44,10 +44,10 @@
bumpControl
</text>
</g><!-- Component: timer -->
<g transform="translate(210 800)">
<g transform="translate(210 200)">
<rect
data-name="testManuelSchrick.bumperBot.controller.timer"
id="23"
id="24"
width="200"
height="200"
style="fill:white;stroke:black;stroke-width:2;fill-opacity:1.0;stroke-opacity:1.0"
......@@ -72,49 +72,9 @@
</defs><line
stroke-linecap="square"
x1="690"
y1="840"
x2="860"
y2="840"
style="stroke:rgb(0, 0,0);
stroke-width:2;
"
/>
<line
stroke-linecap="square"
x1="860"
y1="840"
x2="860"
y2="240"
style="stroke:rgb(0, 0,0);
stroke-width:6;
"
/>
<line
stroke-linecap="square"
x1="860"
y1="240"
x2="410"
y2="240"
style="stroke:rgb(0, 0,0);
stroke-width:6;
"
/>
<line
stroke-linecap="square"
x1="410"
y1="240"
x2="410"
y2="840"
style="stroke:rgb(0, 0,0);
stroke-width:6;
"
/>
<line
stroke-linecap="square"
x1="410"
y1="840"
x2="680"
y2="840"
y1="480"
x2="890"
y2="480"
style="stroke:rgb(0, 0,0);
stroke-width:2;
marker-end: url(#0,0,0)
......@@ -123,49 +83,9 @@
<line
stroke-linecap="square"
x1="690"
y1="840"
x2="860"
y2="840"
style="stroke:rgb(0, 0,0);
stroke-width:2;
"
/>
<line
stroke-linecap="square"
x1="860"
y1="840"
x2="860"
y2="240"
style="stroke:rgb(0, 0,0);
stroke-width:6;
"
/>
<line
stroke-linecap="square"
x1="860"
y1="240"
x2="410"
y2="240"
style="stroke:rgb(0, 0,0);
stroke-width:6;
"
/>
<line
stroke-linecap="square"
x1="410"
y1="240"
x2="410"
y2="840"
style="stroke:rgb(0, 0,0);
stroke-width:6;
"
/>
<line
stroke-linecap="square"
x1="410"
y1="840"
x2="680"
y2="840"
y1="600"
x2="890"
y2="600"
style="stroke:rgb(0, 0,0);
stroke-width:2;
marker-end: url(#0,0,0)
......@@ -174,9 +94,9 @@
<line
stroke-linecap="square"
x1="40"
y1="120"
y1="720"
x2="30"
y2="120"
y2="720"
style="stroke:rgb(0, 0,0);
stroke-width:2;
marker-end: url(#0,0,0)
......@@ -185,9 +105,9 @@
<line
stroke-linecap="square"
x1="410"
y1="840"
y1="360"
x2="480"
y2="840"
y2="360"
style="stroke:rgb(0, 0,0);
stroke-width:2;
marker-end: url(#0,0,0)
......@@ -196,9 +116,9 @@
<line
stroke-linecap="square"
x1="690"
y1="600"
y1="360"
x2="770"
y2="600"
y2="360"
style="stroke:rgb(0, 0,0);
stroke-width:2;
"
......@@ -206,9 +126,9 @@
<line
stroke-linecap="square"
x1="770"
y1="600"
y1="360"
x2="770"
y2="1080"
y2="120"
style="stroke:rgb(0, 0,0);
stroke-width:2;
"
......@@ -216,9 +136,9 @@
<line
stroke-linecap="square"
x1="770"
y1="1080"
y1="120"
x2="130"
y2="1080"
y2="120"
style="stroke:rgb(0, 0,0);
stroke-width:2;
"
......@@ -226,9 +146,9 @@
<line
stroke-linecap="square"
x1="130"
y1="1080"
y1="120"
x2="130"
y2="960"
y2="240"
style="stroke:rgb(0, 0,0);
stroke-width:2;
"
......@@ -236,9 +156,9 @@
<line
stroke-linecap="square"
x1="130"
y1="960"
y1="240"
x2="200"
y2="960"
y2="240"
style="stroke:rgb(0, 0,0);
stroke-width:2;
marker-end: url(#0,0,0)
......@@ -248,38 +168,47 @@
<!-- Small box indicating a port -->
<rect id="port" x="0" y="0" width="20" height="20"
style="fill:white;stroke:rgb(0,0,0);stroke-width:1;fill-opacity:1.0;stroke-opacity:1.0"/>
</defs><use x="30" y="110" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="26" y="120" transform="rotate(0,26,120)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
</defs><use x="30" y="710" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="26" y="720" transform="rotate(0,26,720)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
bumpPressed
</text>
<use x="480" y="830" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="502" y="840" transform="rotate(0,502,840)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
<use x="890" y="470" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="914" y="480" transform="rotate(0,914,480)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
rightMotorCmd
</text>
<use x="890" y="590" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="914" y="600" transform="rotate(0,914,600)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
leftMotorCmd
</text>
<use x="480" y="350" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="502" y="360" transform="rotate(0,502,360)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
timerSig
</text>
<use x="680" y="590" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="678" y="600" transform="rotate(0,678,600)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
<use x="680" y="350" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="678" y="360" transform="rotate(0,678,360)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
timerCmd
</text>
<use x="680" y="830" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="678" y="840" transform="rotate(0,678,840)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
leftMotorCmd
<use x="680" y="590" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="678" y="600" transform="rotate(0,678,600)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
leftMotorCmdX
</text>
<use x="680" y="830" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="678" y="840" transform="rotate(0,678,840)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
rightMotorCmd
</text>
<use x="680" y="470" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="678" y="480" transform="rotate(0,678,480)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
<tspan>right</tspan><tspan x="678" dy="12">Motor</tspan><tspan x="678" dy="12">Cmd</tspan><tspan x="678" dy="12">X</tspan></text>
<use x="400" y="830" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="398" y="840" transform="rotate(0,398,840)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
<use x="400" y="350" xlink:href="#port" />
<text text-anchor="end" alignment-baseline="middle" x="398" y="360" transform="rotate(0,398,360)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
signal
</text>
<use x="200" y="950" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="222" y="960" transform="rotate(0,222,960)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
<use x="200" y="230" xlink:href="#port" />
<text text-anchor="start" alignment-baseline="middle" x="222" y="240" transform="rotate(0,222,240)" style="font-weight: regular" font-family="Verdana" font-size="11" fill="black">
cmd
</text>
......
......@@ -45,7 +45,7 @@
type="image/svg+xml"
id="svg"
width="560"
height="480">
height="360">
</object>
</body>
......
......@@ -7,7 +7,7 @@
<rect
id="15"
width="400"
height="320"
height="200"
style="fill:white;stroke:black;stroke-width:2;fill-opacity:1.0;stroke-opacity:1.0"/>
<text
......
......@@ -256,7 +256,15 @@
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
</configuration>
</plugin>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
......
......@@ -32,7 +32,8 @@ public class DemonstratorTest {
// helpSVGBuild("testManuelSchrick.oeffentlicher_Demonstrator_FAS_v04_modified.dEMO_FAS.dEMO_FAS.subsystem.dEMO_FAS.dEMO_FAS_Funktion");
// helpSVGBuild("testManuelSchrick.testA");
// helpSVGBuild("testManuelSchrick.testA.testD");
helpSVGBuild("testManuelSchrick.bumperBot");
// helpSVGBuild("testManuelSchrick.bumperBot");
helpSVGBuild("testManuelSchrick.bumperBotEmergency");
// SVGMain.main(new String[]{"--input", "testManuelSchrick.testA", "--modelPath", "src/test/resources/", "--recursiveDrawing", "true"});
// SVGMain.main(new String[]{"--input", "testManuelSchrick.testA", "--modelPath", "C:/svggen/arc/", "--recursiveDrawing", "true"});
......
......@@ -31,8 +31,8 @@ component BumperBot {
in Boolean bumpPressed,
in TimerSignal timerSig,
out TimerCmd timerCmd,
out MotorCmd leftMotorCmd,
out MotorCmd rightMotorCmd;
out MotorCmd leftMotorCmdX,
out MotorCmd rightMotorCmdX;
}
instance BumpControl bumpControl;
......@@ -49,8 +49,8 @@ component BumperBot {
connect timer.signal -> bumpControl.timerSig;
connect bumpControl.timerCmd -> timer.cmd;
connect bumpControl.rightMotorCmd -> rightMotorCmd;
connect bumpControl.leftMotorCmd -> leftMotorCmd;
connect bumpControl.rightMotorCmdX -> rightMotorCmd;
connect bumpControl.leftMotorCmdX -> leftMotorCmd;
}
instance Controller controller;
......
......@@ -38,7 +38,7 @@ component BumperBotEmergency {
component BumpControl {
port
in Boolean bumpPressed,
in Boolean bumpPressedX,
in TimerSignal timerSig,
out TimerCmd timerCmd,
out MotorCmd leftMotorCmd,
......@@ -62,8 +62,8 @@ component BumperBotEmergency {
component MotorArbiter {
port
out MotorCmd rightMotorCmd,
out MotorCmd leftMotorCmd,
out MotorCmd rightMotorCmdX,
out MotorCmd leftMotorCmdX,
in MotorCmd fstAltRightMotorCmd,
in MotorCmd fstAltLeftMotorCmd,
in MotorCmd sndAltRightMotorCmd,
......@@ -73,7 +73,7 @@ component BumperBotEmergency {
instance MotorArbiter motorArbiter;
// connections of the bump control
connect bumpPressed -> bumpControl.bumpPressed;
connect bumpPressed -> bumpControl.bumpPressedX;
connect timer.signal -> bumpControl.timerSig;
connect bumpControl.timerCmd -> timer.cmd;
......@@ -87,8 +87,8 @@ component BumperBotEmergency {
connect emergencyPressed -> motorArbiter.selection;
connect motorArbiter.rightMotorCmd -> rightMotorCmd;
connect motorArbiter.leftMotorCmd -> leftMotorCmd;
connect motorArbiter.rightMotorCmdX -> rightMotorCmd;
connect motorArbiter.leftMotorCmdX -> leftMotorCmd;
}
instance Controller controller;
......
Supports Markdown
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