UnderAutomation.Fanuc 2.3.0.0__tar.gz → 3.1.1.0__tar.gz

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UnderAutomation.Fanuc
-Version: 2.3.0.0
+Version: 3.1.1.0
 Summary: Quickly create applications that communicate with your Fanuc robots
 Home-page: https://underautomation.com/fanuc
 Author: UnderAutomation

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/UnderAutomation.Fanuc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UnderAutomation.Fanuc
-Version: 2.3.0.0
+Version: 3.1.1.0
 Summary: Quickly create applications that communicate with your Fanuc robots
 Home-page: https://underautomation.com/fanuc
 Author: UnderAutomation

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/UnderAutomation.Fanuc.egg-info/SOURCES.txt

@@ -12,11 +12,13 @@ setup.py
 ./underautomation/fanuc/common/cartesian_position_with_tool.py
 ./underautomation/fanuc/common/cartesian_position_with_user_frame.py
 ./underautomation/fanuc/common/configuration.py
+./underautomation/fanuc/common/connect_exception.py
 ./underautomation/fanuc/common/digital_ports.py
 ./underautomation/fanuc/common/extended_cartesian_position.py
 ./underautomation/fanuc/common/ftp_connect_parameters.py
 ./underautomation/fanuc/common/io_status.py
 ./underautomation/fanuc/common/joints_position.py
+./underautomation/fanuc/common/languages.py
 ./underautomation/fanuc/common/position.py
 ./underautomation/fanuc/common/program_type.py
 ./underautomation/fanuc/common/rmi_connect_parameters.py
@@ -543,6 +545,19 @@ setup.py
 ./underautomation/fanuc/ftp/variables/zp_cylinder_variable_type.py
 ./underautomation/fanuc/ftp/variables/zp_grp_variable_type.py
 ./underautomation/fanuc/ftp/variables/zp_sphere_variable_type.py
+./underautomation/fanuc/kinematics/__init__.py
+./underautomation/fanuc/kinematics/arm_kinematic_models.py
+./underautomation/fanuc/kinematics/crx10ia_l_dhm_parameters.py
+./underautomation/fanuc/kinematics/dh_parameters.py
+./underautomation/fanuc/kinematics/i_dh_parameters.py
+./underautomation/fanuc/kinematics/kinematics_category.py
+./underautomation/fanuc/kinematics/kinematics_utils.py
+./underautomation/fanuc/kinematics/crx/__init__.py
+./underautomation/fanuc/kinematics/crx/crx_kinematics_utils.py
+./underautomation/fanuc/kinematics/internal/__init__.py
+./underautomation/fanuc/kinematics/internal/arm_model_attribute.py
+./underautomation/fanuc/kinematics/opw/__init__.py
+./underautomation/fanuc/kinematics/opw/opw_kinematics_utils.py
 ./underautomation/fanuc/lib/UnderAutomation.Fanuc.dll
 ./underautomation/fanuc/lib/version.txt
 ./underautomation/fanuc/license/__init__.py
@@ -679,11 +694,13 @@ underautomation/fanuc/common/cartesian_position.py
 underautomation/fanuc/common/cartesian_position_with_tool.py
 underautomation/fanuc/common/cartesian_position_with_user_frame.py
 underautomation/fanuc/common/configuration.py
+underautomation/fanuc/common/connect_exception.py
 underautomation/fanuc/common/digital_ports.py
 underautomation/fanuc/common/extended_cartesian_position.py
 underautomation/fanuc/common/ftp_connect_parameters.py
 underautomation/fanuc/common/io_status.py
 underautomation/fanuc/common/joints_position.py
+underautomation/fanuc/common/languages.py
 underautomation/fanuc/common/position.py
 underautomation/fanuc/common/program_type.py
 underautomation/fanuc/common/rmi_connect_parameters.py
@@ -1210,6 +1227,19 @@ underautomation/fanuc/ftp/variables/zp_cfg_variable_type.py
 underautomation/fanuc/ftp/variables/zp_cylinder_variable_type.py
 underautomation/fanuc/ftp/variables/zp_grp_variable_type.py
 underautomation/fanuc/ftp/variables/zp_sphere_variable_type.py
