Skip to content

刘韬 / SO815-AutoInOutStore

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

优化

1 个父辈 42429c38
内嵌 并排
正在显示 19 个修改的文件 包含 492 行增加 和 316 行删除
source/ACSingleStore/App.config
......@@ -4,6 +4,7 @@
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
</configSections>
<appSettings>
<add key="EnableWindowsFormsHighDpiAutoResizing" value="false" />
<!--是否开机自动启动料仓-->
<add key="App_AutoRun" value="1" />
<add key="App_Title" value="料仓_批量上下料" />
......
source/ACSingleStore/AutoInOutStore.csproj
......@@ -52,6 +52,9 @@
<PropertyGroup>
<ApplicationIcon>box.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="CodeLibrary, Version=1.0.7635.28877, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
......@@ -190,6 +193,7 @@
<EmbeddedResource Include="userControl\uc_boxdebug.resx">
<DependentUpon>uc_boxdebug.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
......
source/ACSingleStore/FrmIOStatus.Designer.cs
......@@ -37,9 +37,7 @@
this.btnOpenLed = new System.Windows.Forms.Button();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.btnCloseAxisBreak = new System.Windows.Forms.Button();
this.label17 = new System.Windows.Forms.Label();
this.btnOpenAxisBreak = new System.Windows.Forms.Button();
this.label14 = new System.Windows.Forms.Label();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.txtWriteTime = new System.Windows.Forms.TextBox();
......@@ -86,9 +84,7 @@
this.groupBox1.Controls.Add(this.btnOpenLed);
this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.btnCloseAxisBreak);
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.btnOpenAxisBreak);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.btnWriteSingleDO);
this.groupBox1.Controls.Add(this.txtWriteTime);
......@@ -97,7 +93,7 @@
this.groupBox1.Controls.Add(this.btnCloseDoor);
this.groupBox1.Controls.Add(this.btnOpenDoor);
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(740, 3);
this.groupBox1.Location = new System.Drawing.Point(540, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(456, 608);
this.groupBox1.TabIndex = 105;
......@@ -131,7 +127,7 @@
this.radioButton2.AutoSize = true;
this.radioButton2.Location = new System.Drawing.Point(307, 98);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(50, 21);
this.radioButton2.Size = new System.Drawing.Size(71, 28);
this.radioButton2.TabIndex = 270;
this.radioButton2.Text = "关闭";
this.radioButton2.UseVisualStyleBackColor = true;
......@@ -142,7 +138,7 @@
this.radioButton1.Checked = true;
this.radioButton1.Location = new System.Drawing.Point(214, 97);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(50, 21);
this.radioButton1.Size = new System.Drawing.Size(71, 28);
this.radioButton1.TabIndex = 269;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "打开";
......@@ -297,7 +293,7 @@
this.txtDOIndex.Location = new System.Drawing.Point(376, 61);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(74, 23);
this.txtDOIndex.Size = new System.Drawing.Size(74, 31);
this.txtDOIndex.TabIndex = 242;
this.txtDOIndex.Text = "0";
//
......@@ -307,21 +303,10 @@
this.txtDoName.Location = new System.Drawing.Point(112, 61);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(129, 23);
this.txtDoName.Size = new System.Drawing.Size(129, 31);
this.txtDoName.TabIndex = 241;
this.txtDoName.Text = "0";
//
// btnCloseAxisBreak
//
this.btnCloseAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxisBreak.Location = new System.Drawing.Point(17, 253);
this.btnCloseAxisBreak.Name = "btnCloseAxisBreak";
this.btnCloseAxisBreak.Size = new System.Drawing.Size(135, 52);
this.btnCloseAxisBreak.TabIndex = 253;
this.btnCloseAxisBreak.Text = "关闭轴2刹车";
this.btnCloseAxisBreak.UseVisualStyleBackColor = true;
this.btnCloseAxisBreak.Click += new System.EventHandler(this.btnCloseAxisBreak_Click);
//
// label17
//
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -333,17 +318,6 @@
this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnOpenAxisBreak
//
this.btnOpenAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxisBreak.Location = new System.Drawing.Point(17, 198);
this.btnOpenAxisBreak.Name = "btnOpenAxisBreak";
this.btnOpenAxisBreak.Size = new System.Drawing.Size(135, 52);
this.btnOpenAxisBreak.TabIndex = 252;
this.btnOpenAxisBreak.Text = "开启轴2刹车";
this.btnOpenAxisBreak.UseVisualStyleBackColor = true;
this.btnOpenAxisBreak.Click += new System.EventHandler(this.btnOpenAxisBreak_Click);
//
// label14
//
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -372,7 +346,7 @@
this.txtWriteTime.Location = new System.Drawing.Point(112, 96);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(56, 23);
this.txtWriteTime.Size = new System.Drawing.Size(56, 31);
this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0";
//
......@@ -396,7 +370,7 @@
this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(112, 23);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(338, 24);
this.cmbWriteIO.Size = new System.Drawing.Size(338, 32);
this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
......@@ -427,7 +401,7 @@
// button1
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button1.Location = new System.Drawing.Point(1047, 628);
this.button1.Location = new System.Drawing.Point(851, 628);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(135, 34);
this.button1.TabIndex = 254;
......@@ -440,9 +414,9 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(376, 3);
this.groupBox4.Location = new System.Drawing.Point(273, 3);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(359, 680);
this.groupBox4.Size = new System.Drawing.Size(255, 680);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "IO列表";
......@@ -460,7 +434,7 @@
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(348, 660);
this.tableLayoutPanel2.Size = new System.Drawing.Size(244, 660);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -470,7 +444,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(12, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(359, 680);
this.groupBox3.Size = new System.Drawing.Size(255, 680);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "IO列表";
......@@ -488,14 +462,13 @@
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(348, 660);
this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 660);
this.tableLayoutPanel1.TabIndex = 102;
//
// FrmIOStatus
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1204, 689);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1008, 689);
this.Controls.Add(this.button1);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupBox4);
......@@ -534,8 +507,6 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btnCloseDoor;
private System.Windows.Forms.Button btnOpenDoor;
private System.Windows.Forms.Button btnCloseAxisBreak;
private System.Windows.Forms.Button btnOpenAxisBreak;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btnCloseLed;
private System.Windows.Forms.Button btnOpenLed;
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -1140,6 +1140,9 @@ namespace OnlineStore.AutoInOutStore
}
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
CodeLibrary.FrmCodeDecode frm = new FrmCodeDecode();
frm.chbZxing.Checked = false;
frm.chbZxing.Visible = false;
frm.ShowDialog();
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
}
......
source/ACSingleStore/Program.cs
......@@ -94,6 +94,7 @@ namespace OnlineStore.AutoInOutStore
if (!isShow)
{
XmlConfigurator.Configure();
SetProcessDPIAware();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
#if PositionTool
......@@ -113,6 +114,9 @@ namespace OnlineStore.AutoInOutStore
#endif
}
}
[System.Runtime.InteropServices.DllImport("user32.dll")]
private static extern bool SetProcessDPIAware();
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
LogUnhandledException(e.ExceptionObject);
......
source/ACSingleStore/Properties/AssemblyInfo.cs
......@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO815-AutoInOutStore-newui edf7e3d07d3c8cafa890a08f4b855e559a36d414")]
[assembly: AssemblyProduct("SO815-AutoInOutStore-newui 42429c38bd4866dbdd9596cbe2cadc4059c732d2")]
[assembly: AssemblyCopyright("edf7e3d07d3c8cafa890a08f4b855e559a36d414")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
source/ACSingleStore/app.manifest 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC 清单选项
如果想要更改 Windows 用户帐户控制级别，请使用
以下节点之一替换 requestedExecutionLevel 节点。n
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
如果你的应用程序需要此虚拟化来实现向后兼容性，则删除此
元素。
-->
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
Windows 版本的列表。取消评论适当的元素，
Windows 将自动选择最兼容的环境。 -->
<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
<!-- Windows 10 -->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
</application>
</compatibility>
<!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</windowsSettings>
</application>
<!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->
</assembly>
source/ACSingleStore/userControl/AxisMoveControl.Designer.cs
......@@ -31,6 +31,7 @@
this.components = new System.ComponentModel.Container();
this.groupAxis = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblAlarmcode = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.lblhomeSts = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
......@@ -99,7 +100,6 @@
this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.lblServerOn = 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();
......@@ -119,7 +119,7 @@
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(692, 395);
this.groupAxis.Size = new System.Drawing.Size(696, 395);
this.groupAxis.TabIndex = 218;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
......@@ -159,6 +159,17 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "轴状态监控";
//
// lblAlarmcode
//
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;
//
// label4
//
this.label4.AutoSize = true;
......@@ -941,23 +952,12 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// lblAlarmcode
//
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(699, 402);
this.Size = new System.Drawing.Size(703, 402);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupBox2.ResumeLayout(false);
......
source/ACSingleStore/userControl/AxisTipControl.cs
......@@ -62,23 +62,72 @@ public partial class AxisTipControl : FrmBase
comjSpeed.Items.Add(targetSpeed * i / 10);
}
comjSpeed.SelectedIndex = 4;
comjSpeed.KeyUp += ComjSpeed_KeyUp;
SetRelList((int)comjSpeed.SelectedItem);
//【2】读取轴状态，如果读取出错将关闭此定时器
AxisSts sts = HCBoardManager.GetAxisSts(SlvAddr);
if (sts.ServoOn < 0)
{
showToolTip("伺服尚未使能",c);
return;
//return;
}
if (sts.ALM != 0 || sts.WARN != 0 || sts.EMG != 0) {
showToolTip("伺服警报状态中",c);
return;
//return;
}
readPosition();
this.Show();
LanguageProcess();
}
private void ComjSpeed_KeyUp(object sender, KeyEventArgs e)
{
if (!int.TryParse(comjSpeed.Text, out _))
{
//e.Handled = false;
return;
}
SetRelList(int.Parse(comjSpeed.Text));
}
private void ComjSpeed_KeyPress(object sender, KeyPressEventArgs e)
{
}
void SetRelList(int speed) {
flowLayoutPanel1.Controls.Clear();
int[] zoom = new int[] { 1, 3, 5, 7, 9, 11 };
for (int i = 0; i < zoom.Length; i++) {
Button b = new Button();
b.Size = new Size(60, 30);
var bs = (int)Math.Floor(speed / (decimal)zoom[i]);
b.Text = "+" + bs.ToString();
b.Tag = bs;
b.Click += B_Click;
flowLayoutPanel1.Controls.Add(b);
}
for (int i = 0; i < zoom.Length; i++)
{
Button b = new Button();
b.Size = new Size(60, 30);
var bs = (int)Math.Floor(speed / (decimal)zoom[zoom.Length-i-1]) *-1;
b.Text = bs.ToString();
b.Tag = bs;
b.Click += B_Click;
flowLayoutPanel1.Controls.Add(b);
}
}
private void B_Click(object sender, EventArgs e)
{
var b = sender as Button;
int pos = (int)b.Tag;
LogUtil.info("【" + PortName + "_" + SlvAddr + "】相对运动： 点位：" + pos);
AxisManager.RelMove(PortName, SlvAddr, pos, targetSpeed, targetSpeed * 3, targetSpeed * 3);
}
void showToolTip(string txt,Control control) {
var m_ToolTip = new ToolTip();
m_ToolTip.ToolTipIcon = ToolTipIcon.Warning;
......@@ -191,5 +240,15 @@ public partial class AxisTipControl : FrmBase
c.Text = textBox_pos.Text;
this.Close();
}
private void AxisTipControl_Load(object sender, EventArgs e)
{
}
private void comjSpeed_SelectedIndexChanged(object sender, EventArgs e)
{
SetRelList((int)comjSpeed.SelectedItem);
}
}
source/ACSingleStore/userControl/AxisTipControl.designer.cs
......@@ -36,17 +36,20 @@ partial class AxisTipControl
this.label_position = new System.Windows.Forms.Label();
this.btn_ok = new System.Windows.Forms.Button();
this.btn_cancel = new System.Windows.Forms.Button();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// comjSpeed
//
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(155, 8);
this.comjSpeed.Name = "comjSpeed";
this.comjSpeed.Size = new System.Drawing.Size(116, 28);
this.comjSpeed.TabIndex = 339;
this.comjSpeed.SelectedIndexChanged += new System.EventHandler(this.comjSpeed_SelectedIndexChanged);
//
// btnDelMove
//
......@@ -55,7 +58,7 @@ partial class AxisTipControl
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(155, 42);
this.btnDelMove.Name = "btnDelMove";
this.btnDelMove.Size = new System.Drawing.Size(116, 45);
this.btnDelMove.Size = new System.Drawing.Size(116, 32);
this.btnDelMove.TabIndex = 338;
this.btnDelMove.Text = "点动-";
this.btnDelMove.UseVisualStyleBackColor = false;
......@@ -69,7 +72,7 @@ partial class AxisTipControl
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(14, 42);
this.btnAddMove.Name = "btnAddMove";
this.btnAddMove.Size = new System.Drawing.Size(116, 45);
this.btnAddMove.Size = new System.Drawing.Size(116, 32);
this.btnAddMove.TabIndex = 337;
this.btnAddMove.Text = "点动+";
this.btnAddMove.UseVisualStyleBackColor = false;
......@@ -87,14 +90,14 @@ partial class AxisTipControl
//
// textBox_pos
//
this.textBox_pos.Location = new System.Drawing.Point(155, 94);
this.textBox_pos.Location = new System.Drawing.Point(155, 216);
this.textBox_pos.Name = "textBox_pos";
this.textBox_pos.Size = new System.Drawing.Size(116, 23);
this.textBox_pos.TabIndex = 340;
//
// label_position
//
this.label_position.Location = new System.Drawing.Point(38, 94);
this.label_position.Location = new System.Drawing.Point(38, 216);
this.label_position.Name = "label_position";
this.label_position.Size = new System.Drawing.Size(111, 20);
this.label_position.TabIndex = 336;
......@@ -103,7 +106,7 @@ partial class AxisTipControl
//
// btn_ok
//
this.btn_ok.Location = new System.Drawing.Point(181, 123);
this.btn_ok.Location = new System.Drawing.Point(181, 245);
this.btn_ok.Name = "btn_ok";
this.btn_ok.Size = new System.Drawing.Size(90, 33);
this.btn_ok.TabIndex = 341;
......@@ -113,7 +116,7 @@ partial class AxisTipControl
//
// btn_cancel
//
this.btn_cancel.Location = new System.Drawing.Point(16, 123);
this.btn_cancel.Location = new System.Drawing.Point(16, 245);
this.btn_cancel.Name = "btn_cancel";
this.btn_cancel.Size = new System.Drawing.Size(90, 33);
this.btn_cancel.TabIndex = 341;
......@@ -121,11 +124,30 @@ partial class AxisTipControl
this.btn_cancel.UseVisualStyleBackColor = true;
this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click);
//
// flowLayoutPanel1
//
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 19);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(269, 108);
this.flowLayoutPanel1.TabIndex = 342;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.flowLayoutPanel1);
this.groupBox1.Location = new System.Drawing.Point(13, 80);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(275, 130);
this.groupBox1.TabIndex = 343;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "相对运动";
//
// AxisTipControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(293, 166);
this.ClientSize = new System.Drawing.Size(300, 291);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btn_cancel);
this.Controls.Add(this.btn_ok);
this.Controls.Add(this.textBox_pos);
......@@ -140,6 +162,8 @@ partial class AxisTipControl
this.Name = "AxisTipControl";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.Load += new System.EventHandler(this.AxisTipControl_Load);
this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
......@@ -155,4 +179,6 @@ partial class AxisTipControl
private System.Windows.Forms.Label label_position;
private System.Windows.Forms.Button btn_ok;
private System.Windows.Forms.Button btn_cancel;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
private System.Windows.Forms.GroupBox groupBox1;
}
source/ACSingleStore/userControl/uc_boxdebug.Designer.cs
......@@ -30,6 +30,9 @@ namespace OnlineStore.ACSingleStore.useControl
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.groupInout = new System.Windows.Forms.GroupBox();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.checkBox_Double_Alternate = new System.Windows.Forms.CheckBox();
......@@ -97,7 +100,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Location = new System.Drawing.Point(2, 315);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(779, 179);
this.groupInout.Size = new System.Drawing.Size(904, 179);
this.groupInout.TabIndex = 101;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
......@@ -111,10 +114,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Black;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(522, 146);
this.btnInOutP1.Location = new System.Drawing.Point(568, 146);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(133, 29);
this.btnInOutP1.Size = new System.Drawing.Size(157, 29);
this.btnInOutP1.TabIndex = 226;
this.btnInOutP1.Text = "进出轴回待机点P1";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -164,9 +167,9 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(672, 146);
this.btnSavePosition.Location = new System.Drawing.Point(741, 145);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(95, 29);
this.btnSavePosition.Size = new System.Drawing.Size(119, 29);
this.btnSavePosition.TabIndex = 217;
this.btnSavePosition.Text = "保存位置";
this.btnSavePosition.UseVisualStyleBackColor = false;
......@@ -202,11 +205,11 @@ namespace OnlineStore.ACSingleStore.useControl
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(689, 19);
this.txtInOutP2.Location = new System.Drawing.Point(758, 18);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(78, 23);
this.txtInOutP2.Size = new System.Drawing.Size(102, 23);
this.txtInOutP2.TabIndex = 212;
this.txtInOutP2.Text = "-1";
//
......@@ -217,11 +220,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(690, 117);
this.txtComP3.Location = new System.Drawing.Point(759, 116);
this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3.Size = new System.Drawing.Size(78, 23);
this.txtComP3.Size = new System.Drawing.Size(102, 23);
this.txtComP3.TabIndex = 198;
this.txtComP3.Text = "-1";
//
......@@ -232,11 +235,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(689, 85);
this.txtComP2.Location = new System.Drawing.Point(758, 84);
this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP2.Size = new System.Drawing.Size(78, 23);
this.txtComP2.Size = new System.Drawing.Size(102, 23);
this.txtComP2.TabIndex = 196;
this.txtComP2.Text = "-1";
//
......@@ -247,11 +250,11 @@ namespace OnlineStore.ACSingleStore.useControl
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(689, 52);
this.txtInOutP3.Location = new System.Drawing.Point(758, 51);
this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(78, 23);
this.txtInOutP3.Size = new System.Drawing.Size(102, 23);
this.txtInOutP3.TabIndex = 194;
this.txtInOutP3.Text = "-1";
//
......@@ -262,11 +265,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(437, 149);
this.txtMiddleP2.Location = new System.Drawing.Point(460, 149);
this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP2.Size = new System.Drawing.Size(78, 23);
this.txtMiddleP2.Size = new System.Drawing.Size(102, 23);
this.txtMiddleP2.TabIndex = 192;
this.txtMiddleP2.Text = "-1";
//
......@@ -277,11 +280,11 @@ namespace OnlineStore.ACSingleStore.useControl
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(437, 51);
this.txtUpDownP5.Location = new System.Drawing.Point(460, 51);
this.txtUpDownP5.MaxLength = 20;
this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP5.Size = new System.Drawing.Size(78, 23);
this.txtUpDownP5.Size = new System.Drawing.Size(102, 23);
this.txtUpDownP5.TabIndex = 188;
this.txtUpDownP5.Text = "-1";
//
......@@ -292,11 +295,11 @@ namespace OnlineStore.ACSingleStore.useControl
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(437, 116);
this.txtUpDownP6.Location = new System.Drawing.Point(460, 116);
this.txtUpDownP6.MaxLength = 20;
this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP6.Size = new System.Drawing.Size(78, 23);
this.txtUpDownP6.Size = new System.Drawing.Size(102, 23);
this.txtUpDownP6.TabIndex = 190;
this.txtUpDownP6.Text = "-1";
//
......@@ -307,11 +310,11 @@ namespace OnlineStore.ACSingleStore.useControl
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(437, 19);
this.txtUpDownP3.Location = new System.Drawing.Point(460, 19);
this.txtUpDownP3.MaxLength = 20;
this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP3.Size = new System.Drawing.Size(78, 23);
this.txtUpDownP3.Size = new System.Drawing.Size(102, 23);
this.txtUpDownP3.TabIndex = 162;
this.txtUpDownP3.Text = "-1";
//
......@@ -348,11 +351,11 @@ namespace OnlineStore.ACSingleStore.useControl
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(437, 84);
this.txtUpDownP4.Location = new System.Drawing.Point(460, 84);
this.txtUpDownP4.MaxLength = 20;
this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP4.Size = new System.Drawing.Size(78, 23);
this.txtUpDownP4.Size = new System.Drawing.Size(102, 23);
this.txtUpDownP4.TabIndex = 166;
this.txtUpDownP4.Text = "-1";
//
......@@ -365,10 +368,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(522, 14);
this.btnInOutP2.Location = new System.Drawing.Point(568, 14);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(161, 29);
this.btnInOutP2.Size = new System.Drawing.Size(185, 29);
this.btnInOutP2.TabIndex = 211;
this.btnInOutP2.Text = "进出轴取料点P2：";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -383,10 +386,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(522, 113);
this.btnComP3.Location = new System.Drawing.Point(568, 113);
this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(161, 29);
this.btnComP3.Size = new System.Drawing.Size(185, 29);
this.btnComP3.TabIndex = 197;
this.btnComP3.Text = "压紧轴压紧前点P3：";
this.btnComP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -401,10 +404,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(522, 80);
this.btnComP2.Location = new System.Drawing.Point(568, 80);
this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(161, 29);
this.btnComP2.Size = new System.Drawing.Size(185, 29);
this.btnComP2.TabIndex = 195;
this.btnComP2.Text = "压紧轴压紧点P2：";
this.btnComP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -419,10 +422,10 @@ namespace OnlineStore.ACSingleStore.useControl
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.Green;
this.btnInOutP3.Location = new System.Drawing.Point(522, 47);
this.btnInOutP3.Location = new System.Drawing.Point(568, 47);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(161, 29);
this.btnInOutP3.Size = new System.Drawing.Size(185, 29);
this.btnInOutP3.TabIndex = 193;
this.btnInOutP3.Text = "进出轴取料点P3：";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -440,7 +443,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnMiddleP2.Location = new System.Drawing.Point(269, 146);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(161, 29);
this.btnMiddleP2.Size = new System.Drawing.Size(185, 29);
this.btnMiddleP2.TabIndex = 191;
this.btnMiddleP2.Text = "旋转轴库位点P2：";
this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -458,7 +461,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP5.Location = new System.Drawing.Point(269, 47);
this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(161, 29);
this.btnUpDownP5.Size = new System.Drawing.Size(185, 29);
this.btnUpDownP5.TabIndex = 187;
this.btnUpDownP5.Text = "升降轴出料前点P5：";
this.btnUpDownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -476,7 +479,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP6.Location = new System.Drawing.Point(269, 113);
this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(161, 29);
this.btnUpDownP6.Size = new System.Drawing.Size(185, 29);
this.btnUpDownP6.TabIndex = 189;
this.btnUpDownP6.Text = "升降轴出料缓冲点P6：";
this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -494,7 +497,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP3.Location = new System.Drawing.Point(269, 14);
this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(161, 29);
this.btnUpDownP3.Size = new System.Drawing.Size(185, 29);
this.btnUpDownP3.TabIndex = 161;
this.btnUpDownP3.Text = "升降轴入料前点P3：";
this.btnUpDownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -512,7 +515,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP4.Location = new System.Drawing.Point(269, 80);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(161, 29);
this.btnUpDownP4.Size = new System.Drawing.Size(185, 29);
this.btnUpDownP4.TabIndex = 165;
this.btnUpDownP4.Text = "升降轴入料缓冲点P4：";
this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -531,7 +534,23 @@ namespace OnlineStore.ACSingleStore.useControl
this.dataGridView1.AllowUserToResizeColumns = false;
this.dataGridView1.AllowUserToResizeRows = false;
this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Top;
this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
this.dataGridView1.EnableHeadersVisualStyles = false;
......@@ -539,6 +558,14 @@ namespace OnlineStore.ACSingleStore.useControl
this.dataGridView1.MultiSelect = false;
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
this.dataGridView1.RowTemplate.Height = 23;
......@@ -547,7 +574,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.dataGridView1.ShowCellToolTips = false;
this.dataGridView1.ShowEditingIcon = false;
this.dataGridView1.ShowRowErrors = false;
this.dataGridView1.Size = new System.Drawing.Size(785, 313);
this.dataGridView1.Size = new System.Drawing.Size(909, 209);
this.dataGridView1.TabIndex = 103;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown);
......@@ -559,7 +586,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.groupInout);
this.Name = "uc_boxdebug";
this.Size = new System.Drawing.Size(785, 530);
this.Size = new System.Drawing.Size(909, 530);
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
......
source/Common/Setting_Init.cs
......@@ -116,5 +116,7 @@ namespace OnlineStore.Common
public static string Tool_TargetSpeed = "Tool_TargetSpeed";
public static string Tool_TargetPosition = "Tool_TargetPosition";
public static string code_block_size_list= "code_block_size_list";
public static string DisableFixTray = "DisableFixTray";
public static string InOutFixPos = "InOutFixPos";
}
}
source/DeviceLibrary/DeviceLibrary/halcon/CodeManager.cs
......@@ -172,7 +172,7 @@ namespace OnlineStore.DeviceLibrary
Bitmap bmp = null;
try
{
bool nohalcon = true;
bool nohalcon = false;
ho_Image = Camera._cam.CaptureOnImage(cameraName, out bmp, nohalcon);
if (ho_Image == null && !nohalcon)
{
......@@ -182,45 +182,18 @@ namespace OnlineStore.DeviceLibrary
}
LogUtil.info(" 【" + cameraName + "】取图片完成，开始扫码");
string r = "";
foreach (int codesize in Code_Block_Size_List)
{
if (codeList.Count > 0)
break;
List<CodeInfo> tlci = EyemDecode.Decoder(ref bmp,null,codesize);
foreach (CodeInfo code in tlci)
RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
{
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))
codeTypeList = codeTypeList.ToArray(),
codeCount = codeCount,
timeout = 4000
};
var cc = RemoteDecodeHelper.DecodeRequest(bmp, remoteDecodeParam);
if (cc != null)
{
codeList.Add(str);
r = r + "##" + str;
}
}
}
}
/*
* List<CodeInfo> cc = new List<CodeInfo>();
foreach (string codeType in codeTypeList)
{
//判断是否是一维码
if (codeType.ToLower().Equals("barcode"))
{
cc = HDCodeHelper.DecodeBarCode(ho_Image);
}
else
{
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);
......@@ -228,8 +201,6 @@ namespace OnlineStore.DeviceLibrary
}
}
}
}
*/
if (codeList.Count() == 0)
{
SaveImageToFile("mimo", cameraName, bmp);
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
DI,急停,SuddenStop_BTN,0,HC,0,急停,X00,DI-00,0,
DI,复位,Reset_BTN,1,HC,0,复位,X01,DI-01,0,
DI,自动启动,AutoRun_Single,2,HC,0,自动启动,X02,DI-02,0,
DI,气压检测,Airpressure_Check,3,HC,0,气压检测,X03,DI-03,0,
DI,安全光栅,SafetyLightCurtains,4,HC,0,安全光栅,X04,DI-04,0,
DI,左侧防护门关闭,LeftDoorColse_Single,5,HC,0,左侧防护门关闭,X05,DI-05,0,
DI,右侧防护门关闭,RightDoorColse_Single,6,HC,0,右侧防护门关闭,X06,DI-06,0,
DI,上料机构门关闭,DoorClose_LoadMaterial,7,HC,0,上料机构门关闭,X07,DI-07,0,
DI,进料口门上升端,Door_Up,8,HC,0,进料口门上升端,X08,DI-08,0,
DI,进料口门下降端,Door_Down,9,HC,0,进料口门下降端,X09,DI-09,0,
DI,上料机构左门锁打开端,BatchDoor_Open,10,HC,0,上料机构左门锁打开端,X10,DI-10,0,
DI,上料机构左门锁关闭端,BatchDoor_Close,11,HC,0,上料机构左门锁关闭端,X11,DI-11,0,
DI,上料机构右门锁打开端,BatchDoor_Open2,12,HC,0,上料机构右门锁打开端,X12,DI-12,0,
DI,上料机构右门锁关闭端,BatchDoor_Close2,13,HC,0,上料机构右门锁关闭端,X13,DI-13,0,
DI,抓取气缸上升端,ClampingDisc_Up,14,HC,0,抓取气缸上升端,X14,DI-14,0,
DI,抓取气缸下降端,ClampingDisc_Down,15,HC,0,抓取气缸下降端,X15,DI-15,0,
DI,夹爪气缸夹紧端,Clamping_Work,16,HC,0,夹爪气缸夹紧端,X16,DI-16,0,
DI,夹爪气缸放松端,Clamping_Relax,17,HC,0,夹爪气缸放松端,X17,DI-17,0,
DI,7寸料盘检测,WidthCheck1,18,HC,0,7寸料盘检测,X18,DI-18,0,
DI,13寸料盘检测,WidthCheck2,19,HC,0,13寸料盘检测,X19,DI-19,0,
DI,进出料口料盘检测,TrayCheck_Door,20,HC,0,进出料口料盘检测,X20,DI-20,0,
DI,上料定位料盘检测,TrayCheck_LoadMaterial,21,HC,0,上料定位料盘检测,X21,DI-21,0,
DI,上料机构出料检测,OutCheck,22,HC,0,上料机构出料检测,X22,DI-22,0,
DI,料叉机构料盘检测,TrayCheck_Fixture,23,HC,0,料叉机构料盘检测,X23,DI-23,0,
DI,激光对位检测,Laser_Fixture,24,HC,0,料叉机构料盘检测,X24,DI-24,0,
,,,,,,,,,,
DO,自动指示灯,AutoRun_HddLed,0,HC,0,自动指示灯,Y00,DO-00,0,
DO,故障指示灯,Alarm_HddLed,1,HC,0,故障指示灯,Y01,DO-01,0,
DO,待机指示灯,RunSign_HddLed,2,HC,0,待机指示灯,Y02,DO-02,0,
DO,报警蜂鸣器,Buzzer_Sign,3,HC,0,报警蜂鸣器,Y03,DO-03,0,
DO,相机光源开启,CameraLight_Power,4,HC,0,相机光源开启,Y04,DO-04,0,
DO,设备照明开启,Device_Led,5,HC,0,设备照明开启,Y05,DO-05,0,
DO,氮气阀门开启,StartOrStopBlow,6,HC,0,氮气阀门开启,Y06,DO-06,0,
DO,上料机构门锁打开,BatchDoor_Open,7,HC,0,上料机构门锁打开,Y07,DO-07,0,
DO,上料机构门锁关闭,BatchDoor_Close,8,HC,0,上料机构门锁关闭,Y08,DO-08,0,
DO,进料口门上升,Door_Up,9,HC,0,进料口门上升,Y09,DO-09,0,
DO,进料口门下降,Door_Down,10,HC,0,进料口门下降,Y10,DO-10,0,
DO,抓取气缸上升,ClampingDisc_Up,11,HC,0,抓取气缸上升,Y11,DO-11,0,
DO,抓取气缸下降,ClampingDisc_Down,12,HC,0,抓取气缸下降,Y12,DO-12,0,
DO,夹爪气缸夹紧,Clamping_Work,13,HC,0,夹爪气缸夹紧,Y13,DO-13,0,
DO,夹爪气缸放松,Clamping_Relax,14,HC,0,夹爪气缸放松,Y14,DO-14,0,
DO,门禁功能屏蔽,DisableDoorControl,15,HC,0,门禁功能屏蔽,Y15,DO-15,0,
,,,,,,,,,,
,,,,,,,,,,
AXIS,(轴一)旋转轴,Middle_Axis,0,HC,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,1,HC,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,2,HC,0,,,,,
AXIS,(轴四)压紧轴,Comp_Axis,3,HC,0,,,,,
AXIS,(轴五)批量上下料轴,Batch_Axis,4,HC,0,,,,,
,,,,,,,,,,
,,,,,,,,,,
PRO,升降轴 仓门位置P7(人工拿走盘的位置),UpDownAxis_Door_P7,3473,,,,,,,
PRO,升降轴 出库高点P2,UpDownAxis_OutHigh_P2,2276,,,,,,,
PRO,升降轴 出库低点P8,UpDownAxis_OutLow_P8,2073,,,,,,,
PRO,升降轴从吸盘下方接料后下降的高度,UpDownAxis_DownValue,100,,,,,,,
PRO,升降轴 入库P1点集合,UpDownAxis_P1_List,8#3926;12#3884;16#3840;20#3800;24#3789;,,,,,,,
PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,3060,,,,,,,
PRO,进出轴(轴三)P1待机原位点,InOutAxis_P1_Position,100,,,,,,,
PRO,压紧轴(轴四)P1待机原位点,CompressAxis_P1_Position,7000,,,,,,,
PRO,压紧轴(轴四)P2压紧点集合,CompressAxis_P2_List,8#42835;12#38557;16#34550;20#30540;24#26030;,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,,,,
PRO,设备是否调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,,
PRO,默认的料盘宽度（不可更改）,Default_TrayWidth,0,,,,, ,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,180,,,,,,,
,,,,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,,
PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,800,,,,,,,
PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,2400,,,,,,,
PRO,(轴一)旋转轴减速度,MiddleAxis_DelSpeed,2400,,,,,,,
PRO,(轴一)旋转轴原点低速度,MiddleAxis_HomeLowSpeed,100,,,,,,,
PRO,(轴一)旋转轴原点高速,MiddleAxis_HomeHighSpeed,100,,,,,,,
PRO,(轴一)旋转轴原点加速度,MiddleAxis_HomeAddSpeed,500,,,,,,,
PRO,(轴二)升降轴轴目标速度,UpdownAxis_TargetSpeed,2000,,,,,,,
PRO,(轴二)升降轴轴加速度,UpdownAxis_AddSpeed,6000,,,,,,,
PRO,(轴二)升降轴轴减速度,UpdownAxis_DelSpeed,6000,,,,,,,
PRO,(轴二)升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,20,,,,,,,
PRO,(轴二)升降轴轴原点高速,UpdownAxis_HomeHighSpeed,250,,,,,,,
PRO,(轴二)升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,3000,,,,,,,
PRO,(轴三)进出轴目标速度,InoutAxis_TargetSpeed,1000,,,,,,,
PRO,(轴三)进出轴加速度,InoutAxis_AddSpeed,5000,,,,,,,
PRO,(轴三)进出轴减速度,InoutAxis_DelSpeed,5000,,,,,,,
PRO,(轴三)进出轴原点低速,InoutAxis_HomeLowSpeed,80,,,,,,,
PRO,(轴三)进出轴原点高速,InoutAxis_HomeHighSpeed,200,,,,,,,
PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,3000,,,,,,,
PRO,升降轴(轴二)P1速度,UpDownAxis_P1_Speed,2000,,,,,,,
PRO,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,2000,,,,,,,
PRO,升降轴(轴二)P3速度,UpDownAxis_P3_Speed,2000,,,,,,,
PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,150,,,,,,,
PRO,升降轴(轴二)P5速度,UpDownAxis_P5_Speed,2000,,,,,,,
PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,150,,,,,,,
PRO,升降轴(轴二)到仓门P7速度,UpDownAxis_P7_Speed,2000,,,,,,,
PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,,
PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,800,,,,,,,
PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,800,,,,,,,
PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,1600,,,,,,,
PRO,进出轴(轴三)P2速度,InOutAxis_P2_Speed,1800,,,,,,,
PRO,进出轴(轴三)P3速度,InOutAxis_P3_Speed,1800,,,,,, ,
PRO,(轴一)旋转轴最小误差脉冲值,MiddleAxis_ErrorCountMin,5,,,,,,,
PRO,(轴二)升降轴轴最小误差脉冲值,UpdownAxis_ErrorCountMin,5,,,,,,,
PRO,(轴三)进出轴最小误差脉冲值,InoutAxis_ErrorCountMin,5,,,,,,,
PRO,(轴一)旋转轴最大误差脉冲值,MiddleAxis_ErrorCountMax,20,,,,,,,
PRO,(轴二)升降轴轴最大误差脉冲值,UpdownAxis_ErrorCountMax,20,,,,,,,
PRO,(轴三)进出轴最大误差脉冲值,InoutAxis_ErrorCountMax,20,,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,500,,,,,, ,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,
PRO,(轴一)旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,,
PRO,(轴二)升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,,
PRO,(轴三)进出轴最小限位,InoutAxis_PositionMin,0,,,,,,,
PRO,(轴一)旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,,
PRO,(轴二)升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,,
PRO,(轴三)进出轴最大限位,InoutAxis_PositionMax,0,,,,,, ,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,5,,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,1,,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,1,,,,,,,
PRO,温湿度端口号,Humiture_Port,COM5,,,,,,,
,,,,,,,,,,
,,,,,,,,,,
,,,,,,,,,,
PRO,(轴五)上料轴目标速度,BatchAxis_TargetSpeed,13000,,,,,,,
PRO,(轴五)上料轴慢速匀速上升速度,BatchAxis_SlowSpeed,8000,,,,,,,
PRO,(轴五)上料轴加速度,BatchAxis_AddSpeed,60000,,,,,,,
PRO,(轴五)上料轴减速度,BatchAxis_DelSpeed,60000,,,,,,,
PRO,(轴五)上料轴原点低速,BatchAxis_HomeLowSpeed,20000,,,,,,,
PRO,(轴五)上料轴原点高速,BatchAxis_HomeHighSpeed,30000,,,,,,,
PRO,(轴五)上料轴原点加速度,BatchAxis_HomeAddSpeed,90000,,,,,, ,
PRO,(轴五)上料轴P1点（出库时接料盘的位置）,BatchAxis_P1,290669,,,,,, ,
PRO,(轴五)上料轴P2点（待机点）,BatchAxis_P2,3000,,,,,,,
PRO,(轴五)上料轴P2速度,BatchAxis_P2_Speed,20000,,,,,,,
PRO,(轴五)上料轴最小误差脉冲值,BatchAxis_ErrorCountMin,100,,,,,,,
PRO,(轴五)上料轴最大误差脉冲值,BatchAxis_ErrorCountMax,1000,,,,,,,
PRO,(轴五)上料轴最小限位,BatchAxis_PositionMin,0,,,,,,,
PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,,
PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,40,,,,,,,
PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_DownPosition2,3000,,,,,,,
PRO,(轴五)上料轴P1速度,BatchAxis_P1_Speed,22000,,,,,,,
PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,,
PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,
PRO,(轴五)上料轴P3点（上料目标位置）,BatchAxis_P3,362262,,,,,,,
,,,,,,,,,,
PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,100,,,,,,,
PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,100,,,,,,,
,,,,,,,,,,
PRO,(轴四)压紧轴目标速度,CompAxis_TargetSpeed,10000,,,,,,,
PRO,(轴四)压紧轴加速度,CompAxis_AddSpeed,25000,,,,,,,
PRO,(轴四)压紧轴减速度,CompAxis_DelSpeed,25000,,,,,,,
PRO,(轴四)压紧轴原点低速,CompAxis_HomeLowSpeed,3000,,,,,,,
PRO,(轴四)压紧轴原点高速,CompAxis_HomeHighSpeed,5000,,,,,,,
PRO,(轴四)压紧轴原点加速度,CompAxis_HomeAddSpeed,10000,,,,,,,
PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,5000,,,,,,,
PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,8500,,,,,,,
PRO,(轴四)压紧轴P3速度,CompAxis_P3_Speed,8500,,,,,,,
PRO,特殊二维码尺寸配置,CodeSizeConfig,T;PartNum;1=330x81,,,,,,,
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID
DI,急停,SuddenStop_BTN,0,HC,0,急停,X00,DI-00,0
DI,复位,Reset_BTN,1,HC,0,复位,X01,DI-01,0
DI,自动启动,AutoRun_Single,2,HC,0,自动启动,X02,DI-02,0
DI,气压检测,Airpressure_Check,3,HC,0,气压检测,X03,DI-03,0
DI,安全光栅,SafetyLightCurtains,4,HC,0,安全光栅,X04,DI-04,0
DI,左侧防护门关闭,LeftDoorColse_Single,5,HC,0,左侧防护门关闭,X05,DI-05,0
DI,右侧防护门关闭,RightDoorColse_Single,6,HC,0,右侧防护门关闭,X06,DI-06,0
DI,上料机构门关闭,DoorClose_LoadMaterial,7,HC,0,上料机构门关闭,X07,DI-07,0
DI,进料口门上升端,Door_Up,8,HC,0,进料口门上升端,X08,DI-08,0
DI,进料口门下降端,Door_Down,9,HC,0,进料口门下降端,X09,DI-09,0
DI,上料机构左门锁打开端,BatchDoor_Open,10,HC,0,上料机构左门锁打开端,X10,DI-10,0
DI,上料机构左门锁关闭端,BatchDoor_Close,11,HC,0,上料机构左门锁关闭端,X11,DI-11,0
DI,上料机构右门锁打开端,BatchDoor_Open2,12,HC,0,上料机构右门锁打开端,X12,DI-12,0
DI,上料机构右门锁关闭端,BatchDoor_Close2,13,HC,0,上料机构右门锁关闭端,X13,DI-13,0
DI,抓取气缸上升端,ClampingDisc_Up,14,HC,0,抓取气缸上升端,X14,DI-14,0
DI,抓取气缸下降端,ClampingDisc_Down,15,HC,0,抓取气缸下降端,X15,DI-15,0
DI,夹爪气缸夹紧端,Clamping_Work,16,HC,0,夹爪气缸夹紧端,X16,DI-16,0
DI,夹爪气缸放松端,Clamping_Relax,17,HC,0,夹爪气缸放松端,X17,DI-17,0
DI,7寸料盘检测,WidthCheck1,18,HC,0,7寸料盘检测,X18,DI-18,0
DI,13寸料盘检测,WidthCheck2,19,HC,0,13寸料盘检测,X19,DI-19,0
DI,进出料口料盘检测,TrayCheck_Door,20,HC,0,进出料口料盘检测,X20,DI-20,0
DI,上料定位料盘检测,TrayCheck_LoadMaterial,21,HC,0,上料定位料盘检测,X21,DI-21,0
DI,上料机构出料检测,OutCheck,22,HC,0,上料机构出料检测,X22,DI-22,0
DI,料叉机构料盘检测,TrayCheck_Fixture,23,HC,0,料叉机构料盘检测,X23,DI-23,0
DI,激光对位检测,Laser_Fixture,24,HC,0,料叉机构料盘检测,X24,DI-24,0
,,,,,,,,,
DO,自动指示灯,AutoRun_HddLed,0,HC,0,自动指示灯,Y00,DO-00,0
DO,故障指示灯,Alarm_HddLed,1,HC,0,故障指示灯,Y01,DO-01,0
DO,待机指示灯,RunSign_HddLed,2,HC,0,待机指示灯,Y02,DO-02,0
DO,报警蜂鸣器,Buzzer_Sign,3,HC,0,报警蜂鸣器,Y03,DO-03,0
DO,相机光源开启,CameraLight_Power,4,HC,0,相机光源开启,Y04,DO-04,0
DO,设备照明开启,Device_Led,5,HC,0,设备照明开启,Y05,DO-05,0
DO,氮气阀门开启,StartOrStopBlow,6,HC,0,氮气阀门开启,Y06,DO-06,0
DO,上料机构门锁打开,BatchDoor_Open,7,HC,0,上料机构门锁打开,Y07,DO-07,0
DO,上料机构门锁关闭,BatchDoor_Close,8,HC,0,上料机构门锁关闭,Y08,DO-08,0
DO,进料口门上升,Door_Up,9,HC,0,进料口门上升,Y09,DO-09,0
DO,进料口门下降,Door_Down,10,HC,0,进料口门下降,Y10,DO-10,0
DO,抓取气缸上升,ClampingDisc_Up,11,HC,0,抓取气缸上升,Y11,DO-11,0
DO,抓取气缸下降,ClampingDisc_Down,12,HC,0,抓取气缸下降,Y12,DO-12,0
DO,夹爪气缸夹紧,Clamping_Work,13,HC,0,夹爪气缸夹紧,Y13,DO-13,0
DO,夹爪气缸放松,Clamping_Relax,14,HC,0,夹爪气缸放松,Y14,DO-14,0
DO,门禁功能屏蔽,DisableDoorControl,15,HC,0,门禁功能屏蔽,Y15,DO-15,0
,,,,,,,,,
,,,,,,,,,
AXIS,(轴一)旋转轴,Middle_Axis,0,HC,0,,,,
AXIS,(轴二)升降轴,UpDown_Axis,1,HC,0,,,,
AXIS,(轴三)进出轴,InOut_Axis,2,HC,0,,,,
AXIS,(轴四)压紧轴,Comp_Axis,3,HC,0,,,,
AXIS,(轴五)批量上下料轴,Batch_Axis,4,HC,0,,,,
,,,,,,,,,
,,,,,,,,,
PRO,升降轴 仓门位置P7(人工拿走盘的位置),UpDownAxis_Door_P7,3377,,,,,,
PRO,升降轴 出库高点P2,UpDownAxis_OutHigh_P2,2276,,,,,,
PRO,升降轴 出库低点P8,UpDownAxis_OutLow_P8,2073,,,,,,
PRO,升降轴从吸盘下方接料后下降的高度,UpDownAxis_DownValue,100,,,,,,
PRO,升降轴 入库P1点集合,UpDownAxis_P1_List,8#3917;12#3893;16#3840;20#3800;24#3789;,,,,,,
PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,2995,,,,,,
PRO,进出轴(轴三)P1待机原位点,InOutAxis_P1_Position,100,,,,,,
PRO,压紧轴(轴四)P1待机原位点,CompressAxis_P1_Position,7000,,,,,,
PRO,压紧轴(轴四)P2压紧点集合,CompressAxis_P2_List,8#44201;12#38557;16#34550;20#30540;24#26030;,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,,,
PRO,设备是否调试状态（1=调试，0=正常）,IsInDebug,1,,,,,,
PRO,默认的料盘宽度（不可更改）,Default_TrayWidth,0,,,,, ,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,180,,,,,,
,,,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,
PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,800,,,,,,
PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,2400,,,,,,
PRO,(轴一)旋转轴减速度,MiddleAxis_DelSpeed,2400,,,,,,
PRO,(轴一)旋转轴原点低速度,MiddleAxis_HomeLowSpeed,100,,,,,,
PRO,(轴一)旋转轴原点高速,MiddleAxis_HomeHighSpeed,100,,,,,,
PRO,(轴一)旋转轴原点加速度,MiddleAxis_HomeAddSpeed,500,,,,,,
PRO,(轴二)升降轴轴目标速度,UpdownAxis_TargetSpeed,2000,,,,,,
PRO,(轴二)升降轴轴加速度,UpdownAxis_AddSpeed,6000,,,,,,
PRO,(轴二)升降轴轴减速度,UpdownAxis_DelSpeed,6000,,,,,,
PRO,(轴二)升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,20,,,,,,
PRO,(轴二)升降轴轴原点高速,UpdownAxis_HomeHighSpeed,250,,,,,,
PRO,(轴二)升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,3000,,,,,,
PRO,(轴三)进出轴目标速度,InoutAxis_TargetSpeed,1000,,,,,,
PRO,(轴三)进出轴加速度,InoutAxis_AddSpeed,5000,,,,,,
PRO,(轴三)进出轴减速度,InoutAxis_DelSpeed,5000,,,,,,
PRO,(轴三)进出轴原点低速,InoutAxis_HomeLowSpeed,80,,,,,,
PRO,(轴三)进出轴原点高速,InoutAxis_HomeHighSpeed,200,,,,,,
PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,3000,,,,,,
PRO,升降轴(轴二)P1速度,UpDownAxis_P1_Speed,2000,,,,,,
PRO,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,2000,,,,,,
PRO,升降轴(轴二)P3速度,UpDownAxis_P3_Speed,2000,,,,,,
PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,150,,,,,,
PRO,升降轴(轴二)P5速度,UpDownAxis_P5_Speed,2000,,,,,,
PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,150,,,,,,
PRO,升降轴(轴二)到仓门P7速度,UpDownAxis_P7_Speed,2000,,,,,,
PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,
PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,800,,,,,,
PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,800,,,,,,
PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,1600,,,,,,
PRO,进出轴(轴三)P2速度,InOutAxis_P2_Speed,1800,,,,,,
PRO,进出轴(轴三)P3速度,InOutAxis_P3_Speed,1800,,,,,,
PRO,(轴一)旋转轴最小误差脉冲值,MiddleAxis_ErrorCountMin,5,,,,,,
PRO,(轴二)升降轴轴最小误差脉冲值,UpdownAxis_ErrorCountMin,5,,,,,,
PRO,(轴三)进出轴最小误差脉冲值,InoutAxis_ErrorCountMin,5,,,,,,
PRO,(轴一)旋转轴最大误差脉冲值,MiddleAxis_ErrorCountMax,20,,,,,,
PRO,(轴二)升降轴轴最大误差脉冲值,UpdownAxis_ErrorCountMax,20,,,,,,
PRO,(轴三)进出轴最大误差脉冲值,InoutAxis_ErrorCountMax,20,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,500,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,
PRO,(轴一)旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,
PRO,(轴二)升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,
PRO,(轴三)进出轴最小限位,InoutAxis_PositionMin,0,,,,,,
PRO,(轴一)旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,
PRO,(轴二)升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,
PRO,(轴三)进出轴最大限位,InoutAxis_PositionMax,0,,,,,,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,5,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,1,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,1,,,,,,
PRO,温湿度端口号,Humiture_Port,COM5,,,,,,
,,,,,,,,,
,,,,,,,,,
,,,,,,,,,
PRO,(轴五)上料轴目标速度,BatchAxis_TargetSpeed,13000,,,,,,
PRO,(轴五)上料轴慢速匀速上升速度,BatchAxis_SlowSpeed,8000,,,,,,
PRO,(轴五)上料轴加速度,BatchAxis_AddSpeed,60000,,,,,,
PRO,(轴五)上料轴减速度,BatchAxis_DelSpeed,60000,,,,,,
PRO,(轴五)上料轴原点低速,BatchAxis_HomeLowSpeed,9000,,,,,,
PRO,(轴五)上料轴原点高速,BatchAxis_HomeHighSpeed,15000,,,,,,
PRO,(轴五)上料轴原点加速度,BatchAxis_HomeAddSpeed,100000,,,,,,
PRO,(轴五)上料轴P1点（出库时接料盘的位置）,BatchAxis_P1,285778,,,,,,
PRO,(轴五)上料轴P2点（待机点）,BatchAxis_P2,3000,,,,,,
PRO,(轴五)上料轴P2速度,BatchAxis_P2_Speed,20000,,,,,,
PRO,(轴五)上料轴最小误差脉冲值,BatchAxis_ErrorCountMin,100,,,,,,
PRO,(轴五)上料轴最大误差脉冲值,BatchAxis_ErrorCountMax,200,,,,,,
PRO,(轴五)上料轴最小限位,BatchAxis_PositionMin,0,,,,,,
PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,
PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,30000,,,,,,
PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_DownPosition2,60000,,,,,,
PRO,(轴五)上料轴P1速度,BatchAxis_P1_Speed,22000,,,,,,
PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,
PRO,最后一盘料需要补充的高度,LastTrayAddHeight,9,,,,,,
PRO,(轴五)上料轴P3点（上料目标位置）,BatchAxis_P3,358243,,,,,,
,,,,,,,,,
PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,100,,,,,,
PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,100,,,,,,
,,,,,,,,,
PRO,(轴四)压紧轴目标速度,CompAxis_TargetSpeed,10000,,,,,,
PRO,(轴四)压紧轴加速度,CompAxis_AddSpeed,95000,,,,,,
PRO,(轴四)压紧轴减速度,CompAxis_DelSpeed,95000,,,,,,
PRO,(轴四)压紧轴原点低速,CompAxis_HomeLowSpeed,3000,,,,,,
PRO,(轴四)压紧轴原点高速,CompAxis_HomeHighSpeed,5000,,,,,,
PRO,(轴四)压紧轴原点加速度,CompAxis_HomeAddSpeed,10000,,,,,,
PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,10000,,,,,,
PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,20000,,,,,,
PRO,(轴四)压紧轴P3速度,CompAxis_P3_Speed,30000,,,,,,
PRO,特殊二维码尺寸配置,CodeSizeConfig,T,PartNum,1=330x81,,,,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -872,6 +872,8 @@ namespace OnlineStore.DeviceLibrary
return false;
}
}
bool DisableFixTray = ConfigAppSettings.GetIntValue(Setting_Init.DisableFixTray).Equals(1);
int InOutFixPos = ConfigAppSettings.GetIntValue(Setting_Init.InOutFixPos);
LineMoveP movePfix=new LineMoveP();
protected override void OutStoreProcess()
{
......@@ -988,7 +990,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_07_CheckFix)
{
if (StoreMove.IsBatchInOutStore && StoreMove.MoveParam != null)
if (!DisableFixTray && StoreMove.IsBatchInOutStore && StoreMove.MoveParam != null)
{
var fixposid = $"1#AC1_0A_99_{StoreMove.MoveParam.PlagtW}";
var fixposition = CSVPositionReader<AutoStorePosition>.GetPositon(fixposid);
......@@ -1007,8 +1009,8 @@ namespace OnlineStore.DeviceLibrary
movePfix.UpDown_P1 = Config.GetUpDownP1(StoreMove.MoveParam.PlateH);
movePfix.ComPress_P2 = fixposition.CompressAxis_Position_P2;
movePfix.ComPress_P3 = fixposition.CompressAxis_CPosition_P3;
movePfix.ComPress_P2 = moveP.ComPress_P2;
movePfix.ComPress_P3 = moveP.ComPress_P3;
movePfix.InOut_P3 = fixposition.InOutAxis_Position_P3;
movePfix.Middle_P2 = fixposition.MiddleAxis_Position_P2;
movePfix.UpDown_P3 = fixposition.UpDownAxis_IHPosition_P3;
......@@ -1039,16 +1041,23 @@ namespace OnlineStore.DeviceLibrary
else if (StoreMove.MoveStep == StoreMoveStep.SO_07_CheckFix_02)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckFix_03);
InStoreLog("出库：库位修正 叉子进入库位中，进出轴至P3(修正库位取放料点) ");
ACAxisMove(Config.InOut_Axis, movePfix.InOut_P3, Config.InOutAxis_P3_Speed);
InStoreLog("出库：库位修正 叉子进入库位中，进出轴至Fix(修正库位取放料点) ");
ACAxisMove(Config.InOut_Axis, movePfix.InOut_P3+InOutFixPos, Config.InOutAxis_P3_Speed);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_07_CheckFix_03)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckFix_04);
StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckFix_04_inoutp3);
InStoreLog("出库：库位修正 压紧轴释放，升降轴到P4 ");
ComMoveToPosition(movePfix.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, movePfix.UpDown_P4, Config.UpDownAxis_P4_Speed);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_07_CheckFix_04_inoutp3)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckFix_04);
InStoreLog("出库：库位修正 进出轴到P3 ");
ACAxisMove(Config.InOut_Axis, movePfix.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_07_CheckFix_04)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckFix_05);
......@@ -1194,7 +1203,7 @@ namespace OnlineStore.DeviceLibrary
//如果可以直接下降，则不需要匀速上升
int targetValue = GetBatchTargetValue(StoreMove.MoveParam.MoveP.BatchAxis_DownValue);
if (targetValue >= 290600)
if (targetValue >= (Config.BatchAxis_P3-Config.BatchAxis_P2)*0.1)
{
OutStoreLog("出库：SO_02 批量上下料轴直接下降后目标位置【" + targetValue + "】不需要匀速上升 ");
}
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
......@@ -215,6 +215,7 @@ namespace OnlineStore.DeviceLibrary
{
return;
}
bool isClearAlarm = false;
switch (StoreMove.MoveStep)
{
case StoreMoveStep.AUTO_R00_Start:
......@@ -224,13 +225,21 @@ namespace OnlineStore.DeviceLibrary
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
AutomaticBaiting.CylinderMove(IO_Type.Clamping_Work, IO_Type.Clamping_Relax, StoreMove);
CylinderMove(IO_Type.ClampingDisc_Up, IO_Type.ClampingDisc_Down, true);
if (ACServerManager.GetAlarmStatus(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue()).Equals(1))
{
isClearAlarm = true;
LogUtil.debug(Name + "复位中：批量上下料轴清理报警");
ACServerManager.AlarmClear(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue());
Thread.Sleep(100);
}
ACAxisRelMove(StoreManager.Config.Batch_Axis, AxisChangeValue*5, StoreManager.Config.BatchAxis_P2_Speed);
LogUtil.info(Name + "复位中：关闭门锁");
break;
case StoreMoveStep.AUTO_R01_CloseDoor:
StoreMove.NextMoveStep(StoreMoveStep.AUTO_R02_AutoAxisHome);
StoreMove.TimeOutSeconds = 120;
bool isClearAlarm = false;
isClearAlarm = false;
if (ACServerManager.GetAlarmStatus(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue()).Equals(1))
{
isClearAlarm = true;
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
......@@ -34,9 +34,16 @@ namespace OnlineStore.DeviceLibrary
moveAxis.TargetPosition = targetPosition;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed, moveAxis.AddSpeed, moveAxis.DelSpeed);
}
private static void ACAxisRelMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, int.MaxValue, targetSpeed));
moveAxis.TargetPosition = targetPosition;
ACServerManager.RelMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed, moveAxis.AddSpeed, moveAxis.DelSpeed);
}
private static void ACAxisHomeMove(ConfigMoveAxis moveAxis)
{
moveAxis.TargetPosition = 0;
LogUtil.debug(Name + moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回");
ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed);
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
......@@ -59,7 +66,7 @@ namespace OnlineStore.DeviceLibrary
if (errorCount <= moveAxis.CanErrorCountMax)
{
LogUtil.info(Name + moveAxis.DisplayStr + "回原已到位，当前位置[" + outCount + "]最大允许误差[" + moveAxis.CanErrorCountMax + "]");
//ACServerManager.SuddenStop(moveAxis);
ACServerManager.SuddenStop(moveAxis);
return true;
}
//判断是否需要重新运动
......@@ -239,7 +246,12 @@ namespace OnlineStore.DeviceLibrary
string deviceName = moveAxis.DeviceName;
short axisNo = moveAxis.GetAxisValue();
bool countError = false;
bool IsOk = AxisManager.instance.AbsMoveIsEnd(deviceName, axisNo, targetPosition, moveAxis.CanErrorCountMax, out countError,out int IMP);
bool IsOk;
int IMP=0;
if (targetPosition== int.MaxValue)
IsOk = AxisManager.instance.GetBusyStatus(deviceName, axisNo).Equals(0);
else
IsOk = AxisManager.instance.AbsMoveIsEnd(deviceName, axisNo, targetPosition, moveAxis.CanErrorCountMax, out countError,out IMP);
if (IsOk)
{
return true;
......
source/DeviceLibrary/store/StoreMoveStep.cs
......@@ -246,6 +246,7 @@ namespace OnlineStore.DeviceLibrary
SO_07_CheckFix_01 ,
SO_07_CheckFix_02 ,
SO_07_CheckFix_03 ,
SO_07_CheckFix_04_inoutp3,
SO_07_CheckFix_04 ,
SO_07_CheckFix_05 ,
/// <summary>
......@@ -291,11 +292,11 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 升降轴走到门口位置
/// </summary>
SO_21_OpenDoor = 121,
SO_21_OpenDoor ,
/// <summary>
/// 等待操作人员拿走料盘
/// </summary>
SO_22_WaitTrayGo = 122,
SO_22_WaitTrayGo,
///// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!