Skip to content

Commit f172b34

Browse files
Update to new version : 4.0.0.0
1 parent 51d9c5f commit f172b34

27 files changed

+723
-2
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import typing
2+
from underautomation.fanuc.stream_motion.internal.stream_motion_connect_parameters_base import StreamMotionConnectParametersBase
3+
import clr
4+
import os
5+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", 'lib', 'UnderAutomation.Fanuc.dll')))
6+
from UnderAutomation.Fanuc.Common import StreamMotionConnectParameters as stream_motion_connect_parameters
7+
8+
class StreamMotionConnectParameters(StreamMotionConnectParametersBase):
9+
def __init__(self, _internal = 0):
10+
if(_internal == 0):
11+
self._instance = stream_motion_connect_parameters()
12+
else:
13+
self._instance = _internal
14+
@property
15+
def enable(self) -> bool:
16+
return self._instance.Enable
17+
@enable.setter
18+
def enable(self, value: bool):
19+
self._instance.Enable = value
20+
@property
21+
def ip(self) -> str:
22+
return self._instance.Ip
23+
@ip.setter
24+
def ip(self, value: str):
25+
self._instance.Ip = value

underautomation/fanuc/connection_parameters.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from underautomation.fanuc.common.ftp_connect_parameters import FtpConnectParameters
55
from underautomation.fanuc.common.snpx_connect_parameters import SnpxConnectParameters
66
from underautomation.fanuc.common.rmi_connect_parameters import RmiConnectParameters
7+
from underautomation.fanuc.common.stream_motion_connect_parameters import StreamMotionConnectParameters
78
import clr
89
import os
910
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), 'lib', 'UnderAutomation.Fanuc.dll')))
@@ -57,3 +58,9 @@ def rmi(self) -> RmiConnectParameters:
5758
@rmi.setter
5859
def rmi(self, value: RmiConnectParameters):
5960
self._instance.Rmi = value
61+
@property
62+
def stream_motion(self) -> StreamMotionConnectParameters:
63+
return StreamMotionConnectParameters(self._instance.StreamMotion)
64+
@stream_motion.setter
65+
def stream_motion(self, value: StreamMotionConnectParameters):
66+
self._instance.StreamMotion = value

underautomation/fanuc/fanuc_robot.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from underautomation.fanuc.ftp.internal.ftp_client_internal import FtpClientInternal
55
from underautomation.fanuc.snpx.internal.snpx_client_internal import SnpxClientInternal
66
from underautomation.fanuc.rmi.internal.rmi_client_internal import RmiClientInternal
7+
from underautomation.fanuc.stream_motion.internal.stream_motion_client_internal import StreamMotionClientInternal
78
from underautomation.fanuc.license.license_info import LicenseInfo
89
import clr
910
import os
@@ -42,5 +43,8 @@ def snpx(self) -> SnpxClientInternal:
4243
def rmi(self) -> RmiClientInternal:
4344
return RmiClientInternal(self._instance.Rmi)
4445
@property
46+
def stream_motion(self) -> StreamMotionClientInternal:
47+
return StreamMotionClientInternal(self._instance.StreamMotion)
48+
@property
4549
def license_info(self) -> LicenseInfo:
4650
return LicenseInfo(None, None, self._instance.LicenseInfo)
18.5 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.5.0.0
1+
4.0.0.0

underautomation/fanuc/stream_motion/__init__.py

Whitespace-only changes.

underautomation/fanuc/stream_motion/data/__init__.py