+underautomation/fanuc/kinematics/__init__.py
+underautomation/fanuc/kinematics/arm_kinematic_models.py
+underautomation/fanuc/kinematics/crx10ia_l_dhm_parameters.py
+underautomation/fanuc/kinematics/dh_parameters.py
+underautomation/fanuc/kinematics/i_dh_parameters.py
+underautomation/fanuc/kinematics/kinematics_category.py
+underautomation/fanuc/kinematics/kinematics_utils.py
+underautomation/fanuc/kinematics/crx/__init__.py
+underautomation/fanuc/kinematics/crx/crx_kinematics_utils.py
+underautomation/fanuc/kinematics/internal/__init__.py
+underautomation/fanuc/kinematics/internal/arm_model_attribute.py
+underautomation/fanuc/kinematics/opw/__init__.py
+underautomation/fanuc/kinematics/opw/opw_kinematics_utils.py
 underautomation/fanuc/lib/UnderAutomation.Fanuc.dll
 underautomation/fanuc/lib/version.txt
 underautomation/fanuc/license/__init__.py

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/common/cartesian_position.py

@@ -14,6 +14,20 @@ class CartesianPosition(XYZPosition):
 			self._instance = _internal
 	def __repr__(self):
 		return self._instance.ToString()
+	def to_homogeneous_matrix(self) -> typing.List[float]:
+		return self._instance.ToHomogeneousMatrix()
+	@staticmethod
+	def from_homogeneous_matrix(R: typing.List[float]) -> 'CartesianPosition':
+		return CartesianPosition(None, None, None, None, None, None, None, cartesian_position.FromHomogeneousMatrix(R))
+	@staticmethod
+	def normalize_angle(angle: float) -> float:
+		return cartesian_position.NormalizeAngle(angle)
+	@staticmethod
+	def normalize_angles(pose: 'CartesianPosition') -> None:
+		cartesian_position.NormalizeAngles(pose._instance if pose else None)
+	@staticmethod
+	def is_near(a: 'CartesianPosition', b: 'CartesianPosition', mmTolerance: float, degreesTolerance: float) -> bool:
+		return cartesian_position.IsNear(a._instance if a else None, b._instance if b else None, mmTolerance, degreesTolerance)
 	@property
 	def w(self) -> float:
 		return self._instance.W

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/common/configuration.py

@@ -19,6 +19,9 @@ class Configuration:
 	def from_string(self, value: str) -> None:
 		self._instance.FromString(value)
 	@property
+	def is_unknown(self) -> bool:
+		return self._instance.IsUnknown
+	@property
 	def wrist_flip(self) -> WristFlip:
 		return WristFlip(self._instance.WristFlip)
 	@wrist_flip.setter
@@ -43,20 +46,20 @@ class Configuration:
 	def arm_front_back(self, value: ArmFrontBack):
 		self._instance.ArmFrontBack = value
 	@property
-	def turn_axis1(self) -> int:
-		return self._instance.TurnAxis1
-	@turn_axis1.setter
-	def turn_axis1(self, value: int):
-		self._instance.TurnAxis1 = value
-	@property
-	def turn_axis2(self) -> int:
-		return self._instance.TurnAxis2
-	@turn_axis2.setter
-	def turn_axis2(self, value: int):
-		self._instance.TurnAxis2 = value
-	@property
-	def turn_axis3(self) -> int:
-		return self._instance.TurnAxis3
-	@turn_axis3.setter
-	def turn_axis3(self, value: int):
-		self._instance.TurnAxis3 = value
+	def turn_axis4(self) -> int:
+		return self._instance.TurnAxis4
+	@turn_axis4.setter
+	def turn_axis4(self, value: int):
+		self._instance.TurnAxis4 = value
+	@property
+	def turn_axis5(self) -> int:
+		return self._instance.TurnAxis5
+	@turn_axis5.setter
+	def turn_axis5(self, value: int):
+		self._instance.TurnAxis5 = value
+	@property
+	def turn_axis6(self) -> int:
+		return self._instance.TurnAxis6
+	@turn_axis6.setter
+	def turn_axis6(self, value: int):
+		self._instance.TurnAxis6 = value

underautomation_fanuc-3.1.1.0/underautomation/fanuc/common/connect_exception.py

