Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0cd19151 由 张东亮
选项

夹爪压紧和释放测试

1 个父辈 77c99760
全部展开
内嵌 并排
正在显示 21 个修改的文件 包含 610 行增加 和 32 行删除
dll/CodeLibrary.dll
此文件类型无法预览
source/Common/Common.csproj
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<HintPath>..\..\packages\log4net.2.0.12\lib\net40\log4net.dll</HintPath> <HintPath>..\..\dll\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">
<HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath>
......
source/DeviceLibrary/Config/Config_Store.csv
...@@ -68,8 +68,8 @@ DI,1,A出料下暂存区料盘检测,UnderArea_Check_A,54,HC,X54,,,,,,,,,,,, ...@@ -68,8 +68,8 @@ DI,1,A出料下暂存区料盘检测,UnderArea_Check_A,54,HC,X54,,,,,,,,,,,,
DI,1,B进料上暂存区料盘检测,UpperArea_Check_B,55,HC,X55,,,,,,,,,,,, DI,1,B进料上暂存区料盘检测,UpperArea_Check_B,55,HC,X55,,,,,,,,,,,,
DI,1,B出料下暂存区料盘检测,UnderArea_Check_B,56,HC,X56,,,,,,,,,,,, DI,1,B出料下暂存区料盘检测,UnderArea_Check_B,56,HC,X56,,,,,,,,,,,,
DI,1,空气压力检测,Airpressure_Check,57,HC,X57,,,,,,,,,,,, DI,1,空气压力检测,Airpressure_Check,57,HC,X57,,,,,,,,,,,,
,,,,58,HC,X58,,,,,,,,,,,, DI,0,绿色按钮（轴正转）,Jog_Add,58,HC,X58,,,,,,,,,,,,
,,,,59,HC,X59,,,,,,,,,,,, DI,0,黄色按钮（轴反转）,Jog_Sub,59,HC,X59,,,,,,,,,,,,
,,,,60,HC,X60,,,,,,,,,,,, ,,,,60,HC,X60,,,,,,,,,,,,
,,,,61,HC,X61,,,,,,,,,,,, ,,,,61,HC,X61,,,,,,,,,,,,
,,,,62,HC,X62,,,,,,,,,,,, ,,,,62,HC,X62,,,,,,,,,,,,
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
<Reference Include="halcondotnet"> <Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath> <HintPath>..\..\dll\halcondotnet.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath> <HintPath>..\..\dll\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="MvCameraControl.Net"> <Reference Include="MvCameraControl.Net">
<HintPath>..\..\dll\MvCameraControl.Net.dll</HintPath> <HintPath>..\..\dll\MvCameraControl.Net.dll</HintPath>
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<Compile Include="storeBean\boxBean\EyemLibDemo.cs" /> <Compile Include="storeBean\boxBean\EyemLibDemo.cs" />
<Compile Include="storeBean\boxBean\Humiture\HumitureBean.cs" /> <Compile Include="storeBean\boxBean\Humiture\HumitureBean.cs" />
<Compile Include="storeBean\boxBean\Humiture\HumitureController.cs" /> <Compile Include="storeBean\boxBean\Humiture\HumitureController.cs" />
<Compile Include="storeBean\boxBean\MoveAxisDebug\BoxEquip_MoveAxisDebug.cs" />
<Compile Include="storeBean\boxBean\positionDebug\DrawerResult.cs" /> <Compile Include="storeBean\boxBean\positionDebug\DrawerResult.cs" />
<Compile Include="storeBean\boxBean\positionDebug\PositionDebugManager.cs" /> <Compile Include="storeBean\boxBean\positionDebug\PositionDebugManager.cs" />
<Compile Include="storeBean\boxBean\positionDebug\PositionDebugResult.cs" /> <Compile Include="storeBean\boxBean\positionDebug\PositionDebugResult.cs" />
...@@ -223,6 +224,7 @@ ...@@ -223,6 +224,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
......
source/DeviceLibrary/manager/model/DeviceStep.cs
...@@ -686,6 +686,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -686,6 +686,25 @@ namespace OnlineStore.DeviceLibrary
SP_29_XAxisBack, SP_29_XAxisBack,
#endregion #endregion
#region 存储机构行走机构循环运行
/// <summary>
/// 行走机构循环运行：开始
/// </summary>
Store_0_Start,
/// <summary>
/// 行走机构循环运行：去目标点
/// </summary>
Store_1_ToTarget,
/// <summary>
/// 行走机构循环运行：返回起始点
/// </summary>
Store_2_BackSource,
/// <summary>
/// 行走机构循环运行：结束
/// </summary>
Store_3_Finish,
#endregion
#region 入料模块复位 1000 开始 #region 入料模块复位 1000 开始
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -849,6 +849,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -849,6 +849,7 @@ namespace OnlineStore.DeviceLibrary
{ {
PosDebugProcess(); PosDebugProcess();
} }
MoveAxisDebugProcess();
BusyMoveProcess(); BusyMoveProcess();
IOTimeOutProcess(); IOTimeOutProcess();
if (NoErrorAlarm()) if (NoErrorAlarm())
......
source/DeviceLibrary/storeBean/boxBean/MoveAxisDebug/BoxEquip_MoveAxisDebug.cs 0 → 100644
using OnlineStore.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public partial class BoxEquip
{
int moveAxisRunCnt = 0;
public bool MoveAxisDebug = true;
public delegate void MoveAxisRunCntEventHandler(int cnt);
public event MoveAxisRunCntEventHandler MoveAxisDebugEvent;
public void StartMoveAixsDebug(string posId)
{
if (isInSuddenDown || isNoAirpressure_Check ||
(!runStatus.Equals(RunStatus.Runing))
|| (!MoveInfo.MoveType.Equals(MoveType.None)))
{
LogUtil.error(Name + " 启动行走机构调试出错，忙碌或报警中 ，storeStatus=" + runStatus + ",MoveType=" + MoveInfo.MoveType + ",isInSuddenDown=" + isInSuddenDown + ",isNoAirpressure_Check=" + isNoAirpressure_Check);
return;
}
moveAxisRunCnt = 0;
MoveAxisDebug=true;
InOutParam param = new InOutParam(new InOutPosInfo("moveaxisdebug", posId));
LogInfo(" 启动行走机构调试【" + param.PosInfo.ToStr() + "】 ");
param.MoveP = new LineMoveP(Config, param.PosInfo.PosId);
MoveInfo.NewMove(MoveType.Working, param);
SetBoxStatus(DeviceStatus.Debugging, RunStatus.Busy);
MoveInfo.NextMoveStep(StepEnum.Store_0_Start);
PullAxis_Inout_To_P1();
}
public void StopMoveAxisDebug()
{
MoveAxisDebug = false;
}
public void MoveAxisDebugProcess()
{
if (MoveInfo.IsInWait)
{
CheckWait(MoveInfo);
}
if (MoveInfo.IsInWait)
{
return;
}
switch (MoveInfo.MoveStep)
{
case StepEnum.Store_0_Start:
MoveInfo.NextMoveStep(StepEnum.Store_1_ToTarget);
LogInfo($"行走机构调试{MoveInfo.SLog}： 开始调试，去目标位置");
MoveAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.MoveAxis_P3, Config.MoveAxis_P3_Speed);
break;
case StepEnum.Store_1_ToTarget:
MoveInfo.NextMoveStep(StepEnum.Store_2_BackSource);
LogInfo($"行走机构调试 {MoveInfo.SLog}：到达目标位置，开始返回起始点");
MoveAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.MoveAxis_P1, Config.MoveAxis_P1_Speed);
break;
case StepEnum.Store_2_BackSource:
moveAxisRunCnt++;
if(MoveAxisDebug)
{
MoveInfo.NextMoveStep(StepEnum.Store_1_ToTarget);
LogInfo($"行走机构调试 {MoveInfo.SLog}：到达起始点，去目标位置。当前来回次数：{moveAxisRunCnt}");
MoveAxisDebugEvent(moveAxisRunCnt);
MoveAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.MoveAxis_P3, Config.MoveAxis_P3_Speed);
}
else
{
MoveInfo.NextMoveStep(StepEnum.Store_3_Finish);
LogInfo($"行走机构调试 {MoveInfo.SLog}：运行结束，当前来回次数：{moveAxisRunCnt}");
MoveAxisDebugEvent(moveAxisRunCnt);
}
break;
case StepEnum.Store_3_Finish:
SetBoxStatus(DeviceStatus.Debugging, RunStatus.Runing);
MoveInfo.EndMove();
break;
}
}
}
}
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -322,6 +322,14 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -322,6 +322,14 @@ namespace OnlineStore.LoadCSVLibrary
/// DO,1,吸盘工作信号,ClampWork,45,HC,Y45,,,,,,,,,,,, /// DO,1,吸盘工作信号,ClampWork,45,HC,Y45,,,,,,,,,,,,
/// </summary> /// </summary>
public static string ClampWork = "ClampWork"; public static string ClampWork = "ClampWork";
/// <summary>
/// DI,0,轴点动运行+,Jog_Add,7,HC,X07,,,,,,,,,,,,
/// </summary>
public static string Jog_Add = "Jog_Add";
/// <summary>
/// DI,0,轴点动运行-,Jog_Sub,8,HC,X08,,,,,,,,,,,,
/// </summary>
public static string Jog_Sub = "Jog_Sub";
} }
public enum IO_VALUE public enum IO_VALUE
{ {
......
source/XLRStoreClient/FrmPwd.cs
...@@ -26,7 +26,7 @@ namespace OnlineStore.XLRStore ...@@ -26,7 +26,7 @@ namespace OnlineStore.XLRStore
private void FrmPwd_Load(object sender, EventArgs e) private void FrmPwd_Load(object sender, EventArgs e)
{ {
this.DialogResult = DialogResult.None; this.DialogResult = DialogResult.None;
txtPwd.Text = ConfigAppSettings.GetValue(Setting_Init.DefaultPWD); txtPwd.Text = "";//ConfigAppSettings.GetValue(Setting_Init.DefaultPWD);
} }
private void btnNext_Click(object sender, EventArgs e) private void btnNext_Click(object sender, EventArgs e)
......
source/XLRStoreClient/XLRStore.csproj
...@@ -103,6 +103,12 @@ ...@@ -103,6 +103,12 @@
<Compile Include="boxForm\FrmAxisMove.Designer.cs"> <Compile Include="boxForm\FrmAxisMove.Designer.cs">
<DependentUpon>FrmAxisMove.cs</DependentUpon> <DependentUpon>FrmAxisMove.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="boxForm\FrmMoveAxisDebug.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="boxForm\FrmMoveAxisDebug.Designer.cs">
<DependentUpon>FrmMoveAxisDebug.cs</DependentUpon>
</Compile>
<Compile Include="boxForm\FrmPosDebug.cs"> <Compile Include="boxForm\FrmPosDebug.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -220,6 +226,9 @@ ...@@ -220,6 +226,9 @@
<EmbeddedResource Include="boxForm\FrmAxisMove.resx"> <EmbeddedResource Include="boxForm\FrmAxisMove.resx">
<DependentUpon>FrmAxisMove.cs</DependentUpon> <DependentUpon>FrmAxisMove.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="boxForm\FrmMoveAxisDebug.resx">
<DependentUpon>FrmMoveAxisDebug.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="boxForm\FrmPosDebug.resx"> <EmbeddedResource Include="boxForm\FrmPosDebug.resx">
<DependentUpon>FrmPosDebug.cs</DependentUpon> <DependentUpon>FrmPosDebug.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
...@@ -510,18 +510,18 @@ namespace OnlineStore.XLRStore ...@@ -510,18 +510,18 @@ namespace OnlineStore.XLRStore
if (frmAxisMove == null) if (frmAxisMove == null)
{ {
frmAxisMove = new FrmAxisMove(true); frmAxisMove = new FrmAxisMove(true);
frmAxisMove.Show(); frmAxisMove.ShowDialog();
} }
else else
{ {
if (frmAxisMove.IsDisposed) if (frmAxisMove.IsDisposed)
{ {
frmAxisMove = new FrmAxisMove(true); frmAxisMove = new FrmAxisMove(true);
frmAxisMove.Show(); frmAxisMove.ShowDialog();
} }
else else
{ {
frmAxisMove.Activate(); frmAxisMove.ShowDialog();
} }
} }
} }
......
source/XLRStoreClient/boxForm/FrmMoveAxisDebug.Designer.cs 0 → 100644
namespace OnlineStore.XLRStore
{
partial class FrmMoveAxisDebug
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.SuspendLayout();
//
// button1
//
this.button1.Location = new System.Drawing.Point(58, 77);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(109, 48);
this.button1.TabIndex = 0;
this.button1.Text = "开始";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// button2
//
this.button2.Location = new System.Drawing.Point(212, 77);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(109, 48);
this.button2.TabIndex = 1;
this.button2.Text = "结束";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(147, 158);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(69, 20);
this.label1.TabIndex = 2;
this.label1.Text = "label1";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(54, 37);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(69, 20);
this.label2.TabIndex = 4;
this.label2.Text = "库位：";
//
// comboBox1
//
this.comboBox1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(116, 29);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(205, 28);
this.comboBox1.TabIndex = 5;
//
// FrmMoveAxisDebug
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(359, 217);
this.Controls.Add(this.comboBox1);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
this.Name = "FrmMoveAxisDebug";
this.Text = "行走机构循环调试";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox comboBox1;
}
}
\ No newline at end of file \ No newline at end of file
source/XLRStoreClient/boxForm/FrmMoveAxisDebug.cs 0 → 100644
using OnlineStore.DeviceLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.XLRStore
{
public partial class FrmMoveAxisDebug : Form
{
public FrmMoveAxisDebug()
{
CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
boxEquip = StoreManager.XLRStore.boxEquip;
boxEquip.MoveAxisDebugEvent += BoxEquip_MoveAxisDebugEvent;
comboBox1.DataSource = boxEquip.PositionNumList;
if (comboBox1.Items.Count > 0)
comboBox1.SelectedIndex = 0;
}
private void BoxEquip_MoveAxisDebugEvent(int cnt)
{
if(!this.IsHandleCreated)
return;
this.Invoke(new Action(() =>
{
label1.Text = cnt.ToString();
}));
}
BoxEquip boxEquip;
private void button1_Click(object sender, EventArgs e)
{
boxEquip.StartMoveAixsDebug(comboBox1.SelectedItem.ToString());
}
private void button2_Click(object sender, EventArgs e)
{
boxEquip.StopMoveAxisDebug();
}
}
}
source/XLRStoreClient/boxForm/FrmMoveAxisDebug.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file \ No newline at end of file
source/XLRStoreClient/boxForm/FrmPosDebug.Designer.cs
...@@ -52,6 +52,7 @@ namespace OnlineStore.XLRStore ...@@ -52,6 +52,7 @@ namespace OnlineStore.XLRStore
this.btnStart = new System.Windows.Forms.Button(); this.btnStart = new System.Windows.Forms.Button();
this.btnStop = new System.Windows.Forms.Button(); this.btnStop = new System.Windows.Forms.Button();
this.btnPosResult = new System.Windows.Forms.Button(); this.btnPosResult = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -282,11 +283,22 @@ namespace OnlineStore.XLRStore ...@@ -282,11 +283,22 @@ namespace OnlineStore.XLRStore
this.btnPosResult.UseVisualStyleBackColor = true; this.btnPosResult.UseVisualStyleBackColor = true;
this.btnPosResult.Click += new System.EventHandler(this.btnPosResult_Click); this.btnPosResult.Click += new System.EventHandler(this.btnPosResult_Click);
// //
// button1
//
this.button1.Location = new System.Drawing.Point(597, 140);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(137, 60);
this.button1.TabIndex = 7;
this.button1.Text = "行走机构循环运行";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// FrmPosDebug // FrmPosDebug
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 354); this.ClientSize = new System.Drawing.Size(800, 354);
this.Controls.Add(this.button1);
this.Controls.Add(this.btnPosResult); this.Controls.Add(this.btnPosResult);
this.Controls.Add(this.btnStop); this.Controls.Add(this.btnStop);
this.Controls.Add(this.btnStart); this.Controls.Add(this.btnStart);
...@@ -327,5 +339,6 @@ namespace OnlineStore.XLRStore ...@@ -327,5 +339,6 @@ namespace OnlineStore.XLRStore
private System.Windows.Forms.Button btnStart; private System.Windows.Forms.Button btnStart;
private System.Windows.Forms.Button btnStop; private System.Windows.Forms.Button btnStop;
private System.Windows.Forms.Button btnPosResult; private System.Windows.Forms.Button btnPosResult;
private System.Windows.Forms.Button button1;
} }
} }
\ No newline at end of file \ No newline at end of file
source/XLRStoreClient/boxForm/FrmPosDebug.cs
using OnlineStore.DeviceLibrary; using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
...@@ -78,5 +79,40 @@ namespace OnlineStore.XLRStore ...@@ -78,5 +79,40 @@ namespace OnlineStore.XLRStore
} }
} }
} }
FrmMoveAxisDebug frmMoveAxisDebug = null;
private void button1_Click(object sender, EventArgs e)
{
try
{
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("打开行走机构循环测试时，没有正确输入密码");
return;
}
if (frmMoveAxisDebug == null)
{
frmMoveAxisDebug = new FrmMoveAxisDebug();
frmMoveAxisDebug.Show();
}
else
{
if (frmMoveAxisDebug.IsDisposed)
{
frmMoveAxisDebug = new FrmMoveAxisDebug();
frmMoveAxisDebug.Show();
}
else
{
frmMoveAxisDebug.Activate();
}
}
}
catch (Exception ex)
{
LogUtil.error("打开行走机构循环测试时出错：", ex);
}
}
} }
} }
source/XLRStoreClient/inputForm/FrmInputEquip.Designer.cs
...@@ -56,6 +56,8 @@ namespace OnlineStore.XLRStore ...@@ -56,6 +56,8 @@ namespace OnlineStore.XLRStore
this.axisMoveControl1 = new OnlineStore.XLRStore.useControl.AxisMoveRectControl(); this.axisMoveControl1 = new OnlineStore.XLRStore.useControl.AxisMoveRectControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupDO = new System.Windows.Forms.GroupBox(); this.groupDO = new System.Windows.Forms.GroupBox();
this.btnClampJawStop = new System.Windows.Forms.Button();
this.btnClampJawStart = new System.Windows.Forms.Button();
this.btnClampRelax = new System.Windows.Forms.Button(); this.btnClampRelax = new System.Windows.Forms.Button();
this.btnClampWork = new System.Windows.Forms.Button(); this.btnClampWork = new System.Windows.Forms.Button();
this.LineStop_B = new System.Windows.Forms.Button(); this.LineStop_B = new System.Windows.Forms.Button();
...@@ -563,6 +565,8 @@ namespace OnlineStore.XLRStore ...@@ -563,6 +565,8 @@ namespace OnlineStore.XLRStore
// //
// groupDO // groupDO
// //
this.groupDO.Controls.Add(this.btnClampJawStop);
this.groupDO.Controls.Add(this.btnClampJawStart);
this.groupDO.Controls.Add(this.btnClampRelax); this.groupDO.Controls.Add(this.btnClampRelax);
this.groupDO.Controls.Add(this.btnClampWork); this.groupDO.Controls.Add(this.btnClampWork);
this.groupDO.Controls.Add(this.LineStop_B); this.groupDO.Controls.Add(this.LineStop_B);
...@@ -583,12 +587,38 @@ namespace OnlineStore.XLRStore ...@@ -583,12 +587,38 @@ namespace OnlineStore.XLRStore
this.groupDO.TabStop = false; this.groupDO.TabStop = false;
this.groupDO.Text = "IO操作测试"; this.groupDO.Text = "IO操作测试";
// //
// btnClampJawStop
//
this.btnClampJawStop.BackColor = System.Drawing.Color.MistyRose;
this.btnClampJawStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampJawStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampJawStop.Location = new System.Drawing.Point(314, 185);
this.btnClampJawStop.Name = "btnClampJawStop";
this.btnClampJawStop.Size = new System.Drawing.Size(135, 34);
this.btnClampJawStop.TabIndex = 290;
this.btnClampJawStop.Text = "夹爪测试结束";
this.btnClampJawStop.UseVisualStyleBackColor = false;
this.btnClampJawStop.Click += new System.EventHandler(this.btnClampJawStop_Click);
//
// btnClampJawStart
//
this.btnClampJawStart.BackColor = System.Drawing.Color.GreenYellow;
this.btnClampJawStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampJawStart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampJawStart.Location = new System.Drawing.Point(10, 185);
this.btnClampJawStart.Name = "btnClampJawStart";
this.btnClampJawStart.Size = new System.Drawing.Size(135, 34);
this.btnClampJawStart.TabIndex = 289;
this.btnClampJawStart.Text = "夹爪测试开始";
this.btnClampJawStart.UseVisualStyleBackColor = false;
this.btnClampJawStart.Click += new System.EventHandler(this.btnClampJawStart_Click);
//
// btnClampRelax // btnClampRelax
// //
this.btnClampRelax.BackColor = System.Drawing.Color.White; this.btnClampRelax.BackColor = System.Drawing.Color.White;
this.btnClampRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClampRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampRelax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClampRelax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampRelax.Location = new System.Drawing.Point(162, 185); this.btnClampRelax.Location = new System.Drawing.Point(314, 145);
this.btnClampRelax.Name = "btnClampRelax"; this.btnClampRelax.Name = "btnClampRelax";
this.btnClampRelax.Size = new System.Drawing.Size(135, 34); this.btnClampRelax.Size = new System.Drawing.Size(135, 34);
this.btnClampRelax.TabIndex = 288; this.btnClampRelax.TabIndex = 288;
...@@ -744,7 +774,7 @@ namespace OnlineStore.XLRStore ...@@ -744,7 +774,7 @@ namespace OnlineStore.XLRStore
this.btnCloseAll.BackColor = System.Drawing.Color.White; this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(314, 145); this.btnCloseAll.Location = new System.Drawing.Point(162, 185);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(135, 34); this.btnCloseAll.Size = new System.Drawing.Size(135, 34);
this.btnCloseAll.TabIndex = 259; this.btnCloseAll.TabIndex = 259;
...@@ -1418,6 +1448,8 @@ namespace OnlineStore.XLRStore ...@@ -1418,6 +1448,8 @@ namespace OnlineStore.XLRStore
protected System.Windows.Forms.CheckBox checkBox1; protected System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.Button btnClampRelax; private System.Windows.Forms.Button btnClampRelax;
private System.Windows.Forms.Button btnClampWork; private System.Windows.Forms.Button btnClampWork;
private System.Windows.Forms.Button btnClampJawStop;
private System.Windows.Forms.Button btnClampJawStart;
} }
} }
source/XLRStoreClient/useControl/AxisMoveControl.Designer.cs
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
this.txtAxisDeviceName = new System.Windows.Forms.TextBox(); this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.lblServerOn = new System.Windows.Forms.Label(); this.lblServerOn = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnIOJog = new System.Windows.Forms.Button();
this.groupAxis.SuspendLayout(); this.groupAxis.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
...@@ -478,6 +479,7 @@ ...@@ -478,6 +479,7 @@
// //
// panel1 // panel1
// //
this.panel1.Controls.Add(this.btnIOJog);
this.panel1.Controls.Add(this.btnEndHome); this.panel1.Controls.Add(this.btnEndHome);
this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.btnAxisStop); this.panel1.Controls.Add(this.btnAxisStop);
...@@ -527,7 +529,7 @@ ...@@ -527,7 +529,7 @@
// linkLabel1 // linkLabel1
// //
this.linkLabel1.AutoSize = true; this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(184, 146); this.linkLabel1.Location = new System.Drawing.Point(183, 131);
this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(32, 17); this.linkLabel1.Size = new System.Drawing.Size(32, 17);
this.linkLabel1.TabIndex = 333; this.linkLabel1.TabIndex = 333;
...@@ -611,7 +613,7 @@ ...@@ -611,7 +613,7 @@
// txtMiddleSpeed // txtMiddleSpeed
// //
this.txtMiddleSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleSpeed.Location = new System.Drawing.Point(77, 190); this.txtMiddleSpeed.Location = new System.Drawing.Point(83, 156);
this.txtMiddleSpeed.MaxLength = 6; this.txtMiddleSpeed.MaxLength = 6;
this.txtMiddleSpeed.Name = "txtMiddleSpeed"; this.txtMiddleSpeed.Name = "txtMiddleSpeed";
this.txtMiddleSpeed.Size = new System.Drawing.Size(73, 26); this.txtMiddleSpeed.Size = new System.Drawing.Size(73, 26);
...@@ -666,7 +668,7 @@ ...@@ -666,7 +668,7 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 195); this.label1.Location = new System.Drawing.Point(18, 161);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17); this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 329; this.label1.TabIndex = 329;
...@@ -690,7 +692,7 @@ ...@@ -690,7 +692,7 @@
// //
this.label8.AutoSize = true; this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(10, 145); this.label8.Location = new System.Drawing.Point(9, 130);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17); this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.TabIndex = 255; this.label8.TabIndex = 255;
...@@ -715,7 +717,7 @@ ...@@ -715,7 +717,7 @@
// txtAxisPosition // txtAxisPosition
// //
this.txtAxisPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAxisPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisPosition.Location = new System.Drawing.Point(75, 140); this.txtAxisPosition.Location = new System.Drawing.Point(74, 125);
this.txtAxisPosition.Name = "txtAxisPosition"; this.txtAxisPosition.Name = "txtAxisPosition";
this.txtAxisPosition.ReadOnly = true; this.txtAxisPosition.ReadOnly = true;
this.txtAxisPosition.Size = new System.Drawing.Size(103, 26); this.txtAxisPosition.Size = new System.Drawing.Size(103, 26);
...@@ -838,6 +840,17 @@ ...@@ -838,6 +840,17 @@
// //
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// btnIOJog
//
this.btnIOJog.BackColor = System.Drawing.Color.Red;
this.btnIOJog.Location = new System.Drawing.Point(13, 188);
this.btnIOJog.Name = "btnIOJog";
this.btnIOJog.Size = new System.Drawing.Size(134, 37);
this.btnIOJog.TabIndex = 335;
this.btnIOJog.Text = "IO点动";
this.btnIOJog.UseVisualStyleBackColor = false;
this.btnIOJog.Click += new System.EventHandler(this.btnIOJog_Click);
//
// AxisMoveControl // AxisMoveControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -917,5 +930,6 @@ ...@@ -917,5 +930,6 @@
protected System.Windows.Forms.Label lblStatus; protected System.Windows.Forms.Label lblStatus;
protected System.Windows.Forms.Label lblAxisType; protected System.Windows.Forms.Label lblAxisType;
protected System.Windows.Forms.Button btnEndHome; protected System.Windows.Forms.Button btnEndHome;
private System.Windows.Forms.Button btnIOJog;
} }
} }
source/XLRStoreClient/useControl/AxisMoveControl.cs
...@@ -289,6 +289,50 @@ namespace OnlineStore.XLRStore ...@@ -289,6 +289,50 @@ namespace OnlineStore.XLRStore
if (this.Visible) if (this.Visible)
{ {
ReadAxisStatus(); ReadAxisStatus();
IO_AxisMove();
}
}
private void IO_AxisMove()
{
if (!JogIo.Equals(btnIOJog.Text.Contains(gouStr)))
{
if (JogIo)
{
btnIOJog.Text = gouStr + "IO点动";
btnIOJog.BackColor = Color.Green;
}
else
{
btnIOJog.Text = "IO点动";
btnIOJog.BackColor = Color.Red;
}
}
if (!JogIo)
{
return;
}
try
{
if (IOManager.IOValue(IO_Type.Jog_Add, 0).Equals(IO_VALUE.LOW) &&
IOManager.IOValue(IO_Type.Jog_Sub, 0).Equals(IO_VALUE.LOW))
{
btnDelMove_MouseUp(null, null);
btnAddMove_MouseUp(null, null);
}
else if (IOManager.IOValue(IO_Type.Jog_Add, 0).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.Jog_Sub, 0).Equals(IO_VALUE.LOW))
{
btnAddMove_MouseDown(null, null);
}
else if (IOManager.IOValue(IO_Type.Jog_Add, 0).Equals(IO_VALUE.LOW) &&
IOManager.IOValue(IO_Type.Jog_Sub, 0).Equals(IO_VALUE.HIGH))
{
btnDelMove_MouseDown(null, null);
}
}
catch (Exception ex)
{
LogUtil.error("IO_AxisMove", ex);
} }
} }
private void ReadAxisStatus() private void ReadAxisStatus()
...@@ -402,5 +446,39 @@ namespace OnlineStore.XLRStore ...@@ -402,5 +446,39 @@ namespace OnlineStore.XLRStore
{ {
HCBoardManager.FinishHome(SlvAddr); HCBoardManager.FinishHome(SlvAddr);
} }
static bool JogIo { get; set; } = false;
private string gouStr = "✔";
private void btnIOJog_Click(object sender, EventArgs e)
{
if (btnIOJog.Text.Contains(gouStr))
{
JogIo = false;
btnIOJog.Text = "IO点动";
btnIOJog.BackColor = Color.Red;
}
else
{
try
{
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("IO点动开启，没有正确输入密码");
return;
}
JogIo = true;
btnIOJog.Text = gouStr + "IO点动";
btnIOJog.BackColor = Color.Green;
}
catch (Exception ex)
{
LogUtil.error("IO点动开启", ex);
}
}
LogUtil.info(Name + " 点击：" + btnIOJog.Text);
}
} }
} }
source/XLRStoreClient/useControl/ClampJawControl.Designer.cs
...@@ -30,6 +30,7 @@ namespace OnlineStore.XLRStore.useControl ...@@ -30,6 +30,7 @@ namespace OnlineStore.XLRStore.useControl
private void InitializeComponent() private void InitializeComponent()
{ {
this.groupClamp = new System.Windows.Forms.GroupBox(); this.groupClamp = new System.Windows.Forms.GroupBox();
this.lblSensor = new System.Windows.Forms.Label();
this.lblIsMoving = new System.Windows.Forms.Label(); this.lblIsMoving = new System.Windows.Forms.Label();
this.btnReset = new System.Windows.Forms.Button(); this.btnReset = new System.Windows.Forms.Button();
this.lblErrorCode = new System.Windows.Forms.Label(); this.lblErrorCode = new System.Windows.Forms.Label();
...@@ -41,7 +42,6 @@ namespace OnlineStore.XLRStore.useControl ...@@ -41,7 +42,6 @@ namespace OnlineStore.XLRStore.useControl
this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btnClampWork = new System.Windows.Forms.Button(); this.btnClampWork = new System.Windows.Forms.Button();
this.btnClampRelax = new System.Windows.Forms.Button(); this.btnClampRelax = new System.Windows.Forms.Button();
this.lblSensor = new System.Windows.Forms.Label();
this.groupClamp.SuspendLayout(); this.groupClamp.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -70,10 +70,19 @@ namespace OnlineStore.XLRStore.useControl ...@@ -70,10 +70,19 @@ namespace OnlineStore.XLRStore.useControl
this.groupClamp.TabStop = false; this.groupClamp.TabStop = false;
this.groupClamp.Text = "夹爪操作"; this.groupClamp.Text = "夹爪操作";
// //
// lblSensor
//
this.lblSensor.AutoSize = true;
this.lblSensor.Location = new System.Drawing.Point(149, 58);
this.lblSensor.Name = "lblSensor";
this.lblSensor.Size = new System.Drawing.Size(80, 17);
this.lblSensor.TabIndex = 294;
this.lblSensor.Text = "传感器读数：";
//
// lblIsMoving // lblIsMoving
// //
this.lblIsMoving.AutoSize = true; this.lblIsMoving.AutoSize = true;
this.lblIsMoving.Location = new System.Drawing.Point(149, 131); this.lblIsMoving.Location = new System.Drawing.Point(149, 121);
this.lblIsMoving.Name = "lblIsMoving"; this.lblIsMoving.Name = "lblIsMoving";
this.lblIsMoving.Size = new System.Drawing.Size(56, 17); this.lblIsMoving.Size = new System.Drawing.Size(56, 17);
this.lblIsMoving.TabIndex = 293; this.lblIsMoving.TabIndex = 293;
...@@ -104,7 +113,7 @@ namespace OnlineStore.XLRStore.useControl ...@@ -104,7 +113,7 @@ namespace OnlineStore.XLRStore.useControl
// lblEmpty // lblEmpty
// //
this.lblEmpty.AutoSize = true; this.lblEmpty.AutoSize = true;
this.lblEmpty.Location = new System.Drawing.Point(149, 85); this.lblEmpty.Location = new System.Drawing.Point(149, 79);
this.lblEmpty.Name = "lblEmpty"; this.lblEmpty.Name = "lblEmpty";
this.lblEmpty.Size = new System.Drawing.Size(44, 17); this.lblEmpty.Size = new System.Drawing.Size(44, 17);
this.lblEmpty.TabIndex = 290; this.lblEmpty.TabIndex = 290;
...@@ -126,7 +135,7 @@ namespace OnlineStore.XLRStore.useControl ...@@ -126,7 +135,7 @@ namespace OnlineStore.XLRStore.useControl
// lblReached // lblReached
// //
this.lblReached.AutoSize = true; this.lblReached.AutoSize = true;
this.lblReached.Location = new System.Drawing.Point(149, 108); this.lblReached.Location = new System.Drawing.Point(149, 100);
this.lblReached.Name = "lblReached"; this.lblReached.Name = "lblReached";
this.lblReached.Size = new System.Drawing.Size(68, 17); this.lblReached.Size = new System.Drawing.Size(68, 17);
this.lblReached.TabIndex = 288; this.lblReached.TabIndex = 288;
...@@ -135,7 +144,7 @@ namespace OnlineStore.XLRStore.useControl ...@@ -135,7 +144,7 @@ namespace OnlineStore.XLRStore.useControl
// lblPosition // lblPosition
// //
this.lblPosition.AutoSize = true; this.lblPosition.AutoSize = true;
this.lblPosition.Location = new System.Drawing.Point(149, 39); this.lblPosition.Location = new System.Drawing.Point(149, 37);
this.lblPosition.Name = "lblPosition"; this.lblPosition.Name = "lblPosition";
this.lblPosition.Size = new System.Drawing.Size(68, 17); this.lblPosition.Size = new System.Drawing.Size(68, 17);
this.lblPosition.TabIndex = 287; this.lblPosition.TabIndex = 287;
...@@ -189,15 +198,6 @@ namespace OnlineStore.XLRStore.useControl ...@@ -189,15 +198,6 @@ namespace OnlineStore.XLRStore.useControl
this.btnClampRelax.UseVisualStyleBackColor = false; this.btnClampRelax.UseVisualStyleBackColor = false;
this.btnClampRelax.Click += new System.EventHandler(this.btnClampRelax_Click); this.btnClampRelax.Click += new System.EventHandler(this.btnClampRelax_Click);
// //
// lblSensor
//
this.lblSensor.AutoSize = true;
this.lblSensor.Location = new System.Drawing.Point(149, 62);
this.lblSensor.Name = "lblSensor";
this.lblSensor.Size = new System.Drawing.Size(80, 17);
this.lblSensor.TabIndex = 294;
this.lblSensor.Text = "传感器读数：";
//
// ClampJawControl // ClampJawControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!