Skip to content

Commit b7a3fcb

Browse files
committed
Add language selection in ConnectControl
1 parent e691bc1 commit b7a3fcb

File tree

6 files changed

+93
-39
lines changed

6 files changed

+93
-39
lines changed

README.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,21 @@ using UnderAutomation.Fanuc;
320320

321321
```csharp
322322
var robot = new FanucRobot();
323-
robot.Connect(new ConnectParameters("192.168.0.1"));
323+
var parameters = new ConnectParameters("192.168.0.1");
324+
parameters.Language = Languages.English; // Japanese and Chinese controllers are also supported
325+
326+
parameters.Telnet.Enable = true;
327+
parameters.Telnet.TelnetKclPassword = "your_telnet_password";
328+
329+
parameters.Ftp.Enable = true;
330+
parameters.Ftp.FtpUser = "";
331+
parameters.Ftp.FtpPassword = "";
332+
333+
parameters.Snpx.Enable = true;
334+
335+
parameters.Rmi.Enable = true;
336+
337+
robot.Connect(parameters);
324338
```
325339

326340
---

UnderAutomation.Fanuc.Showcase.Forms/Components/ConnectControl.Designer.cs

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

UnderAutomation.Fanuc.Showcase.Forms/Components/ConnectControl.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
using System;
2-
using System.Drawing;
3-
using System.Windows.Forms;
4-
using UnderAutomation.Fanuc;
5-
using UnderAutomation.Fanuc.Ftp.Variables;
1+
using UnderAutomation.Fanuc;
2+
using UnderAutomation.Fanuc.Common;
63

74
public partial class ConnectControl : UserControl, IUserControl
85
{
96
FanucRobot _robot;
107

8+
private static ConnectControl Instance;
9+
10+
1111
public ConnectControl(FanucRobot Fanuc)
1212
{
13+
Instance = this;
14+
1315
_robot = Fanuc;
1416
InitializeComponent();
1517

@@ -28,6 +30,17 @@ public ConnectControl(FanucRobot Fanuc)
2830
chkSnpx.Checked = parameters.Snpx.Enable;
2931

3032
chkRmi.Checked = parameters.Rmi.Enable;
33+
34+
foreach (Languages language in Enum.GetValues<Languages>())
35+
{
36+
cbLanguage.Items.Add(language.ToString());
37+
}
38+
cbLanguage.SelectedItem = parameters.Language.ToString();
39+
}
40+
41+
public static Languages GetSelectedLanguage()
42+
{
43+
return Enum.Parse<Languages>(Instance.cbLanguage.SelectedItem.ToString());
3144
}
3245

3346
#region IUserControl
@@ -55,6 +68,8 @@ private void btnConnect_Click(object sender, EventArgs e)
5568
if (e is KeyEventArgs && ((KeyEventArgs)e).KeyCode != Keys.Enter) return;
5669
var parameters = new ConnectionParameters();
5770
parameters.Address = txtIP.Text;
71+
parameters.Language = GetSelectedLanguage();
72+
5873
parameters.Telnet.Enable = chkTelnet.Checked;
5974
parameters.Telnet.TelnetKclPassword = txtTelnetKclPassword.Text;
6075

UnderAutomation.Fanuc.Showcase.Forms/Components/ConnectControl.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,4 @@
120120
<metadata name="addressTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121
<value>17, 17</value>
122122
</metadata>
123-
<metadata name="addressTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124-
<value>17, 17</value>
125-
</metadata>
126123
</root>

UnderAutomation.Fanuc.Showcase.Forms/Components/HeaderFileControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private void tsBrowse_Click(object sender, System.EventArgs e)
3535
if (dlgOpen.ShowDialog() == DialogResult.OK)
3636
{
3737
var sw = Stopwatch.StartNew();
38-
var content = _reader.ReadFile(dlgOpen.FileName);
38+
var content = _reader.ReadFile(dlgOpen.FileName, ConnectControl.GetSelectedLanguage());
3939
sw.Stop();
4040
_onNewValue(content);
4141
lblStatus.Text = $"{dlgOpen.FileName} ({ sw.ElapsedMilliseconds}ms)";

UnderAutomation.Fanuc.Showcase.Forms/Components/VariablesControl.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ private void tsOpenFileFromDisc_Click(object sender, System.EventArgs e)
4545

4646
if (dlgOpenFile.FileNames.Length == 1)
4747
{
48-
variableTable.Show(FanucFileReaders.VariableReader.ReadFile(dlgOpenFile.FileNames[0]));
48+
variableTable.Show(FanucFileReaders.VariableReader.ReadFile(dlgOpenFile.FileNames[0], ConnectControl.GetSelectedLanguage()));
4949
}
5050
else
5151
{
5252
var variableFileList = new VariableFileList() { Name = "Files" };
5353

5454
foreach (var file in dlgOpenFile.FileNames)
5555
{
56-
var fileContent = FanucFileReaders.VariableReader.ReadFile(file);
56+
var fileContent = FanucFileReaders.VariableReader.ReadFile(file, ConnectControl.GetSelectedLanguage());
5757
variableFileList.Add(fileContent);
5858
}
5959

@@ -71,7 +71,7 @@ private void tsOpenFolderFromDisc_Click(object sender, System.EventArgs e)
7171

7272
foreach (var file in Directory.GetFiles(dlgOpenFolder.SelectedPath, "*.va"))
7373
{
74-
var fileContent = FanucFileReaders.VariableReader.ReadFile(file);
74+
var fileContent = FanucFileReaders.VariableReader.ReadFile(file, ConnectControl.GetSelectedLanguage());
7575
variableFileList.Add(fileContent);
7676
}
7777

0 commit comments

Comments
 (0)