@@ -0,0 +1,18 @@
+import typing
+import clr
+import os
+clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..",  'lib', 'UnderAutomation.Fanuc.dll')))
+from UnderAutomation.Fanuc.Common import ConnectException as connect_exception
+
+class ConnectException:
+	def __init__(self, _internal = 0):
+		if(_internal == 0):
+			self._instance = connect_exception()
+		else:
+			self._instance = _internal
+	@property
+	def service(self) -> str:
+		return self._instance.Service
+	@property
+	def robot_ip(self) -> str:
+		return self._instance.RobotIp

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/common/extended_cartesian_position.py

@@ -6,9 +6,9 @@ clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..",
 from UnderAutomation.Fanuc.Common import ExtendedCartesianPosition as extended_cartesian_position
 
 class ExtendedCartesianPosition(CartesianPosition):
-	def __init__(self, x: float, y: float, z: float, w: float, p: float, r: float, e1: float, e2: float, e3: float, t4: int, t5: int, t6: int, _internal = 0):
+	def __init__(self, x: float, y: float, z: float, w: float, p: float, r: float, e1: float, e2: float, e3: float, _internal = 0):
 		if(_internal == 0):
-			self._instance = extended_cartesian_position(x, y, z, w, p, r, e1, e2, e3, t4, t5, t6)
+			self._instance = extended_cartesian_position(x, y, z, w, p, r, e1, e2, e3)
 		else:
 			self._instance = _internal
 	@property
@@ -29,21 +29,3 @@ class ExtendedCartesianPosition(CartesianPosition):
 	@e3.setter
 	def e3(self, value: float):
 		self._instance.E3 = value
-	@property
-	def t4(self) -> int:
-		return self._instance.T4
-	@t4.setter
-	def t4(self, value: int):
-		self._instance.T4 = value
-	@property
-	def t5(self) -> int:
-		return self._instance.T5
-	@t5.setter
-	def t5(self, value: int):
-		self._instance.T5 = value
-	@property
-	def t6(self) -> int:
-		return self._instance.T6
-	@t6.setter
-	def t6(self, value: int):
-		self._instance.T6 = value

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/common/joints_position.py

@@ -5,13 +5,22 @@ clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..",
 from UnderAutomation.Fanuc.Common import JointsPosition as joints_position
 
 class JointsPosition:
-	def __init__(self, j1: float, j2: float, j3: float, j4: float, j5: float, j6: float, j7: float, j8: float, j9: float, _internal = 0):
+	def __init__(self, j1Deg: float, j2Deg: float, j3Deg: float, j4Deg: float, j5Deg: float, j6Deg: float, j7Deg: float, j8Deg: float, j9Deg: float, _internal = 0):
 		if(_internal == 0):
-			self._instance = joints_position(j1, j2, j3, j4, j5, j6, j7, j8, j9)
+			self._instance = joints_position(j1Deg, j2Deg, j3Deg, j4Deg, j5Deg, j6Deg, j7Deg, j8Deg, j9Deg)
 		else:
 			self._instance = _internal
 	def __repr__(self):
 		return self._instance.ToString()
+	@staticmethod
+	def is_near(j1: 'JointsPosition', j2: 'JointsPosition', degreesTolerance: float) -> bool:
+		return joints_position.IsNear(j1._instance if j1 else None, j2._instance if j2 else None, degreesTolerance)
+	@property
+	def item(self) -> float:
+		return self._instance.Item
+	@item.setter
+	def item(self, value: float):
+		self._instance.Item = value
 	@property
 	def values(self) -> typing.List[float]:
 		return self._instance.Values

underautomation_fanuc-3.1.1.0/underautomation/fanuc/common/languages.py

@@ -0,0 +1,9 @@
+import clr
+import os
+clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..",  'lib', 'UnderAutomation.Fanuc.dll')))
+from UnderAutomation.Fanuc.Common import Languages as languages
+
+class Languages(int):
+	English = languages.English
+	Japanese = languages.Japanese
+	Chinese = languages.Chinese

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/common/position.py

@@ -32,7 +32,7 @@ class Position:
 		self._instance.JointsPosition = value
 	@property
 	def cartesian_position(self) -> ExtendedCartesianPosition:
