Skip to content

Commit 207cdff

Browse files
Update to new version : 3.1.1.0
1 parent 0cf3f18 commit 207cdff

30 files changed

+100
-182
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import typing
2+
import clr
3+
import os
4+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", 'lib', 'UnderAutomation.Fanuc.dll')))
5+
from UnderAutomation.Fanuc.Common import ConnectException as connect_exception
6+
7+
class ConnectException:
8+
def __init__(self, _internal = 0):
9+
if(_internal == 0):
10+
self._instance = connect_exception()
11+
else:
12+
self._instance = _internal
13+
@property
14+
def service(self) -> str:
15+
return self._instance.Service
16+
@property
17+
def robot_ip(self) -> str:
18+
return self._instance.RobotIp
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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.Common import Languages as languages
5+
6+
class Languages(int):
7+
English = languages.English
8+
Japanese = languages.Japanese
9+
Chinese = languages.Chinese

underautomation/fanuc/connection_parameters.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import typing
2+
from underautomation.fanuc.common.languages import Languages
23
from underautomation.fanuc.common.telnet_connect_parameters import TelnetConnectParameters
34
from underautomation.fanuc.common.ftp_connect_parameters import FtpConnectParameters
45
from underautomation.fanuc.common.snpx_connect_parameters import SnpxConnectParameters
@@ -27,6 +28,12 @@ def ping_before_connect(self) -> bool:
2728
def ping_before_connect(self, value: bool):
2829
self._instance.PingBeforeConnect = value
2930
@property
31+
def language(self) -> Languages:
32+
return Languages(self._instance.Language)
33+
@language.setter
34+
def language(self, value: Languages):
35+
self._instance.Language = value
36+
@property
3037
def telnet(self) -> TelnetConnectParameters:
3138
return TelnetConnectParameters(self._instance.Telnet)
3239
@telnet.setter

underautomation/fanuc/ftp/diagnosis/current_position_reader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ def after_parse(self) -> None:
1717
def parse_line(self, line: str) -> None:
1818
self._instance.ParseLine(line)
1919
@property
20-
def section_start(self) -> str:
20+
def section_start(self) -> typing.List[str]:
2121
return self._instance.SectionStart

underautomation/fanuc/ftp/diagnosis/diagnosis_reader_2.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import typing
2+
from underautomation.fanuc.common.languages import Languages
23
from underautomation.fanuc.ftp.internal.file_reader_1 import FileReader1
34
import clr
45
import os
@@ -13,5 +14,5 @@ def __init__(self, _internal = 0):
1314
self._instance = diagnosis_reader_2()
1415
else:
1516
self._instance = _internal
16-
def read_file(self, fileStream: typing.Any, fileName: str="None") -> T:
17-
return self._instance.ReadFile(fileStream, fileName)
17+
def read_file(self, fileStream: typing.Any, language: Languages, fileName: str="None") -> T:
18+
return self._instance.ReadFile(fileStream, language, fileName)

underautomation/fanuc/ftp/diagnosis/features_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ def parse_line(self, line: str) -> None:
1717
def after_parse(self) -> None:
1818
self._instance.AfterParse()
1919
@property
20-
def section_start(self) -> str:
20+
def section_start(self) -> typing.List[str]:
2121
return self._instance.SectionStart

underautomation/fanuc/ftp/diagnosis/io_state_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ def parse_line(self, line: str) -> None:
1717
def after_parse(self) -> None:
1818
self._instance.AfterParse()
1919
@property
20-
def section_start(self) -> str:
20+
def section_start(self) -> typing.List[str]:
2121
return self._instance.SectionStart

underautomation/fanuc/ftp/diagnosis/program_states_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ def parse_line(self, line: str) -> None:
1717
def after_parse(self) -> None:
1818
self._instance.AfterParse()
1919
@property
20-
def section_start(self) -> str:
20+
def section_start(self) -> typing.List[str]:
2121
return self._instance.SectionStart

underautomation/fanuc/ftp/diagnosis/safety_status_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ def __init__(self, _internal = 0):
1515
def parse_line(self, line: str, start: str, setValue: typing.Any) -> None:
1616
self._instance.ParseLine(line, start, setValue)
1717
@property
18-
def section_start(self) -> str:
18+
def section_start(self) -> typing.List[str]:
1919
return self._instance.SectionStart

underautomation/fanuc/ftp/diagnosis/summary_diagnosis_reader.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import typing
22
from underautomation.fanuc.ftp.diagnosis.summary_diagnosis import SummaryDiagnosis
3+
from underautomation.fanuc.common.languages import Languages
34
from underautomation.fanuc.ftp.internal.file_reader_1 import FileReader1
45
import clr
56
import os
@@ -12,5 +13,5 @@ def __init__(self, _internal = 0):
1213
self._instance = summary_diagnosis_reader()
1314
else:
1415
self._instance = _internal
15-
def read_file(self, fileStream: typing.Any, fileName: str) -> SummaryDiagnosis:
16-
return SummaryDiagnosis(self._instance.ReadFile(fileStream, fileName))
16+
def read_file(self, fileStream: typing.Any, language: Languages, fileName: str) -> SummaryDiagnosis:
17+
return SummaryDiagnosis(self._instance.ReadFile(fileStream, language, fileName))

0 commit comments

Comments
 (0)