Skip to content

Commit b44dd84

Browse files
tbeutbeu
committed
Fix encapsulation issues
1 parent 38112b2 commit b44dd84

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

‎Modelica_DeviceDrivers/Blocks/Communication.mo

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,9 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
530530
import Modelica_DeviceDrivers;
531531
import Modelica_DeviceDrivers.Packaging.SerialPackager;
532532

533-
input Modelica_DeviceDrivers.Communication.SoftingCAN softingCAN "Handle for device";
533+
input SoftingCAN softingCAN "Handle for device";
534534
input Integer objectNumber "Object number of message (from defineObject(..))";
535-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg;
535+
input SerialPackager pkg;
536536
input Real dummy;
537537
output Real dummy2;
538538
algorithm
@@ -546,10 +546,10 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
546546
import Modelica_DeviceDrivers;
547547
import Modelica_DeviceDrivers.Packaging.SerialPackager;
548548

549-
input Modelica_DeviceDrivers.Communication.SoftingCAN softingCAN "Handle for device";
549+
input SoftingCAN softingCAN "Handle for device";
550550
input Integer objectNumber "Object number of message (from defineObject(..))";
551551
input Integer dataLength "Length of message in bytes";
552-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg;
552+
input SerialPackager pkg;
553553
input Real dummy;
554554
output Real dummy2;
555555
algorithm
@@ -750,7 +750,7 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
750750

751751
input SocketCAN socketCAN;
752752
input Integer can_id "CAN frame identifier";
753-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg;
753+
input SerialPackager pkg;
754754
input Real dummy;
755755
output Real dummy2;
756756
algorithm
@@ -767,7 +767,7 @@ See <a href=\"modelica://Modelica_DeviceDrivers.Blocks.Examples.TestSerialPackag
767767
input Integer can_id "CAN frame identifier";
768768
input Integer can_dlc(min=0,max=8)
769769
" length of data in bytes (min=0, max=8)";
770-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg;
770+
input SerialPackager pkg;
771771
input Real dummy;
772772
output Real dummy2;
773773
algorithm

‎Modelica_DeviceDrivers/Communication/SerialPort_.mo

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ package SerialPort_ "Accompanying functions for the SerialPort object"
44

55
encapsulated function read
66
import Modelica_DeviceDrivers.Communication.SerialPort;
7+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
78
input SerialPort sPort;
8-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg "Data package to be read";
9+
input SerialPackager pkg;
910
external "C" MDD_serialPortReadP(sPort, pkg)
1011
annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
1112
Include = "#include \"MDDSerialPort.h\" ",
@@ -15,8 +16,9 @@ package SerialPort_ "Accompanying functions for the SerialPort object"
1516

1617
encapsulated function sendTo
1718
import Modelica_DeviceDrivers.Communication.SerialPort;
19+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
1820
input SerialPort sPort "Serial Port object";
19-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg "Data package to be sent";
21+
input SerialPackager pkg;
2022
input Integer dataSize "Size of data";
2123
external "C" MDD_serialPortSendP(sPort, pkg, dataSize)
2224
annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",

‎Modelica_DeviceDrivers/Communication/SharedMemory_.mo

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package SharedMemory_ "Accompanying functions for the SharedMemory object"
33
extends Modelica_DeviceDrivers.Utilities.Icons.DriverIcon;
44
encapsulated function read
55
import Modelica_DeviceDrivers.Communication.SharedMemory;
6+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
67
input SharedMemory sm;
7-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg "Data package to be read";
8+
input SerialPackager pkg "Data package to be read";
89
external "C" MDD_SharedMemoryReadP(sm, pkg)
910
annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
1011
Include = "#include \"MDDSharedMemory.h\" ",
@@ -14,8 +15,9 @@ package SharedMemory_ "Accompanying functions for the SharedMemory object"
1415

1516
encapsulated function write
1617
import Modelica_DeviceDrivers.Communication.SharedMemory;
18+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
1719
input SharedMemory sm;
18-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg "Data package to be written";
20+
input SerialPackager pkg "Data package to be written";
1921
input Integer len;
2022
external "C" MDD_SharedMemoryWriteP(sm, pkg, len)
2123
annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",

‎Modelica_DeviceDrivers/Communication/SocketCAN_.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package SocketCAN_ "Accompanying functions for the SocketCAN object"
33
extends Modelica_DeviceDrivers.Utilities.Icons.DriverIcon;
44
encapsulated function write "Write CAN frame/message to socket"
55
import Modelica_DeviceDrivers.Communication.SocketCAN;
6-
6+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
77
input SocketCAN socketCAN;
88
input Integer can_id "CAN frame identifier";
99
input Integer can_dlc(min=0,max=8) " length of data in bytes (min=0, max=8)";
10-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg;
10+
input SerialPackager pkg;
1111

1212
external "C" MDD_socketCANWriteP(socketCAN, can_id, can_dlc, pkg)
1313
annotation (IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
@@ -31,10 +31,10 @@ package SocketCAN_ "Accompanying functions for the SocketCAN object"
3131
encapsulated function readObject
3232
"Read previously defined CAN object from CAN interface."
3333
import Modelica_DeviceDrivers.Communication.SocketCAN;
34-
34+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
3535
input SocketCAN socketCAN;
3636
input Integer can_id "CAN frame identifier";
37-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg;
37+
input SerialPackager pkg;
3838

3939
external "C" MDD_socketCANReadP(socketCAN, can_id, pkg)
4040
annotation (IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",

‎Modelica_DeviceDrivers/Communication/SoftingCAN_.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ package SoftingCAN_ "Accompanying functions for the SoftingCAN object"
3232
encapsulated function writeObject
3333
"Write object (CAN message) to transmit buffer"
3434
import Modelica_DeviceDrivers.Communication.SoftingCAN;
35-
35+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
3636
input SoftingCAN softingCAN "Handle for device";
3737
input Integer objectNumber "Object number of message (from defineObject(..))";
3838
input Integer dataLength "Length of message in bytes";
39-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg;
39+
input SerialPackager pkg;
4040

4141
external "C" MDD_softingCANWriteObjectP(softingCAN, objectNumber, dataLength, pkg)
4242
annotation (IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",

‎Modelica_DeviceDrivers/Communication/TCPIPSocketClient_.mo

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ package TCPIPSocketClient_ "Accompanying functions for the TCP/IP socket client
1818

1919
encapsulated function read
2020
import Modelica_DeviceDrivers.Communication.TCPIPSocketClient;
21+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
2122
input TCPIPSocketClient socketClient;
22-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg "Data package to be read";
23+
input SerialPackager pkg "Data package to be read";
2324
input Integer dataSize "Size of data";
2425
external "C" MDD_TCPIPClient_ReadP(socketClient, pkg, dataSize)
2526
annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
@@ -30,8 +31,9 @@ package TCPIPSocketClient_ "Accompanying functions for the TCP/IP socket client
3031

3132
encapsulated function sendTo
3233
import Modelica_DeviceDrivers.Communication.TCPIPSocketClient;
34+
import Modelica_DeviceDrivers.Packaging.SerialPackager;
3335
input TCPIPSocketClient socketClient;
34-
input Modelica_DeviceDrivers.Packaging.SerialPackager pkg "Data package to be sent";
36+
input SerialPackager pkg "Data package to be sent";
3537
input Integer dataSize "Size of data";
3638
output Integer sendError "Send error flag";
3739
external "C" sendError = MDD_TCPIPClient_SendP(socketClient, pkg, dataSize)

0 commit comments

Comments
 (0)