-		return ExtendedCartesianPosition(None, None, None, None, None, None, None, None, None, None, None, None, self._instance.CartesianPosition)
+		return ExtendedCartesianPosition(None, None, None, None, None, None, None, None, None, self._instance.CartesianPosition)
 	@cartesian_position.setter
 	def cartesian_position(self, value: ExtendedCartesianPosition):
 		self._instance.CartesianPosition = value

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/connection_parameters.py

@@ -1,4 +1,5 @@
 import typing
+from underautomation.fanuc.common.languages import Languages
 from underautomation.fanuc.common.telnet_connect_parameters import TelnetConnectParameters
 from underautomation.fanuc.common.ftp_connect_parameters import FtpConnectParameters
 from underautomation.fanuc.common.snpx_connect_parameters import SnpxConnectParameters
@@ -27,6 +28,12 @@ class ConnectionParameters:
 	def ping_before_connect(self, value: bool):
 		self._instance.PingBeforeConnect = value
 	@property
+	def language(self) -> Languages:
+		return Languages(self._instance.Language)
+	@language.setter
+	def language(self, value: Languages):
+		self._instance.Language = value
+	@property
 	def telnet(self) -> TelnetConnectParameters:
 		return TelnetConnectParameters(self._instance.Telnet)
 	@telnet.setter

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/fanuc_robot.py

@@ -17,7 +17,7 @@ class FanucRobot:
 		else:
 			self._instance = _internal
 	def connect(self, parameters: ConnectionParameters) -> None:
-		self._instance.Connect(parameters._instance)
+		self._instance.Connect(parameters._instance if parameters else None)
 	def disconnect(self) -> None:
 		self._instance.Disconnect()
 	@staticmethod

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/diagnosis/current_position_reader.py

@@ -17,5 +17,5 @@ class CurrentPositionReader(SectionParser1[CurrentPosition]):
 	def parse_line(self, line: str) -> None:
 		self._instance.ParseLine(line)
 	@property
-	def section_start(self) -> str:
+	def section_start(self) -> typing.List[str]:
 		return self._instance.SectionStart

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/diagnosis/diagnosis_reader_2.py

@@ -1,4 +1,5 @@
 import typing
+from underautomation.fanuc.common.languages import Languages
 from underautomation.fanuc.ftp.internal.file_reader_1 import FileReader1
 import clr
 import os
@@ -13,5 +14,5 @@ class DiagnosisReader2(FileReader1[T], typing.Generic[T, U]):
 			self._instance = diagnosis_reader_2()
 		else:
 			self._instance = _internal
-	def read_file(self, fileStream: typing.Any, fileName: str="None") -> T:
-		return self._instance.ReadFile(fileStream, fileName)
+	def read_file(self, fileStream: typing.Any, language: Languages, fileName: str="None") -> T:
+		return self._instance.ReadFile(fileStream, language, fileName)

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/diagnosis/features_parser.py

@@ -17,5 +17,5 @@ class FeaturesParser(SectionParser1[Features]):
 	def after_parse(self) -> None:
 		self._instance.AfterParse()
 	@property
-	def section_start(self) -> str:
+	def section_start(self) -> typing.List[str]:
 		return self._instance.SectionStart

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/diagnosis/io_state_parser.py

@@ -17,5 +17,5 @@ class IOStateParser(SectionParser1[IOState]):
 	def after_parse(self) -> None:
 		self._instance.AfterParse()
 	@property
-	def section_start(self) -> str:
+	def section_start(self) -> typing.List[str]:
 		return self._instance.SectionStart

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/diagnosis/program_states_parser.py

@@ -17,5 +17,5 @@ class ProgramStatesParser(SectionParser1[ProgramStates]):
 	def after_parse(self) -> None:
 		self._instance.AfterParse()
 	@property
-	def section_start(self) -> str:
+	def section_start(self) -> typing.List[str]:
 		return self._instance.SectionStart

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/diagnosis/safety_status_parser.py

@@ -15,5 +15,5 @@ class SafetyStatusParser(SectionParser1[SafetyStatus]):
 	def parse_line(self, line: str, start: str, setValue: typing.Any) -> None:
 		self._instance.ParseLine(line, start, setValue)
 	@property
-	def section_start(self) -> str:
+	def section_start(self) -> typing.List[str]:
 		return self._instance.SectionStart

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/diagnosis/summary_diagnosis_reader.py

@@ -1,5 +1,6 @@
 import typing
 from underautomation.fanuc.ftp.diagnosis.summary_diagnosis import SummaryDiagnosis
