Skip to content

刘韬 / SO775-DUOStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 44f88ec1 由 刘韬
选项

添加p2,p3压紧皱列表

1 个父辈 e42042fd
内嵌 并排
正在显示 39 个修改的文件 包含 1646 行增加 和 750 行删除
source/Common/Common.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......@@ -33,9 +33,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath>
......
source/Common/Setting_Init.cs
......@@ -104,5 +104,9 @@ namespace OnlineStore.Common
//是否有T4进出轴
public static string HasT4Axis = "HasT4Axis";
public static string AgvServerIp = "AgvServerIp";
}
}
source/Common/util/LogUtil.cs
......@@ -19,6 +19,7 @@ namespace OnlineStore.Common
public static Dictionary<int, DateTime> lastErrorLogTime = new Dictionary<int, DateTime>();
public static System.Windows.Forms.RichTextBox logBox = null;
public static event ShowLog showLogEvent;
public static int showCount = 30;
public static bool debug_opened = false;
......@@ -117,7 +118,11 @@ namespace OnlineStore.Common
text += str;
}
System.DateTime now = System.DateTime.Now;
logList.Add(now.ToLongTimeString() + " " + msg + Environment.NewLine);
string newmsg = now.ToLongTimeString() + " " + msg + Environment.NewLine;
logList.Add(newmsg);
showLogEvent?.Invoke(text+ newmsg, Color.Black);
if (logBox == null)
{
return;
......
source/DUOStore/App.config
......@@ -12,7 +12,7 @@
<!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
<add key="StopBlowValue" value="4" />
<!--Server address-->
<!--<add key="http.server" value="http://10.85.160.25/myproject/" />-->
<add key="http.server" value="http://localhost/myproject/" />
<!--storeType-->
<add key="store_count" value="2" />
<add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
......@@ -39,12 +39,12 @@
<!--IO模块是否主动上传-->
<add key="AIOAutoUpload" value="0" />
<add key="CodeCount" value="3" />
<add key="Tool_P3_Offset" value="7000" />
<add key="Tool_P4_Offset" value="-2000" />
<add key="Tool_P5_Offset" value="-2000" />
<add key="Tool_P6_Offset" value="7000" />
<add key="Tool_P3_Offset" value="70" />
<add key="Tool_P4_Offset" value="-20" />
<add key="Tool_P5_Offset" value="-20" />
<add key="Tool_P6_Offset" value="70" />
<add key="Tool_TargetSpeed" value="20" />
<add key="Tool_TargetPosition" value="1835000" />
<add key="Tool_TargetPosition" value="10420" />
<add key="Agv_Log_Open" value="1" />
<!--进出轴位置-->
......@@ -54,6 +54,7 @@
<!--当前料架信息-料架类型，0=空料架，1=入库料架，2=出库料架-->
<add key ="CurrShelfType" value ="-1"/>
<add key ="HasT4Axis" value ="true"/>
<add key ="AgvServerIp" value ="192.168.11.11"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......@@ -66,6 +67,16 @@
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<appender name="Rmaxis" type="log4net.Appender.RollingFileAppender">
<file value="logs/Rmaxis.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<appender name="AIOBOX" type="log4net.Appender.RollingFileAppender">
<file value="logs/aio/AIOBOX.log" />
<param name="Encoding" value="UTF-8" />
......@@ -84,6 +95,10 @@
<level value="Info" />
<appender-ref ref="AIOBOX" />
</logger>
<logger name="Rmaxis">
<level value="ALL" />
<appender-ref ref="Rmaxis" />
</logger>
<!--<root>
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
......
source/DUOStore/DUOStore.csproj
......@@ -38,14 +38,20 @@
<ApplicationIcon>box.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath>
<Reference Include="CodeLibrary, Version=1.0.7380.18241, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\GeneralClassLibrary\CodeLibraryProject\CodeLibrary\bin\Debug\CodeLibrary.dll</HintPath>
</Reference>
<Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\dll\log4net.dll</HintPath>
<Reference Include="HuichuanLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......
source/DUOStore/FrmAxisDebug.Designer.cs
......@@ -427,7 +427,7 @@
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmAxisDebug";
this.Text = "轴点动调试";
this.Text = "运动轴调试";
this.Load += new System.EventHandler(this.FrmAxisDebug_Load);
this.Shown += new System.EventHandler(this.FrmAxisDebug_Shown);
((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
......
source/DUOStore/FrmAxisMove.Designer.cs
......@@ -37,33 +37,33 @@ namespace OnlineStore.DUOStore
this.btnAxisOn = new System.Windows.Forms.Button();
this.txtUpdownP5 = new System.Windows.Forms.TextBox();
this.btnUpdownP5 = new System.Windows.Forms.Button();
this.txtInOutP4 = new System.Windows.Forms.TextBox();
this.txtUpdownP4 = new System.Windows.Forms.TextBox();
this.btnInOutP4 = new System.Windows.Forms.Button();
this.btnUpdownP4 = new System.Windows.Forms.Button();
this.txtInOutP1 = new System.Windows.Forms.TextBox();
this.txtUpdownP1 = new System.Windows.Forms.TextBox();
this.txtInOutP2 = new System.Windows.Forms.TextBox();
this.txtUpdownP2 = new System.Windows.Forms.TextBox();
this.txtMiddleP1 = new System.Windows.Forms.TextBox();
this.txtBatchP1 = new System.Windows.Forms.TextBox();
this.txtBatchP2 = new System.Windows.Forms.TextBox();
this.txtMiddleP2 = new System.Windows.Forms.TextBox();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.btnInOutP2 = new System.Windows.Forms.Button();
this.btnUpdownP1 = new System.Windows.Forms.Button();
this.btnUpdownP2 = new System.Windows.Forms.Button();
this.btnMiddleP1 = new System.Windows.Forms.Button();
this.btnBatchP1 = new System.Windows.Forms.Button();
this.btnBatchP2 = new System.Windows.Forms.Button();
this.txtInOutP3 = new System.Windows.Forms.TextBox();
this.btnMiddleP2 = new System.Windows.Forms.Button();
this.btnInOutP3 = new System.Windows.Forms.Button();
this.txtUpdownP3 = new System.Windows.Forms.TextBox();
this.btnUpdownP3 = new System.Windows.Forms.Button();
this.txtMiddleP3 = new System.Windows.Forms.TextBox();
this.btnMiddleP3 = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.btnInOutP3 = new System.Windows.Forms.Button();
this.txtInOutP3 = new System.Windows.Forms.TextBox();
this.btnInOutP2 = new System.Windows.Forms.Button();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.txtInOutP2 = new System.Windows.Forms.TextBox();
this.txtInOutP1 = new System.Windows.Forms.TextBox();
this.btnInOutP4 = new System.Windows.Forms.Button();
this.txtInOutP4 = new System.Windows.Forms.TextBox();
this.groupInout.SuspendLayout();
this.SuspendLayout();
//
......@@ -110,9 +110,9 @@ namespace OnlineStore.DUOStore
this.groupInout.Controls.Add(this.txtMiddleP3);
this.groupInout.Controls.Add(this.btnMiddleP3);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(12, 308);
this.groupInout.Location = new System.Drawing.Point(585, 13);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(1163, 274);
this.groupInout.Size = new System.Drawing.Size(693, 534);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "提升机构位置信息";
......@@ -120,7 +120,7 @@ namespace OnlineStore.DUOStore
// btnSaveP
//
this.btnSaveP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveP.Location = new System.Drawing.Point(1014, 180);
this.btnSaveP.Location = new System.Drawing.Point(372, 357);
this.btnSaveP.Name = "btnSaveP";
this.btnSaveP.Size = new System.Drawing.Size(128, 39);
this.btnSaveP.TabIndex = 313;
......@@ -169,7 +169,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP6.Location = new System.Drawing.Point(558, 222);
this.txtUpdownP6.Location = new System.Drawing.Point(232, 468);
this.txtUpdownP6.MaxLength = 0;
this.txtUpdownP6.Name = "txtUpdownP6";
this.txtUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -180,7 +180,7 @@ namespace OnlineStore.DUOStore
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(1014, 100);
this.btnAxisOff.Location = new System.Drawing.Point(372, 277);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 276;
......@@ -197,7 +197,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP6.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP6.Location = new System.Drawing.Point(347, 217);
this.btnUpdownP6.Location = new System.Drawing.Point(21, 463);
this.btnUpdownP6.Name = "btnUpdownP6";
this.btnUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP6.Size = new System.Drawing.Size(205, 33);
......@@ -210,7 +210,7 @@ namespace OnlineStore.DUOStore
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(1014, 55);
this.btnAxisOn.Location = new System.Drawing.Point(372, 232);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 275;
......@@ -225,7 +225,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP5.Location = new System.Drawing.Point(558, 185);
this.txtUpdownP5.Location = new System.Drawing.Point(232, 431);
this.txtUpdownP5.MaxLength = 0;
this.txtUpdownP5.Name = "txtUpdownP5";
this.txtUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -242,7 +242,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP5.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP5.Location = new System.Drawing.Point(347, 180);
this.btnUpdownP5.Location = new System.Drawing.Point(21, 426);
this.btnUpdownP5.Name = "btnUpdownP5";
this.btnUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP5.Size = new System.Drawing.Size(205, 33);
......@@ -252,6 +252,21 @@ namespace OnlineStore.DUOStore
this.btnUpdownP5.UseVisualStyleBackColor = false;
this.btnUpdownP5.Click += new System.EventHandler(this.btnUpdownP5_Click);
//
// txtInOutP4
//
this.txtInOutP4.AcceptsReturn = true;
this.txtInOutP4.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP4.Location = new System.Drawing.Point(583, 147);
this.txtInOutP4.MaxLength = 0;
this.txtInOutP4.Name = "txtInOutP4";
this.txtInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP4.Size = new System.Drawing.Size(89, 23);
this.txtInOutP4.TabIndex = 308;
this.txtInOutP4.Text = "999999";
//
// txtUpdownP4
//
this.txtUpdownP4.AcceptsReturn = true;
......@@ -259,7 +274,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP4.Location = new System.Drawing.Point(558, 147);
this.txtUpdownP4.Location = new System.Drawing.Point(232, 393);
this.txtUpdownP4.MaxLength = 0;
this.txtUpdownP4.Name = "txtUpdownP4";
this.txtUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -267,6 +282,25 @@ namespace OnlineStore.DUOStore
this.txtUpdownP4.TabIndex = 308;
this.txtUpdownP4.Text = "999999";
//
// btnInOutP4
//
this.btnInOutP4.AutoSize = true;
this.btnInOutP4.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP4.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP4.ForeColor = System.Drawing.Color.DarkGoldenrod;
this.btnInOutP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP4.Location = new System.Drawing.Point(372, 142);
this.btnInOutP4.Name = "btnInOutP4";
this.btnInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP4.Size = new System.Drawing.Size(205, 33);
this.btnInOutP4.TabIndex = 307;
this.btnInOutP4.Text = "T4_进出轴放料点P4";
this.btnInOutP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP4.UseVisualStyleBackColor = false;
this.btnInOutP4.Click += new System.EventHandler(this.btnInOutP4_Click);
//
// btnUpdownP4
//
this.btnUpdownP4.AutoSize = true;
......@@ -276,7 +310,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP4.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP4.Location = new System.Drawing.Point(347, 142);
this.btnUpdownP4.Location = new System.Drawing.Point(21, 388);
this.btnUpdownP4.Name = "btnUpdownP4";
this.btnUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP4.Size = new System.Drawing.Size(205, 33);
......@@ -286,6 +320,21 @@ namespace OnlineStore.DUOStore
this.btnUpdownP4.UseVisualStyleBackColor = false;
this.btnUpdownP4.Click += new System.EventHandler(this.btnUpdownP4_Click);
//
// txtInOutP1
//
this.txtInOutP1.AcceptsReturn = true;
this.txtInOutP1.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(584, 33);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP1.Size = new System.Drawing.Size(89, 23);
this.txtInOutP1.TabIndex = 306;
this.txtInOutP1.Text = "999999";
//
// txtUpdownP1
//
this.txtUpdownP1.AcceptsReturn = true;
......@@ -293,7 +342,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP1.Location = new System.Drawing.Point(559, 33);
this.txtUpdownP1.Location = new System.Drawing.Point(233, 279);
this.txtUpdownP1.MaxLength = 20;
this.txtUpdownP1.Name = "txtUpdownP1";
this.txtUpdownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -301,6 +350,21 @@ namespace OnlineStore.DUOStore
this.txtUpdownP1.TabIndex = 306;
this.txtUpdownP1.Text = "999999";
//
// txtInOutP2
//
this.txtInOutP2.AcceptsReturn = true;
this.txtInOutP2.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(583, 71);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(89, 23);
this.txtInOutP2.TabIndex = 304;
this.txtInOutP2.Text = "999999";
//
// txtUpdownP2
//
this.txtUpdownP2.AcceptsReturn = true;
......@@ -308,7 +372,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP2.Location = new System.Drawing.Point(558, 71);
this.txtUpdownP2.Location = new System.Drawing.Point(232, 317);
this.txtUpdownP2.MaxLength = 20;
this.txtUpdownP2.Name = "txtUpdownP2";
this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -376,6 +440,44 @@ namespace OnlineStore.DUOStore
this.txtMiddleP2.TabIndex = 286;
this.txtMiddleP2.Text = "999999";
//
// btnInOutP1
//
this.btnInOutP1.AutoSize = true;
this.btnInOutP1.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.DarkGoldenrod;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(372, 28);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(205, 33);
this.btnInOutP1.TabIndex = 305;
this.btnInOutP1.Text = "T4_进出轴待机点 P1";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.UseVisualStyleBackColor = false;
this.btnInOutP1.Click += new System.EventHandler(this.btnInOutP1_Click);
//
// btnInOutP2
//
this.btnInOutP2.AutoSize = true;
this.btnInOutP2.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.DarkGoldenrod;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(372, 66);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(205, 33);
this.btnInOutP2.TabIndex = 303;
this.btnInOutP2.Text = "T4_进出轴7寸取料点P2";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.UseVisualStyleBackColor = false;
this.btnInOutP2.Click += new System.EventHandler(this.btnInOutP2_Click);
//
// btnUpdownP1
//
this.btnUpdownP1.AutoSize = true;
......@@ -385,7 +487,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP1.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP1.Location = new System.Drawing.Point(347, 28);
this.btnUpdownP1.Location = new System.Drawing.Point(21, 274);
this.btnUpdownP1.Name = "btnUpdownP1";
this.btnUpdownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP1.Size = new System.Drawing.Size(205, 33);
......@@ -404,7 +506,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP2.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.Location = new System.Drawing.Point(347, 66);
this.btnUpdownP2.Location = new System.Drawing.Point(21, 312);
this.btnUpdownP2.Name = "btnUpdownP2";
this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP2.Size = new System.Drawing.Size(205, 33);
......@@ -471,6 +573,21 @@ namespace OnlineStore.DUOStore
this.btnBatchP2.UseVisualStyleBackColor = false;
this.btnBatchP2.Click += new System.EventHandler(this.btnBatchP2_Click);
//
// txtInOutP3
//
this.txtInOutP3.AcceptsReturn = true;
this.txtInOutP3.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(583, 109);
this.txtInOutP3.MaxLength = 0;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(89, 23);
this.txtInOutP3.TabIndex = 227;
this.txtInOutP3.Text = "999999";
//
// btnMiddleP2
//
this.btnMiddleP2.AutoSize = true;
......@@ -489,6 +606,25 @@ namespace OnlineStore.DUOStore
this.btnMiddleP2.UseVisualStyleBackColor = false;
this.btnMiddleP2.Click += new System.EventHandler(this.btnMiddleP2_Click);
//
// btnInOutP3
//
this.btnInOutP3.AutoSize = true;
this.btnInOutP3.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.DarkGoldenrod;
this.btnInOutP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.Location = new System.Drawing.Point(372, 104);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(205, 33);
this.btnInOutP3.TabIndex = 226;
this.btnInOutP3.Text = "T4_进出轴13寸取料点P3";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.UseVisualStyleBackColor = false;
this.btnInOutP3.Click += new System.EventHandler(this.btnInOutP3_Click);
//
// txtUpdownP3
//
this.txtUpdownP3.AcceptsReturn = true;
......@@ -496,7 +632,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP3.Location = new System.Drawing.Point(558, 109);
this.txtUpdownP3.Location = new System.Drawing.Point(232, 355);
this.txtUpdownP3.MaxLength = 0;
this.txtUpdownP3.Name = "txtUpdownP3";
this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -513,7 +649,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP3.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP3.Location = new System.Drawing.Point(347, 104);
this.btnUpdownP3.Location = new System.Drawing.Point(21, 350);
this.btnUpdownP3.Name = "btnUpdownP3";
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(205, 33);
......@@ -562,150 +698,14 @@ namespace OnlineStore.DUOStore
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(11, 1);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 305);
this.axisMoveControl1.Size = new System.Drawing.Size(568, 407);
this.axisMoveControl1.TabIndex = 274;
//
// btnInOutP3
//
this.btnInOutP3.AutoSize = true;
this.btnInOutP3.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.DarkGoldenrod;
this.btnInOutP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.Location = new System.Drawing.Point(683, 104);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(205, 33);
this.btnInOutP3.TabIndex = 226;
this.btnInOutP3.Text = "T4_进出轴13寸取料点P3";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.UseVisualStyleBackColor = false;
this.btnInOutP3.Click += new System.EventHandler(this.btnInOutP3_Click);
//
// txtInOutP3
//
this.txtInOutP3.AcceptsReturn = true;
this.txtInOutP3.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(894, 109);
this.txtInOutP3.MaxLength = 0;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(89, 23);
this.txtInOutP3.TabIndex = 227;
this.txtInOutP3.Text = "999999";
//
// btnInOutP2
//
this.btnInOutP2.AutoSize = true;
this.btnInOutP2.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.DarkGoldenrod;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(683, 66);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(205, 33);
this.btnInOutP2.TabIndex = 303;
this.btnInOutP2.Text = "T4_进出轴7寸取料点P2";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.UseVisualStyleBackColor = false;
this.btnInOutP2.Click += new System.EventHandler(this.btnInOutP2_Click);
//
// btnInOutP1
//
this.btnInOutP1.AutoSize = true;
this.btnInOutP1.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.DarkGoldenrod;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(683, 28);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(205, 33);
this.btnInOutP1.TabIndex = 305;
this.btnInOutP1.Text = "T4_进出轴待机点 P1";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.UseVisualStyleBackColor = false;
this.btnInOutP1.Click += new System.EventHandler(this.btnInOutP1_Click);
//
// txtInOutP2
//
this.txtInOutP2.AcceptsReturn = true;
this.txtInOutP2.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(894, 71);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(89, 23);
this.txtInOutP2.TabIndex = 304;
this.txtInOutP2.Text = "999999";
//
// txtInOutP1
//
this.txtInOutP1.AcceptsReturn = true;
this.txtInOutP1.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(895, 33);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP1.Size = new System.Drawing.Size(89, 23);
this.txtInOutP1.TabIndex = 306;
this.txtInOutP1.Text = "999999";
//
// btnInOutP4
//
this.btnInOutP4.AutoSize = true;
this.btnInOutP4.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP4.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP4.ForeColor = System.Drawing.Color.DarkGoldenrod;
this.btnInOutP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP4.Location = new System.Drawing.Point(683, 142);
this.btnInOutP4.Name = "btnInOutP4";
this.btnInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP4.Size = new System.Drawing.Size(205, 33);
this.btnInOutP4.TabIndex = 307;
this.btnInOutP4.Text = "T4_进出轴放料点P4";
this.btnInOutP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP4.UseVisualStyleBackColor = false;
this.btnInOutP4.Click += new System.EventHandler(this.btnInOutP4_Click);
//
// txtInOutP4
//
this.txtInOutP4.AcceptsReturn = true;
this.txtInOutP4.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP4.Location = new System.Drawing.Point(894, 147);
this.txtInOutP4.MaxLength = 0;
this.txtInOutP4.Name = "txtInOutP4";
this.txtInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP4.Size = new System.Drawing.Size(89, 23);
this.txtInOutP4.TabIndex = 308;
this.txtInOutP4.Text = "999999";
//
// FrmAxisMove
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1231, 630);
this.ClientSize = new System.Drawing.Size(1323, 559);
this.Controls.Add(this.groupInout);
this.Controls.Add(this.axisMoveControl1);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......
source/DUOStore/FrmAxisMove.cs
......@@ -34,7 +34,8 @@ namespace OnlineStore.DUOStore
private void FrmTest_Load(object sender, EventArgs e)
{
axisMoveControl1.LoadData(null, new AxisBean[] { StoreManager.Store.T1_BatchAxis, StoreManager.Store.T2_MiddleAxis, StoreManager.Store.T3_UpdownAxis, StoreManager.Store.T4_InOut_Axis });
axisMoveControl1.LoadData(StoreManager.Store);
//new AxisBean[] { StoreManager.Store.T1_BatchAxis, StoreManager.Store.T2_MiddleAxis, StoreManager.Store.T3_UpdownAxis, StoreManager.Store.T4_InOut_Axis }
LoadPostion();
}
......
source/DUOStore/FrmBox.Designer.cs
......@@ -130,7 +130,7 @@ namespace OnlineStore.DUOStore
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(153, 522);
this.chbDebug.Location = new System.Drawing.Point(20, 405);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271;
......@@ -154,7 +154,7 @@ namespace OnlineStore.DUOStore
this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox4.Location = new System.Drawing.Point(5, 109);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(228, 198);
this.groupBox4.Size = new System.Drawing.Size(228, 159);
this.groupBox4.TabIndex = 270;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -171,7 +171,7 @@ namespace OnlineStore.DUOStore
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(217, 178);
this.tableLayoutPanel2.Size = new System.Drawing.Size(217, 139);
this.tableLayoutPanel2.TabIndex = 103;
//
// lblTemp
......@@ -180,7 +180,7 @@ namespace OnlineStore.DUOStore
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(-154, 593);
this.lblTemp.Location = new System.Drawing.Point(15, 577);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.lblTemp.TabIndex = 270;
......@@ -190,9 +190,9 @@ namespace OnlineStore.DUOStore
//
this.groupBox1.Controls.Add(this.tableLayoutPanel1);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(5, 310);
this.groupBox1.Location = new System.Drawing.Point(5, 274);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(228, 198);
this.groupBox1.Size = new System.Drawing.Size(228, 196);
this.groupBox1.TabIndex = 269;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DI列表";
......@@ -204,12 +204,12 @@ namespace OnlineStore.DUOStore
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel1.Location = new System.Drawing.Point(5, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(217, 178);
this.tableLayoutPanel1.Size = new System.Drawing.Size(217, 190);
this.tableLayoutPanel1.TabIndex = 102;
//
// tabControl1
......@@ -222,7 +222,7 @@ namespace OnlineStore.DUOStore
this.tabControl1.Location = new System.Drawing.Point(239, 112);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(844, 506);
this.tabControl1.Size = new System.Drawing.Size(1054, 612);
this.tabControl1.TabIndex = 272;
//
// tabPage4
......@@ -231,7 +231,7 @@ namespace OnlineStore.DUOStore
this.tabPage4.Controls.Add(this.groupInout);
this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(836, 473);
this.tabPage4.Size = new System.Drawing.Size(1046, 579);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = " 库位信息 ";
this.tabPage4.UseVisualStyleBackColor = true;
......@@ -291,7 +291,7 @@ namespace OnlineStore.DUOStore
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(6, 3);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(822, 390);
this.groupInout.Size = new System.Drawing.Size(1032, 390);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
......@@ -1042,6 +1042,7 @@ namespace OnlineStore.DUOStore
// tabPage1
//
this.tabPage1.Controls.Add(this.btnUpdown);
this.tabPage1.Controls.Add(this.chbDebug);
this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Controls.Add(this.btnAxisOff);
this.tabPage1.Controls.Add(this.btnAxisOn);
......@@ -1049,7 +1050,7 @@ namespace OnlineStore.DUOStore
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(836, 473);
this.tabPage1.Size = new System.Drawing.Size(1046, 579);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服/温湿度 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -1057,7 +1058,7 @@ namespace OnlineStore.DUOStore
// btnUpdown
//
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdown.Location = new System.Drawing.Point(555, 416);
this.btnUpdown.Location = new System.Drawing.Point(614, 114);
this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(128, 39);
this.btnUpdown.TabIndex = 273;
......@@ -1076,16 +1077,16 @@ namespace OnlineStore.DUOStore
this.groupBox7.Controls.Add(this.label27);
this.groupBox7.Controls.Add(this.btnTempClose);
this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Location = new System.Drawing.Point(13, 318);
this.groupBox7.Location = new System.Drawing.Point(586, 172);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(437, 138);
this.groupBox7.Size = new System.Drawing.Size(437, 216);
this.groupBox7.TabIndex = 272;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "温控器调试";
//
// btnSelTemp
//
this.btnSelTemp.Location = new System.Drawing.Point(188, 85);
this.btnSelTemp.Location = new System.Drawing.Point(28, 141);
this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(157, 33);
this.btnSelTemp.TabIndex = 248;
......@@ -1161,7 +1162,7 @@ namespace OnlineStore.DUOStore
//
// btnTempClose
//
this.btnTempClose.Location = new System.Drawing.Point(298, 33);
this.btnTempClose.Location = new System.Drawing.Point(188, 63);
this.btnTempClose.Name = "btnTempClose";
this.btnTempClose.Size = new System.Drawing.Size(100, 33);
this.btnTempClose.TabIndex = 89;
......@@ -1171,7 +1172,7 @@ namespace OnlineStore.DUOStore
//
// btnTempInit
//
this.btnTempInit.Location = new System.Drawing.Point(188, 33);
this.btnTempInit.Location = new System.Drawing.Point(188, 24);
this.btnTempInit.Name = "btnTempInit";
this.btnTempInit.Size = new System.Drawing.Size(100, 33);
this.btnTempInit.TabIndex = 88;
......@@ -1182,7 +1183,7 @@ namespace OnlineStore.DUOStore
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(555, 371);
this.btnAxisOff.Location = new System.Drawing.Point(614, 69);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 11;
......@@ -1193,7 +1194,7 @@ namespace OnlineStore.DUOStore
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(555, 326);
this.btnAxisOn.Location = new System.Drawing.Point(614, 24);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 10;
......@@ -1206,14 +1207,14 @@ namespace OnlineStore.DUOStore
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(7, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 316);
this.axisMoveControl1.Size = new System.Drawing.Size(573, 399);
this.axisMoveControl1.TabIndex = 0;
//
// btnDoorDown
//
this.btnDoorDown.BackColor = System.Drawing.Color.White;
this.btnDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorDown.Location = new System.Drawing.Point(10, 560);
this.btnDoorDown.Location = new System.Drawing.Point(14, 522);
this.btnDoorDown.Name = "btnDoorDown";
this.btnDoorDown.Size = new System.Drawing.Size(137, 39);
this.btnDoorDown.TabIndex = 272;
......@@ -1225,7 +1226,7 @@ namespace OnlineStore.DUOStore
//
this.btnDoorUp.BackColor = System.Drawing.Color.White;
this.btnDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorUp.Location = new System.Drawing.Point(10, 514);
this.btnDoorUp.Location = new System.Drawing.Point(14, 476);
this.btnDoorUp.Name = "btnDoorUp";
this.btnDoorUp.Size = new System.Drawing.Size(137, 39);
this.btnDoorUp.TabIndex = 271;
......@@ -1246,7 +1247,7 @@ namespace OnlineStore.DUOStore
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(5, 2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(1075, 105);
this.groupBox3.Size = new System.Drawing.Size(1285, 105);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
......@@ -1314,7 +1315,7 @@ namespace OnlineStore.DUOStore
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(407, 14);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(662, 50);
this.lblWarnMsg.Size = new System.Drawing.Size(872, 50);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -1333,9 +1334,8 @@ namespace OnlineStore.DUOStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1084, 623);
this.ClientSize = new System.Drawing.Size(1294, 729);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.chbDebug);
this.Controls.Add(this.lblTemp);
this.Controls.Add(this.btnDoorDown);
this.Controls.Add(this.groupBox1);
......@@ -1357,6 +1357,7 @@ namespace OnlineStore.DUOStore
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupBox3.ResumeLayout(false);
......
source/DUOStore/FrmBox.cs
......@@ -50,7 +50,7 @@ namespace OnlineStore.DUOStore
}
// this.groupBox3.Text = "设备[" + BoxBean.CID + "]状态";
this.Text = BoxBean.Name;
axisMoveControl1.LoadData(BoxBean, new AxisBean[] { BoxBean.MiddleAxis, BoxBean.UpdownAxis, BoxBean.InoutAxis, BoxBean.ComAxis });
axisMoveControl1.LoadData(BoxBean);
ACBoxPosition acPosition = null;
if (BoxBean.PositionNumList.Count > 0)
{
......@@ -70,8 +70,8 @@ namespace OnlineStore.DUOStore
txtUpDownP2.Text = BoxBean.Config.UpDownAxis_P2.ToString();
txtMiddleP11.Text = BoxBean.Config.MiddleAxis_P11.ToString();
txtInoutP11.Text = BoxBean.Config.InOutAxis_P11.ToString();
txtComP3.Text = BoxBean.Config.CompAxis_P3.ToString();
txtInOutP2.Text = BoxBean.Config.InOutAxis_P2.ToString();
//txtComP3.Text = BoxBean.Config.CompAxis_P3.ToString();
//txtInOutP2.Text = BoxBean.Config.InOutAxis_P2.ToString();
LoadPData(acPosition);
chbDebug.Checked = BoxBean.IsDebug;
......@@ -278,8 +278,10 @@ namespace OnlineStore.DUOStore
txtUpDownP6.Text = acPosition.UpdownAxis_OL_P6.ToString();
txtInOutP3.Text = acPosition.InoutAxis_P3.ToString();
txtMiddleP2.Text = acPosition.MiddleAxis_P2.ToString();
int comP2 = BoxBean.Config.GetComP2(acPosition.BagHigh);
txtComP2.Text = comP2.ToString();
txtComP2.Text = acPosition.ComAxis_P2.ToString();
txtComP3.Text = acPosition.ComAxis_P3.ToString();
//int comP2 = BoxBean.Config.GetComP2(acPosition.BagHigh);
//txtComP2.Text = comP2.ToString();
lblSize.Text = "尺寸：" + acPosition.BagWidth + "*" + acPosition.BagHigh;
}
}
......@@ -298,6 +300,8 @@ namespace OnlineStore.DUOStore
acPosition.UpdownAxis_IL_P4 = FormUtil.GetIntValue(txtUpDownP4);
acPosition.UpdownAxis_OH_P5 = FormUtil.GetIntValue(txtUpDownP5);
acPosition.UpdownAxis_OL_P6 = FormUtil.GetIntValue(txtUpDownP6);
acPosition.ComAxis_P2 = FormUtil.GetIntValue(txtComP2);
acPosition.ComAxis_P3 = FormUtil.GetIntValue(txtComP3);
}
//位置配置
string appPath = Application.StartupPath;
......@@ -384,16 +388,16 @@ namespace OnlineStore.DUOStore
if (BoxBean.Config.CompAxis_P3 != comp3)
{
BoxBean.Config.CompAxis_P3 = comp3;
needUpdate = true;
}
if (BoxBean.Config.GetComP2(acPosition.BagHigh) != comp2)
{
BoxBean.Config.UpdateComP2(acPosition.BagHigh, comp2);
needUpdate = true;
}
//if (BoxBean.Config.CompAxis_P3 != comp3)
//{
// BoxBean.Config.CompAxis_P3 = comp3;
// needUpdate = true;
//}
//if (BoxBean.Config.GetComP2(acPosition.BagHigh) != comp2)
//{
// BoxBean.Config.UpdateComP2(acPosition.BagHigh, comp2);
// needUpdate = true;
//}
if (BoxBean.Config.CompAxis_P1 != comp1)
{
BoxBean.Config.CompAxis_P1 = comp1;
......@@ -717,7 +721,7 @@ namespace OnlineStore.DUOStore
if (BoxBean.Config.DIList.ContainsKey(IO_Type.Fixture_Check))
{
ioIP = BoxBean.Config.DIList[IO_Type.Fixture_Check].IO_IP;
ioIndex = BoxBean.Config.DIList[IO_Type.Fixture_Check].GetIOAddr();
ioIndex = BoxBean.Config.DIList[IO_Type.Fixture_Laser].GetIOAddr();
}
FrmPositionTool frm = new FrmPositionTool(PortName, slvAddr, ioIP, ioIndex, Text, BoxBean.ID);
frm.ShowDialog();
......
source/DUOStore/FrmIOStatus.Designer.cs
......@@ -17,8 +17,9 @@
{
this.components = new System.ComponentModel.Container();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.button1 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnCloseGate = new System.Windows.Forms.Button();
this.btnOpenGate = new System.Windows.Forms.Button();
this.btnCloseAll = new System.Windows.Forms.Button();
this.btnRelax = new System.Windows.Forms.Button();
this.btnClamp = new System.Windows.Forms.Button();
......@@ -56,22 +57,12 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// button1
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Location = new System.Drawing.Point(689, 563);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(125, 37);
this.button1.TabIndex = 254;
this.button1.Text = "关闭";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.btnCloseGate);
this.groupBox1.Controls.Add(this.btnOpenGate);
this.groupBox1.Controls.Add(this.btnCloseAll);
this.groupBox1.Controls.Add(this.btnRelax);
this.groupBox1.Controls.Add(this.btnClamp);
......@@ -98,12 +89,36 @@
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(524, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(322, 536);
this.groupBox1.Size = new System.Drawing.Size(577, 536);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
//
// btnCloseGate
//
this.btnCloseGate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseGate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseGate.Location = new System.Drawing.Point(307, 206);
this.btnCloseGate.Name = "btnCloseGate";
this.btnCloseGate.Size = new System.Drawing.Size(125, 34);
this.btnCloseGate.TabIndex = 304;
this.btnCloseGate.Text = "大门关闭";
this.btnCloseGate.UseVisualStyleBackColor = false;
this.btnCloseGate.Click += new System.EventHandler(this.btnCloseGate_Click);
//
// btnOpenGate
//
this.btnOpenGate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenGate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenGate.Location = new System.Drawing.Point(307, 169);
this.btnOpenGate.Name = "btnOpenGate";
this.btnOpenGate.Size = new System.Drawing.Size(125, 34);
this.btnOpenGate.TabIndex = 303;
this.btnOpenGate.Text = "大门打开";
this.btnOpenGate.UseVisualStyleBackColor = false;
this.btnOpenGate.Click += new System.EventHandler(this.btnOpenGate_Click);
//
// btnCloseAll
//
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
......@@ -196,7 +211,7 @@
this.btnTopDown.Name = "btnTopDown";
this.btnTopDown.Size = new System.Drawing.Size(125, 34);
this.btnTopDown.TabIndex = 289;
this.btnTopDown.Text = "线体顶升气缸下降";
this.btnTopDown.Text = "横移顶升气缸下降";
this.btnTopDown.UseVisualStyleBackColor = false;
this.btnTopDown.Click += new System.EventHandler(this.btnTopDown_Click);
//
......@@ -208,7 +223,7 @@
this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(125, 34);
this.btnTopUp.TabIndex = 288;
this.btnTopUp.Text = "线体顶升气缸上升";
this.btnTopUp.Text = "横移顶升气缸上升";
this.btnTopUp.UseVisualStyleBackColor = false;
this.btnTopUp.Click += new System.EventHandler(this.btnTopUp_Click);
//
......@@ -338,13 +353,13 @@
this.btn_Down.TabIndex = 250;
this.btn_Down.Text = "定位销下降";
this.btn_Down.UseVisualStyleBackColor = false;
this.btn_Down.Click += new System.EventHandler(this.btnLocationUp_Click);
this.btn_Down.Click += new System.EventHandler(this.btnLocationDown_Click);
//
// btn_Up
//
this.btn_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_Up.Location = new System.Drawing.Point(34, 286);
this.btn_Up.Location = new System.Drawing.Point(31, 286);
this.btn_Up.Name = "btn_Up";
this.btn_Up.Size = new System.Drawing.Size(125, 34);
this.btn_Up.TabIndex = 250;
......@@ -439,8 +454,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(858, 621);
this.Controls.Add(this.button1);
this.ClientSize = new System.Drawing.Size(1132, 621);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
......@@ -476,7 +490,6 @@
private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Button btnBack;
private System.Windows.Forms.Button btnFoward;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btnOpenDo;
private System.Windows.Forms.Button btnCloseDO;
private System.Windows.Forms.Button btnTopDown;
......@@ -491,6 +504,8 @@
private System.Windows.Forms.Button btn_Stop;
private System.Windows.Forms.Button btn_Down;
private System.Windows.Forms.Button btn_Up;
private System.Windows.Forms.Button btnCloseGate;
private System.Windows.Forms.Button btnOpenGate;
}
}
source/DUOStore/FrmIOStatus.cs
......@@ -243,11 +243,6 @@ namespace OnlineStore.DUOStore
timer1.Start();
}
private void button1_Click(object sender, EventArgs e)
{
this.Close();
}
private void btnOpenDo_Click(object sender, EventArgs e)
{
WriteDO(IO_VALUE.HIGH);
......@@ -289,7 +284,7 @@ namespace OnlineStore.DUOStore
private void btnStoreOn_Click(object sender, EventArgs e)
{
BtnMove(btnCamerLed, "打开设备照明", "关闭设备照明", IO_Type.Device_Led);
BtnMove(btnDeviceLed, "打开设备照明", "关闭设备照明", IO_Type.Device_Led);
}
private void btnCloseCyDo_Click(object sender, EventArgs e)
......@@ -305,12 +300,12 @@ namespace OnlineStore.DUOStore
private void btnClamp_Click(object sender, EventArgs e)
{
ElectricGripper.Clamp();
StoreManager.Store.electricClamp.Clamp();
}
private void btnRelax_Click(object sender, EventArgs e)
{
ElectricGripper.Release();
StoreManager.Store.electricClamp.Release();
}
private void btnLDoorUp_Click(object sender, EventArgs e)
......@@ -368,5 +363,15 @@ namespace OnlineStore.DUOStore
{
StoreManager.Store.InOutStation_GoOut();
}
private void btnOpenGate_Click(object sender, EventArgs e)
{
StoreManager.Store.OpenGate();
}
private void btnCloseGate_Click(object sender, EventArgs e)
{
StoreManager.Store.CloseGate();
}
}
}
source/DUOStore/FrmStore.Designer.cs
......@@ -33,6 +33,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.panel1 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.chbInstoreEnd = new System.Windows.Forms.CheckBox();
this.chkDebug = new System.Windows.Forms.CheckBox();
this.lblMoveInfo = new System.Windows.Forms.Label();
......@@ -72,7 +73,6 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.button1 = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.panel1.SuspendLayout();
......@@ -129,6 +129,19 @@
this.panel1.Size = new System.Drawing.Size(182, 623);
this.panel1.TabIndex = 271;
//
// button1
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button1.BackColor = System.Drawing.Color.White;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Location = new System.Drawing.Point(12, 490);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(105, 35);
this.button1.TabIndex = 272;
this.button1.Text = "测试";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// chbInstoreEnd
//
this.chbInstoreEnd.AutoSize = true;
......@@ -320,54 +333,54 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
......@@ -477,19 +490,6 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// button1
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button1.BackColor = System.Drawing.Color.White;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Location = new System.Drawing.Point(12, 490);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(105, 35);
this.button1.TabIndex = 272;
this.button1.Text = "测试";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// FrmStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......
source/DUOStore/FrmStore.cs
......@@ -33,6 +33,7 @@ namespace OnlineStore.DUOStore
startTimer.Enabled = false;
startTimer.AutoReset = false;
Control.CheckForIllegalCrossThreadCalls = false;
LogUtil.showLogEvent += LogUtil_showLogEvent;
}
......@@ -63,7 +64,8 @@ namespace OnlineStore.DUOStore
chbInstoreEnd.Checked = store.InstoreEndSendShelf;
chbOutstoreEnd.Checked = store.OutstoreEndSendShelf;
LoadOk = true;
LogUtil.logBox = this.logBox;
//LogUtil.logBox = this.logBox;
this.timer1.Start();
}
catch (Exception ex)
......@@ -73,6 +75,16 @@ namespace OnlineStore.DUOStore
}
}
private void LogUtil_showLogEvent(string msg, Color color)
{
this.Invoke(new Action(() => {
logBox.Text = msg;
logBox.Select(logBox.Text.Length, 0);
logBox.ScrollToCaret();
}));
}
private void AddForm(string text, Form form)
{
text = text.PadLeft(12, ' ');
......@@ -271,6 +283,7 @@ namespace OnlineStore.DUOStore
IOManager.instance.CloseAllConnection();
HumitureController.CloseAllPort();
AxisManager.instance.CloseAllPort();
AxisManager.instance.CloseCard();
if (Camera._cam != null)
{
Camera._cam.CloseAll();
......@@ -651,8 +664,8 @@ namespace OnlineStore.DUOStore
{
if (LogUtil.logBox == null)
{
LogUtil.logBox = logBox;
LogUtil.UpdateLogbox();
//LogUtil.logBox = logBox;
//LogUtil.UpdateLogbox();
}
}
}
......
source/DUOStore/useControl/AxisMoveControl.Designer.cs
......@@ -28,7 +28,32 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.groupAxis = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label4 = new System.Windows.Forms.Label();
this.lblhomeSts = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.lblAxEncAcc = new System.Windows.Forms.Label();
this.lblINP = new System.Windows.Forms.Label();
this.lblBUSY = new System.Windows.Forms.Label();
this.lblNEL = new System.Windows.Forms.Label();
this.lblORG = new System.Windows.Forms.Label();
this.lblPEL = new System.Windows.Forms.Label();
this.lblSvOn = new System.Windows.Forms.Label();
this.lblEMG = new System.Windows.Forms.Label();
this.lblWARN = new System.Windows.Forms.Label();
this.lblALM = new System.Windows.Forms.Label();
this.label53 = new System.Windows.Forms.Label();
this.label56 = new System.Windows.Forms.Label();
this.label55 = new System.Windows.Forms.Label();
this.label52 = new System.Windows.Forms.Label();
this.lblAxEncVel = new System.Windows.Forms.Label();
this.lblAxPrfVel = new System.Windows.Forms.Label();
this.lblAxEncPos = new System.Windows.Forms.Label();
this.lblAxPrfPos = new System.Windows.Forms.Label();
this.lblAxisPrfMode = new System.Windows.Forms.Label();
this.label50 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
......@@ -51,8 +76,7 @@
this.btnComAlarmClear = new System.Windows.Forms.Button();
this.btnAxisStop = new System.Windows.Forms.Button();
this.btnAxisReturnHome = new System.Windows.Forms.Button();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.btnMCopy = new System.Windows.Forms.Button();
this.cmbAxis = new System.Windows.Forms.ComboBox();
this.btnDelMove = new System.Windows.Forms.Button();
this.btnOpenAxis = new System.Windows.Forms.Button();
this.btnCloseAxis = new System.Windows.Forms.Button();
......@@ -74,9 +98,10 @@
this.txtAxisValue = new System.Windows.Forms.TextBox();
this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.lblServerOn = new System.Windows.Forms.Label();
this.txtStb = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.lblAlarmcode = new System.Windows.Forms.Label();
this.groupAxis.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
......@@ -87,21 +112,287 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupAxis.BackColor = System.Drawing.Color.White;
this.groupAxis.Controls.Add(this.groupBox2);
this.groupAxis.Controls.Add(this.groupBox1);
this.groupAxis.Controls.Add(this.panel1);
this.groupAxis.Controls.Add(this.lblServerOn);
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(4, 3);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(724, 302);
this.groupAxis.Size = new System.Drawing.Size(692, 395);
this.groupAxis.TabIndex = 218;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
//
// groupBox2
//
this.groupBox2.Controls.Add(this.lblAlarmcode);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.lblhomeSts);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Controls.Add(this.lblAxEncAcc);
this.groupBox2.Controls.Add(this.lblINP);
this.groupBox2.Controls.Add(this.lblBUSY);
this.groupBox2.Controls.Add(this.lblNEL);
this.groupBox2.Controls.Add(this.lblORG);
this.groupBox2.Controls.Add(this.lblPEL);
this.groupBox2.Controls.Add(this.lblSvOn);
this.groupBox2.Controls.Add(this.lblEMG);
this.groupBox2.Controls.Add(this.lblWARN);
this.groupBox2.Controls.Add(this.lblALM);
this.groupBox2.Controls.Add(this.label53);
this.groupBox2.Controls.Add(this.label56);
this.groupBox2.Controls.Add(this.label55);
this.groupBox2.Controls.Add(this.label52);
this.groupBox2.Controls.Add(this.lblAxEncVel);
this.groupBox2.Controls.Add(this.lblAxPrfVel);
this.groupBox2.Controls.Add(this.lblAxEncPos);
this.groupBox2.Controls.Add(this.lblAxPrfPos);
this.groupBox2.Controls.Add(this.lblAxisPrfMode);
this.groupBox2.Controls.Add(this.label50);
this.groupBox2.Location = new System.Drawing.Point(7, 270);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
this.groupBox2.Size = new System.Drawing.Size(540, 118);
this.groupBox2.TabIndex = 303;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "轴状态监控";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(267, 90);
this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 17);
this.label4.TabIndex = 18;
this.label4.Text = "回原状态:";
//
// lblhomeSts
//
this.lblhomeSts.AutoSize = true;
this.lblhomeSts.Location = new System.Drawing.Point(332, 90);
this.lblhomeSts.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblhomeSts.Name = "lblhomeSts";
this.lblhomeSts.Size = new System.Drawing.Size(17, 17);
this.lblhomeSts.TabIndex = 17;
this.lblhomeSts.Text = "...";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(433, 90);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 17);
this.label2.TabIndex = 11;
this.label2.Text = "实际加速度:";
this.label2.Visible = false;
//
// lblAxEncAcc
//
this.lblAxEncAcc.AutoSize = true;
this.lblAxEncAcc.Location = new System.Drawing.Point(510, 90);
this.lblAxEncAcc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncAcc.Name = "lblAxEncAcc";
this.lblAxEncAcc.Size = new System.Drawing.Size(17, 17);
this.lblAxEncAcc.TabIndex = 12;
this.lblAxEncAcc.Text = "...";
this.lblAxEncAcc.Visible = false;
//
// lblINP
//
this.lblINP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblINP.Location = new System.Drawing.Point(414, 24);
this.lblINP.Name = "lblINP";
this.lblINP.Size = new System.Drawing.Size(56, 30);
this.lblINP.TabIndex = 10;
this.lblINP.Text = "到位";
this.lblINP.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblBUSY
//
this.lblBUSY.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblBUSY.Location = new System.Drawing.Point(356, 24);
this.lblBUSY.Name = "lblBUSY";
this.lblBUSY.Size = new System.Drawing.Size(56, 30);
this.lblBUSY.TabIndex = 9;
this.lblBUSY.Text = "忙碌";
this.lblBUSY.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblNEL
//
this.lblNEL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblNEL.Location = new System.Drawing.Point(298, 24);
this.lblNEL.Name = "lblNEL";
this.lblNEL.Size = new System.Drawing.Size(56, 30);
this.lblNEL.TabIndex = 8;
this.lblNEL.Text = "负极限";
this.lblNEL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblORG
//
this.lblORG.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblORG.Location = new System.Drawing.Point(240, 24);
this.lblORG.Name = "lblORG";
this.lblORG.Size = new System.Drawing.Size(56, 30);
this.lblORG.TabIndex = 7;
this.lblORG.Text = "原点";
this.lblORG.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblPEL
//
this.lblPEL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblPEL.Location = new System.Drawing.Point(182, 24);
this.lblPEL.Name = "lblPEL";
this.lblPEL.Size = new System.Drawing.Size(56, 30);
this.lblPEL.TabIndex = 6;
this.lblPEL.Text = "正极限";
this.lblPEL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblSvOn
//
this.lblSvOn.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblSvOn.Location = new System.Drawing.Point(8, 24);
this.lblSvOn.Name = "lblSvOn";
this.lblSvOn.Size = new System.Drawing.Size(56, 30);
this.lblSvOn.TabIndex = 5;
this.lblSvOn.Text = "伺服";
this.lblSvOn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblEMG
//
this.lblEMG.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblEMG.Location = new System.Drawing.Point(124, 24);
this.lblEMG.Name = "lblEMG";
this.lblEMG.Size = new System.Drawing.Size(56, 30);
this.lblEMG.TabIndex = 4;
this.lblEMG.Text = "急停";
this.lblEMG.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblWARN
//
this.lblWARN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblWARN.Location = new System.Drawing.Point(472, 24);
this.lblWARN.Name = "lblWARN";
this.lblWARN.Size = new System.Drawing.Size(56, 30);
this.lblWARN.TabIndex = 3;
this.lblWARN.Text = "警告";
this.lblWARN.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblALM
//
this.lblALM.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblALM.Location = new System.Drawing.Point(66, 24);
this.lblALM.Name = "lblALM";
this.lblALM.Size = new System.Drawing.Size(56, 30);
this.lblALM.TabIndex = 2;
this.lblALM.Text = "报警";
this.lblALM.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label53
//
this.label53.AutoSize = true;
this.label53.Location = new System.Drawing.Point(134, 90);
this.label53.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(59, 17);
this.label53.TabIndex = 1;
this.label53.Text = "规划速度:";
//
// label56
//
this.label56.AutoSize = true;
this.label56.Location = new System.Drawing.Point(10, 90);
this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label56.Name = "label56";
this.label56.Size = new System.Drawing.Size(59, 17);
this.label56.TabIndex = 1;
this.label56.Text = "实际速度:";
//
// label55
//
this.label55.AutoSize = true;
this.label55.Location = new System.Drawing.Point(10, 65);
this.label55.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label55.Name = "label55";
this.label55.Size = new System.Drawing.Size(59, 17);
this.label55.TabIndex = 1;
this.label55.Text = "实际位置:";
//
// label52
//
this.label52.AutoSize = true;
this.label52.Location = new System.Drawing.Point(134, 65);
this.label52.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label52.Name = "label52";
this.label52.Size = new System.Drawing.Size(59, 17);
this.label52.TabIndex = 1;
this.label52.Text = "规划位置:";
//
// lblAxEncVel
//
this.lblAxEncVel.AutoSize = true;
this.lblAxEncVel.Location = new System.Drawing.Point(73, 90);
this.lblAxEncVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncVel.Name = "lblAxEncVel";
this.lblAxEncVel.Size = new System.Drawing.Size(17, 17);
this.lblAxEncVel.TabIndex = 1;
this.lblAxEncVel.Text = "...";
//
// lblAxPrfVel
//
this.lblAxPrfVel.AutoSize = true;
this.lblAxPrfVel.Location = new System.Drawing.Point(199, 90);
this.lblAxPrfVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfVel.Name = "lblAxPrfVel";
this.lblAxPrfVel.Size = new System.Drawing.Size(17, 17);
this.lblAxPrfVel.TabIndex = 1;
this.lblAxPrfVel.Text = "...";
//
// lblAxEncPos
//
this.lblAxEncPos.AutoSize = true;
this.lblAxEncPos.Location = new System.Drawing.Point(73, 65);
this.lblAxEncPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncPos.Name = "lblAxEncPos";
this.lblAxEncPos.Size = new System.Drawing.Size(17, 17);
this.lblAxEncPos.TabIndex = 1;
this.lblAxEncPos.Text = "...";
//
// lblAxPrfPos
//
this.lblAxPrfPos.AutoSize = true;
this.lblAxPrfPos.Location = new System.Drawing.Point(199, 65);
this.lblAxPrfPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfPos.Name = "lblAxPrfPos";
this.lblAxPrfPos.Size = new System.Drawing.Size(17, 17);
this.lblAxPrfPos.TabIndex = 1;
this.lblAxPrfPos.Text = "...";
//
// lblAxisPrfMode
//
this.lblAxisPrfMode.AutoSize = true;
this.lblAxisPrfMode.Location = new System.Drawing.Point(332, 65);
this.lblAxisPrfMode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxisPrfMode.Name = "lblAxisPrfMode";
this.lblAxisPrfMode.Size = new System.Drawing.Size(17, 17);
this.lblAxisPrfMode.TabIndex = 1;
this.lblAxisPrfMode.Text = "...";
//
// label50
//
this.label50.AutoSize = true;
this.label50.Location = new System.Drawing.Point(267, 65);
this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label50.Name = "label50";
this.label50.Size = new System.Drawing.Size(59, 17);
this.label50.TabIndex = 1;
this.label50.Text = "规划模式:";
//
// groupBox1
//
this.groupBox1.Controls.Add(this.txtStb);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtBusyStatus);
this.groupBox1.Controls.Add(this.label11);
this.groupBox1.Controls.Add(this.txtHomeStatus);
......@@ -119,7 +410,7 @@
this.groupBox1.Controls.Add(this.txtHomeSingle);
this.groupBox1.Location = new System.Drawing.Point(553, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(154, 282);
this.groupBox1.Size = new System.Drawing.Size(135, 260);
this.groupBox1.TabIndex = 302;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "状态";
......@@ -127,7 +418,7 @@
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(120, 104);
this.txtBusyStatus.Location = new System.Drawing.Point(99, 76);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
......@@ -135,16 +426,16 @@
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(6, 135);
this.label11.Location = new System.Drawing.Point(31, 107);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(105, 17);
this.label11.Size = new System.Drawing.Size(59, 17);
this.label11.TabIndex = 292;
this.label11.Text = "HOME-CMP状态:";
this.label11.Text = "回零状态:";
//
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(120, 132);
this.txtHomeStatus.Location = new System.Drawing.Point(99, 104);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
......@@ -152,7 +443,7 @@
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(45, 107);
this.label10.Location = new System.Drawing.Point(24, 79);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.TabIndex = 289;
......@@ -161,7 +452,7 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(52, 51);
this.label3.Location = new System.Drawing.Point(31, 51);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 17);
this.label3.TabIndex = 286;
......@@ -170,7 +461,7 @@
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(40, 219);
this.label24.Location = new System.Drawing.Point(19, 191);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(71, 17);
this.label24.TabIndex = 316;
......@@ -180,7 +471,7 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(52, 23);
this.label5.Location = new System.Drawing.Point(31, 23);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 17);
this.label5.TabIndex = 328;
......@@ -190,7 +481,7 @@
//
this.btnGetAlarm.BackColor = System.Drawing.Color.White;
this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGetAlarm.Location = new System.Drawing.Point(35, 245);
this.btnGetAlarm.Location = new System.Drawing.Point(14, 218);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(110, 34);
this.btnGetAlarm.TabIndex = 284;
......@@ -201,7 +492,7 @@
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(120, 48);
this.txtAlarmStatus.Location = new System.Drawing.Point(99, 48);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
......@@ -209,7 +500,7 @@
// txtLimit2
//
this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(120, 216);
this.txtLimit2.Location = new System.Drawing.Point(99, 188);
this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313;
......@@ -217,7 +508,7 @@
// txtServoStatue
//
this.txtServoStatue.Enabled = false;
this.txtServoStatue.Location = new System.Drawing.Point(120, 20);
this.txtServoStatue.Location = new System.Drawing.Point(99, 20);
this.txtServoStatue.Name = "txtServoStatue";
this.txtServoStatue.Size = new System.Drawing.Size(25, 23);
this.txtServoStatue.TabIndex = 327;
......@@ -225,7 +516,7 @@
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(40, 191);
this.label22.Location = new System.Drawing.Point(19, 163);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(71, 17);
this.label22.TabIndex = 312;
......@@ -235,7 +526,7 @@
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(120, 188);
this.txtLimit1.Location = new System.Drawing.Point(99, 160);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309;
......@@ -243,7 +534,7 @@
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(52, 163);
this.label6.Location = new System.Drawing.Point(31, 135);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(59, 17);
this.label6.TabIndex = 300;
......@@ -252,7 +543,7 @@
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(120, 160);
this.txtHomeSingle.Location = new System.Drawing.Point(99, 132);
this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297;
......@@ -264,8 +555,7 @@
this.panel1.Controls.Add(this.btnComAlarmClear);
this.panel1.Controls.Add(this.btnAxisStop);
this.panel1.Controls.Add(this.btnAxisReturnHome);
this.panel1.Controls.Add(this.comboBox1);
this.panel1.Controls.Add(this.btnMCopy);
this.panel1.Controls.Add(this.cmbAxis);
this.panel1.Controls.Add(this.btnDelMove);
this.panel1.Controls.Add(this.btnOpenAxis);
this.panel1.Controls.Add(this.btnCloseAxis);
......@@ -289,13 +579,13 @@
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(7, 17);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(540, 273);
this.panel1.Size = new System.Drawing.Size(540, 250);
this.panel1.TabIndex = 219;
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(169, 178);
this.linkLabel1.Location = new System.Drawing.Point(169, 165);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(32, 17);
this.linkLabel1.TabIndex = 336;
......@@ -308,7 +598,7 @@
this.comjSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comjSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comjSpeed.FormattingEnabled = true;
this.comjSpeed.Location = new System.Drawing.Point(71, 225);
this.comjSpeed.Location = new System.Drawing.Point(71, 207);
this.comjSpeed.Name = "comjSpeed";
this.comjSpeed.Size = new System.Drawing.Size(95, 28);
this.comjSpeed.TabIndex = 335;
......@@ -317,7 +607,7 @@
//
this.btnComAlarmClear.BackColor = System.Drawing.Color.White;
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(307, 169);
this.btnComAlarmClear.Location = new System.Drawing.Point(307, 154);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(110, 34);
this.btnComAlarmClear.TabIndex = 50;
......@@ -332,10 +622,10 @@
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(427, 90);
this.btnAxisStop.Location = new System.Drawing.Point(427, 78);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(110, 114);
this.btnAxisStop.Size = new System.Drawing.Size(110, 110);
this.btnAxisStop.TabIndex = 246;
this.btnAxisStop.Text = " 停止运动";
this.btnAxisStop.UseVisualStyleBackColor = false;
......@@ -348,7 +638,7 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(307, 129);
this.btnAxisReturnHome.Location = new System.Drawing.Point(307, 116);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(110, 34);
......@@ -357,35 +647,23 @@
this.btnAxisReturnHome.UseVisualStyleBackColor = false;
this.btnAxisReturnHome.Click += new System.EventHandler(this.btnAxisReturnHome_Click);
//
// comboBox1
//
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(71, 13);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(227, 28);
this.comboBox1.TabIndex = 301;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// btnMCopy
//
this.btnMCopy.BackColor = System.Drawing.Color.White;
this.btnMCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMCopy.Location = new System.Drawing.Point(468, 225);
this.btnMCopy.Name = "btnMCopy";
this.btnMCopy.Size = new System.Drawing.Size(69, 28);
this.btnMCopy.TabIndex = 334;
this.btnMCopy.Text = "复制";
this.btnMCopy.UseVisualStyleBackColor = false;
this.btnMCopy.Visible = false;
// cmbAxis
//
this.cmbAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAxis.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbAxis.FormattingEnabled = true;
this.cmbAxis.Location = new System.Drawing.Point(71, 6);
this.cmbAxis.Name = "cmbAxis";
this.cmbAxis.Size = new System.Drawing.Size(227, 28);
this.cmbAxis.TabIndex = 301;
this.cmbAxis.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// btnDelMove
//
this.btnDelMove.BackColor = System.Drawing.Color.White;
this.btnDelMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDelMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDelMove.Location = new System.Drawing.Point(321, 217);
this.btnDelMove.Location = new System.Drawing.Point(321, 199);
this.btnDelMove.Name = "btnDelMove";
this.btnDelMove.Size = new System.Drawing.Size(140, 45);
this.btnDelMove.TabIndex = 332;
......@@ -401,7 +679,7 @@
this.btnOpenAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnOpenAxis.Location = new System.Drawing.Point(307, 9);
this.btnOpenAxis.Location = new System.Drawing.Point(307, 2);
this.btnOpenAxis.Name = "btnOpenAxis";
this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnOpenAxis.Size = new System.Drawing.Size(110, 34);
......@@ -417,7 +695,7 @@
this.btnCloseAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(427, 9);
this.btnCloseAxis.Location = new System.Drawing.Point(427, 2);
this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(110, 34);
......@@ -431,7 +709,7 @@
this.btnAddMove.BackColor = System.Drawing.Color.White;
this.btnAddMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAddMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAddMove.Location = new System.Drawing.Point(172, 217);
this.btnAddMove.Location = new System.Drawing.Point(172, 199);
this.btnAddMove.Name = "btnAddMove";
this.btnAddMove.Size = new System.Drawing.Size(140, 45);
this.btnAddMove.TabIndex = 330;
......@@ -447,7 +725,7 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(207, 99);
this.txtASpeed.Location = new System.Drawing.Point(207, 88);
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -458,7 +736,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(9, 231);
this.label1.Location = new System.Drawing.Point(9, 213);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 329;
......@@ -470,7 +748,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(142, 104);
this.label47.Location = new System.Drawing.Point(142, 93);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(59, 17);
......@@ -485,7 +763,7 @@
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(207, 140);
this.btnReadPosition.Location = new System.Drawing.Point(207, 127);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(91, 34);
......@@ -501,7 +779,7 @@
this.btnAxisVMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(307, 89);
this.btnAxisVMove.Location = new System.Drawing.Point(307, 78);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(110, 34);
......@@ -514,7 +792,7 @@
//
this.label8.AutoSize = true;
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(18, 149);
this.label8.Location = new System.Drawing.Point(18, 136);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.TabIndex = 255;
......@@ -527,7 +805,7 @@
this.btnAxisRMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(427, 48);
this.btnAxisRMove.Location = new System.Drawing.Point(427, 39);
this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(110, 34);
......@@ -539,7 +817,7 @@
// lblCountPulse
//
this.lblCountPulse.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCountPulse.Location = new System.Drawing.Point(83, 144);
this.lblCountPulse.Location = new System.Drawing.Point(83, 131);
this.lblCountPulse.Name = "lblCountPulse";
this.lblCountPulse.ReadOnly = true;
this.lblCountPulse.Size = new System.Drawing.Size(118, 26);
......@@ -552,7 +830,7 @@
this.btnAxisAMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisAMove.Location = new System.Drawing.Point(307, 49);
this.btnAxisAMove.Location = new System.Drawing.Point(307, 40);
this.btnAxisAMove.Name = "btnAxisAMove";
this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisAMove.Size = new System.Drawing.Size(110, 34);
......@@ -566,7 +844,7 @@
this.label49.AutoSize = true;
this.label49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label49.Location = new System.Drawing.Point(10, 18);
this.label49.Location = new System.Drawing.Point(10, 11);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(51, 17);
this.label49.TabIndex = 233;
......@@ -579,7 +857,7 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(207, 57);
this.txtAPosition.Location = new System.Drawing.Point(207, 48);
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -592,7 +870,7 @@
this.label46.AutoSize = true;
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(26, 104);
this.label46.Location = new System.Drawing.Point(26, 93);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(35, 17);
this.label46.TabIndex = 239;
......@@ -605,7 +883,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(142, 62);
this.label48.Location = new System.Drawing.Point(142, 53);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(59, 17);
......@@ -618,7 +896,7 @@
this.label45.AutoSize = true;
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(14, 62);
this.label45.Location = new System.Drawing.Point(14, 53);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(47, 17);
this.label45.TabIndex = 240;
......@@ -628,22 +906,22 @@
// txtAxisValue
//
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(71, 99);
this.txtAxisValue.Location = new System.Drawing.Point(71, 88);
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true;
this.txtAxisValue.Size = new System.Drawing.Size(68, 26);
this.txtAxisValue.Size = new System.Drawing.Size(50, 26);
this.txtAxisValue.TabIndex = 242;
this.txtAxisValue.Text = "0";
//
// txtAxisDeviceName
//
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(71, 57);
this.txtAxisDeviceName.Location = new System.Drawing.Point(71, 48);
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true;
this.txtAxisDeviceName.Size = new System.Drawing.Size(68, 26);
this.txtAxisDeviceName.Size = new System.Drawing.Size(50, 26);
this.txtAxisDeviceName.TabIndex = 241;
this.txtAxisDeviceName.Text = "0";
//
......@@ -658,31 +936,32 @@
this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.TabIndex = 268;
//
// txtStb
// timer1
//
this.txtStb.Enabled = false;
this.txtStb.Location = new System.Drawing.Point(120, 76);
this.txtStb.Name = "txtStb";
this.txtStb.Size = new System.Drawing.Size(25, 23);
this.txtStb.TabIndex = 329;
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// label2
// lblAlarmcode
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(54, 79);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(57, 17);
this.label2.TabIndex = 330;
this.label2.Text = "STB状态:";
this.lblAlarmcode.AutoSize = true;
this.lblAlarmcode.Location = new System.Drawing.Point(433, 65);
this.lblAlarmcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAlarmcode.Name = "lblAlarmcode";
this.lblAlarmcode.Size = new System.Drawing.Size(68, 17);
this.lblAlarmcode.TabIndex = 19;
this.lblAlarmcode.Text = "错误码:160";
this.lblAlarmcode.Visible = false;
//
// AxisMoveControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(731, 310);
this.Size = new System.Drawing.Size(699, 402);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.panel1.ResumeLayout(false);
......@@ -694,7 +973,7 @@
#endregion
private System.Windows.Forms.GroupBox groupAxis;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.ComboBox cmbAxis;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtHomeSingle;
private System.Windows.Forms.Label label11;
......@@ -732,14 +1011,37 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox txtServoStatue;
private System.Windows.Forms.Button btnMCopy;
private System.Windows.Forms.Button btnDelMove;
private System.Windows.Forms.Button btnAddMove;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ComboBox comjSpeed;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.TextBox txtStb;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label lblhomeSts;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label lblAxEncAcc;
private System.Windows.Forms.Label lblINP;
private System.Windows.Forms.Label lblBUSY;
private System.Windows.Forms.Label lblNEL;
private System.Windows.Forms.Label lblORG;
private System.Windows.Forms.Label lblPEL;
private System.Windows.Forms.Label lblSvOn;
private System.Windows.Forms.Label lblEMG;
private System.Windows.Forms.Label lblWARN;
private System.Windows.Forms.Label lblALM;
private System.Windows.Forms.Label label53;
private System.Windows.Forms.Label label56;
private System.Windows.Forms.Label label55;
private System.Windows.Forms.Label label52;
private System.Windows.Forms.Label lblAxEncVel;
private System.Windows.Forms.Label lblAxPrfVel;
private System.Windows.Forms.Label lblAxEncPos;
private System.Windows.Forms.Label lblAxPrfPos;
private System.Windows.Forms.Label lblAxisPrfMode;
private System.Windows.Forms.Label label50;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Label lblAlarmcode;
}
}
source/DUOStore/useControl/AxisMoveControl.cs
......@@ -11,56 +11,72 @@ using OnlineStore.DeviceLibrary;
using OnlineStore.Common;
using System.Threading;
using OnlineStore.LoadCSVLibrary;
using HuichuanLibrary;
namespace OnlineStore.DUOStore
{
public partial class AxisMoveControl : UserControl
{
private List<AxisBean> axisList = new List<AxisBean>();
private BoxBean boxBean = null;
public bool IsHuiChuan = true;
private List<ConfigMoveAxis> axisList = new List<ConfigMoveAxis>();
private EquipBase boxBean = null;
private string PortName = "";
private short SlvAddr = 0;
public int ptpAcc = 0;
public int ptpDec = 0;
public AxisMoveControl()
{
InitializeComponent();
}
public void LoadData(BoxBean box, params AxisBean[] moveAxis)
public void LoadData(EquipBase equipBase, bool isHc = true)
{
this.boxBean = box;
axisList = new List<AxisBean>(moveAxis);
this.boxBean = equipBase;
axisList = new List<ConfigMoveAxis>(equipBase.moveAxisList);
if (axisList.Count > 0)
{
comboBox1.Items.Clear();
foreach (AxisBean a in axisList)
cmbAxis.Items.Clear();
foreach (ConfigMoveAxis a in axisList)
{
comboBox1.Items.Add(a.Config.Explain);
cmbAxis.Items.Add(a.Explain);
}
comboBox1.SelectedIndex = 0;
cmbAxis.SelectedIndex = 0;
PortName = moveAxis[0].Config.DeviceName;
SlvAddr = moveAxis[0].Config.GetAxisValue();
PortName = axisList[0].DeviceName;
SlvAddr = axisList[0].GetAxisValue();
txtAxisDeviceName.Text = PortName;
txtAxisValue.Text = SlvAddr.ToString();
}
btnAddMove.BackColor = Color.White;
btnDelMove.BackColor = Color.White;
this.IsHuiChuan = isHc;
if (IsHuiChuan)
{
groupBox1.Visible = false;
groupBox2.Visible = true;
timer1.Start();
}
else
{
groupBox1.Visible = true;
groupBox2.Visible = false;
}
}
private bool CanMove()
{
if (axis == null)
{
MessageBox.Show("请先选择运动轴", "警告 ", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
//如果是取料升降轴，取料旋转轴，如果进出轴不在待机点，不能运动
if (boxBean != null)
{
if (boxBean.Config.UpDown_Axis.IsSameAxis(PortName, SlvAddr)
|| (boxBean.Config.Middle_Axis.IsSameAxis(PortName, SlvAddr)))
{
int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InOutDefaultPosition);
int currValue = boxBean.InoutAxis.GetAclPosition();
int currValue =AxisManager.instance.GetActualtPosition( boxBean.Config.InOut_Axis.DeviceName,boxBean.Config.InOut_Axis.GetAxisValue());
if (currValue <= InOutDefaultPosition)
{
return true;
......@@ -73,20 +89,16 @@ namespace OnlineStore.DUOStore
return true;
}
}
return true;
}
private void btnOpenAxis_Click(object sender, EventArgs e)
{
LogUtil.info("点击【打开伺服】，【" + PortName + "_" + SlvAddr + "】 ");
string msg = "";
axisList[comboBox1.SelectedIndex].Open(false, out msg);
LogUtil.info(boxBean.Name+"点击【打开伺服】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.ServoOn(PortName, SlvAddr);
}
private void btnCloseAxis_Click(object sender, EventArgs e)
{
LogUtil.info("点击【关闭伺服】，【" + PortName + "_" + SlvAddr + "】 ");
// AxisManager.instance.ServoOff(PortName, SlvAddr);
axisList[comboBox1.SelectedIndex].ServoOff();
LogUtil.info(boxBean.Name+"点击【关闭伺服】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.ServoOff(PortName, SlvAddr);
}
private void btnAxisAMove_Click(object sender, EventArgs e)
......@@ -97,8 +109,8 @@ namespace OnlineStore.DUOStore
}
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.instance.AbsMove(PortName, SlvAddr, position, speed, ptpAcc, ptpDec);
LogUtil.info(boxBean.Name+"点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.instance.AbsMove(PortName, SlvAddr, position, speed,axis.AddSpeed,axis.DelSpeed);
}
private void btnAxisRMove_Click(object sender, EventArgs e)
......@@ -109,8 +121,8 @@ namespace OnlineStore.DUOStore
}
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.instance.RelMove(PortName, SlvAddr, position, speed,ptpAcc,ptpDec);
LogUtil.info(boxBean.Name+"点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.instance.RelMove(PortName, SlvAddr, position, speed,axis.AddSpeed,axis.DelSpeed);
}
private void btnAxisVMove_Click(object sender, EventArgs e)
......@@ -120,13 +132,13 @@ namespace OnlineStore.DUOStore
return;
}
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【匀速运动】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
LogUtil.info(boxBean.Name+"点击【匀速运动】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
AxisManager.instance.SpeedMove(PortName, SlvAddr, speed);
}
private void btnAxisStop_Click(object sender, EventArgs e)
{
LogUtil.info("点击【停止运动】，【" + PortName + "_" + SlvAddr + "】 ");
LogUtil.info(boxBean.Name+"点击【停止运动】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.SuddenStop(PortName, SlvAddr);
if (btnAddMove.BackColor == Color.Green)
{
......@@ -142,7 +154,7 @@ namespace OnlineStore.DUOStore
private void btnComAlarmClear_Click(object sender, EventArgs e)
{
LogUtil.info("点击【清理报警】，【" + PortName + "_" + SlvAddr + "】 ");
LogUtil.info(boxBean.Name+"点击【清理报警】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.AlarmClear(PortName, SlvAddr);
Thread.Sleep(100);
AxisManager.instance.ServoOn(PortName, SlvAddr);
......@@ -154,9 +166,16 @@ namespace OnlineStore.DUOStore
{
return;
}
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
AxisManager.instance.HomeMove(PortName, SlvAddr,50,1,speed);
//int speed = FormUtil.GetIntValue(txtASpeed);
foreach(ConfigMoveAxis a in axisList)
{
if (a.IsSameAxis(PortName, SlvAddr))
{
LogUtil.info(boxBean.Name+"点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + a.HomeHighSpeed + "】");
AxisManager.instance.HomeMove(PortName, SlvAddr, a.HomeHighSpeed,a.HomeLowSpeed,a.HomeAddSpeed);
}
}
}
private void btnGetAlarm_Click(object sender, EventArgs e)
......@@ -177,12 +196,13 @@ namespace OnlineStore.DUOStore
lblCountPulse.Text = AxisManager.instance.GetActualtPosition(PortName, SlvAddr).ToString();
}
private ConfigMoveAxis axis = null;
private List<Color> colorsList = new List<Color>();
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (comboBox1.SelectedIndex >= 0)
if (cmbAxis.SelectedIndex >= 0)
{
ConfigMoveAxis axis = axisList[comboBox1.SelectedIndex].Config;
axis = axisList[cmbAxis.SelectedIndex];
PortName = axis.DeviceName;
SlvAddr = axis.GetAxisValue();
txtAxisDeviceName.Text = PortName;
......@@ -199,36 +219,20 @@ namespace OnlineStore.DUOStore
btnAddMove.Text = "点动+ ";
btnDelMove.Text = "点动- ";
txtASpeed.Text = targetSpeed.ToString();
int SelIndex = comboBox1.SelectedIndex;
if (SelIndex.Equals(0))
{
color = Color.Blue;
}
else if (SelIndex.Equals(1))
{
color = Color.Red;
}
int SelIndex = cmbAxis.SelectedIndex;
else if (SelIndex.Equals(2))
{
color = Color.Green;
}
else if (SelIndex.Equals(3))
{
color = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); ;
}
else if (SelIndex.Equals(4))
{
color = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
}
else if (SelIndex.Equals(5))
if (colorsList.Count <= 0)
{
color = Color.BlueViolet;
}
else if (SelIndex.Equals(6))
{
color = Color.Firebrick;
colorsList.Add(Color.Blue);
colorsList.Add(Color.Red);
colorsList.Add(Color.Green);
colorsList.Add(System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))));
colorsList.Add(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))));
colorsList.Add(Color.BlueViolet);
colorsList.Add(Color.Firebrick);
}
color = colorsList[SelIndex];
btnOpenAxis.ForeColor = color;
btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color;
......@@ -253,7 +257,7 @@ namespace OnlineStore.DUOStore
}
private void AxisMove(int speed)
{
LogUtil.info("【" + PortName + "_" + SlvAddr + "】点动： 速度：" + speed);
LogUtil.info(boxBean.Name+"【" + PortName + "_" + SlvAddr + "】点动： 速度：" + speed);
AxisManager.instance.SpeedMove(PortName, SlvAddr, speed);
}
private void btnAddMove_MouseDown(object sender, MouseEventArgs e)
......@@ -318,5 +322,103 @@ namespace OnlineStore.DUOStore
{
Clipboard.SetDataObject(lblCountPulse.Text, true);
}
private void timer1_Tick(object sender, EventArgs e)
{
if (this.Visible)
{
ReadAxisStatus();
}
}
private void ReadAxisStatus()
{
groupBox2.Text = cmbAxis.Text + "-状态监控";
//【1】更新轴号
short axisNo = SlvAddr;
if (axisNo < 0)
{
return;
}
short modeValue = HCBoardManager.GetAxisPrfMode(axisNo);
if (modeValue < 0)
{
return;
}
else
{
string mode = HCBoardManager.AxisPrfMode(modeValue);
lblAxisPrfMode.Text = mode;
}
//【2】读取轴状态，如果读取出错将关闭此定时器
AxisSts sts = HCBoardManager.GetAxisSts(axisNo);
if (sts.ServoOn < 0)
{
return;
}
//【3】更新界面显示
ShowlbSts(lblALM, sts.ALM,true); //报警信号
ShowlbSts(lblWARN, sts.WARN); //警告信号
ShowlbSts(lblEMG, sts.EMG);//急停信号
ShowlbSts(lblSvOn, sts.ServoOn); //使能信号
ShowlbSts(lblBUSY, sts.BUSY); //轴忙信号
ShowlbSts(lblINP, sts.INP); //轴到位信号
if (sts.ORG < 0)
{
return;
}
ShowlbSts(lblPEL, sts.PEL); //正限位信号
ShowlbSts(lblORG, sts.ORG); //原点信号
ShowlbSts(lblNEL, sts.NEL); //负限位信号
//label59.Text = ConvertDecimalToBinary(nTimerAxSts[0]); //轴状态是按bit进行解读，因此这里将AxSts转换为二进制bit进行显示
lblAxPrfPos.Text = HCBoardManager.GetAxisPrfPos(axisNo).ToString();
lblAxPrfVel.Text = HCBoardManager.GetAxisPrfVel(axisNo).ToString();
//label62.Text = nTimerAxPrfAcc[0].ToString();
lblAxEncPos.Text = HCBoardManager.GetAxisCurrPos(axisNo).ToString();
lblAxEncVel.Text = HCBoardManager.GetAxisCurrVel(axisNo).ToString();
lblAxEncAcc.Text = HCBoardManager.GetAxisCurrAcc(axisNo).ToString();
//label65.Text = nTimerAxEncAcc[0].ToString();
short value = HCBoardManager.GetHomeStatus(axisNo);
string homesstr = HCBoardManager.AxisHomeSts(value);
lblhomeSts.Text = homesstr;
}
private void ShowlbSts(Label lbl, int value,bool isAlarm=false )
{
if (value.Equals(1))
{
if (isAlarm)
{
lbl.BackColor = Color.Red ;
lblAlarmcode.Visible = true;
lblAlarmcode.ForeColor = Color.Red;
lblAlarmcode.Text = "错误码：" + HCBoardManager.GetAxErrCode(SlvAddr);
}
else
{
lbl.BackColor = Color.Lime;
}
}
else if (value.Equals(0))
{
lbl.BackColor = Color.LightGray;
if (isAlarm)
{
lblAlarmcode.Visible = false ;
}
}
else
{
lbl.BackColor = this.BackColor;
}
}
public void StopTimer()
{
this.timer1.Stop();
}
}
}
source/DUOStore/useControl/AxisMoveControl.resx
......@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
source/DeviceLibrary/AXIS/AxisManager.cs
......@@ -29,6 +29,11 @@ namespace OnlineStore.DeviceLibrary
}
#region 485通信方法
/// <summary>
/// 废弃return true
/// </summary>
/// <param name="portName"></param>
/// <returns></returns>
public abstract bool OpenPort(string portName);
/// <summary>
/// 松下专用
......
source/DeviceLibrary/AgvClient/AgvClient.cs 0 → 100644
using Asa;
using OnlineStore.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class AgvClient
{
public static bool CurrCancelState = false;
private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
private static Asa.AgvClient agvClient;
public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
public static List<string> NodeList = new List<string>();
private static bool isInit = false;
public static void Init()
{
try
{
// LogUtil.info("开始 Init agvclient");
if (!isInit)
{
isInit = true;
agvClient = new Asa.AgvClient(ServerIp);
agvClient.CancelState = true;
agvClient.Log += AgvClient_Log;
agvClient.Arrive += AgvClient_Arrive;
agvClient.Ready += AgvClient_Ready;
agvClient.CloseDoor += AgvClient_CloseDoor;
}
actionMap = new Dictionary<string, Asa.ClientAction>();
LogUtil.info(" 开始 agvClient.Connect");
agvClient.Connect();
foreach (string str in NodeList)
{
SetStatus(str);
}
}
catch (Exception ex)
{
LogUtil.error("初始化agvClient " + ServerIp + " 出错：", ex);
}
}
public static void SetCancelState(bool isCancel)
{
CurrCancelState = isCancel;
if (agvClient != null)
{
agvClient.CancelState = isCancel;
}
}
public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low, bool isMust = false)
{
if (!isMust)
{
if (actionMap.ContainsKey(id))
{
ClientAction currA = actionMap[id]; //相同状态就设置一次
if (currA.Equals(action))
{
return;
}
}
}
string mark = "";
if (shelfId != "")
{
int index = shelfId.IndexOf(',');
if (index > 0)
{
//紧急出料模块，料串离开时，mark=紧急料或者分配料，rfid=料串号
mark = shelfId.Substring(index + 1, shelfId.Length - index - 1);
shelfId = shelfId.Substring(0, index);
}
}
agvClient.SetStatus(id, mark, shelfId, action, level);
UpdateAction(id, action);
LogUtil.info("AgvClient SetStatus id:" + id + ",mark:" + mark + ",shelfId:" + shelfId + ",action:" + action.ToString() + ",level:" + level.ToString());
}
private static void AgvClient_Ready(string id, string rfid)
{
try
{
//UpdateAction(id, ClientAction.Ready);
LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + rfid + "] " + GetAction(id).ToString());
if (GetAction(id) == ClientAction.NeedEnter || id == "D1")
{
SetStatus(id, "", ClientAction.MayEnter);
}
else if (GetAction(id) == ClientAction.NeedLeave || id == "D2")
{
SetStatus(id, "", ClientAction.MayLeave);
}
else
{
LogUtil.error("收到 AgvClient_Arrive [" + id + "] [" + rfid + "] 未找到对应的设备 ，暂不处理");
}
}
catch (Exception ex)
{
LogUtil.error("AgvClient_Ready [" + id + "] [" + rfid + "] 处理出错：" + ex.ToString());
}
}
private static void AgvClient_CloseDoor(string id, string rfid)
{
LogUtil.info("收到 AgvClient_CloseDoor [" + id + "] [" + rfid + "] 暂无需处理 ");
}
private static void AgvClient_Arrive(string id, string rfid)
{
// UpdateAction(id, ClientAction.Arrive);
LogUtil.info("收到 AgvClient_Arrive [" + id + "] [" + rfid + "]暂无需处理 ");
}
internal static bool ISConnected()
{
if (agvClient == null)
{
return false;
}
return agvClient.IsConn;
}
public static bool SetToNone(string id, string shelfId = "")
{
ClientAction currA = GetAction(id);
if (currA.Equals(ClientAction.None) || currA.Equals(ClientAction.NeedLeave) || currA.Equals(ClientAction.NeedEnter))
{
SetStatus(id, shelfId, ClientAction.None);
return true;
}
return false;
}
public static bool NeedEnter(string id, string shelfId = "", ClientLevel level = ClientLevel.Low)
{
ClientAction currA = GetAction(id);
if (currA.Equals(ClientAction.None) || currA.Equals(ClientAction.NeedLeave) || currA.Equals(ClientAction.NeedEnter))
{
SetStatus(id, shelfId, ClientAction.NeedEnter, level);
return true;
}
return false;
}
public static bool NeedLeave(string id, string shelfId = "", ClientLevel level = ClientLevel.Low)
{
ClientAction currA = GetAction(id);
if (currA.Equals(ClientAction.None) || currA.Equals(ClientAction.NeedLeave) || currA.Equals(ClientAction.NeedEnter))
{
SetStatus(id, shelfId, ClientAction.NeedLeave, level);
return true;
}
return false;
}
private static bool isLog = true;//ConfigAppSettings.GetIntValue(Setting_Init.Agv_Log_Open).Equals(1);
private static void AgvClient_Log(string s)
{
try
{
if (isLog)
{
LogUtil.info(" AGV " + ServerIp + " Log : " + s);
}
}
catch (Exception ex)
{
LogUtil.error("AgvClient_Log 出错：" + ex.ToString());
}
}
public static Asa.ClientAction GetAction(string NodeName)
{
if (actionMap.ContainsKey(NodeName))
{
return actionMap[NodeName];
}
return Asa.ClientAction.None;
}
public static void UpdateAction(string name, Asa.ClientAction action)
{
if (actionMap.ContainsKey(name))
{
actionMap[name] = action;
}
else
{
actionMap.Add(name, action);
}
}
public static void Dispose()
{
try
{
if (agvClient != null)
{
agvClient.Close();
}
}
catch (Exception ex)
{
LogUtil.error("释放 agvClient " + ServerIp + " 出错：", ex);
}
}
}
}
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -43,8 +43,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\Client.dll</HintPath>
</Reference>
<Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath>
<Reference Include="CodeLibrary, Version=1.0.7380.18241, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\GeneralClassLibrary\CodeLibraryProject\CodeLibrary\bin\Debug\CodeLibrary.dll</HintPath>
</Reference>
<Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath>
......@@ -52,9 +53,13 @@
<Reference Include="HuichuanLibrary">
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath>
</Reference>
<Reference Include="Neotel.Rmaxis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath>
<HintPath>..\..\..\增广夹爪\Rmaxis\bin\Debug\Neotel.Rmaxis.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......@@ -67,6 +72,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AgvClient\AgvClient.cs" />
<Compile Include="AXIS\AxisManager.cs" />
<Compile Include="AXIS\HC\HCAxisManager.cs" />
<Compile Include="AXIS\PanasonicServo\ACCMDManager.cs" />
......
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速时间,减速时间,原点低速度,原点高速,原点加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,,L1_旋转轴,Middle_Axis,1,COM1,,150,1000,1000,80,60,50,10,1000,0,0
AXIS,,L2_上下轴,UpDown_Axis,2,COM1,,300,400,400,400,400,400,10,1000,0,0
AXIS,,L3_进出轴,InOut_Axis,3,COM1,,100,300,300,20,60,200,10,1000,0,0
AXIS,,L4_压紧轴,Comp_Axis,4,COM1,,100,300,300,20,60,200,10,1000,0,0
AXIS,,L1_旋转轴,Middle_Axis,0,HC,,800,2400,2400,50,250,3000,10,1000,0,0
AXIS,,L2_上下轴,UpDown_Axis,1,HC,,2000,6000,6000,50,250,3000,10,1000,0,0
AXIS,,L3_进出轴,InOut_Axis,2,HC,,1000,5000,5000,50,300,8000,10,1000,0,0
AXIS,,L4_压紧轴,Comp_Axis,3,HC,,10000,25000,25000,3000,10000,20000,10,1000,0,0
,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,L2_上下轴_P1待机点/入料口低点,UpDownAxis_P1,585000,,,,,,,,,,,,
PRO,,L2_上下轴_P2入料口高点,UpDownAxis_P2,604500,,,,,,,,,,,,
PRO,,L1_旋转轴_P1待机点/入料口位置,MiddleAxis_P1,307200,,,,,,,,,,,,
PRO,,L3_进出轴_P1待机点,InOutAxis_P1,1000,,,,,,,,,,,,
PRO,,L4_压紧轴_P1待机点,CompAxis_P1,140000,,,,,,,,,,,,
PRO,,L4_压紧轴_P3压紧前点,CompAxis_P3,180000,,,,,,,,,,,,
PRO,,L4_压紧轴_P2压紧点范围对应值,CompAxis_P2_List,8=385001;12=383001;16=379001;,,,,,,,,,,,,
PRO,,L2_上下轴_P1待机点/入料口低点,UpDownAxis_P1,10,,,,,,,,,,,,
PRO,,L2_上下轴_P2入料口高点,UpDownAxis_P2,10,,,,,,,,,,,,
PRO,,L1_旋转轴_P1待机点/入料口位置,MiddleAxis_P1,10,,,,,,,,,,,,
PRO,,L3_进出轴_P1待机点,InOutAxis_P1,10,,,,,,,,,,,,
PRO,,L4_压紧轴_P1待机点,CompAxis_P1,10,,,,,,,,,,,,
PRO,,L4_压紧轴_P3压紧前点,CompAxis_P3,10,,,,,,,,,,,,
PRO,,L4_压紧轴_P2压紧点范围对应值,CompAxis_P2_List,8=42835;12=38557;16=34550;20=30540;24=26030;,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,L2_上下轴_P11-出料口-低点,UpDownAxis_P11,1000000,,,,,,,,,,,,
PRO,,L2_上下轴_P12-出料口-高点,UpDownAxis_P12,1023000,,,,,,,,,,,,
PRO,,L1_旋转轴_P11-出料口位置,MiddleAxis_P11,306900,,,,,,,,,,,,
PRO,,L3_进出轴_P2-入料口取放料点,InOutAxis_P2,140800,,,,,,,,,,,,
PRO,,L3_进出轴_P11-出料口取放料点,InOutAxis_P11,148000,,,,,,,,,,,,
PRO,,L2_上下轴_P11-出料口-低点,UpDownAxis_P11,10,,,,,,,,,,,,
PRO,,L2_上下轴_P12-出料口-高点,UpDownAxis_P12,10,,,,,,,,,,,,
PRO,,L1_旋转轴_P11-出料口位置,MiddleAxis_P11,10,,,,,,,,,,,,
PRO,,L3_进出轴_P2-入料口取放料点,InOutAxis_P2,10,,,,,,,,,,,,
PRO,,L3_进出轴_P11-出料口取放料点,InOutAxis_P11,10,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,L2_上下轴_P1速度/高速,UpDownAxis_P1_Speed,600,,,,,,,,,,,,
PRO,,L2_上下轴_P2速度/低速,UpDownAxis_P2_Speed,600,,,,,,,,,,,,
PRO,,L2_上下轴_P3速度,UpDownAxis_P3_Speed,1000,,, ,,,,,,,,,
PRO,,L2_上下轴_P4速度,UpDownAxis_P4_Speed,200,,,,,,,,,,,,
PRO,,L2_上下轴_P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,,
PRO,,L2_上下轴_P6速度,UpDownAxis_P6_Speed,200,,,,,,,,,,,,
PRO,,L2_上下轴_P7速度,UpDownAxis_P7_Speed,600,,,,,,,,,,,,
PRO,,L2_上下轴_P8速度,UpDownAxis_P8_Speed,600,,,,,,,,,,,,
PRO,,L1_旋转轴_P1速度,MiddleAxis_P1_Speed,300,,,,,,,,,,,,
PRO,,L1_旋转轴_P2速度,MiddleAxis_P2_Speed,300,,,,,,,,,,,,
PRO,,L3_进出轴_P1速度,InOutAxis_P1_Speed,300,,,,,,,,,,,,
PRO,,L3_进出轴_P2速度,InOutAxis_P2_Speed,300,,,,,,,,,,,,
PRO,,L3_进出轴_P3速度,InOutAxis_P3_Speed,300,,,,,,,,,,,,
PRO,,L4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,,
PRO,,L4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,,
PRO,,L4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,,
PRO,,L2_上下轴_P1速度/高速,UpDownAxis_P1_Speed,2000,,,,,,,,,,,,
PRO,,L2_上下轴_P2速度/低速,UpDownAxis_P2_Speed,2000,,,,,,,,,,,,
PRO,,L2_上下轴_P3速度,UpDownAxis_P3_Speed,2000,,, ,,,,,,,,,
PRO,,L2_上下轴_P4速度,UpDownAxis_P4_Speed,150,,,,,,,,,,,,
PRO,,L2_上下轴_P5速度,UpDownAxis_P5_Speed,2000,,,,,,,,,,,,
PRO,,L2_上下轴_P6速度,UpDownAxis_P6_Speed,150,,,,,,,,,,,,
PRO,,L2_上下轴_P7速度,UpDownAxis_P7_Speed,2000,,,,,,,,,,,,
PRO,,L2_上下轴_P8速度,UpDownAxis_P8_Speed,100,,,,,,,,,,,,
PRO,,L1_旋转轴_P1速度,MiddleAxis_P1_Speed,800,,,,,,,,,,,,
PRO,,L1_旋转轴_P2速度,MiddleAxis_P2_Speed,800,,,,,,,,,,,,
PRO,,L3_进出轴_P1速度,InOutAxis_P1_Speed,1600,,,,,,,,,,,,
PRO,,L3_进出轴_P2速度,InOutAxis_P2_Speed,1800,,,,,,,,,,,,
PRO,,L3_进出轴_P3速度,InOutAxis_P3_Speed,1800,,,,,,,,,,,,
PRO,,L4_压紧轴_P1速度,CompAxis_P1_Speed,5000,,,,,,,,,,,,
PRO,,L4_压紧轴_P2速度,CompAxis_P2_Speed,8500,,,,,,,,,,,,
PRO,,L4_压紧轴_P3速度,CompAxis_P3_Speed,8500,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,L2_上下轴_P11速度/低速,UpDownAxis_P11_Speed,600,,,,,,,,,,,,
PRO,,L2_上下轴_P12速度/高速,UpDownAxis_P12_Speed,600,,,,,,,,,,,,
PRO,,L3_进出轴_P11速度,InOutAxis_P11_Speed,300,,,,,,,,,,,,
PRO,,L1_旋转轴_P11速度,MiddleAxis_P11_Speed,300,,,,,,,,,,,,
PRO,,L2_上下轴_P11速度/低速,UpDownAxis_P11_Speed,1000,,,,,,,,,,,,
PRO,,L2_上下轴_P12速度/高速,UpDownAxis_P12_Speed,2000,,,,,,,,,,,,
PRO,,L3_进出轴_P11速度,InOutAxis_P11_Speed,1800,,,,,,,,,,,,
PRO,,L1_旋转轴_P11速度,MiddleAxis_P11_Speed,800,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,,
PRO,,是否是调试状态,IsInDebug,0,,,,,,,,,,,,
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速时间,减速时间,原点低速度,原点高速,原点加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,,R1_旋转轴,Middle_Axis,1,COM2,,250,1000,1000,80,60,50,10,1000,0,0
AXIS,,R2_上下轴,UpDown_Axis,2,COM2,,300,400,400,400,400,400,10,1000,0,0
AXIS,,R3_进出轴,InOut_Axis,3,COM2,,100,300,300,20,60,200,10,1000,0,0
AXIS,,R4_压紧轴,Comp_Axis,4,COM2,,100,300,300,20,60,200,10,1000,0,0
AXIS,,R1_旋转轴,Middle_Axis,8,HC,,800,2400,2400,50,250,3000,10,1000,0,0
AXIS,,R2_上下轴,UpDown_Axis,9,HC,,2000,6000,6000,50,250,3000,10,1000,0,0
AXIS,,R3_进出轴,InOut_Axis,10,HC,,1000,5000,5000,50,300,8000,10,1000,0,0
AXIS,,R4_压紧轴,Comp_Axis,11,HC,,10000,25000,25000,3000,10000,20000,10,1000,0,0
,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,R2_上下轴_P1待机点/扫码放料低点,UpDownAxis_P1,585000,,,,,,,,,,,,
PRO,,R2_上下轴_P2扫码放料高点缓冲点,UpDownAxis_P2,604500,,,,,,,,,,,,
PRO,,R1_旋转轴_P1待机点/扫码放料点,MiddleAxis_P1,307200,,,,,,,,,,,,
PRO,,R3_进出轴_P1待机点,InOutAxis_P1,1000,,,,,,,,,,,,
PRO,,R4_压紧轴_P1待机点,CompAxis_P1,140000,,,,,,,,,,,,
PRO,,R4_压紧轴_P3压紧前点,CompAxis_P3,180000,,,,,,,,,,,,
PRO,,R4_压紧轴_P2压紧点范围对应值,CompAxis_P2_List,8=201264;12=383001;16=379001;,,,,,,,,,,,,
PRO,,R2_上下轴_P1待机点/扫码放料低点,UpDownAxis_P1,10,,,,,,,,,,,,
PRO,,R2_上下轴_P2扫码放料高点缓冲点,UpDownAxis_P2,10,,,,,,,,,,,,
PRO,,R1_旋转轴_P1待机点/扫码放料点,MiddleAxis_P1,10,,,,,,,,,,,,
PRO,,R3_进出轴_P1待机点,InOutAxis_P1,10,,,,,,,,,,,,
PRO,,R4_压紧轴_P1待机点,CompAxis_P1,10,,,,,,,,,,,,
PRO,,R4_压紧轴_P3压紧前点,CompAxis_P3,10,,,,,,,,,,,,
PRO,,R4_压紧轴_P2压紧点范围对应值,CompAxis_P2_List,8=42835;12=38557;16=34550;20=30540;24=26030;,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,R2_上下轴_P11-出料口-低点,UpDownAxis_P11,1000000,,,,,,,,,,,,
PRO,,R2_上下轴_P12-出料口-高点,UpDownAxis_P12,1023000,,,,,,,,,,,,
PRO,,R1_旋转轴_P11-出料口位置,MiddleAxis_P11,306900,,,,,,,,,,,,
PRO,,R3_进出轴_P2-入料口取放料点,InOutAxis_P2,140800,,,,,,,,,,,,
PRO,,R3_进出轴_P11-出料口取放料点,InOutAxis_P11,148000,,,,,,,,,,,,
PRO,,R2_上下轴_P11-出料口-低点,UpDownAxis_P11,10,,,,,,,,,,,,
PRO,,R2_上下轴_P12-出料口-高点,UpDownAxis_P12,10,,,,,,,,,,,,
PRO,,R1_旋转轴_P11-出料口位置,MiddleAxis_P11,10,,,,,,,,,,,,
PRO,,R3_进出轴_P2-入料口取放料点,InOutAxis_P2,10,,,,,,,,,,,,
PRO,,R3_进出轴_P11-出料口取放料点,InOutAxis_P11,10,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,R2_上下轴_P1速度/高速,UpDownAxis_P1_Speed,600,,,,,,,,,,,,
PRO,,R2_上下轴_P2速度/低速,UpDownAxis_P2_Speed,600,,,,,,,,,,,,
PRO,,R2_上下轴_P3速度,UpDownAxis_P3_Speed,1000,,, ,,,,,,,,,
PRO,,R2_上下轴_P4速度,UpDownAxis_P4_Speed,200,,,,,,,,,,,,
PRO,,R2_上下轴_P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,,
PRO,,R2_上下轴_P6速度,UpDownAxis_P6_Speed,200,,,,,,,,,,,,
PRO,,R2_上下轴_P7速度,UpDownAxis_P7_Speed,600,,,,,,,,,,,,
PRO,,R2_上下轴_P8速度,UpDownAxis_P8_Speed,600,,,,,,,,,,,,
PRO,,R1_旋转轴_P1速度,MiddleAxis_P1_Speed,300,,,,,,,,,,,,
PRO,,R1_旋转轴_P2速度,MiddleAxis_P2_Speed,300,,,,,,,,,,,,
PRO,,R3_进出轴_P1速度,InOutAxis_P1_Speed,300,,,,,,,,,,,,
PRO,,R3_进出轴_P2速度,InOutAxis_P2_Speed,300,,,,,,,,,,,,
PRO,,R3_进出轴_P3速度,InOutAxis_P3_Speed,300,,,,,,,,,,,,
PRO,,R4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,,
PRO,,R4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,,
PRO,,R4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,,
PRO,,R2_上下轴_P1速度/高速,UpDownAxis_P1_Speed,2000,,,,,,,,,,,,
PRO,,R2_上下轴_P2速度/低速,UpDownAxis_P2_Speed,2000,,,,,,,,,,,,
PRO,,R2_上下轴_P3速度,UpDownAxis_P3_Speed,2000,,, ,,,,,,,,,
PRO,,R2_上下轴_P4速度,UpDownAxis_P4_Speed,150,,,,,,,,,,,,
PRO,,R2_上下轴_P5速度,UpDownAxis_P5_Speed,2000,,,,,,,,,,,,
PRO,,R2_上下轴_P6速度,UpDownAxis_P6_Speed,150,,,,,,,,,,,,
PRO,,R2_上下轴_P7速度,UpDownAxis_P7_Speed,2000,,,,,,,,,,,,
PRO,,R2_上下轴_P8速度,UpDownAxis_P8_Speed,100,,,,,,,,,,,,
PRO,,R1_旋转轴_P1速度,MiddleAxis_P1_Speed,800,,,,,,,,,,,,
PRO,,R1_旋转轴_P2速度,MiddleAxis_P2_Speed,800,,,,,,,,,,,,
PRO,,R3_进出轴_P1速度,InOutAxis_P1_Speed,1600,,,,,,,,,,,,
PRO,,R3_进出轴_P2速度,InOutAxis_P2_Speed,1800,,,,,,,,,,,,
PRO,,R3_进出轴_P3速度,InOutAxis_P3_Speed,1800,,,,,,,,,,,,
PRO,,R4_压紧轴_P1速度,CompAxis_P1_Speed,5000,,,,,,,,,,,,
PRO,,R4_压紧轴_P2速度,CompAxis_P2_Speed,8500,,,,,,,,,,,,
PRO,,R4_压紧轴_P3速度,CompAxis_P3_Speed,8500,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,R2_上下轴_P11速度/低速,UpDownAxis_P11_Speed,600,,,,,,,,,,,,
PRO,,R2_上下轴_P12速度/高速,UpDownAxis_P12_Speed,600,,,,,,,,,,,,
PRO,,R3_进出轴_P11速度,InOutAxis_P11_Speed,300,,,,,,,,,,,,
PRO,,R1_旋转轴_P11速度,MiddleAxis_P11_Speed,300,,,,,,,,,,,,
PRO,,R2_上下轴_P11速度/低速,UpDownAxis_P11_Speed,1000,,,,,,,,,,,,
PRO,,R2_上下轴_P12速度/高速,UpDownAxis_P12_Speed,2000,,,,,,,,,,,,
PRO,,R3_进出轴_P11速度,InOutAxis_P11_Speed,1800,,,,,,,,,,,,
PRO,,R1_旋转轴_P11速度,MiddleAxis_P11_Speed,800,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,,
PRO,,是否是调试状态,IsInDebug,0,,,,,,,,,,,,
source/DeviceLibrary/StoreConfig/StoreConfig.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速时间,减速时间,原点低速度,原点高速,原点加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,,T1_提升机构升降轴,T1_Batch_Axis,1,HC,,250,500,500,100,200,1000,10,1000,0,0
AXIS,,T2_取料机构旋转轴,T2_Middle_Axis,2,HC,,1000,1000,1000,200,500,500,10,1000,0,0
AXIS,,T3_取料机构上下轴,T3_Updown_Axis,3,HC,,800,1000,1000,200,500,500,10,1000,0,0
AXIS,,T4_取料机构进出轴,T4_InOut_Axis,4,HC,,800,1000,1000,200,500,500,10,1000,0,0
AXIS,,T1_提升机构升降轴,T1_Batch_Axis,4,HC,,250,500,500,100,200,1000,10,1000,0,0
AXIS,,T2_取料机构旋转轴,T2_Middle_Axis,5,HC,,1000,1000,1000,200,500,500,10,1000,0,0
AXIS,,T3_取料机构上下轴,T3_Updown_Axis,6,HC,,800,1000,1000,200,500,500,10,1000,0,0
AXIS,,T4_取料机构进出轴,T4_InOut_Axis,7,HC,,800,1000,1000,200,500,500,10,1000,0,0
,,,,,,,,,,,,,,,,
PRO,,IO模块对应的DI数量,IO_DILength,192.168.201.21#16;192.168.201.22#16;192.168.200.23#8,,,,,,,,,,,,
PRO,,IO模块对应的DO数量,IO_DOLength,192.168.201.21#16;192.168.201.22#16;192.168.200.23#8,,,,,,,,,,,,
......@@ -134,6 +134,10 @@ PRO,0,T4_进出轴7寸取料点P2Speed,InOutAxis_P2Speed,5000,,,,,,,,,,,,
PRO,0,T4_进出轴13寸取料点P3Speed,InOutAxis_P3Speed,5000,,,,,,,,,,,,
PRO,0,T4_进出轴放料点P4Speed,InOutAxis_P4Speed,5000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,AgvInName,AgvInName,D1,,,,,,,,,,,,
PRO,0,AgvOutName,AgvOutName,D2,,,,,,,,,,,,
PRO,0,电夹爪1端口,Clamp1Port,COM12,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,预警温度,WarnTemperate,80,,,,,,,,,,,,
PRO,,预警湿度,WarnHumidity,80,,,,,,,,,,,,
PRO,,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,,
......@@ -148,4 +152,4 @@ PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,,,,,,,
PRO,0,是否调试状态（1=调试，0=正常）,IsDebug,1,,,,,,,,,,,,
PRO,,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,,,,,,
PRO,,所有料仓的CID(用#号分隔),All_CIDs,packing-1#packing-2,,,,,,,,,,,,
PRO,,扫码的相机名称(多个用#分隔),CameraNameList,GigE:MV-CE200-10GC (00D76546875),,,,,,,,,,,,
PRO,,扫码的相机名称(多个用#分隔),CameraNameList,GigE:MV-CE200-10GC (00E96448339),,,,,,,,,,,,
source/DeviceLibrary/StoreConfig/linePositions_1.csv
位置,优先级,高度,宽度,料仓ID,旋转轴库位点P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3
1#AC1_1_1_4,259,32,15,1,306200,1290614,1299614,1299614,1290614,140800
1#AC1_1_1_5,258,32,15,1,306200,1334970,1343970,1343970,1334970,140800
1#AC1_1_1_6,257,32,15,1,306200,1381622,1392122,1392122,1381622,140800
1#AC1_1_1_7,256,32,15,1,306200,1424390,1433390,1433390,1424390,140800
1#AC1_1_1_8,255,32,15,1,306200,1471088,1481488,1481488,1471088,140800
1#AC1_1_1_9,254,32,15,1,306200,1514627,1525627,1525627,1514627,140800
1#AC1_1_1_10,253,32,15,1,306200,1561503,1570503,1570503,1561503,140800
1#AC1_1_1_11,252,32,15,1,306200,1603404,1612404,1612404,1603404,140800
1#AC1_1_1_12,251,32,15,1,306200,1650000,1660593,1660593,1650000,140800
1#AC1_1_1_13,250,32,15,1,306200,1693078,1702078,1702078,1693078,140800
1#AC1_1_1_14,249,32,15,1,306200,1738576,1747576,1747576,1738576,140800
1#AC1_1_1_15,248,32,15,1,306200,1785295,1794295,1794295,1785295,140800
1#AC1_1_1_16,247,12,15,1,436077,9671,20171,20171,9671,140800
1#AC1_1_1_17,246,12,15,1,436077,39893,50393,50393,39893,140800
1#AC1_1_1_18,245,12,15,1,436077,70661,81161,81161,70661,140800
1#AC1_1_1_19,244,12,15,1,436077,98713,109213,109213,98713,140800
1#AC1_1_1_20,243,12,15,1,436077,128728,139228,139228,128728,140800
1#AC1_1_1_21,242,12,15,1,436077,159195,169695,169695,159195,140800
1#AC1_1_2_4,241,12,15,1,436077,189134,199634,199634,189134,140800
1#AC1_1_2_5,240,12,15,1,436077,219845,230345,230345,219845,140800
1#AC1_1_2_6,239,12,15,1,436077,252000,262500,262500,252000,140800
1#AC1_1_2_7,238,12,15,1,436077,280421,290921,290921,280421,140800
1#AC1_1_2_8,237,12,15,1,436077,312224,322724,322724,312224,140800
1#AC1_1_2_9,236,12,15,1,436077,342256,352756,352756,342256,140800
1#AC1_1_2_10,235,12,15,1,436077,369382,379882,379882,369382,140800
1#AC1_1_2_11,234,12,15,1,436077,399751,410251,410251,399751,140800
1#AC1_1_2_12,233,12,15,1,436200,430923,441423,441423,430923,140800
1#AC1_1_2_13,232,12,15,1,436157,459859,470359,470359,459859,140800
1#AC1_1_2_14,231,12,15,1,436214,489685,500185,500185,489685,140800
1#AC1_1_2_15,230,12,15,1,436271,522581,533081,533081,522581,140800
1#AC1_1_2_16,229,12,15,1,435628,550105,560605,560605,550105,140800
1#AC1_1_2_17,228,12,15,1,435585,583474,593974,593974,583474,140800
1#AC1_1_2_18,227,12,15,1,435542,612943,623443,623443,612943,140800
1#AC1_1_2_19,226,12,15,1,435499,642389,652889,652889,642389,140800
1#AC1_1_2_20,225,12,15,1,435456,670221,680721,680721,670221,140800
1#AC1_1_2_21,224,12,15,1,435413,700236,713736,713736,700236,140800
位置,优先级,高度,宽度,料仓ID,旋转轴库位点P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3
1#AC1_1_1_4,259,32,15,1,306200,1290614,1299614,1299614,1290614,140800,,
1#AC1_1_1_5,258,32,15,1,306200,1334970,1343970,1343970,1334970,140800,,
1#AC1_1_1_6,257,32,15,1,306200,1381622,1392122,1392122,1381622,140800,,
1#AC1_1_1_7,256,32,15,1,306200,1424390,1433390,1433390,1424390,140800,,
1#AC1_1_1_8,255,32,15,1,306200,1471088,1481488,1481488,1471088,140800,,
1#AC1_1_1_9,254,32,15,1,306200,1514627,1525627,1525627,1514627,140800,,
1#AC1_1_1_10,253,32,15,1,306200,1561503,1570503,1570503,1561503,140800,,
1#AC1_1_1_11,252,32,15,1,306200,1603404,1612404,1612404,1603404,140800,,
1#AC1_1_1_12,251,32,15,1,306200,1650000,1660593,1660593,1650000,140800,,
1#AC1_1_1_13,250,32,15,1,306200,1693078,1702078,1702078,1693078,140800,,
1#AC1_1_1_14,249,32,15,1,306200,1738576,1747576,1747576,1738576,140800,,
1#AC1_1_1_15,248,32,15,1,306200,1785295,1794295,1794295,1785295,140800,,
1#AC1_1_1_16,247,12,15,1,436077,9671,20171,20171,9671,140800,,
1#AC1_1_1_17,246,12,15,1,436077,39893,50393,50393,39893,140800,,
1#AC1_1_1_18,245,12,15,1,436077,70661,81161,81161,70661,140800,,
1#AC1_1_1_19,244,12,15,1,436077,98713,109213,109213,98713,140800,,
1#AC1_1_1_20,243,12,15,1,436077,128728,139228,139228,128728,140800,,
1#AC1_1_1_21,242,12,15,1,436077,159195,169695,169695,159195,140800,,
1#AC1_1_2_4,241,12,15,1,436077,189134,199634,199634,189134,140800,,
1#AC1_1_2_5,240,12,15,1,436077,219845,230345,230345,219845,140800,,
1#AC1_1_2_6,239,12,15,1,436077,252000,262500,262500,252000,140800,,
1#AC1_1_2_7,238,12,15,1,436077,280421,290921,290921,280421,140800,,
1#AC1_1_2_8,237,12,15,1,436077,312224,322724,322724,312224,140800,,
1#AC1_1_2_9,236,12,15,1,436077,342256,352756,352756,342256,140800,,
1#AC1_1_2_10,235,12,15,1,436077,369382,379882,379882,369382,140800,,
1#AC1_1_2_11,234,12,15,1,436077,399751,410251,410251,399751,140800,,
1#AC1_1_2_12,233,12,15,1,436200,430923,441423,441423,430923,140800,,
1#AC1_1_2_13,232,12,15,1,436157,459859,470359,470359,459859,140800,,
1#AC1_1_2_14,231,12,15,1,436214,489685,500185,500185,489685,140800,,
1#AC1_1_2_15,230,12,15,1,436271,522581,533081,533081,522581,140800,,
1#AC1_1_2_16,229,12,15,1,435628,550105,560605,560605,550105,140800,,
1#AC1_1_2_17,228,12,15,1,435585,583474,593974,593974,583474,140800,,
1#AC1_1_2_18,227,12,15,1,435542,612943,623443,623443,612943,140800,,
1#AC1_1_2_19,226,12,15,1,435499,642389,652889,652889,642389,140800,,
1#AC1_1_2_20,225,12,15,1,435456,670221,680721,680721,670221,140800,,
1#AC1_1_2_21,224,12,15,1,435413,700236,713736,713736,700236,140800,,
,,,,,,,,,,,,
,,,,,,,,,,,,
,,,,,,,,,,,,
,,,,,,,,,,,,
,,,,,,,,,,,,
,,,,,,,,,,,,
,,,,,,,,,,,,
,,,,,,,,,,,,
source/DeviceLibrary/device/halcon/CodeManager.cs
......@@ -8,6 +8,7 @@ using System.IO;
using System.Linq;
using System.Runtime.ExceptionServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.DeviceLibrary
......@@ -112,27 +113,53 @@ namespace OnlineStore.DeviceLibrary
}
try
{
foreach (string cameraName in cameraList)
Task[] cameraTask = new Task[cameraList.Count()];
for (int i = 0; i < cameraList.Count(); i++)
{
var cameraName = cameraList[i];
cameraTask[i] = Task.Run(() =>
{
if (cameraName.Trim().Equals(""))
{
continue;
return;
}
DateTime startTime = DateTime.Now;
LogUtil.info(deviceName + " 【" + cameraName + "】开始取图片");
LogUtil.info(" 【" + cameraName + "】开始取图片");
HalconDotNet.HObject ho_Image = null;
Bitmap bmp = null;
try
{
ho_Image = Camera._cam.CaptureOnImage(cameraName);
if (ho_Image == null)
bool nohalcon = true;
ho_Image = Camera._cam.CaptureOnImage(cameraName, out bmp, nohalcon);
if (ho_Image == null && !nohalcon)
{
LogUtil.error(deviceName + " 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
LogUtil.error(" 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
CloseCamera(cameraName);
continue;
return;
}
LogUtil.info(deviceName + " 【" + cameraName + "】取图片完成，开始扫码");
List<CodeInfo> cc = new List<CodeInfo>();
LogUtil.info(" 【" + cameraName + "】取图片完成，开始扫码");
string r = "";
List<CodeInfo> tlci = EyemDecode.Decoder(ref bmp);
foreach (CodeInfo code in tlci)
{
LogUtil.info(" 【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
string str = CodeManager.ReplaceCode(code.CodeStr);
lock (codeList)
{
if (!codeList.Contains(str))
{
codeList.Add(str);
r = r + "##" + str;
}
}
}
/*
* List<CodeInfo> cc = new List<CodeInfo>();
foreach (string codeType in codeTypeList)
{
//判断是否是一维码
......@@ -142,11 +169,13 @@ namespace OnlineStore.DeviceLibrary
}
else
{
cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, timeOut);
cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, 2000);
}
foreach (CodeInfo c in cc)
{
string str = CodeManager.ReplaceCode(c.CodeStr);
lock (codeList)
{
if (!codeList.Contains(str))
{
codeList.Add(str);
......@@ -154,21 +183,23 @@ namespace OnlineStore.DeviceLibrary
}
}
}
if (String.IsNullOrEmpty(r))
}
*/
if (codeList.Count() == 0)
{
// SaveImageToFile(deviceName, cameraName, bit);
SaveImageToFile("mimo", cameraName, bmp);
}
LogUtil.info(deviceName + " 【" + cameraName + "】扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r);
LogUtil.info(" 【" + cameraName + "】" + " 扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r);
}
catch (AccessViolationException e)
{
LogUtil.error(deviceName + " 扫码出现AccessViolationException异常，关闭相机【" + cameraName + "】：" + e.ToString());
LogUtil.error(" 扫码出现AccessViolationException异常，关闭相机【" + cameraName + "】：" + e.ToString());
Camera._cam.Close(cameraName);
// GC.Collect();
}
catch (Exception ex)
{
LogUtil.error(deviceName + " 扫码出错：" + ex.ToString());
LogUtil.error(" 扫码出错：" + ex.ToString());
}
finally
{
......@@ -176,17 +207,23 @@ namespace OnlineStore.DeviceLibrary
{
ho_Image.Dispose();
}
if (bmp != null)
bmp.Dispose();
}
});
//cameraTask[i].Wait();
}
Task.WaitAll(cameraTask);
}
catch (AccessViolationException e)
{
LogUtil.error(deviceName + " 扫码出现AccessViolationException异常：" + e.ToString());
LogUtil.error(" 扫码出现AccessViolationException异常：" + e.ToString());
// GC.Collect();
}
catch (Exception ex)
{
LogUtil.error(deviceName + " 扫码出错：" + ex.ToString());
LogUtil.error(" 扫码出错：" + ex.ToString());
}
return codeList;
}
......
source/DeviceLibrary/duoStore/BoxBean.cs
......@@ -16,10 +16,10 @@ namespace OnlineStore.DeviceLibrary
{
public AutoInoutInfo AutoInout = new AutoInoutInfo();
public string CID = "";
public BOX_Config Config;
public override BOX_Config Config { get; set; } =null;
public string lastPosId = "";
public StoreStatus lastPosIdStatus = StoreStatus.StoreOnline;
private List<ConfigMoveAxis> moveAxisList = new List<ConfigMoveAxis>();
public override List<ConfigMoveAxis> moveAxisList { get; set; } = new List<ConfigMoveAxis>();
public List<string> PositionNumList = new List<string>();
public HumitureBean humBean = null;
......
source/DeviceLibrary/duoStore/DUOStoreBean.cs
......@@ -20,19 +20,36 @@ namespace OnlineStore.DeviceLibrary
internal Dictionary<int, BOX_Config> BoxConfigMap { get; set; }
public Dictionary<int, BoxBean> BoxMap = new Dictionary<int, BoxBean>();
public Store_Config Config { get; set; }
private Store_Config _config;
public new Store_Config Config
{
get
{
return _config;
}
set
{
//base.Config = (BaseConfig)value;
_config = value;
}
}
public bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
/// <summary>
/// 取料提升机构气缸
/// </summary>
//public HoisterCylinder hoisterCylinder = new HoisterCylinder(0);
public ElectricGripper electricClamp = new ElectricGripper(0);
public ElectricGripper electricClamp = new ElectricGripper();
public AxisBean T1_BatchAxis = null;
public AxisBean T2_MiddleAxis = null;
public AxisBean T3_UpdownAxis = null;
public AxisBean T4_InOut_Axis = null;
public bool HasT4Axis = false;
/// <summary>
/// 轴列表
/// </summary>
public override List<ConfigMoveAxis> moveAxisList { get; set; } = new List<ConfigMoveAxis>();
#region 初始化
internal bool canStart = false;
......@@ -70,6 +87,17 @@ namespace OnlineStore.DeviceLibrary
T2_MiddleAxis = new AxisBean(Config.T2_Middle_Axis,Name);
T3_UpdownAxis = new AxisBean(Config.T3_Updown_Axis,Name);
T4_InOut_Axis = new AxisBean(Config.T4_InOut_Axis, Name);
moveAxisList = new List<ConfigMoveAxis>();
moveAxisList.Add(Config.T1_Batch_Axis);
moveAxisList.Add(Config.T2_Middle_Axis);
moveAxisList.Add(Config.T3_Updown_Axis);
moveAxisList.Add(Config.T4_InOut_Axis);
AgvClient.NodeList.Add(Config.AgvInName);
AgvClient.NodeList.Add(Config.AgvOutName);
IOManager.Init();
CodeManager.LoadConfig();
......@@ -78,9 +106,16 @@ namespace OnlineStore.DeviceLibrary
HasT4Axis = Convert.ToBoolean(ConfigAppSettings.GetValue(Setting_Init.HasT4Axis));
Task.Factory.StartNew(delegate
{
if (!electricClamp.OpenPort(Config.Clamp1Port))
throw new Exception($"电动夹爪打开失败 端口：{Config.Clamp1Port}");
else {
LogUtil.info(Name + $"加载电夹爪成功：{Config.Clamp1Port}");
electricClamp.HomeReset();
}
//RFIDManager.RfidReader.Open(rfidList.ToArray());
IOManager.instance.ConnectionIOList(ioList);
AxisManager.Init();
//AgvClient.Init();
IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
......@@ -221,7 +256,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.LR_03_BatchAxisHome);
LogUtil.info(Name + "复位 " + MoveInfo.MoveStep + " ：夹爪回原点，提升轴回原点，上下轴回原点，流水线停止");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
ElectricGripper.HomeReset(MoveInfo);
electricClamp.HomeReset(MoveInfo);
T1_BatchAxis.HomeMove(MoveInfo);
T3_UpdownAxis.HomeMove(MoveInfo);
......@@ -234,7 +269,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
T1_BatchAxis.AbsMove(MoveInfo, Config.BatchAxis_P1, Config.BatchAxis_P1Speed);
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
ElectricGripper.Release(MoveInfo);
electricClamp.Release(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LR_04_BatchToP1))
{
......@@ -649,6 +684,15 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
}
public void OpenGate(StoreMoveInfo move = null) {
CylinderMove(move, IO_Type.RightDoor_Close, IO_Type.RightDoor_Open);
CylinderMove(move, IO_Type.LeftDoor_Close, IO_Type.LeftDoor_Open);
}
public void CloseGate(StoreMoveInfo move = null)
{
CylinderMove(move, IO_Type.RightDoor_Open, IO_Type.RightDoor_Close);
CylinderMove(move, IO_Type.LeftDoor_Open, IO_Type.LeftDoor_Close);
}
public bool OpenAllAxis(bool isCheck = true)
{
if (RunMultiAxis(isCheck, new AxisBean []{ T3_UpdownAxis,T2_MiddleAxis,T4_InOut_Axis, T1_BatchAxis }))
......
source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs
......@@ -277,7 +277,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_14_CylinderTighten);
InOutStoreLog("取料：夹爪气缸夹紧");
ElectricGripper.Clamp(MoveInfo);
electricClamp.Clamp(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_14_CylinderTighten))
{
......@@ -317,7 +317,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_19_CylinderRelax);
InOutStoreLog("料盘移栽： 夹爪气缸放松");
ElectricGripper.Release(MoveInfo);
electricClamp.Release(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_19_CylinderRelax))
{
......@@ -674,7 +674,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_13_CylinderTighten);
InOutStoreLog("取料：夹爪气缸夹紧");
ElectricGripper.Clamp(MoveInfo);
electricClamp.Clamp(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_13_CylinderTighten))
{
......@@ -796,7 +796,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_24_CylinderRelax);
InOutStoreLog("料盘移栽： 上料气缸放松");
ElectricGripper.Release(MoveInfo);
electricClamp.Release(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_24_CylinderRelax))
{
......
source/DeviceLibrary/duoStore/DUOStoreBean_RaiseStation.cs
......@@ -14,10 +14,11 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public void InOutStation_GoIn()
{
IOMove(IO_Type.RaiseStation_GoIn, IO_VALUE.HIGH);
IOMove(IO_Type.RaiseStation_GoIn1, IO_VALUE.HIGH);
IOMove(IO_Type.RaiseStation_GoOut, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_GoOut1, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_GoIn, IO_VALUE.HIGH);
IOMove(IO_Type.RaiseStation_GoIn1, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_FrontCheck, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_BackendCheck, IO_VALUE.HIGH));
}
......
source/DeviceLibrary/duoStore/ElectricGripper - 复制.cs 0 → 100644
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class ElectricGripper
{
private static int subType = 0;
public static Enum GripperType = GripperTypeE.None;
public ElectricGripper(int subType)
{
//this.subType = subType;
}
public static void Clamp(StoreMoveInfo moveInfo = null)
{
GripperType = GripperTypeE.Gripper;
if (!IsBusy)
{
setAction("01000");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
}
if (moveInfo != null)
moveInfo.WaitList.Add(WaitResultInfo.WaitAction(new Func<WaitResultInfo, bool>(WaitAction)));
}
public static bool Release(StoreMoveInfo moveInfo = null)
{
GripperType = GripperTypeE.Release;
if (!IsBusy)
{
setAction("10000");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
return true;
}
else
{
if (moveInfo != null)
moveInfo.WaitList.Add(WaitResultInfo.WaitAction(new Func<WaitResultInfo, bool>(WaitAction)));
return false;
}
}
public static void HomeReset(StoreMoveInfo moveInfo = null) {
GripperType = GripperTypeE.Reset;
if (!IsBusy)
{
setAction("11111");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
}
if (moveInfo != null)
//moveInfo.WaitList.Add(WaitResultInfo.WaitElectricClamp());
moveInfo.WaitList.Add(WaitResultInfo.WaitAction(new Func<WaitResultInfo, bool>(WaitAction)));
}
public static bool IsBusy {
get {
return IOManager.IOValue(IO_Type.Clamp_Busy, subType).Equals(IO_VALUE.HIGH);
}
}
public static bool IsClamp {
get
{
return IOManager.IOValue(IO_Type.Clamp_OnPosition, subType).Equals(IO_VALUE.HIGH);
}
}
static bool WaitAction(WaitResultInfo w)
{
if (ElectricGripper.IsBusy)
return false;
if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Gripper))
{
if (ElectricGripper.IsClamp)
return true;
else
{
ElectricGripper.Clamp();
return false; ;
}
}
else if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Release))
{
return ElectricGripper.Release();
}
else if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Reset))
{
return ElectricGripper.IsBusy;
}
else {
return true;
}
}
public static int state
{
get
{
int s1 = (int)IOManager.IOValue(IO_Type.Clamp_Abnormal1, subType);
int s2 = (int)IOManager.IOValue(IO_Type.Clamp_Abnormal2, subType);
int s3 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize1, subType);
int s4 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize2, subType);
int s5 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize3, subType);
string b = s1.ToString() + s2 + s3 + s4 + s5;
return Convert.ToInt32(b, 2);
}
}
public static void setAction(string s) {
for (int i = 0; i < 5; i++)
{
IOManager.IOMove("Clamp_SetPos"+i,s[i]=='1'? IO_VALUE.HIGH : IO_VALUE.LOW, subType);
}
}
public enum GripperTypeE
{
Gripper,
Release,
Reset,
None
}
}
}
source/DeviceLibrary/duoStore/ElectricGripper.cs
......@@ -9,31 +9,39 @@ namespace OnlineStore.DeviceLibrary
{
public class ElectricGripper
{
private static int subType = 0;
public static Enum GripperType = GripperTypeE.None;
public ElectricGripper(int subType)
private int subType = 0;
private Neotel.Rmaxis axis;
public Enum GripperType = GripperTypeE.None;
public bool OpenPort(string port)
{
//this.subType = subType;
axis = new Neotel.Rmaxis();
bool rtn = axis.OpenPort(port);
//var s = "版本号\r\n" + axis.GetVersion();
return rtn;
}
public static void Clamp(StoreMoveInfo moveInfo = null)
public void ClosePort() {
axis.ClosePort();
}
public void Clamp(StoreMoveInfo moveInfo = null)
{
GripperType = GripperTypeE.Gripper;
if (!IsBusy)
{
setAction("01000");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
axis.Push(30, 7, 500);
if (moveInfo!=null)
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
}
if (moveInfo != null)
moveInfo.WaitList.Add(WaitResultInfo.WaitAction(new Func<WaitResultInfo, bool>(WaitAction)));
}
public static bool Release(StoreMoveInfo moveInfo = null)
public bool Release(StoreMoveInfo moveInfo = null)
{
GripperType = GripperTypeE.Release;
if (!IsBusy)
{
setAction("10000");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
axis.GoHome();
if (moveInfo != null)
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
return true;
}
else
......@@ -43,80 +51,56 @@ namespace OnlineStore.DeviceLibrary
return false;
}
}
public static void HomeReset(StoreMoveInfo moveInfo = null) {
public void HomeReset(StoreMoveInfo moveInfo = null) {
GripperType = GripperTypeE.Reset;
if (!IsBusy)
{
setAction("11111");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
}
//if (!IsBusy)
//{
axis.ResetError();
axis.GoHome();
// }
if (moveInfo != null)
//moveInfo.WaitList.Add(WaitResultInfo.WaitElectricClamp());
moveInfo.WaitList.Add(WaitResultInfo.WaitAction(new Func<WaitResultInfo, bool>(WaitAction)));
}
public static bool IsBusy {
public bool IsBusy {
get {
return IOManager.IOValue(IO_Type.Clamp_Busy, subType).Equals(IO_VALUE.HIGH);
return !axis.IsReached;
}
}
public static bool IsClamp {
public bool IsClamp {
get
{
return IOManager.IOValue(IO_Type.Clamp_OnPosition, subType).Equals(IO_VALUE.HIGH);
return !axis.IsPushEmpty;
}
}
static bool WaitAction(WaitResultInfo w)
bool WaitAction(WaitResultInfo w)
{
if (ElectricGripper.IsBusy)
if (this.IsBusy)
return false;
if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Gripper))
if (this.GripperType.Equals(ElectricGripper.GripperTypeE.Gripper))
{
if (ElectricGripper.IsClamp)
if (this.IsClamp)
return true;
else
{
ElectricGripper.Clamp();
this.Clamp();
return false; ;
}
}
else if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Release))
else if (this.GripperType.Equals(ElectricGripper.GripperTypeE.Release))
{
return ElectricGripper.Release();
return this.Release();
}
else if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Reset))
else if (this.GripperType.Equals(ElectricGripper.GripperTypeE.Reset))
{
return ElectricGripper.IsBusy;
return this.IsBusy;
}
else {
return true;
}
}
public static int state
{
get
{
int s1 = (int)IOManager.IOValue(IO_Type.Clamp_Abnormal1, subType);
int s2 = (int)IOManager.IOValue(IO_Type.Clamp_Abnormal2, subType);
int s3 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize1, subType);
int s4 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize2, subType);
int s5 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize3, subType);
string b = s1.ToString() + s2 + s3 + s4 + s5;
return Convert.ToInt32(b, 2);
}
}
public static void setAction(string s) {
for (int i = 0; i < 5; i++)
{
IOManager.IOMove("Clamp_SetPos"+i,s[i]=='1'? IO_VALUE.HIGH : IO_VALUE.LOW, subType);
}
}
public enum GripperTypeE
{
Gripper,
......
source/DeviceLibrary/duoStore/EquipBase.cs
......@@ -11,6 +11,8 @@ namespace OnlineStore.DeviceLibrary
{
public abstract class EquipBase : KTK_Store
{
public virtual List<ConfigMoveAxis> moveAxisList { get; set; }=null;
public virtual BOX_Config Config { get; set; } = null;
internal int logType = 1000;
public DateTime LastAlarmTime = DateTime.Now;
public override void Alarm(AlarmType alarmType, string alarmDetial = "", string alarmMsg = "", MoveType storeMoveType = MoveType.None)
......@@ -235,10 +237,6 @@ namespace OnlineStore.DeviceLibrary
{
IOMove(wait.IoType, wait.IoValue);
}
else if (wait.IoType.Equals(IO_Type.Clamp_OnPosition))
{
ElectricGripper.Clamp();
}
else if (span.TotalMilliseconds > timeOutMs && NoAlarm())
{
......@@ -262,26 +260,6 @@ namespace OnlineStore.DeviceLibrary
wait.IsEnd = wait.Action.Invoke(wait);
LogUtil.info($"{Name} 自定义等待 IsEnd={wait.IsEnd},Type={wait.Action.GetType()}");
}
else if (wait.WaitType.Equals(WaitEnum.W012_ElectricGripperEvent))
{
if (ElectricGripper.IsBusy)
break;
if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Gripper))
{
if (ElectricGripper.IsClamp)
wait.IsEnd = true;
else
{
ElectricGripper.Clamp();
break;
}
}
else if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Release))
{
wait.IsEnd = ElectricGripper.Release();
}
}
else
{
wait.IsEnd = CheckWaitResult(MoveInfo, wait);
......
source/DeviceLibrary/duoStore/StoreManager.cs
......@@ -218,8 +218,11 @@ namespace OnlineStore.DeviceLibrary
{
param.PlateW = position.BagWidth;
}
p.ComPress_P2 = box.Config.GetComP2(position.BagHigh);
p.ComPress_P3 = box.Config.CompAxis_P3;
//p.ComPress_P2 = box.Config.GetComP2(position.BagHigh);
//p.ComPress_P3 = box.Config.CompAxis_P3;
p.ComPress_P2 = position.ComAxis_P2;
p.ComPress_P3 = position.ComAxis_P3;
p.InOut_P3 = position.InoutAxis_P3;
p.Middle_P2 = position.MiddleAxis_P2;
p.UpDown_P3 = position.UpdownAxis_IH_P3;
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......@@ -33,9 +33,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......
source/LoadCVSLibrary/position/ACBoxPosition.cs
......@@ -46,16 +46,16 @@ namespace OnlineStore.LoadCSVLibrary
[CSVAttribute("进出轴库位点取料点P3")]
public int InoutAxis_P3 { get; set; }
///// <summary>
///// 压紧轴（压紧点）P2
///// </summary>
//[CSVAttribute("压紧轴压紧点P2")]
//public int ComAxis_P2 { get; set; }
///// <summary>
///// 压紧轴（压紧前点）P3
///// </summary>
//[CSVAttribute("压紧轴压紧前点P3")]
//public int ComAxis_P3 { get; set; }
/// <summary>
/// 压紧轴（压紧点）P2
/// </summary>
[CSVAttribute("压紧轴压紧点P2")]
public int ComAxis_P2 { get; set; }
/// <summary>
/// 压紧轴（压紧前点）P3
/// </summary>
[CSVAttribute("压紧轴压紧前点P3")]
public int ComAxis_P3 { get; set; }
///// <summary>
///// 轴3(进出轴） 扫码放料点P2
......
source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
......@@ -63,16 +63,16 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[ConfigProAttribute("CompAxis_P1")]
public int CompAxis_P1 { get; set; }
/// <summary>
/// PRO,,L4_压紧轴_P3压紧前点,CompAxis_P3,180000
/// </summary>
[ConfigProAttribute("CompAxis_P3")]
public int CompAxis_P3 { get; set; }
/// <summary>
/// PRO,,L4_压紧轴_P2压紧点范围对应值,CompAxis_P2_List,8=385001;12=383001;16=379001;
/// </summary>
[ConfigProAttribute("CompAxis_P2_List")]
public string CompAxis_P2_List { get; set; }
///// <summary>
///// PRO,,L4_压紧轴_P3压紧前点,CompAxis_P3,180000
///// </summary>
//[ConfigProAttribute("CompAxis_P3")]
//public int CompAxis_P3 { get; set; }
///// <summary>
///// PRO,,L4_压紧轴_P2压紧点范围对应值,CompAxis_P2_List,8=385001;12=383001;16=379001;
///// </summary>
//[ConfigProAttribute("CompAxis_P2_List")]
//public string CompAxis_P2_List { get; set; }
/// <summary>
/// PRO,,L2_上下轴_P11-出料口-低点,UpDownAxis_P11,1000000
/// </summary>
......@@ -211,68 +211,68 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("IsInDebug")]
public int IsInDebug { get; set; }
private Dictionary< int,int > ComP2Map =null ;
public int GetComP2(int plateh)
{
//查找指定的高度
analysisComP2();
if (ComP2Map.ContainsKey(plateh))
{
return ComP2Map[plateh];
}
return new List<int>(ComP2Map.Values).First<int>();
}
//private Dictionary< int,int > ComP2Map =null ;
//public int GetComP2(int plateh)
//{
// //查找指定的高度
// analysisComP2();
// if (ComP2Map.ContainsKey(plateh))
// {
// return ComP2Map[plateh];
// }
// return new List<int>(ComP2Map.Values).First<int>();
//}
public void UpdateComP2(int height, int p2)
{
analysisComP2();
if (ComP2Map.ContainsKey(height))
{
ComP2Map[height] = p2;
}
else
{
ComP2Map.Add(height, p2);
}
string tt = "";
foreach (int p in ComP2Map.Keys)
{
tt += p + "=" + ComP2Map[p] + ";";
}
CompAxis_P2_List = tt;
}
//public void UpdateComP2(int height, int p2)
//{
// analysisComP2();
// if (ComP2Map.ContainsKey(height))
// {
// ComP2Map[height] = p2;
// }
// else
// {
// ComP2Map.Add(height, p2);
// }
// string tt = "";
// foreach (int p in ComP2Map.Keys)
// {
// tt += p + "=" + ComP2Map[p] + ";";
// }
// CompAxis_P2_List = tt;
//}
private void analysisComP2()
{
if (ComP2Map == null)
{
try
{
// 8=385001;424000#12=383001;385000#16=379001;
ComP2Map = new Dictionary<int, int>();
string[] arrayList = CompAxis_P2_List.Split(';');
foreach (string str in arrayList)
{
if (str.Equals(""))
{
continue;
}
string[] com2A = str.Split('=');
if (com2A.Length.Equals(2))
{
int plateH = Convert.ToInt32(com2A[0]);
int p2 = Convert.ToInt32(com2A[1]);
ComP2Map.Add(plateH, p2);
}
}
}
catch (Exception ex)
{
LogUtil.error("解析CompAxis_P2_List【" + CompAxis_P2_List + "】出错：" + ex.ToString());
}
}
}
//private void analysisComP2()
//{
// if (ComP2Map == null)
// {
// try
// {
// // 8=385001;424000#12=383001;385000#16=379001;
// ComP2Map = new Dictionary<int, int>();
// string[] arrayList = CompAxis_P2_List.Split(';');
// foreach (string str in arrayList)
// {
// if (str.Equals(""))
// {
// continue;
// }
// string[] com2A = str.Split('=');
// if (com2A.Length.Equals(2))
// {
// int plateH = Convert.ToInt32(com2A[0]);
// int p2 = Convert.ToInt32(com2A[1]);
// ComP2Map.Add(plateH, p2);
// }
// }
// }
// catch (Exception ex)
// {
// LogUtil.error("解析CompAxis_P2_List【" + CompAxis_P2_List + "】出错：" + ex.ToString());
// }
// }
//}
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
......@@ -256,6 +256,7 @@ namespace OnlineStore.LoadCSVLibrary
///DI 0 提升工位定位2下降端 X34
/// </summary>
public static string RaiseStation_DownLocation2 = "RaiseStation_DownLocation2";
/*
/// <summary>
///DI 0 卡爪到位确认 X39
/// </summary>
......@@ -288,6 +289,7 @@ namespace OnlineStore.LoadCSVLibrary
///DI 0 卡爪物件辨识3 X46
/// </summary>
public static string Clamp_ObjRecognize3 = "Clamp_ObjRecognize3";
*/
}
public enum IO_VALUE
{
......
source/LoadCVSLibrary/storeConfig/config/Store_Config.cs
......@@ -287,9 +287,12 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("InOutAxis_P4Speed")]
public int InOutAxis_P4Speed { get; set; }
[ConfigProAttribute("AgvInName")]
public string AgvInName { get; set; }
[ConfigProAttribute("AgvOutName")]
public string AgvOutName { get; set; }
[ConfigProAttribute("Clamp1Port")]
public string Clamp1Port { get; set; }
private List<string> CameraList = new List<string>();
public List<string> GetCameraList()
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!