1、调试补偿模板过程中，屏蔽温度补充；2、增加 通讯发送不成功后，重发，3、修复运动到位判断
This commit is contained in:
zhengxuan.zhang
Generated
+121
-137
@@ -37,8 +37,6 @@
|
||||
this.btnOpen = new System.Windows.Forms.Button();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.rdoTCP = new System.Windows.Forms.RadioButton();
|
||||
this.rdoSimu = new System.Windows.Forms.RadioButton();
|
||||
this.tmrMonitor = new System.Windows.Forms.Timer(this.components);
|
||||
this.grpMotionTest = new System.Windows.Forms.GroupBox();
|
||||
this.btnHallAll = new System.Windows.Forms.Button();
|
||||
@@ -185,7 +183,7 @@
|
||||
this.label49 = new System.Windows.Forms.Label();
|
||||
this.label47 = new System.Windows.Forms.Label();
|
||||
this.groupBox8 = new System.Windows.Forms.GroupBox();
|
||||
this.button8 = new System.Windows.Forms.Button();
|
||||
this.btn_movepose = new System.Windows.Forms.Button();
|
||||
this.checkBox1 = new System.Windows.Forms.CheckBox();
|
||||
this.textBox3 = new System.Windows.Forms.TextBox();
|
||||
this.textBox2 = new System.Windows.Forms.TextBox();
|
||||
@@ -194,19 +192,19 @@
|
||||
this.label45 = new System.Windows.Forms.Label();
|
||||
this.label44 = new System.Windows.Forms.Label();
|
||||
this.groupBox7 = new System.Windows.Forms.GroupBox();
|
||||
this.button7 = new System.Windows.Forms.Button();
|
||||
this.button6 = new System.Windows.Forms.Button();
|
||||
this.button5 = new System.Windows.Forms.Button();
|
||||
this.button4 = new System.Windows.Forms.Button();
|
||||
this.btn_Y_Back = new System.Windows.Forms.Button();
|
||||
this.btn_X_right = new System.Windows.Forms.Button();
|
||||
this.btn_X_left = new System.Windows.Forms.Button();
|
||||
this.btn_Y_Forward = new System.Windows.Forms.Button();
|
||||
this.groupBox6 = new System.Windows.Forms.GroupBox();
|
||||
this.button3 = new System.Windows.Forms.Button();
|
||||
this.button2 = new System.Windows.Forms.Button();
|
||||
this.button1 = new System.Windows.Forms.Button();
|
||||
this.btn_home = new System.Windows.Forms.Button();
|
||||
this.btn_stop = new System.Windows.Forms.Button();
|
||||
this.btn_start = new System.Windows.Forms.Button();
|
||||
this.groupBox10 = new System.Windows.Forms.GroupBox();
|
||||
this.label48 = new System.Windows.Forms.Label();
|
||||
this.textBox4 = new System.Windows.Forms.TextBox();
|
||||
this.button10 = new System.Windows.Forms.Button();
|
||||
this.button9 = new System.Windows.Forms.Button();
|
||||
this.btn_halt = new System.Windows.Forms.Button();
|
||||
this.btn_run = new System.Windows.Forms.Button();
|
||||
this.checkBox4 = new System.Windows.Forms.CheckBox();
|
||||
this.checkBox3 = new System.Windows.Forms.CheckBox();
|
||||
this.checkBox2 = new System.Windows.Forms.CheckBox();
|
||||
@@ -238,8 +236,6 @@
|
||||
this.groupBox1.Controls.Add(this.btnOpen);
|
||||
this.groupBox1.Controls.Add(this.label2);
|
||||
this.groupBox1.Controls.Add(this.label1);
|
||||
this.groupBox1.Controls.Add(this.rdoTCP);
|
||||
this.groupBox1.Controls.Add(this.rdoSimu);
|
||||
this.groupBox1.Location = new System.Drawing.Point(12, 12);
|
||||
this.groupBox1.Name = "groupBox1";
|
||||
this.groupBox1.Size = new System.Drawing.Size(273, 94);
|
||||
@@ -249,7 +245,7 @@
|
||||
//
|
||||
// txtPort
|
||||
//
|
||||
this.txtPort.Location = new System.Drawing.Point(171, 40);
|
||||
this.txtPort.Location = new System.Drawing.Point(103, 37);
|
||||
this.txtPort.Name = "txtPort";
|
||||
this.txtPort.Size = new System.Drawing.Size(91, 21);
|
||||
this.txtPort.TabIndex = 15;
|
||||
@@ -257,15 +253,15 @@
|
||||
//
|
||||
// txtIP
|
||||
//
|
||||
this.txtIP.Location = new System.Drawing.Point(171, 17);
|
||||
this.txtIP.Location = new System.Drawing.Point(103, 14);
|
||||
this.txtIP.Name = "txtIP";
|
||||
this.txtIP.Size = new System.Drawing.Size(91, 21);
|
||||
this.txtIP.TabIndex = 16;
|
||||
this.txtIP.Text = "10.0.0.100";
|
||||
this.txtIP.Text = "100.0.0.100";
|
||||
//
|
||||
// btnClose
|
||||
//
|
||||
this.btnClose.Location = new System.Drawing.Point(181, 65);
|
||||
this.btnClose.Location = new System.Drawing.Point(113, 62);
|
||||
this.btnClose.Name = "btnClose";
|
||||
this.btnClose.Size = new System.Drawing.Size(81, 23);
|
||||
this.btnClose.TabIndex = 14;
|
||||
@@ -275,7 +271,7 @@
|
||||
//
|
||||
// btnOpen
|
||||
//
|
||||
this.btnOpen.Location = new System.Drawing.Point(94, 65);
|
||||
this.btnOpen.Location = new System.Drawing.Point(7, 62);
|
||||
this.btnOpen.Name = "btnOpen";
|
||||
this.btnOpen.Size = new System.Drawing.Size(81, 23);
|
||||
this.btnOpen.TabIndex = 13;
|
||||
@@ -286,7 +282,7 @@
|
||||
// label2
|
||||
//
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(102, 44);
|
||||
this.label2.Location = new System.Drawing.Point(15, 41);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(29, 12);
|
||||
this.label2.TabIndex = 11;
|
||||
@@ -295,36 +291,12 @@
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(102, 21);
|
||||
this.label1.Location = new System.Drawing.Point(15, 18);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(71, 12);
|
||||
this.label1.TabIndex = 12;
|
||||
this.label1.Text = "目标设备 IP";
|
||||
//
|
||||
// rdoTCP
|
||||
//
|
||||
this.rdoTCP.AutoSize = true;
|
||||
this.rdoTCP.Location = new System.Drawing.Point(6, 19);
|
||||
this.rdoTCP.Name = "rdoTCP";
|
||||
this.rdoTCP.Size = new System.Drawing.Size(41, 16);
|
||||
this.rdoTCP.TabIndex = 10;
|
||||
this.rdoTCP.TabStop = true;
|
||||
this.rdoTCP.Text = "TCP";
|
||||
this.rdoTCP.UseVisualStyleBackColor = true;
|
||||
this.rdoTCP.CheckedChanged += new System.EventHandler(this.RdoTCP_CheckedChanged);
|
||||
//
|
||||
// rdoSimu
|
||||
//
|
||||
this.rdoSimu.AutoSize = true;
|
||||
this.rdoSimu.Location = new System.Drawing.Point(6, 42);
|
||||
this.rdoSimu.Name = "rdoSimu";
|
||||
this.rdoSimu.Size = new System.Drawing.Size(59, 16);
|
||||
this.rdoSimu.TabIndex = 9;
|
||||
this.rdoSimu.TabStop = true;
|
||||
this.rdoSimu.Text = "模拟器";
|
||||
this.rdoSimu.UseVisualStyleBackColor = true;
|
||||
this.rdoSimu.CheckedChanged += new System.EventHandler(this.RdoSimu_CheckedChanged);
|
||||
//
|
||||
// tmrMonitor
|
||||
//
|
||||
this.tmrMonitor.Interval = 50;
|
||||
@@ -584,6 +556,10 @@
|
||||
//
|
||||
this.cboAxisNo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cboAxisNo.FormattingEnabled = true;
|
||||
this.cboAxisNo.Items.AddRange(new object[] {
|
||||
"1",
|
||||
"0",
|
||||
"8"});
|
||||
this.cboAxisNo.Location = new System.Drawing.Point(115, 20);
|
||||
this.cboAxisNo.Name = "cboAxisNo";
|
||||
this.cboAxisNo.Size = new System.Drawing.Size(60, 20);
|
||||
@@ -1814,7 +1790,7 @@
|
||||
//
|
||||
// groupBox8
|
||||
//
|
||||
this.groupBox8.Controls.Add(this.button8);
|
||||
this.groupBox8.Controls.Add(this.btn_movepose);
|
||||
this.groupBox8.Controls.Add(this.checkBox1);
|
||||
this.groupBox8.Controls.Add(this.textBox3);
|
||||
this.groupBox8.Controls.Add(this.textBox2);
|
||||
@@ -1829,14 +1805,15 @@
|
||||
this.groupBox8.TabStop = false;
|
||||
this.groupBox8.Text = "定位";
|
||||
//
|
||||
// button8
|
||||
// btn_movepose
|
||||
//
|
||||
this.button8.Location = new System.Drawing.Point(129, 122);
|
||||
this.button8.Name = "button8";
|
||||
this.button8.Size = new System.Drawing.Size(120, 37);
|
||||
this.button8.TabIndex = 7;
|
||||
this.button8.Text = "移动到目标位置";
|
||||
this.button8.UseVisualStyleBackColor = true;
|
||||
this.btn_movepose.Location = new System.Drawing.Point(129, 122);
|
||||
this.btn_movepose.Name = "btn_movepose";
|
||||
this.btn_movepose.Size = new System.Drawing.Size(120, 37);
|
||||
this.btn_movepose.TabIndex = 7;
|
||||
this.btn_movepose.Text = "移动到目标位置";
|
||||
this.btn_movepose.UseVisualStyleBackColor = true;
|
||||
this.btn_movepose.Click += new System.EventHandler(this.btn_movepose_Click);
|
||||
//
|
||||
// checkBox1
|
||||
//
|
||||
@@ -1898,10 +1875,10 @@
|
||||
//
|
||||
// groupBox7
|
||||
//
|
||||
this.groupBox7.Controls.Add(this.button7);
|
||||
this.groupBox7.Controls.Add(this.button6);
|
||||
this.groupBox7.Controls.Add(this.button5);
|
||||
this.groupBox7.Controls.Add(this.button4);
|
||||
this.groupBox7.Controls.Add(this.btn_Y_Back);
|
||||
this.groupBox7.Controls.Add(this.btn_X_right);
|
||||
this.groupBox7.Controls.Add(this.btn_X_left);
|
||||
this.groupBox7.Controls.Add(this.btn_Y_Forward);
|
||||
this.groupBox7.Location = new System.Drawing.Point(6, 100);
|
||||
this.groupBox7.Name = "groupBox7";
|
||||
this.groupBox7.Size = new System.Drawing.Size(283, 160);
|
||||
@@ -1909,47 +1886,51 @@
|
||||
this.groupBox7.TabStop = false;
|
||||
this.groupBox7.Text = "Jog";
|
||||
//
|
||||
// button7
|
||||
// btn_Y_Back
|
||||
//
|
||||
this.button7.Location = new System.Drawing.Point(104, 107);
|
||||
this.button7.Name = "button7";
|
||||
this.button7.Size = new System.Drawing.Size(75, 35);
|
||||
this.button7.TabIndex = 3;
|
||||
this.button7.Text = "Y后退";
|
||||
this.button7.UseVisualStyleBackColor = true;
|
||||
this.btn_Y_Back.Location = new System.Drawing.Point(104, 107);
|
||||
this.btn_Y_Back.Name = "btn_Y_Back";
|
||||
this.btn_Y_Back.Size = new System.Drawing.Size(75, 35);
|
||||
this.btn_Y_Back.TabIndex = 3;
|
||||
this.btn_Y_Back.Text = "Y后退";
|
||||
this.btn_Y_Back.UseVisualStyleBackColor = true;
|
||||
this.btn_Y_Back.Click += new System.EventHandler(this.btn_Y_Back_Click);
|
||||
//
|
||||
// button6
|
||||
// btn_X_right
|
||||
//
|
||||
this.button6.Location = new System.Drawing.Point(198, 61);
|
||||
this.button6.Name = "button6";
|
||||
this.button6.Size = new System.Drawing.Size(75, 35);
|
||||
this.button6.TabIndex = 2;
|
||||
this.button6.Text = "X右移";
|
||||
this.button6.UseVisualStyleBackColor = true;
|
||||
this.btn_X_right.Location = new System.Drawing.Point(198, 61);
|
||||
this.btn_X_right.Name = "btn_X_right";
|
||||
this.btn_X_right.Size = new System.Drawing.Size(75, 35);
|
||||
this.btn_X_right.TabIndex = 2;
|
||||
this.btn_X_right.Text = "X右移";
|
||||
this.btn_X_right.UseVisualStyleBackColor = true;
|
||||
this.btn_X_right.Click += new System.EventHandler(this.btn_X_right_Click);
|
||||
//
|
||||
// button5
|
||||
// btn_X_left
|
||||
//
|
||||
this.button5.Location = new System.Drawing.Point(10, 61);
|
||||
this.button5.Name = "button5";
|
||||
this.button5.Size = new System.Drawing.Size(75, 35);
|
||||
this.button5.TabIndex = 1;
|
||||
this.button5.Text = "X左移";
|
||||
this.button5.UseVisualStyleBackColor = true;
|
||||
this.btn_X_left.Location = new System.Drawing.Point(10, 61);
|
||||
this.btn_X_left.Name = "btn_X_left";
|
||||
this.btn_X_left.Size = new System.Drawing.Size(75, 35);
|
||||
this.btn_X_left.TabIndex = 1;
|
||||
this.btn_X_left.Text = "X左移";
|
||||
this.btn_X_left.UseVisualStyleBackColor = true;
|
||||
this.btn_X_left.Click += new System.EventHandler(this.btn_X_left_Click);
|
||||
//
|
||||
// button4
|
||||
// btn_Y_Forward
|
||||
//
|
||||
this.button4.Location = new System.Drawing.Point(104, 12);
|
||||
this.button4.Name = "button4";
|
||||
this.button4.Size = new System.Drawing.Size(75, 35);
|
||||
this.button4.TabIndex = 0;
|
||||
this.button4.Text = "Y前进";
|
||||
this.button4.UseVisualStyleBackColor = true;
|
||||
this.btn_Y_Forward.Location = new System.Drawing.Point(104, 12);
|
||||
this.btn_Y_Forward.Name = "btn_Y_Forward";
|
||||
this.btn_Y_Forward.Size = new System.Drawing.Size(75, 35);
|
||||
this.btn_Y_Forward.TabIndex = 0;
|
||||
this.btn_Y_Forward.Text = "Y前进";
|
||||
this.btn_Y_Forward.UseVisualStyleBackColor = true;
|
||||
this.btn_Y_Forward.Click += new System.EventHandler(this.btn_Y_Forward_Click);
|
||||
//
|
||||
// groupBox6
|
||||
//
|
||||
this.groupBox6.Controls.Add(this.button3);
|
||||
this.groupBox6.Controls.Add(this.button2);
|
||||
this.groupBox6.Controls.Add(this.button1);
|
||||
this.groupBox6.Controls.Add(this.btn_home);
|
||||
this.groupBox6.Controls.Add(this.btn_stop);
|
||||
this.groupBox6.Controls.Add(this.btn_start);
|
||||
this.groupBox6.Location = new System.Drawing.Point(6, 24);
|
||||
this.groupBox6.Name = "groupBox6";
|
||||
this.groupBox6.Size = new System.Drawing.Size(283, 70);
|
||||
@@ -1957,39 +1938,42 @@
|
||||
this.groupBox6.TabStop = false;
|
||||
this.groupBox6.Text = "动作";
|
||||
//
|
||||
// button3
|
||||
// btn_home
|
||||
//
|
||||
this.button3.Location = new System.Drawing.Point(198, 24);
|
||||
this.button3.Name = "button3";
|
||||
this.button3.Size = new System.Drawing.Size(75, 30);
|
||||
this.button3.TabIndex = 2;
|
||||
this.button3.Text = "回原点";
|
||||
this.button3.UseVisualStyleBackColor = true;
|
||||
this.btn_home.Location = new System.Drawing.Point(198, 24);
|
||||
this.btn_home.Name = "btn_home";
|
||||
this.btn_home.Size = new System.Drawing.Size(75, 30);
|
||||
this.btn_home.TabIndex = 2;
|
||||
this.btn_home.Text = "回原点";
|
||||
this.btn_home.UseVisualStyleBackColor = true;
|
||||
this.btn_home.Click += new System.EventHandler(this.btn_home_Click);
|
||||
//
|
||||
// button2
|
||||
// btn_stop
|
||||
//
|
||||
this.button2.Location = new System.Drawing.Point(104, 24);
|
||||
this.button2.Name = "button2";
|
||||
this.button2.Size = new System.Drawing.Size(75, 30);
|
||||
this.button2.TabIndex = 1;
|
||||
this.button2.Text = "停止";
|
||||
this.button2.UseVisualStyleBackColor = true;
|
||||
this.btn_stop.Location = new System.Drawing.Point(104, 24);
|
||||
this.btn_stop.Name = "btn_stop";
|
||||
this.btn_stop.Size = new System.Drawing.Size(75, 30);
|
||||
this.btn_stop.TabIndex = 1;
|
||||
this.btn_stop.Text = "停止";
|
||||
this.btn_stop.UseVisualStyleBackColor = true;
|
||||
this.btn_stop.Click += new System.EventHandler(this.btn_stop_Click);
|
||||
//
|
||||
// button1
|
||||
// btn_start
|
||||
//
|
||||
this.button1.Location = new System.Drawing.Point(10, 24);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(75, 30);
|
||||
this.button1.TabIndex = 0;
|
||||
this.button1.Text = "开始";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
this.btn_start.Location = new System.Drawing.Point(10, 24);
|
||||
this.btn_start.Name = "btn_start";
|
||||
this.btn_start.Size = new System.Drawing.Size(75, 30);
|
||||
this.btn_start.TabIndex = 0;
|
||||
this.btn_start.Text = "开始";
|
||||
this.btn_start.UseVisualStyleBackColor = true;
|
||||
this.btn_start.Click += new System.EventHandler(this.btn_start_Click);
|
||||
//
|
||||
// groupBox10
|
||||
//
|
||||
this.groupBox10.Controls.Add(this.label48);
|
||||
this.groupBox10.Controls.Add(this.textBox4);
|
||||
this.groupBox10.Controls.Add(this.button10);
|
||||
this.groupBox10.Controls.Add(this.button9);
|
||||
this.groupBox10.Controls.Add(this.btn_halt);
|
||||
this.groupBox10.Controls.Add(this.btn_run);
|
||||
this.groupBox10.Controls.Add(this.checkBox4);
|
||||
this.groupBox10.Controls.Add(this.checkBox3);
|
||||
this.groupBox10.Controls.Add(this.checkBox2);
|
||||
@@ -2016,23 +2000,25 @@
|
||||
this.textBox4.Size = new System.Drawing.Size(35, 21);
|
||||
this.textBox4.TabIndex = 5;
|
||||
//
|
||||
// button10
|
||||
// btn_halt
|
||||
//
|
||||
this.button10.Location = new System.Drawing.Point(94, 60);
|
||||
this.button10.Name = "button10";
|
||||
this.button10.Size = new System.Drawing.Size(60, 23);
|
||||
this.button10.TabIndex = 4;
|
||||
this.button10.Text = "停止";
|
||||
this.button10.UseVisualStyleBackColor = true;
|
||||
this.btn_halt.Location = new System.Drawing.Point(94, 60);
|
||||
this.btn_halt.Name = "btn_halt";
|
||||
this.btn_halt.Size = new System.Drawing.Size(60, 23);
|
||||
this.btn_halt.TabIndex = 4;
|
||||
this.btn_halt.Text = "停止";
|
||||
this.btn_halt.UseVisualStyleBackColor = true;
|
||||
this.btn_halt.Click += new System.EventHandler(this.btn_halt_Click);
|
||||
//
|
||||
// button9
|
||||
// btn_run
|
||||
//
|
||||
this.button9.Location = new System.Drawing.Point(13, 60);
|
||||
this.button9.Name = "button9";
|
||||
this.button9.Size = new System.Drawing.Size(60, 23);
|
||||
this.button9.TabIndex = 3;
|
||||
this.button9.Text = "运行";
|
||||
this.button9.UseVisualStyleBackColor = true;
|
||||
this.btn_run.Location = new System.Drawing.Point(13, 60);
|
||||
this.btn_run.Name = "btn_run";
|
||||
this.btn_run.Size = new System.Drawing.Size(60, 23);
|
||||
this.btn_run.TabIndex = 3;
|
||||
this.btn_run.Text = "运行";
|
||||
this.btn_run.UseVisualStyleBackColor = true;
|
||||
this.btn_run.Click += new System.EventHandler(this.btn_run_Click);
|
||||
//
|
||||
// checkBox4
|
||||
//
|
||||
@@ -2154,8 +2140,6 @@
|
||||
private System.Windows.Forms.Button btnOpen;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.RadioButton rdoTCP;
|
||||
private System.Windows.Forms.RadioButton rdoSimu;
|
||||
private System.Windows.Forms.Button btnHalt;
|
||||
private System.Windows.Forms.GroupBox grpMst;
|
||||
private System.Windows.Forms.Label label16;
|
||||
@@ -2266,7 +2250,7 @@
|
||||
private System.Windows.Forms.GroupBox groupBox5;
|
||||
private System.Windows.Forms.GroupBox groupBox9;
|
||||
private System.Windows.Forms.GroupBox groupBox8;
|
||||
private System.Windows.Forms.Button button8;
|
||||
private System.Windows.Forms.Button btn_movepose;
|
||||
private System.Windows.Forms.CheckBox checkBox1;
|
||||
private System.Windows.Forms.TextBox textBox3;
|
||||
private System.Windows.Forms.TextBox textBox2;
|
||||
@@ -2275,19 +2259,19 @@
|
||||
private System.Windows.Forms.Label label45;
|
||||
private System.Windows.Forms.Label label44;
|
||||
private System.Windows.Forms.GroupBox groupBox7;
|
||||
private System.Windows.Forms.Button button7;
|
||||
private System.Windows.Forms.Button button6;
|
||||
private System.Windows.Forms.Button button5;
|
||||
private System.Windows.Forms.Button button4;
|
||||
private System.Windows.Forms.Button btn_Y_Back;
|
||||
private System.Windows.Forms.Button btn_X_right;
|
||||
private System.Windows.Forms.Button btn_X_left;
|
||||
private System.Windows.Forms.Button btn_Y_Forward;
|
||||
private System.Windows.Forms.GroupBox groupBox6;
|
||||
private System.Windows.Forms.Button button3;
|
||||
private System.Windows.Forms.Button button2;
|
||||
private System.Windows.Forms.Button button1;
|
||||
private System.Windows.Forms.Button btn_home;
|
||||
private System.Windows.Forms.Button btn_stop;
|
||||
private System.Windows.Forms.Button btn_start;
|
||||
private System.Windows.Forms.GroupBox groupBox10;
|
||||
private System.Windows.Forms.Label label48;
|
||||
private System.Windows.Forms.TextBox textBox4;
|
||||
private System.Windows.Forms.Button button10;
|
||||
private System.Windows.Forms.Button button9;
|
||||
private System.Windows.Forms.Button btn_halt;
|
||||
private System.Windows.Forms.Button btn_run;
|
||||
private System.Windows.Forms.CheckBox checkBox4;
|
||||
private System.Windows.Forms.CheckBox checkBox3;
|
||||
private System.Windows.Forms.CheckBox checkBox2;
|
||||
|
||||
+57
-16
@@ -3,7 +3,9 @@ using System.Diagnostics;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Windows.Forms;
|
||||
using ACS.SPiiPlusNET;
|
||||
using HexcalMC.Base;
|
||||
using HexcalMC.Properties;
|
||||
|
||||
// ACS .NET Library
|
||||
|
||||
namespace HexcalMC
|
||||
@@ -38,11 +40,11 @@ namespace HexcalMC
|
||||
private int _mNValues, _mNOutputState;
|
||||
private object _mObjReadVar;
|
||||
|
||||
public Motion()
|
||||
public Motion(Api api)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
_acs = new Api(); //初始化 ACS运动控制类
|
||||
_acs = api; //初始化 ACS运动控制类
|
||||
|
||||
// Register Event 注册时间
|
||||
_acs.PHYSICALMOTIONEND += ACS_PHYSICALMOTIONEND;
|
||||
@@ -129,7 +131,6 @@ namespace HexcalMC
|
||||
|
||||
private void Form1_Load(object sender, EventArgs e)
|
||||
{
|
||||
rdoTCP.Checked = true;
|
||||
btnOpen.Enabled = true;
|
||||
btnClose.Enabled = false;
|
||||
|
||||
@@ -237,18 +238,17 @@ namespace HexcalMC
|
||||
|
||||
try
|
||||
{
|
||||
if (rdoTCP.Checked)
|
||||
if (_acs.IsConnected)
|
||||
{
|
||||
DebugDfn.AddLogText("运动平台已连接");
|
||||
}
|
||||
else
|
||||
{
|
||||
// TCP/IP (Ethernet)
|
||||
_acs.OpenCommEthernetTCP(
|
||||
txtIP.Text, // IP Address (Default : 10.0.0.100)
|
||||
Convert.ToInt32(txtPort.Text.Trim())); // TCP/IP Port nubmer (default : 701)
|
||||
}
|
||||
else if (rdoSimu.Checked)
|
||||
{
|
||||
// Simmulation mode
|
||||
_acs.OpenCommSimulator();
|
||||
}
|
||||
|
||||
_mBConnected = true;
|
||||
|
||||
@@ -263,11 +263,11 @@ namespace HexcalMC
|
||||
// When we are using multi axes command (ex) ToPointM, HaltM, ...), we need to allocate the array size more 1.
|
||||
// Because of the last delimeter (-1)
|
||||
_mArrAxisList = new Axis[_mNTotalAxis + 1];
|
||||
for (i = 0; i < _mNTotalAxis; i++)
|
||||
{
|
||||
cboAxisNo.Items.Add(i.ToString());
|
||||
_mArrAxisList[i] = (Axis)i;
|
||||
}
|
||||
//for (i = 0; i < _mNTotalAxis; i++)
|
||||
//{
|
||||
// cboAxisNo.Items.Add(i.ToString());
|
||||
// _mArrAxisList[i] = (Axis)i;
|
||||
//}
|
||||
|
||||
// Insert '-1' at the last
|
||||
_mArrAxisList[_mNTotalAxis] = Axis.ACSC_NONE;
|
||||
@@ -664,7 +664,7 @@ namespace HexcalMC
|
||||
}
|
||||
}
|
||||
|
||||
// 정방향 이동 동작
|
||||
|
||||
private void BtnJogPos_MouseDown(object sender, MouseEventArgs e)
|
||||
{
|
||||
double lfVelocity = 0.0f;
|
||||
@@ -852,7 +852,7 @@ namespace HexcalMC
|
||||
|
||||
private void BtnEventMotionEnd_Click(object sender, EventArgs e)
|
||||
{
|
||||
_acs.PHYSICALMOTIONEND +=ACS_PHYSICALMOTIONEND;
|
||||
_acs.PHYSICALMOTIONEND += ACS_PHYSICALMOTIONEND;
|
||||
_acs.EnableEvent(Interrupts.ACSC_INTR_PHYSICAL_MOTION_END);
|
||||
lstLog.Items.Add("PHYSICAL_MOTION_END event enabled");
|
||||
}
|
||||
@@ -889,6 +889,47 @@ namespace HexcalMC
|
||||
lstLog.Items.Add("PROGRAM_END event enabled");
|
||||
}
|
||||
|
||||
|
||||
private void btn_movepose_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_start_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_stop_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_home_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_X_left_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_X_right_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_Y_Forward_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_Y_Back_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_run_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void btn_halt_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void ACS_PROGRAMEND(BufferMasks buffer)
|
||||
{
|
||||
int bit = 0x01;
|
||||
|
||||
@@ -1148,7 +1148,7 @@
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>176</value>
|
||||
<value>77</value>
|
||||
</metadata>
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
|
||||
Reference in New Issue
Block a user