+from underautomation.fanuc.common.languages import Languages
 from underautomation.fanuc.ftp.internal.file_reader_1 import FileReader1
 import clr
 import os
@@ -12,5 +13,5 @@ class SummaryDiagnosisReader(FileReader1[SummaryDiagnosis]):
 			self._instance = summary_diagnosis_reader()
 		else:
 			self._instance = _internal
-	def read_file(self, fileStream: typing.Any, fileName: str) -> SummaryDiagnosis:
-		return SummaryDiagnosis(self._instance.ReadFile(fileStream, fileName))
+	def read_file(self, fileStream: typing.Any, language: Languages, fileName: str) -> SummaryDiagnosis:
+		return SummaryDiagnosis(self._instance.ReadFile(fileStream, language, fileName))

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/fanuc_file_readers.py

@@ -1,5 +1,6 @@
 import typing
 from underautomation.fanuc.ftp.internal.i_fanuc_content import IFanucContent
+from underautomation.fanuc.common.languages import Languages
 from underautomation.fanuc.ftp.internal.i_file_reader_1 import IFileReader1
 from underautomation.fanuc.ftp.variables.variable_reader import VariableReader
 from underautomation.fanuc.ftp.list.error_list_reader import ErrorListReader
@@ -25,29 +26,22 @@ class FanucFileReaders:
 		else:
 			self._instance = _internal
 	@staticmethod
-	def read_file(fileStream: typing.Any, fileName: str) -> IFanucContent:
-		return IFanucContent(fanuc_file_readers.ReadFile(fileStream, fileName))
+	def read_file(fileStream: typing.Any, fileName: str, language: Languages) -> IFanucContent:
+		return IFanucContent(fanuc_file_readers.ReadFile(fileStream, fileName, language))
 	@property
 	def readers(self) -> typing.List[IFileReader1]:
 		return [IFileReader1(x) for x in self._instance.Readers]
-	@property
-	def variable_reader(self) -> VariableReader:
-		return VariableReader(self._instance.VariableReader)
-	@property
-	def error_list_reader(self) -> ErrorListReader:
-		return ErrorListReader(self._instance.ErrorListReader)
-	@property
-	def summary_diagnostic_reader(self) -> SummaryDiagnosisReader:
-		return SummaryDiagnosisReader(self._instance.SummaryDiagnosticReader)
-	@property
-	def current_position_reader(self) -> DiagnosisReader2[CurrentPosition, CurrentPositionReader]:
-		return DiagnosisReader2[CurrentPosition, CurrentPositionReader](self._instance.CurrentPositionReader)
-	@property
-	def io_state_reader(self) -> DiagnosisReader2[IOState, IOStateParser]:
-		return DiagnosisReader2[IOState, IOStateParser](self._instance.IOStateReader)
-	@property
-	def safety_status_reader(self) -> DiagnosisReader2[SafetyStatus, SafetyStatusParser]:
-		return DiagnosisReader2[SafetyStatus, SafetyStatusParser](self._instance.SafetyStatusReader)
-	@property
-	def program_states(self) -> DiagnosisReader2[ProgramStates, ProgramStatesParser]:
-		return DiagnosisReader2[ProgramStates, ProgramStatesParser](self._instance.ProgramStates)
+
+FanucFileReaders.variable_reader = FanucFileReaders(fanuc_file_readers.VariableReader)
+
+FanucFileReaders.error_list_reader = FanucFileReaders(fanuc_file_readers.ErrorListReader)
+
+FanucFileReaders.summary_diagnostic_reader = FanucFileReaders(fanuc_file_readers.SummaryDiagnosticReader)
+
+FanucFileReaders.current_position_reader = FanucFileReaders(fanuc_file_readers.CurrentPositionReader)
+
+FanucFileReaders.io_state_reader = FanucFileReaders(fanuc_file_readers.IOStateReader)
+
+FanucFileReaders.safety_status_reader = FanucFileReaders(fanuc_file_readers.SafetyStatusReader)
+
+FanucFileReaders.program_states = FanucFileReaders(fanuc_file_readers.ProgramStates)

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/internal/file_reader_1.py

