modelica-3rdparty#325 WIP branch

bernhard-thiele · Jun 23, 2021 · 331b3ef · 331b3ef
1 parent b30ead8
commit 331b3ef
Show file tree

Hide file tree

Showing 2 changed files with 130 additions and 0 deletions.
diff --git a/Modelica_DeviceDrivers/Blocks/Examples/TestSerialPackager_TCPIPServerClient.mo b/Modelica_DeviceDrivers/Blocks/Examples/TestSerialPackager_TCPIPServerClient.mo
@@ -0,0 +1,129 @@
+within Modelica_DeviceDrivers.Blocks.Examples;
+model TestSerialPackager_TCPIPServerClient
+  "Example for combining TCP/IP server and client blocks."
+  extends Modelica.Icons.Example;
+  extends Modelica.Icons.UnderConstruction;
+  inner Modelica_DeviceDrivers.Blocks.Communication.TCPIPServerConfig
+    tcpipserverconfig(
+    port=10002,
+    maxClients=1,
+    useNonblockingMode=true)
+    annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
+  Modelica_DeviceDrivers.Blocks.Communication.TCPIPServerReceive tCPIPReceive(
+    clientIndex=1,
+    blockUntilConnected=false,
+                   showAdvancedOutputs=true)
+                                annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=270,
+        origin={-80,50})));
+  Modelica_DeviceDrivers.Blocks.Packaging.SerialPackager.GetInteger getInteger(n=3)
+    annotation (Placement(transformation(extent={{-90,0},{-70,20}})));
+  Modelica_DeviceDrivers.Blocks.Packaging.SerialPackager.Packager packager(
+      useBackwardPropagatedBufferSize=false, userBufferSize=12)
+    annotation (Placement(transformation(extent={{-30,40},{-10,60}})));
+  Modelica_DeviceDrivers.Blocks.Packaging.SerialPackager.AddInteger addInteger(n=3, nu=1)
+    annotation (Placement(transformation(extent={{-30,0},{-10,20}})));
+  Modelica_DeviceDrivers.Blocks.Communication.TCPIPServerSend tCPIPSend(
+    enableExternalTrigger=true,
+    blockUntilConnected=false,
+    autoBufferSize=true,
+    userBufferSize=12) annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=270,
+        origin={-20,-30})));
+  OperatingSystem.RealtimeSynchronize realtimeSynchronize
+    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
+  Process process
+    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
+  Packaging.SerialPackager.Packager                               packager1(
+      useBackwardPropagatedBufferSize=false, userBufferSize=12)                                                                      annotation(Placement(transformation(extent={{50,62},
+            {70,82}})));
+  Packaging.SerialPackager.AddInteger                               addInteger1(n=3, nu=1)
+                                                                                     annotation(Placement(transformation(extent={{50,20},
+            {70,40}})));
+  Modelica.Blocks.Sources.IntegerExpression intExp[3](y=integer(10*sin(time))*{
+        1,2,3}) annotation (Placement(transformation(extent={{18,20},{38,40}})));
+  Packaging.SerialPackager.GetInteger                               getInteger1(n=3)
+                                                                               annotation(Placement(transformation(extent={{50,-40},
+            {70,-20}})));
+  Communication.TCPIP_Client_IO tCPIP_Client_IO(
+    startTime=1,
+    port=10002,
+    outputBufferSize=3*4,
+    inputBufferSize=3*4)                       annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=270,
+        origin={60,0})));
+protected
+  block Process
+    extends Modelica.Blocks.Icons.Block;
+    Modelica.Blocks.Interfaces.BooleanInput trigger annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={0,-120})));
+    Modelica.Blocks.Interfaces.IntegerInput u[3]
+      annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+    Modelica.Blocks.Interfaces.IntegerOutput y[3]
+      annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+  equation
+    when trigger then
+      Modelica.Utilities.Streams.print("Process, t="+String(time));
+      y = 2*u;
+    end when;
+    annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+          coordinateSystem(preserveAspectRatio=false)));
+  end Process;
+equation
+  connect(tCPIPReceive.pkgOut, getInteger.pkgIn)
+    annotation (Line(points={{-80,39.2},{-80,20.8}},color={0,0,0}));
+  connect(packager.pkgOut, addInteger.pkgIn)
+    annotation (Line(points={{-20,39.2},{-20,20.8}},
+                                                   color={0,0,0}));
+  connect(addInteger.pkgOut[1], tCPIPSend.pkgIn)
+    annotation (Line(points={{-20,-0.8},{-20,-19.2}},color={0,0,0}));
+  connect(tCPIPSend.trigger, tCPIPReceive.recvTrigger) annotation (Line(points={{-32,-30},
+          {-92,-30},{-92,30},{-86,30},{-86,39}},           color={255,0,255}));
+  connect(getInteger.y, process.u)
+    annotation (Line(points={{-69,10},{-62,10}},
+                                               color={255,127,0}));
+  connect(process.y, addInteger.u)
+    annotation (Line(points={{-39,10},{-32,10}},
+                                             color={255,127,0}));
+  connect(process.trigger, tCPIPReceive.recvTrigger) annotation (Line(points={{-50,-2},
+          {-50,-30},{-92,-30},{-92,30},{-86,30},{-86,39}},    color={255,0,255}));
+  connect(packager1.pkgOut, addInteger1.pkgIn)
+    annotation (Line(points={{60,61.2},{60,40.8}}, color={0,0,0}));
+  connect(addInteger1.pkgOut[1], tCPIP_Client_IO.pkgIn)
+    annotation (Line(points={{60,19.2},{60,10.8}}, color={0,0,0}));
+  connect(tCPIP_Client_IO.pkgOut, getInteger1.pkgIn)
+    annotation (Line(points={{60,-10.8},{60,-19.2}}, color={0,0,0}));
+  connect(intExp.y, addInteger1.u)
+    annotation (Line(points={{39,30},{48,30}}, color={255,127,0}));
+  annotation (
+    Documentation(info="<html>
+<p>
+The <code>tcpipserverconfig</code> block is configured for listening at port 10002 and for using a non-blocking TCP/IP
+socket.
+</p>
+<p>
+For meaningful results a TCP/IP client needs to connect and send suitable data, otherwise no data is received. Such
+a client is provided as C code test program 
+(<a href=\"modelica://Modelica_DeviceDrivers/Resources/test/Communication/TCPIPClientAsRemoteStation.c\">Resources/test/Communication/TCPIPClientAsRemoteStation.c</a>).
+</p>
+</html>"),
+    experiment(
+      StopTime=10,
+      Interval=0.01,
+      __Dymola_Algorithm="Euler"),
+    Diagram(graphics={
+        Text(
+          extent={{-10,-46},{124,-64}},
+          lineColor={238,46,47},
+          textString="Infinite block"),                                       Line(
+          points={{0,100},{0,-100},{0,-100}},
+          color={238,46,47},
+          pattern=LinePattern.Dash)}));
+end TestSerialPackager_TCPIPServerClient;
diff --git a/Modelica_DeviceDrivers/Blocks/Examples/package.order b/Modelica_DeviceDrivers/Blocks/Examples/package.order
@@ -22,3 +22,4 @@ TestSerialPackager_MQTT
 TestRealtimeSynchronize
 TestSerialPackager_TCPIPServer
 TestSerialPackager_TCPIPServerMultipleClients
+TestSerialPackager_TCPIPServerClient