Skip to content

Commit 57b818f

Browse files
committed
update samples to new version
1 parent 9790806 commit 57b818f

File tree

69 files changed

+1264
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1264
-5
lines changed

.NET/Examples/WindowsDesktop/Components/AlarmControl.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void PeriodicUpdate()
6161
private void btnReset_Click(object sender, EventArgs e)
6262
{
6363
_robot.HighSpeedEServer.AlarmReset(AlarmResetType.Reset);
64+
OnOpen();
6465
}
6566

6667
private void btnRefresh_Click(object sender, EventArgs e)

.NET/Examples/WindowsDesktop/Components/FileControl.Designer.cs

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.NET/Examples/WindowsDesktop/Components/FileControl.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
126126
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
127127
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADo
128-
CAAAAk1TRnQBSQFMAgEBAwEAASABAQEgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
128+
CAAAAk1TRnQBSQFMAgEBAwEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
129129
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
130130
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
131131
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

.NET/Examples/WindowsDesktop/Components/LicenseControl.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Windows.Forms;
22
using UnderAutomation.Yaskawa;
3+
using UnderAutomation.Yaskawa.License;
34

45
public partial class LicenseControl : UserControl, IUserControl
56
{

.NET/Examples/WindowsDesktop/Components/PositionControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public PositionControl(YaskawaRobot Yaskawa)
2929

3030
public void OnClose()
3131
{
32-
worker.CancelAsync();
32+
if (worker.IsBusy) worker.CancelAsync();
3333
}
3434

3535
public void OnOpen()

.NET/Examples/WindowsDesktop/Components/StatusControl.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.NET/Examples/WindowsDesktop/Components/StatusControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public StatusControl(YaskawaRobot Yaskawa)
3232

3333
public void OnClose()
3434
{
35-
worker.CancelAsync();
35+
if (worker.IsBusy) worker.CancelAsync();
3636
}
3737

3838
public void OnOpen()

.github/workflows/Release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ jobs:
2828
run: |
2929
cd "$Env:GITHUB_WORKSPACE\.NET\Examples\WindowsDesktop\bin\Release\"
3030
7z a -tzip -mx=9 $Env:GITHUB_WORKSPACE\YaskawaSDK_DesktopExample.zip *
31+
- name: zip LABView example
32+
run: 7z a -tzip -mx=9 YaskawaSDK_LABView.zip LabVIEW\
3133
- uses: ncipollo/release-action@v1
3234
with:
33-
artifacts: "YaskawaSDK_Full.zip,YaskawaSDK_DesktopExample.zip,YaskawaSDK.zip"
35+
artifacts: "YaskawaSDK_Full.zip,YaskawaSDK_DesktopExample.zip,YaskawaSDK.zip,YaskawaSDK_LABView.zip"
3436
bodyFile: "whatsNew.md"
3537
token: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[My Computer]
2+
My Computer = "192.168.0.121"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[ProjectWindow_Data]
2+
ProjectExplorer.ClassicPosition[String] = "203,142,796,977"
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<Project Type="Project" LVVersion="21008000">
3+
<Item Name="My Computer" Type="My Computer">
4+
<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
5+
<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
6+
<Property Name="server.tcp.enabled" Type="Bool">false</Property>
7+
<Property Name="server.tcp.port" Type="Int">0</Property>
8+
<Property Name="server.tcp.serviceName" Type="Str">My Computer/VI Server</Property>
9+
<Property Name="server.tcp.serviceName.default" Type="Str">My Computer/VI Server</Property>
10+
<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
11+
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
12+
<Property Name="specify.custom.address" Type="Bool">false</Property>
13+
<Item Name="Demo.vi" Type="VI" URL="../Demo.vi"/>
14+
<Item Name="Dependencies" Type="Dependencies">
15+
<Item Name="UnderAutomation.Yaskawa.dll" Type="Document" URL="../../../Library/UnderAutomation.Yaskawa.dll"/>
16+
</Item>
17+
<Item Name="Build Specifications" Type="Build"/>
18+
</Item>
19+
</Project>

LabVIEW/Examples/LabVIEW21/Demo.vi

7.33 KB
Binary file not shown.
60.5 KB
Binary file not shown.

LabVIEW/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Read the documentation : https://underautomation.com/yaskawa/documentation/get-started-labview

Python/underautomation/__init__.py

Whitespace-only changes.

Python/underautomation/yaskawa/__init__.py

Whitespace-only changes.

Python/underautomation/yaskawa/common/__init__.py

Whitespace-only changes.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import typing
2+
from underautomation.yaskawa.high_speed_e_server.internal.high_speed_e_server_connect_parameters_base import HighSpeedEServerConnectParametersBase
3+
import clr
4+
import os
5+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", 'lib', 'UnderAutomation.Yaskawa.dll')))
6+
from UnderAutomation.Yaskawa.Common import HighSpeedEServerConnectParameters as high_speed_e_server_connect_parameters
7+
8+
class HighSpeedEServerConnectParameters(HighSpeedEServerConnectParametersBase):
9+
def __init__(self, _internal = 0):
10+
if(_internal == 0):
11+
self._instance = high_speed_e_server_connect_parameters()
12+
else:
13+
self._instance = _internal
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import typing
2+
from underautomation.yaskawa.common.high_speed_e_server_connect_parameters import HighSpeedEServerConnectParameters
3+
import clr
4+
import os
5+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), 'lib', 'UnderAutomation.Yaskawa.dll')))
6+
from UnderAutomation.Yaskawa import ConnectParameters as connect_parameters
7+
8+
class ConnectParameters:
9+
def __init__(self, ip: str, _internal = 0):
10+
if(_internal == 0):
11+
self._instance = connect_parameters(ip)
12+
else:
13+
self._instance = _internal
14+
@property
15+
def ping_before_connect(self) -> bool:
16+
return self._instance.PingBeforeConnect
17+
@ping_before_connect.setter
18+
def ping_before_connect(self, value: bool):
19+
self._instance.PingBeforeConnect = 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
26+
@property
27+
def high_speed_e_server(self) -> HighSpeedEServerConnectParameters:
28+
return HighSpeedEServerConnectParameters(self._instance.HighSpeedEServer)
29+
@high_speed_e_server.setter
30+
def high_speed_e_server(self, value: HighSpeedEServerConnectParameters):
31+
self._instance.HighSpeedEServer = value