@@ -1,6 +1,7 @@
 import typing
 from underautomation.fanuc.ftp.internal.i_file_reader_1 import IFileReader1
 from underautomation.fanuc.ftp.internal.i_file_reader import IFileReader
+from underautomation.fanuc.common.languages import Languages
 from underautomation.fanuc.ftp.internal.file_reader import FileReader
 import clr
 import os
@@ -14,5 +15,5 @@ class FileReader1(FileReader, IFileReader1[T], IFileReader, typing.Generic[T]):
 			self._instance = file_reader_1()
 		else:
 			self._instance = _internal
-	def read_file(self, fileStream: typing.Any, fileName: str="None") -> T:
-		return self._instance.ReadFile(fileStream, fileName)
+	def read_file(self, fileStream: typing.Any, language: Languages, fileName: str="None") -> T:
+		return self._instance.ReadFile(fileStream, language, fileName)

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/internal/ftp_client_base.py

@@ -1,4 +1,5 @@
 import typing
+from underautomation.fanuc.common.languages import Languages
 from underautomation.fanuc.ftp.internal.ftp_direct_file_handling import FtpDirectFileHandling
 from underautomation.fanuc.ftp.internal.ftp_known_variable_files import FtpKnownVariableFiles
 from underautomation.fanuc.ftp.diagnosis.summary_diagnosis import SummaryDiagnosis
@@ -15,7 +16,6 @@ import os
 clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..",  'lib', 'UnderAutomation.Fanuc.dll')))
 from UnderAutomation.Fanuc.Ftp.Internal import FtpClientBase as ftp_client_base
 
-렫 = typing.TypeVar('렫')
 class FtpClientBase:
 	def __init__(self, _internal = 0):
 		if(_internal == 0):
@@ -46,6 +46,12 @@ class FtpClientBase:
 	def ip(self) -> str:
 		return self._instance.IP
 	@property
+	def language(self) -> Languages:
+		return Languages(self._instance.Language)
+	@language.setter
+	def language(self, value: Languages):
+		self._instance.Language = value
+	@property
 	def connected(self) -> bool:
 		return self._instance.Connected
 	@property

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/internal/i_file_reader_1.py

@@ -1,5 +1,6 @@
 import typing
 from underautomation.fanuc.ftp.internal.i_file_reader import IFileReader
+from underautomation.fanuc.common.languages import Languages
 import clr
 import os
 clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..",  'lib', 'UnderAutomation.Fanuc.dll')))
@@ -12,5 +13,5 @@ class IFileReader1(IFileReader, typing.Generic[T]):
 			self._instance = i_file_reader_1()
 		else:
 			self._instance = _internal
-	def read_file(self, fileStream: typing.Any, fileName: str) -> T:
-		return self._instance.ReadFile(fileStream, fileName)
+	def read_file(self, fileStream: typing.Any, language: Languages, fileName: str) -> T:
+		return self._instance.ReadFile(fileStream, language, fileName)

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/internal/section_parser.py

@@ -17,7 +17,7 @@ class SectionParser:
 	def after_parse(self) -> None:
 		self._instance.AfterParse()
 	@property
-	def section_start(self) -> str:
+	def section_start(self) -> typing.List[str]:
 		return self._instance.SectionStart
 	@property
 	def end_of_file(self) -> bool:

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/list/error_list_reader.py

@@ -1,5 +1,6 @@
 import typing
 from underautomation.fanuc.ftp.list.error_list import ErrorList
+from underautomation.fanuc.common.languages import Languages
 from underautomation.fanuc.ftp.internal.file_reader_1 import FileReader1
 import clr
 import os
@@ -12,5 +13,5 @@ class ErrorListReader(FileReader1[ErrorList]):
 			self._instance = error_list_reader()
 		else:
 			self._instance = _internal
-	def read_file(self, fileStream: typing.Any, fileName: str="None") -> ErrorList:
-		return ErrorList(self._instance.ReadFile(fileStream, fileName))
+	def read_file(self, fileStream: typing.Any, language: Languages, fileName: str="None") -> ErrorList:
+		return ErrorList(self._instance.ReadFile(fileStream, language, fileName))

{underautomation_fanuc-2.3.0.0 → underautomation_fanuc-3.1.1.0}/underautomation/fanuc/ftp/variables/generic_variable_type_helpers.py

