Skip to content

Commit 59954bd

Browse files
tbeutbeu
committed
Remove superfluous dummy annotations
1 parent bcbf8c1 commit 59954bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+91
-276
lines changed

‎Blocks/Communication.mo

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ package Communication
4444
annotation (preferredView="info",
4545
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
4646
-100},{100,100}}), graphics={Text(extent={{-150,136},{150,96}},
47-
textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=true,
48-
extent={{-100,-100},{100,100}}), graphics),
49-
Documentation(info="<html>
47+
textString="%name")}), Documentation(info="<html>
5048
<p>Supports reading from a named shared memory partition. The name of the shared memory partition is
5149
provided by the parameter <b>memoryID</b>. If the shared memory partition does not yet exist during initialization, it is created.</p>
5250
</html>"));
@@ -96,9 +94,7 @@ provided by the parameter <b>memoryID</b>. If the shared memory partition does n
9694
annotation (preferredView="info",
9795
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
9896
-100},{100,100}}), graphics={Text(extent={{-150,136},{150,96}},
99-
textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=true,
100-
extent={{-100,-100},{100,100}}), graphics),
101-
Documentation(info="<html>
97+
textString="%name")}), Documentation(info="<html>
10298
<p>Supports writing to a named shared memory partition. The name of the shared memory partition is
10399
provided by the parameter <b>memoryID</b>. If the shared memory partition does not yet exist during initialization, it is created.</p>
104100
</html>"));
@@ -149,9 +145,7 @@ provided by the parameter <b>memoryID</b>. If the shared memory partition does n
149145
annotation (preferredView="info",
150146
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
151147
-100},{100,100}}), graphics={Text(extent={{-150,136},{150,96}},
152-
textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=true,
153-
extent={{-100,-100},{100,100}}), graphics),
154-
Documentation(info="<html>
148+
textString="%name")}), Documentation(info="<html>
155149
<p>Supports receiving of User Datagram Protocol (UDP) datagrams.</p>
156150
</html>"));
157151
end UDPReceive;
@@ -204,9 +198,7 @@ provided by the parameter <b>memoryID</b>. If the shared memory partition does n
204198
annotation (preferredView="info",
205199
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
206200
-100},{100,100}}), graphics={Text(extent={{-150,136},{150,96}},
207-
textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=true,
208-
extent={{-100,-100},{100,100}}), graphics),
209-
Documentation(info="<html>
201+
textString="%name")}), Documentation(info="<html>
210202
<p>Supports sending of User Datagram Protocol (UDP) datagrams.</p>
211203
</html>"));
212204
end UDPSend;
@@ -268,9 +260,7 @@ provided by the parameter <b>memoryID</b>. If the shared memory partition does n
268260
textString="%Serial_Port",
269261
lineColor={0,0,0}), Text(extent={{-152,-48},{148,-88}},
270262
lineColor={0,0,0},
271-
textString="%baud")}), Diagram(coordinateSystem(preserveAspectRatio=true,
272-
extent={{-100,-100},{100,100}}), graphics),
273-
Documentation(info="<html>
263+
textString="%baud")}), Documentation(info="<html>
274264
<h4><font color=\"#008000\">Support for receiving datagrams over a serial port</font></h4>
275265
<p><b>Currently only supported for Linux!</b></p>
276266
<h4><font color=\"#008000\">Example</font></h4>
@@ -339,9 +329,7 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
339329
textString="%Serial_Port",
340330
lineColor={0,0,0}), Text(extent={{-154,-44},{146,-84}},
341331
lineColor={0,0,0},
342-
textString="%baud")}), Diagram(coordinateSystem(preserveAspectRatio=true,
343-
extent={{-100,-100},{100,100}}), graphics),
344-
Documentation(info="<html>
332+
textString="%baud")}), Documentation(info="<html>
345333
<h4><font color=\"#008000\">Support for sending datagrams over a serial port</font></h4>
346334
<p><b>Currently only supported for Linux!</b></p>
347335
<h4><font color=\"#008000\">Example</font></h4>
@@ -386,7 +374,6 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
386374
extent={{-98,72},{94,46}},
387375
lineColor={0,0,0},
388376
textString="%deviceName")}),
389-
Diagram(graphics),
390377
Documentation(info="<html>
391378
<h4><font color=\"#008000\">Support for Softing CAN bus</font></h4>
392379
<p><b>Please, read the package information for <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Communication.SoftingCAN\"><code>SoftingCAN</code></a> first!</b></p>
@@ -446,7 +433,6 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
446433
extent={{-160,24},{160,-6}},
447434
lineColor={0,0,0},
448435
textString="(%startTime, %sampleTime) s")}),
449-
Diagram(graphics),
450436
Documentation(info="<html>
451437
<h4><font color=\"#008000\">Support for Softing CAN bus</font></h4>
452438
<p><b>Please, read the package information for <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Communication.SoftingCAN\"><code>SoftingCAN</code></a> first!</b></p>
@@ -508,7 +494,6 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
508494
extent={{-160,24},{160,-6}},
509495
lineColor={0,0,0},
510496
textString="(%startTime, %sampleTime) s")}),
511-
Diagram(graphics),
512497
Documentation(info="<html>
513498
<h4><font color=\"#008000\">Support for Softing CAN bus</font></h4>
514499
<p><b>Please, read the package information for <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Communication.SoftingCAN\"><code>SoftingCAN</code></a> first!</b></p>
@@ -675,9 +660,6 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
675660
lineColor={0,0,0},
676661
textString="(%startTime, %sampleTime) s",
677662
horizontalAlignment=TextAlignment.Left)}),
678-
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
679-
{100,100}}),
680-
graphics),
681663
Documentation(info="<html>
682664
<h4><font color=\"#008000\">Support for Linux Socket CAN interface</font></h4>
683665
<p><b>Please, read the package information for <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Communication.SocketCAN\"><code>SocketCAN</code></a> first!</b></p>
@@ -740,9 +722,6 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
740722
lineColor={0,0,0},
741723
textString="(%startTime, %sampleTime) s",
742724
horizontalAlignment=TextAlignment.Left)}),
743-
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
744-
{100,100}}),
745-
graphics),
746725
Documentation(info="<html>
747726
<h4><font color=\"#008000\">Support for Linux Socket CAN interface</font></h4>
748727
<p><b>Please, read the package information for <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Communication.SocketCAN\"><code>SocketCAN</code></a> first!</b></p>

‎Blocks/Examples/TestSerialPackager.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ equation
8080
color={0,0,0},
8181
pattern=LinePattern.None,
8282
smooth=Smooth.None));
83-
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
84-
-100},{100,100}}), graphics), experiment(StopTime=5.0),
83+
annotation (experiment(StopTime=5.0),
8584
Documentation(info="<html>
8685
<p>
8786
The example demonstrates that pack and unpack blocks of the <code>SerialPackager</code> package can be connected directly.

‎Blocks/Examples/TestSerialPackagerBitPack_UDP.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ equation
119119
color={0,0,0},
120120
pattern=LinePattern.None,
121121
smooth=Smooth.None));
122-
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
123-
-100},{100,100}}), graphics), experiment(StopTime=5.0),
122+
annotation (experiment(StopTime=5.0),
124123
Documentation(info="<html>
125124
<p>
126125
In particular this model demonstrates how integer values can be packed and unpacked at bit level using the <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Packaging.SerialPackager.PackUnsignedInteger\"> <code>PackUnsignedInteger</code></a> and <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Packaging.SerialPackager.UnpackUnsignedInteger\"><code>UnpackUnsignedInteger</code></a> blocks.

‎Blocks/Examples/TestSerialPackager_SharedMemory.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ equation
6868
color={0,0,0},
6969
pattern=LinePattern.None,
7070
smooth=Smooth.None));
71-
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
72-
-100},{100,100}}), graphics), experiment(StopTime=5.0),
71+
annotation (experiment(StopTime=5.0),
7372
Documentation(info="<html>
7473
<p>
7574
The <code>sharedMemoryWrite</code> block writes to the memory partition with <code>memoryID = \"sharedMemory\"</code>. The <code>sharedMemoryRead</code> block reads from that partition.

‎Blocks/Examples/TestSerialPackager_UDP.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ equation
9191
color={0,0,0},
9292
pattern=LinePattern.None,
9393
smooth=Smooth.None));
94-
annotation (Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-100,
95-
-100},{100,100}}), graphics), experiment(StopTime=5.0),
94+
annotation (experiment(StopTime=5.0),
9695
Documentation(info="<html>
9796
<p>
9897
The <code>uDPSend</code> block sends to the local port 10002. The <code>uDPReceive</code> block starts a background process that listens at port 10002. Consequently, the <code>uDPReceive</code> block receives what the <code>uDPSend</code> block sends.

‎Blocks/HardwareIO.mo

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ package HardwareIO
2424
textString="%deviceName"),
2525
Bitmap(extent={{-96,20},{10,-92}}, fileName=
2626
"modelica://Modelica_DeviceDrivers/Resources/Images/Icons/gears.png")}),
27-
Diagram(graphics),
2827
Documentation(info="<html>
2928
<p>Record for configuring a Comedi device. At initialization time the comedi device given by the parameter <code>deviceName </code>will be opened and a handle to that device will be assigned to the final parameter<code> dh.</code>This handle needs to be passed as parameter to the remaining Comedi read and write blocks<code>.</code></p>
3029
<h4><font color=\"#008000\">Note</font></h4>
@@ -115,8 +114,7 @@ package HardwareIO
115114
-104},{224,-134}},
116115
lineColor={0,0,0},
117116
textString="Device: %comedi"), Text(extent={{-152,142},{148,102}},
118-
textString="%name")}), Diagram(graphics),
119-
Documentation(info="<html>
117+
textString="%name")}), Documentation(info="<html>
120118
<p>The parameter <code>comedi</code> needs to be set to a valid Comedi device handle, i.e., needs to be set to the record member <code>dh</code> of a <code>ComediConfig</code> record instance.</p>
121119
<p>Wraps the Comedi function<code> comedi_data_read(..)</code>. See the Comedi documentation for the meanings of the parameters <code>subDevice, channel, range, aref</code>.</p>
122120
<h4><font color=\"#008000\">Note</font></h4>
@@ -181,7 +179,6 @@ package HardwareIO
181179
lineColor={0,0,0},
182180
textString="Device: %comedi"), Text(extent={{-150,142},{150,102}},
183181
textString="%name")}),
184-
Diagram(graphics),
185182
Documentation(info="<html>
186183
<p>The parameter <code>comedi</code> needs to be set to a valid Comedi device handle, i.e., needs to be set to the record member <code>dh</code> of a <code>ComediConfig</code> record instance.</p>
187184
<p>Uses the Comedi function<code> comedi_from_phys(..)</code> to support providing a physical value (volts or milliamps) as input to the DAC. See the Comedi documentation for the meanings of the parameters <code>subDevice, channel, range, aref.</code></p>
@@ -247,8 +244,7 @@ package HardwareIO
247244
-104},{224,-134}},
248245
lineColor={0,0,0},
249246
textString="Device: %comedi"), Text(extent={{-152,142},{148,102}},
250-
textString="%name")}), Diagram(graphics),
251-
Documentation(info="<html>
247+
textString="%name")}), Documentation(info="<html>
252248
<p>The parameter <code>comedi</code> needs to be set to a valid Comedi device handle, i.e., needs to be set to the record member <code>dh</code> of a <code>ComediConfig</code> record instance.</p>
253249
<p>Uses the Comedi function<code> comedi_to_phys(..)</code> to convert a raw input obtained from the ADC to a physical value (volts or milliamps) . See the Comedi documentation for the meanings of the parameters <code>subDevice, channel, range, aref.</code></p>
254250
<h4><font color=\"#008000\">Note</font></h4>
@@ -295,7 +291,6 @@ package HardwareIO
295291
lineColor={0,0,0},
296292
textString="Device: %comedi"), Text(extent={{-150,142},{150,102}},
297293
textString="%name")}),
298-
Diagram(graphics),
299294
Documentation(info="<html>
300295
<p>The parameter <code>comedi</code> needs to be set to a valid Comedi device handle, i.e., needs to be set to the record member <code>dh</code> of a <code>ComediConfig</code> record instance.</p>
301296
<p>Wraps the Comedi function<code> comedi_dio_write(..)</code>. See the Comedi documentation for the meanings of the parameters <code>subDevice </code>and<code> channel</code>.</p>
@@ -343,7 +338,6 @@ package HardwareIO
343338
lineColor={0,0,0},
344339
textString="Device: %comedi"), Text(extent={{-150,142},{150,102}},
345340
textString="%name")}),
346-
Diagram(graphics),
347341
Documentation(info="<html>
348342
<p>The parameter <code>comedi</code> needs to be set to a valid Comedi device handle, i.e., needs to be set to the record member <code>dh</code> of a <code>ComediConfig</code> record instance.</p>
349343
<p>Wraps the Comedi function<code> comedi_dio_read(..)</code>. See the Comedi documentation for the meanings of the parameters <code>subDevice </code>and<code> channel</code>.</p>

‎Blocks/InputDevices.mo

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ package InputDevices
2424
Modelica_DeviceDrivers.InputDevices.GameController.getData(ID);
2525
end when;
2626
axes = (AxesRaw .- 32768)/32768 ./gain;
27-
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
28-
-100},{100,100}}),
29-
graphics),
30-
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
27+
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
3128
-100},{100,100}}), graphics={Bitmap(extent={{-86,88},{88,-88}},
3229
fileName="../Resources/Images/Icons/joystick.png"), Text(extent={
3330
{-150,140},{150,100}}, textString="%name")}),
@@ -107,8 +104,6 @@ package InputDevices
107104
keyState = if (not useKeyKombination and keyStateInt == 1 and additionalKeyStateInt == 0) then true else
108105
if (useKeyKombination and keyStateInt == 1 and additionalKeyStateInt == 1) then true else false;
109106
annotation (
110-
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
111-
100}}), graphics),
112107
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
113108
graphics={
114109
Text(extent={{-150,140},{150,100}}, textString="%name"),
@@ -188,10 +183,7 @@ package InputDevices
188183
points={{61,60},{110,60}},
189184
color={0,0,127},
190185
smooth=Smooth.None));
191-
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
192-
-100},{100,100}}),
193-
graphics),
194-
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
186+
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
195187
-100},{100,100}}), graphics={Text(extent={{-150,140},{150,100}},
196188
textString="%name"), Bitmap(extent={{-86,88},{88,-88}}, fileName=
197189
"modelica://Modelica_DeviceDrivers/Resources/Images/Icons/Spacemouse.png")}),
@@ -243,10 +235,7 @@ package InputDevices
243235
keyLeft = if (KeyCode[4]==1) then true else false;
244236
keyReturn = if (KeyCode[5]==1) then true else false;
245237
keySpace = if (KeyCode[6]==1) then true else false;
246-
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
247-
-100},{100,100}}),
248-
graphics),
249-
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
238+
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
250239
-100},{100,100}}), graphics={
251240
Text(extent={{-150,140},{150,100}}, textString="%name"),
252241
Rectangle(

‎Blocks/Interfaces.mo

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ package Interfaces
2525
Line(
2626
points={{-52,-40},{0,0},{50,-40}},
2727
color={95,95,95},
28-
smooth=Smooth.None)}),Diagram(coordinateSystem(
29-
preserveAspectRatio=true,
30-
extent={{-100,-100},{100,100}},
31-
initialScale=0.2)));
28+
smooth=Smooth.None)}));
3229
end PackageIn;
3330