Python/underautomation/yaskawa/high_speed_e_server/__init__.py

Whitespace-only changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class AlarmResetType(int):
2+
Reset = 1
3+
Cancel = 2
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class ArmFlipInformation(int):
2+
Upper = 0
3+
Lower = 1
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class AxisFlipInformation(int):
2+
LT180 = 0
3+
UT180 = 1
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
class ControlGroup(int):
2+
RobotPulseValue = 0
3+
BasePulseValue = 10
4+
StationPulseValue = 21
5+
RobotCartesian = 100
6+
BaseCartesian = 110
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class FlipNoFlipInformation(int):
2+
Flip = 0
3+
NoFlip = 1
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import typing
2+
import clr
3+
import os
4+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", 'lib', 'UnderAutomation.Yaskawa.dll')))
5+
from UnderAutomation.Yaskawa.HighSpeedEServer import GetFileProgress as get_file_progress
6+
7+
class GetFileProgress:
8+
def __init__(self, _internal = 0):
9+
if(_internal == 0):
10+
self._instance = get_file_progress()
11+
else:
12+
self._instance = _internal
13+
@property
14+
def completed(self) -> bool:
15+
return self._instance.Completed
16+
@completed.setter
17+
def completed(self, value: bool):
18+
self._instance.Completed = value
19+
@property
20+
def file_name(self) -> str:
21+
return self._instance.FileName
22+
@file_name.setter
23+
def file_name(self, value: str):
24+
self._instance.FileName = value
25+
@property
26+
def downloaded_bytes(self) -> int:
27+
return self._instance.DownloadedBytes
28+
@downloaded_bytes.setter
29+
def downloaded_bytes(self, value: int):
30+
self._instance.DownloadedBytes = value
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import typing
2+
from underautomation.yaskawa.high_speed_e_server.internal.high_speed_e_server_client_base import HighSpeedEServerClientBase
3+
import clr
4+
import os
5+
clr.AddReference(os.path.realpath(os.path.join(os.path.dirname(__file__), "..", 'lib', 'UnderAutomation.Yaskawa.dll')))
6+
from UnderAutomation.Yaskawa.HighSpeedEServer import HighSpeedEServerClient as high_speed_e_server_client
7+
8+
class HighSpeedEServerClient(HighSpeedEServerClientBase):
9+
def __init__(self, _internal = 0):
10+
if(_internal == 0):
11+
self._instance = high_speed_e_server_client()
12+
else:
13+
self._instance = _internal

Python/underautomation/yaskawa/high_speed_e_server/internal/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)