Whitespace-only changes.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import typing
2+
from underautomation.fanuc.stream_motion.data.packet_type_from_robot import PacketTypeFromRobot
3+
from underautomation.fanuc.stream_motion.data.threshold_type import ThresholdType
4+
import clr
5+
import os
6+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", 'lib', 'UnderAutomation.Fanuc.dll')))
7+
from UnderAutomation.Fanuc.StreamMotion.Data import AckPacket as ack_packet
8+
9+
class AckPacket:
10+
def __init__(self, _internal = 0):
11+
if(_internal == 0):
12+
self._instance = ack_packet()
13+
else:
14+
self._instance = _internal
15+
def __repr__(self):
16+
return self._instance.ToString()
17+
@property
18+
def packet_type(self) -> PacketTypeFromRobot:
19+
return PacketTypeFromRobot(self._instance.PacketType)
20+
@property
21+
def version_number(self) -> int:
22+
return self._instance.VersionNumber
23+
@property
24+
def axis_number(self) -> int:
25+
return self._instance.AxisNumber
26+
@property
27+
def threshold_type(self) -> ThresholdType:
28+
return ThresholdType(self._instance.ThresholdType)
29+
@property
30+
def max_cartesian_speed(self) -> int:
31+
return self._instance.MaxCartesianSpeed
32+
@property
33+
def unknown0(self) -> int:
34+
return self._instance.Unknown0
35+
@property
36+
def thresholds_no_load(self) -> typing.List[float]:
37+
return self._instance.ThresholdsNoLoad
38+
@property
39+
def thresholds_max_load(self) -> typing.List[float]:
40+
return self._instance.ThresholdsMaxLoad
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
import typing
2+
from underautomation.fanuc.stream_motion.data.data_style import DataStyle
3+
from underautomation.fanuc.stream_motion.data.motion_data import MotionData
4+
from underautomation.fanuc.stream_motion.data.io_type import IOType
5+
import clr
6+
import os
7+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", 'lib', 'UnderAutomation.Fanuc.dll')))
8+
from UnderAutomation.Fanuc.StreamMotion.Data import CommandPacket as command_packet
9+
10+
class CommandPacket:
11+
def __init__(self, dataStyle: DataStyle, motionData: MotionData, _internal = 0):
12+
if(_internal == 0):
13+
self._instance = command_packet(dataStyle, motionData)
14+
else:
15+
self._instance = _internal
16+
@property
17+
def is_last_data(self) -> bool:
18+
return self._instance.IsLastData
19+
@is_last_data.setter
20+
def is_last_data(self, value: bool):
21+
self._instance.IsLastData = value
22+
@property
23+
def read_io_type(self) -> IOType:
24+
return IOType(self._instance.ReadIOType)
25+
@read_io_type.setter
26+
def read_io_type(self, value: IOType):
27+
self._instance.ReadIOType = value
28+
@property
29+
def read_io_index(self) -> int:
30+
return self._instance.ReadIOIndex
31+
@read_io_index.setter
32+
def read_io_index(self, value: int):
33+
self._instance.ReadIOIndex = value
34+
@property
35+
def read_io_mask(self) -> int:
36+
return self._instance.ReadIOMask
37+
@read_io_mask.setter
38+
def read_io_mask(self, value: int):
39+
self._instance.ReadIOMask = value
40+
@property
41+
def data_style(self) -> DataStyle:
42+
return DataStyle(self._instance.DataStyle)
43+
@data_style.setter
44+
def data_style(self, value: DataStyle):
45+
self._instance.DataStyle = value
46+
@property
47+
def write_io_type(self) -> IOType:
48+
return IOType(self._instance.WriteIOType)
49+
@write_io_type.setter
50+
def write_io_type(self, value: IOType):
51+
self._instance.WriteIOType = value
52+
@property
53+
def write_io_index(self) -> int:
54+
return self._instance.WriteIOIndex
55+
@write_io_index.setter
56+
def write_io_index(self, value: int):
57+
self._instance.WriteIOIndex = value
58+
@property
59+
def write_io_mask(self) -> int:
60+
return self._instance.WriteIOMask
61+
@write_io_mask.setter
62+
def write_io_mask(self, value: int):
63+
self._instance.WriteIOMask = value
64+
@property
65+
def write_io_value(self) -> int:
66+
return self._instance.WriteIOValue
67+
@write_io_value.setter
68+
def write_io_value(self, value: int):
69+
self._instance.WriteIOValue = value
70+
@property
71+
def motion_data(self) -> MotionData:
72+
return MotionData(None, self._instance.MotionData)
73+
@motion_data.setter
74+
def motion_data(self, value: MotionData):
75+
self._instance.MotionData = value
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import clr
2+
import os
3+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", 'lib', 'UnderAutomation.Fanuc.dll')))
4+
from UnderAutomation.Fanuc.StreamMotion.Data import DataStyle as data_style
5+
6+
class DataStyle(int):
7+
Cartesian = data_style.Cartesian
8+
Joint = data_style.Joint

0 commit comments

Comments
 (0)