3431
connector PackageOut "Packager output connector"
@@ -54,10 +51,7 @@ package Interfaces
5451
Line(
5552
points={{-50,40},{2,0},{52,40}},
5653
color={95,95,95},
57-
smooth=Smooth.None)}),Diagram(coordinateSystem(
58-
preserveAspectRatio=true,
59-
extent={{-100,-100},{100,100}},
60-
initialScale=0.2)));
54+
smooth=Smooth.None)}));
6155
end PackageOut;
6256

6357
connector SoftingCANOut
@@ -80,10 +74,7 @@ package Interfaces
8074
Line(
8175
points={{-50,38},{2,-2},{52,38}},
8276
color={95,95,95},
83-
smooth=Smooth.None)}),Diagram(coordinateSystem(
84-
preserveAspectRatio=true,
85-
extent={{-100,-100},{100,100}},
86-
initialScale=0.2)));
77+
smooth=Smooth.None)}));
8778
end SoftingCANOut;
8879

8980
connector SoftingCANIn
@@ -106,10 +97,7 @@ package Interfaces
10697
Line(
10798
points={{-52,-40},{0,0},{50,-40}},
10899
color={95,95,95},
109-
smooth=Smooth.None)}),Diagram(coordinateSystem(
110-
preserveAspectRatio=true,
111-
extent={{-100,-100},{100,100}},
112-
initialScale=0.2)));
100+
smooth=Smooth.None)}));
113101
end SoftingCANIn;
114102

115103
partial block PartialSoftingCANMessage
@@ -123,9 +111,6 @@ package Interfaces
123111
lineColor={0,0,0},
124112
textString="%name"), Bitmap(extent={{-40,-16},{40,-96}},
125113
fileName=
126-
"modelica://Modelica_DeviceDrivers/Resources/Images/Icons/package.PNG")}),
127-
Diagram(coordinateSystem(
128-
preserveAspectRatio=true, extent={{-100,-100},{100,100}}),
129-
graphics));
114+
"modelica://Modelica_DeviceDrivers/Resources/Images/Icons/package.PNG")}));
130115
end PartialSoftingCANMessage;
131116
end Interfaces;

‎Blocks/OperatingSystem.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ package OperatingSystem
8989
end for;
9090
end when;
9191
annotation (preferredView="info",
92-
Diagram(graphics), Icon(graphics={
92+
Icon(graphics={
9393
Polygon(
9494
points={{-80,60},{-60,60},{-70,80},{-80,60}},
9595
lineColor={0,0,0},

0 commit comments

Comments
 (0)