@@ -13,7 +13,7 @@ class GenericVariableTypeHelpers:
 			self._instance = _internal
 	@staticmethod
 	def get_ancestors(element: IGenericVariableType) -> typing.List[IGenericVariableType]:
-		return [IGenericVariableType(x) for x in generic_variable_type_helpers.GetAncestors(element._instance)]
+		return [IGenericVariableType(x) for x in generic_variable_type_helpers.GetAncestors(element._instance if element else None)]
 	@staticmethod
 	def get_field(element: IGenericVariableType, name: str) -> IGenericVariableType:
-		return IGenericVariableType(generic_variable_type_helpers.GetField(element._instance, name))
+		return IGenericVariableType(generic_variable_type_helpers.GetField(element._instance if element else None, name))

underautomation_fanuc-3.1.1.0/underautomation/fanuc/ftp/variables/variable_reader.py

@@ -0,0 +1,130 @@
+import typing
+from underautomation.fanuc.ftp.variables.generic_variable_file import GenericVariableFile
+from underautomation.fanuc.common.languages import Languages
+from underautomation.fanuc.ftp.variables.generic_variable import GenericVariable
+from underautomation.fanuc.ftp.variables.variable_reader_1 import VariableReader1
+from underautomation.fanuc.ftp.internal.file_reader_1 import FileReader1
+from underautomation.fanuc.ftp.variables.aavmmain_file import AavmmainFile
+from underautomation.fanuc.ftp.variables.bicsetup_file import BicsetupFile
+from underautomation.fanuc.ftp.variables.cbparam_file import CbparamFile
+from underautomation.fanuc.ftp.variables.cellio_file import CellioFile
+from underautomation.fanuc.ftp.variables.comset_file import ComsetFile
+from underautomation.fanuc.ftp.variables.diocfgsv_file import DiocfgsvFile
+from underautomation.fanuc.ftp.variables.gemdata_file import GemdataFile
+from underautomation.fanuc.ftp.variables.htcolrec_file import HtcolrecFile
+from underautomation.fanuc.ftp.variables.httpkcl_file import HttpkclFile
+from underautomation.fanuc.ftp.variables.irc_counter_file import IrcCounterFile
+from underautomation.fanuc.ftp.variables.irc_msg_file import IrcMsgFile
+from underautomation.fanuc.ftp.variables.irc_status_file import IrcStatusFile
+from underautomation.fanuc.ftp.variables.irc_stlabel_file import IrcStlabelFile
+from underautomation.fanuc.ftp.variables.klaction_file import KlactionFile
+from underautomation.fanuc.ftp.variables.mixlogic_file import MixlogicFile
+from underautomation.fanuc.ftp.variables.mtparam_file import MtparamFile
+from underautomation.fanuc.ftp.variables.numreg_file import NumregFile
+from underautomation.fanuc.ftp.variables.palreg_file import PalregFile
+from underautomation.fanuc.ftp.variables.posreg_file import PosregFile
+from underautomation.fanuc.ftp.variables.strreg_file import StrregFile
+from underautomation.fanuc.ftp.variables.swiupdt_file import SwiupdtFile
+from underautomation.fanuc.ftp.variables.sycldint_file import SycldintFile
+from underautomation.fanuc.ftp.variables.symotn_file import SymotnFile
+from underautomation.fanuc.ftp.variables.synosave_file import SynosaveFile
+from underautomation.fanuc.ftp.variables.sysframe_file import SysframeFile
+from underautomation.fanuc.ftp.variables.sysfsac_file import SysfsacFile
+from underautomation.fanuc.ftp.variables.syshost_file import SyshostFile
+from underautomation.fanuc.ftp.variables.sysmacro_file import SysmacroFile
+from underautomation.fanuc.ftp.variables.sysmast_file import SysmastFile
+from underautomation.fanuc.ftp.variables.syspass_file import SyspassFile
+from underautomation.fanuc.ftp.variables.sysservo_file import SysservoFile
+from underautomation.fanuc.ftp.variables.system_file import SystemFile
+from underautomation.fanuc.ftp.variables.sysuif_file import SysuifFile
+from underautomation.fanuc.ftp.variables.tpsnap_file import TpsnapFile
+from underautomation.fanuc.ftp.variables.vcmrinit_file import VcmrinitFile
+import clr
+import os
+clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..",  'lib', 'UnderAutomation.Fanuc.dll')))
+from UnderAutomation.Fanuc.Ftp.Variables import VariableReader as variable_reader
+
+class VariableReader(FileReader1[GenericVariableFile]):
+	def __init__(self, _internal = 0):
+		if(_internal == 0):
+			self._instance = variable_reader()
+		else:
+			self._instance = _internal
+	def read_file(self, fileStream: typing.Any, language: Languages, fileName: str) -> GenericVariableFile:
+		return GenericVariableFile(self._instance.ReadFile(fileStream, language, fileName))
+	@staticmethod
+	def read_variable_file(fileStream: typing.Any, fileName: str, language: Languages) -> GenericVariableFile:
+		return GenericVariableFile(variable_reader.ReadVariableFile(fileStream, fileName, language))
+	@staticmethod
+	def parse_variable_file(stream: typing.Any, language: Languages) -> typing.List[GenericVariable]:
+		return [GenericVariable(x) for x in variable_reader.ParseVariableFile(stream, language)]
+
+VariableReader.aavmmain_file = VariableReader(variable_reader.AavmmainFile)
+
+VariableReader.bicsetup_file = VariableReader(variable_reader.BicsetupFile)
+
+VariableReader.cbparam_file = VariableReader(variable_reader.CbparamFile)
+
+VariableReader.cellio_file = VariableReader(variable_reader.CellioFile)
+
+VariableReader.comset_file = VariableReader(variable_reader.ComsetFile)
+
+VariableReader.diocfgsv_file = VariableReader(variable_reader.DiocfgsvFile)
+
+VariableReader.gemdata_file = VariableReader(variable_reader.GemdataFile)
+
+VariableReader.htcolrec_file = VariableReader(variable_reader.HtcolrecFile)
+
+VariableReader.httpkcl_file = VariableReader(variable_reader.HttpkclFile)
+
+VariableReader.irc_counter_file = VariableReader(variable_reader.IrcCounterFile)
+
+VariableReader.irc_msg_file = VariableReader(variable_reader.IrcMsgFile)
+
+VariableReader.irc_status_file = VariableReader(variable_reader.IrcStatusFile)
+
+VariableReader.irc_stlabel_file = VariableReader(variable_reader.IrcStlabelFile)
+
+VariableReader.klaction_file = VariableReader(variable_reader.KlactionFile)
+
+VariableReader.mixlogic_file = VariableReader(variable_reader.MixlogicFile)
+
+VariableReader.mtparam_file = VariableReader(variable_reader.MtparamFile)
+
+VariableReader.numreg_file = VariableReader(variable_reader.NumregFile)
+
+VariableReader.palreg_file = VariableReader(variable_reader.PalregFile)
+
+VariableReader.posreg_file = VariableReader(variable_reader.PosregFile)
+
+VariableReader.strreg_file = VariableReader(variable_reader.StrregFile)
+
+VariableReader.swiupdt_file = VariableReader(variable_reader.SwiupdtFile)
+
+VariableReader.sycldint_file = VariableReader(variable_reader.SycldintFile)
+
+VariableReader.symotn_file = VariableReader(variable_reader.SymotnFile)
+
+VariableReader.synosave_file = VariableReader(variable_reader.SynosaveFile)
+
+VariableReader.sysframe_file = VariableReader(variable_reader.SysframeFile)
+
+VariableReader.sysfsac_file = VariableReader(variable_reader.SysfsacFile)
+
+VariableReader.syshost_file = VariableReader(variable_reader.SyshostFile)
+
+VariableReader.sysmacro_file = VariableReader(variable_reader.SysmacroFile)
+
+VariableReader.sysmast_file = VariableReader(variable_reader.SysmastFile)
+
+VariableReader.syspass_file = VariableReader(variable_reader.SyspassFile)
+
+VariableReader.sysservo_file = VariableReader(variable_reader.SysservoFile)
+
+VariableReader.system_file = VariableReader(variable_reader.SystemFile)
+
+VariableReader.sysuif_file = VariableReader(variable_reader.SysuifFile)
+
+VariableReader.tpsnap_file = VariableReader(variable_reader.TpsnapFile)
+
+VariableReader.vcmrinit_file = VariableReader(variable_reader.VcmrinitFile)