Skip to content

张东亮 / NS200

转到一个项目
切换导航栏
切换导航栏固定状态
Commit dd3f09d7 由 贾鹏旭
选项

合并冲突

1 个父辈 4d2c68da
全部展开
内嵌 并排
正在显示 24 个修改的文件 包含 515 行增加 和 107 行删除
AutoScanAndLabel/AboutBox1.Designer.cs
......@@ -50,7 +50,8 @@ namespace AutoScanAndLabel
this.tableLayoutPanel.Controls.Add(this.textBoxDescription, 1, 4);
this.tableLayoutPanel.Controls.Add(this.okButton, 1, 5);
this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel.Location = new System.Drawing.Point(9, 8);
this.tableLayoutPanel.Location = new System.Drawing.Point(12, 10);
this.tableLayoutPanel.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel.Name = "tableLayoutPanel";
this.tableLayoutPanel.RowCount = 6;
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
......@@ -59,17 +60,17 @@ namespace AutoScanAndLabel
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.Size = new System.Drawing.Size(417, 245);
this.tableLayoutPanel.Size = new System.Drawing.Size(556, 306);
this.tableLayoutPanel.TabIndex = 0;
//
// labelProductName
//
this.labelProductName.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelProductName.Location = new System.Drawing.Point(60, 0);
this.labelProductName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelProductName.MaximumSize = new System.Drawing.Size(0, 16);
this.labelProductName.Location = new System.Drawing.Point(80, 0);
this.labelProductName.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0);
this.labelProductName.MaximumSize = new System.Drawing.Size(0, 20);
this.labelProductName.Name = "labelProductName";
this.labelProductName.Size = new System.Drawing.Size(354, 16);
this.labelProductName.Size = new System.Drawing.Size(472, 20);
this.labelProductName.TabIndex = 19;
this.labelProductName.Text = "产品名称";
this.labelProductName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -77,12 +78,13 @@ namespace AutoScanAndLabel
// labelVersion
//
this.labelVersion.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelVersion.Location = new System.Drawing.Point(60, 24);
this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelVersion.MaximumSize = new System.Drawing.Size(0, 16);
this.labelVersion.Location = new System.Drawing.Point(80, 30);
this.labelVersion.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0);
this.labelVersion.MaximumSize = new System.Drawing.Size(0, 20);
this.labelVersion.Name = "labelVersion";
this.labelVersion.Size = new System.Drawing.Size(354, 16);
this.labelVersion.Size = new System.Drawing.Size(472, 20);
this.labelVersion.TabIndex = 0;
this.labelVersion.Tag = "not";
this.labelVersion.Text = "版本";
this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.labelVersion.Click += new System.EventHandler(this.labelVersion_Click);
......@@ -90,11 +92,11 @@ namespace AutoScanAndLabel
// labelCopyright
//
this.labelCopyright.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelCopyright.Location = new System.Drawing.Point(60, 48);
this.labelCopyright.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 16);
this.labelCopyright.Location = new System.Drawing.Point(80, 60);
this.labelCopyright.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0);
this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 20);
this.labelCopyright.Name = "labelCopyright";
this.labelCopyright.Size = new System.Drawing.Size(354, 16);
this.labelCopyright.Size = new System.Drawing.Size(472, 20);
this.labelCopyright.TabIndex = 21;
this.labelCopyright.Text = "版权";
this.labelCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -102,11 +104,11 @@ namespace AutoScanAndLabel
// labelCompanyName
//
this.labelCompanyName.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelCompanyName.Location = new System.Drawing.Point(60, 72);
this.labelCompanyName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 16);
this.labelCompanyName.Location = new System.Drawing.Point(80, 90);
this.labelCompanyName.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0);
this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 20);
this.labelCompanyName.Name = "labelCompanyName";
this.labelCompanyName.Size = new System.Drawing.Size(354, 16);
this.labelCompanyName.Size = new System.Drawing.Size(472, 20);
this.labelCompanyName.TabIndex = 22;
this.labelCompanyName.Text = "公司名称";
this.labelCompanyName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -114,13 +116,13 @@ namespace AutoScanAndLabel
// textBoxDescription
//
this.textBoxDescription.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBoxDescription.Location = new System.Drawing.Point(60, 99);
this.textBoxDescription.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
this.textBoxDescription.Location = new System.Drawing.Point(80, 124);
this.textBoxDescription.Margin = new System.Windows.Forms.Padding(8, 4, 4, 4);
this.textBoxDescription.Multiline = true;
this.textBoxDescription.Name = "textBoxDescription";
this.textBoxDescription.ReadOnly = true;
this.textBoxDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.textBoxDescription.Size = new System.Drawing.Size(354, 116);
this.textBoxDescription.Size = new System.Drawing.Size(472, 145);
this.textBoxDescription.TabIndex = 23;
this.textBoxDescription.TabStop = false;
this.textBoxDescription.Text = "说明";
......@@ -129,9 +131,10 @@ namespace AutoScanAndLabel
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.okButton.Location = new System.Drawing.Point(339, 221);
this.okButton.Location = new System.Drawing.Point(452, 277);
this.okButton.Margin = new System.Windows.Forms.Padding(4);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 21);
this.okButton.Size = new System.Drawing.Size(100, 25);
this.okButton.TabIndex = 24;
this.okButton.Text = "确定(&O)";
this.okButton.Click += new System.EventHandler(this.okButton_Click);
......@@ -139,15 +142,16 @@ namespace AutoScanAndLabel
// AboutBox1
//
this.AcceptButton = this.okButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(435, 261);
this.ClientSize = new System.Drawing.Size(580, 326);
this.Controls.Add(this.tableLayoutPanel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "AboutBox1";
this.Padding = new System.Windows.Forms.Padding(9, 8, 9, 8);
this.Padding = new System.Windows.Forms.Padding(12, 10, 12, 10);
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
......
AutoScanAndLabel/AboutBox1.cs
......@@ -15,10 +15,10 @@ namespace AutoScanAndLabel
public AboutBox1()
{
InitializeComponent();
this.Text = String.Format(crc.GetString("Res0001", "关于 {0}"), AssemblyTitle);
this.Text = String.Format(crc.GetString("Res0001", "关于 {0}"), crc.GetString("App_Title", "自动贴标机"));
this.labelProductName.Text = AssemblyProduct;
this.labelVersion.Text = String.Format(crc.GetString("Res0002", "版本 {0}"), AssemblyVersion);
this.labelCopyright.Text = AssemblyCopyright;
this.labelCopyright.Text = crc.GetString("Res0219", "版权 © 2021");
this.labelCompanyName.Text = AssemblyCompany;
this.textBoxDescription.Text = AssemblyDescription;
}
......@@ -63,10 +63,10 @@ namespace AutoScanAndLabel
{
int days = Convert.ToInt32(strArray[2]);
int seconds = Convert.ToInt32(strArray[3]);
DateTime d1 = DateTime.Parse("2000-01-01");
DateTime d1 = DateTime.Parse("2023-11-10");
var newData = d1.AddDays(days);
newData = newData.AddSeconds(seconds * 2);
updatetime = "LastUpdate: " + newData.ToString("yyyy-MM-dd HH:mm:ss");
updatetime = $"{crc.GetString("Res0220", "最后更新时间:")}" + newData.ToString("yyyy-MM-dd HH:mm:ss");
}
if (attributes.Length == 0)
......
AutoScanAndLabel/App.ico 0 → 100644
此文件类型无法预览
AutoScanAndLabel/AutoScanAndLabel.csproj
......@@ -98,6 +98,12 @@
<Compile Include="FrmLabelEdit.Designer.cs">
<DependentUpon>FrmLabelEdit.cs</DependentUpon>
</Compile>
<Compile Include="Homepage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Homepage.Designer.cs">
<DependentUpon>Homepage.cs</DependentUpon>
</Compile>
<Compile Include="IOControl.cs">
<SubType>UserControl</SubType>
</Compile>
......@@ -155,6 +161,9 @@
<EmbeddedResource Include="FrmLabelEdit.resx">
<DependentUpon>FrmLabelEdit.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Homepage.resx">
<DependentUpon>Homepage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="IOControl.resx">
<DependentUpon>IOControl.cs</DependentUpon>
</EmbeddedResource>
......@@ -230,6 +239,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="App.ico" />
<Content Include="icon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
AutoScanAndLabel/Form1.cs
......@@ -3,19 +3,14 @@ using CodeLibrary;
using ConfigHelper;
using DeviceLibrary;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using AutoScanAndLabel.UC;
using PrintLabel;
using OnlineStore.LoadCSVLibrary;
namespace AutoScanAndLabel
{
......@@ -35,8 +30,18 @@ namespace AutoScanAndLabel
t1.Start();
GC.KeepAlive(t1);
this.Shown += Form1_Shown;
panel1.SendToBack();
}
private void SetControlBackColor(Control control, Color color)
{
control.BackColor = color; // 设置当前控件的背景色
foreach (Control child in control.Controls)
{
child.ForeColor = System.Drawing.Color.White;
SetControlBackColor(child, color); // 递归设置子控件的背景色
}
}
private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{
if (tabControl1.TabCount > tabpagecount)
......@@ -65,7 +70,7 @@ namespace AutoScanAndLabel
stateView.Columns[2].Text = crc.GetString("Res0006", "步骤");
stateView.Columns[3].Text = crc.GetString("Form1_tabControl1_tabPage1_Text", "信息");
启用调试模式ToolStripMenuItem.Text = !RobotManage.IsDebug ? crc.GetString("Res0101", "启用配置模式") : crc.GetString("Res0012", "停用配置模式");
设备操作ToolStripMenuItem.Text = !RobotManage.IsDebug ? crc.GetString("Res0101", "启用配置模式") : crc.GetString("Res0012", "停用配置模式");
}
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
......@@ -133,7 +138,7 @@ namespace AutoScanAndLabel
#endregion
LogUtil.info("开始初始化");
cb_EnableBuzzer.Checked = Config.Get("EnableBuzzer", true);
//cb_EnableBuzzer.Checked = Config.Get("EnableBuzzer", true);
AlarmBuzzer.BuzzerStateChange += AlarmBuzzer_BuzzerStateChange;
RobotManage.LoadFinishEvent += RobotManage_LoadFinishEvent;
if (Config.Get("EnableLogWindow", false))
......@@ -146,7 +151,7 @@ namespace AutoScanAndLabel
private void CodeResourceControl_RefreshLanguageEvent()
{
if(RobotManage.isRunning)
if (RobotManage.isRunning)
{
if (userpause)
{
......@@ -225,12 +230,12 @@ namespace AutoScanAndLabel
e.NewWidth = (sender as ListView).Columns[e.ColumnIndex].Width;
e.Cancel = true;
}
const int tabpagecount = 4;
const int tabpagecount = 3;
void addTablePage()
{
AddForm("Res0008", crc.GetString("Res0008", "IO调试"), ioc);
AddForm("Res0009", crc.GetString("Res0009", "伺服调试"), ac);
AddForm("Res0070", crc.GetString("Res0070", "Agv调试"), agv);
//AddForm("Res0070", crc.GetString("Res0070", "Agv调试"), agv);
AddForm("Res0010", crc.GetString("Res0010", "相关设置"), sc);
crc.LanguageProcess(this);
}
......@@ -559,11 +564,11 @@ namespace AutoScanAndLabel
aboutBox1.ShowDialog();
}
private void cb_EnableBuzzer_CheckedChanged(object sender, EventArgs e)
{
Config.Set("EnableBuzzer", cb_EnableBuzzer.Checked);
AlarmBuzzer.Enable = cb_EnableBuzzer.Checked;
}
//private void cb_EnableBuzzer_CheckedChanged(object sender, EventArgs e)
//{
// Config.Set("EnableBuzzer", cb_EnableBuzzer.Checked);
// AlarmBuzzer.Enable = cb_EnableBuzzer.Checked;
//}
private void btn_PauseBuzzer_Click(object sender, EventArgs e)
{
......@@ -626,5 +631,82 @@ namespace AutoScanAndLabel
if (obj.Dock == DockStyle.Fill)
obj.Dock = DockStyle.None;
}
private void listView1_SelectedIndexChanged(object sender, EventArgs e)
{
}
private void aGVToolStripMenuItem_Click(object sender, EventArgs e)
{
panel1.BringToFront();
panel1.Controls.Clear();
panel1.Controls.Add(agv);
}
private void 相机条码ToolStripMenuItem_Click(object sender, EventArgs e)
{
panel1.BringToFront();
CodeLibrary.CodeResourceControl.GetLanguageEvent += Crc_GetLanguageEvent;
CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode();
frm.CurrLanguage = Crc_GetLanguageEvent();
frm.chbZxing.Checked = false;
//设置子窗口不显示为顶级窗口
frm.TopLevel = false;
//设置子窗口的样式，没有上面的标题栏
frm.FormBorderStyle = FormBorderStyle.None;
//填充
frm.Dock = DockStyle.Fill;
//清空Panel里面的控件
this.panel1.Controls.Clear();
//加入控件
this.panel1.Controls.Add(frm);
//让窗体显示
frm.Show();
}
private void 设备操作ToolStripMenuItem_Click(object sender, EventArgs e)
{
panel1.SendToBack();
panel1.Controls.Clear();
RobotManage.IsDebug = RobotManage.IsDebug ? false : true;
(sender as ToolStripMenuItem).Text = !RobotManage.IsDebug ? crc.GetString("Res0101", "设备操作") : crc.GetString("Res0012", "停用配置模式");
if (RobotManage.IsDebug)
{
RobotManage.Config = (Robot_Config)CSVConfigReader.LoadConfig(RobotManage.Config);
addTablePage();
RobotManage.LoadDebug();
}
else
{
var tc = tabControl1.TabPages.Count;
for (int i = 1; i <tc; i++)
{
tabControl1.TabPages[tc - i].Parent = null;
}
}
}
private void 退出ToolStripMenuItem1_Click(object sender, EventArgs e)
{
if (RobotManage.isRunning)
{
MessageBox.Show(crc.GetString("Res0082", "机器尚在运行,不能退出,请先停止运行."));
}
else
{
RobotManage.Stop();
RobotManage.ShutDown();
Thread.Sleep(2000);
Application.Exit();
}
}
private void cb_EnableBuzzer_CheckedChanged(object sender, EventArgs e)
{
}
}
}
\ No newline at end of file
AutoScanAndLabel/Homepage.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
AutoScanAndLabel/IOControl.cs
......@@ -65,6 +65,7 @@ namespace AutoScanAndLabel
this.tableLayoutPanel1.Controls.Clear();
this.tableLayoutPanel1.RowStyles.Clear();
this.tableLayoutPanel1.RowCount = RobotManage.Config.DIList.Count;
this.tableLayoutPanel1.Font = new Font("微软雅黑", 10, FontStyle.Bold);
foreach (ConfigIO ioValue in RobotManage.Config.DIList.Values)
{
//if (ioValue.SubType.Equals(0))
......@@ -80,6 +81,7 @@ namespace AutoScanAndLabel
this.tableLayoutPanel2.Controls.Clear();
this.tableLayoutPanel2.RowStyles.Clear();
this.tableLayoutPanel2.RowCount = RobotManage.Config.DOList.Count;
this.tableLayoutPanel2.Font= new Font("微软雅黑", 10, FontStyle.Bold);
roleindex = 0;
foreach (ConfigIO ioValue in RobotManage.Config.DOList.Values)
{
......
AutoScanAndLabel/Properties/AssemblyInfo.cs
......@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.0.0")]
//[assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
AutoScanAndLabel/SettingControl.Designer.cs
......@@ -38,15 +38,17 @@ namespace AutoScanAndLabel
this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.btn_labelDebug = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.listEdit_pn = new AutoScanAndLabel.UC.ListEditControl();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.listEditControl1 = new AutoScanAndLabel.UC.ListEditControl();
this.txt_code = new System.Windows.Forms.TextBox();
this.btn_codetest = new System.Windows.Forms.Button();
this.label_matchdebugstring = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
this.uC_U11 = new AutoScanAndLabel.UC_U1();
this.listEditControl1 = new AutoScanAndLabel.UC.ListEditControl();
this.listEdit_pn = new AutoScanAndLabel.UC.ListEditControl();
this.cb_EnableBuzzer = new System.Windows.Forms.CheckBox();
this.cb_IgnoreGratingSignal = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -145,18 +147,6 @@ namespace AutoScanAndLabel
this.groupBox2.Text = "PN匹配规则";
this.groupBox2.Visible = false;
//
// listEdit_pn
//
this.listEdit_pn.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEdit_pn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEdit_pn.ListFile = "config/pn.list";
this.listEdit_pn.Location = new System.Drawing.Point(3, 21);
this.listEdit_pn.Margin = new System.Windows.Forms.Padding(5);
this.listEdit_pn.Name = "listEdit_pn";
this.listEdit_pn.Size = new System.Drawing.Size(354, 154);
this.listEdit_pn.TabIndex = 3;
this.listEdit_pn.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.listEditControl1);
......@@ -168,18 +158,6 @@ namespace AutoScanAndLabel
this.groupBox3.Text = "QTY匹配规则";
this.groupBox3.Visible = false;
//
// listEditControl1
//
this.listEditControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEditControl1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEditControl1.ListFile = "config/qty.list";
this.listEditControl1.Location = new System.Drawing.Point(3, 21);
this.listEditControl1.Margin = new System.Windows.Forms.Padding(5);
this.listEditControl1.Name = "listEditControl1";
this.listEditControl1.Size = new System.Drawing.Size(354, 204);
this.listEditControl1.TabIndex = 3;
this.listEditControl1.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// txt_code
//
this.txt_code.Location = new System.Drawing.Point(6, 24);
......@@ -233,14 +211,62 @@ namespace AutoScanAndLabel
this.uC_U11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.uC_U11.Location = new System.Drawing.Point(3, 246);
this.uC_U11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uC_U11.Margin = new System.Windows.Forms.Padding(4);
this.uC_U11.Name = "uC_U11";
this.uC_U11.Size = new System.Drawing.Size(591, 167);
this.uC_U11.Size = new System.Drawing.Size(591, 187);
this.uC_U11.TabIndex = 9;
//
// listEditControl1
//
this.listEditControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEditControl1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEditControl1.ListFile = "config/qty.list";
this.listEditControl1.Location = new System.Drawing.Point(3, 21);
this.listEditControl1.Margin = new System.Windows.Forms.Padding(5);
this.listEditControl1.Name = "listEditControl1";
this.listEditControl1.Size = new System.Drawing.Size(354, 204);
this.listEditControl1.TabIndex = 3;
this.listEditControl1.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// listEdit_pn
//
this.listEdit_pn.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEdit_pn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEdit_pn.ListFile = "config/pn.list";
this.listEdit_pn.Location = new System.Drawing.Point(3, 21);
this.listEdit_pn.Margin = new System.Windows.Forms.Padding(5);
this.listEdit_pn.Name = "listEdit_pn";
this.listEdit_pn.Size = new System.Drawing.Size(354, 154);
this.listEdit_pn.TabIndex = 3;
this.listEdit_pn.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// cb_EnableBuzzer
//
this.cb_EnableBuzzer.AutoSize = true;
this.cb_EnableBuzzer.Location = new System.Drawing.Point(403, 13);
this.cb_EnableBuzzer.Name = "cb_EnableBuzzer";
this.cb_EnableBuzzer.Size = new System.Drawing.Size(104, 19);
this.cb_EnableBuzzer.TabIndex = 13;
this.cb_EnableBuzzer.Text = "使用蜂鸣器";
this.cb_EnableBuzzer.UseVisualStyleBackColor = true;
this.cb_EnableBuzzer.CheckedChanged += new System.EventHandler(this.cb_EnableBuzzer_CheckedChanged);
//
// cb_IgnoreGratingSignal
//
this.cb_IgnoreGratingSignal.AutoSize = true;
this.cb_IgnoreGratingSignal.Location = new System.Drawing.Point(403, 44);
this.cb_IgnoreGratingSignal.Name = "cb_IgnoreGratingSignal";
this.cb_IgnoreGratingSignal.Size = new System.Drawing.Size(119, 19);
this.cb_IgnoreGratingSignal.TabIndex = 11;
this.cb_IgnoreGratingSignal.Text = "忽略安全光栅";
this.cb_IgnoreGratingSignal.UseVisualStyleBackColor = true;
this.cb_IgnoreGratingSignal.CheckedChanged += new System.EventHandler(this.cb_IgnoreGratingSignal_CheckedChanged);
//
// SettingControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.cb_EnableBuzzer);
this.Controls.Add(this.cb_IgnoreGratingSignal);
this.Controls.Add(this.button1);
this.Controls.Add(this.uC_U11);
this.Controls.Add(this.groupBox4);
......@@ -282,5 +308,7 @@ namespace AutoScanAndLabel
private System.Windows.Forms.GroupBox groupBox4;
private UC_U1 uC_U11;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.CheckBox cb_EnableBuzzer;
private System.Windows.Forms.CheckBox cb_IgnoreGratingSignal;
}
}
AutoScanAndLabel/SettingControl.cs
......@@ -27,9 +27,9 @@ namespace AutoScanAndLabel
//chbAutoRun.Enabled = false;
chbAutoRun.Checked = Convert.ToBoolean(ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun));
this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged);
//chbAutoRun.Enabled = true;
}
//chbAutoRun.Enabled = true;
}
private void RobotManage_LoadFinishEvent(bool state, string msg)
{
if (!state)
......@@ -170,5 +170,21 @@ namespace AutoScanAndLabel
var bmp = new Bitmap("d:\\17-09-05-154.bmp");
var cc = RemoteDecodeHelper_mod.DecodeRequest(bmp, remoteDecodeParam);
}
private void cb_IgnoreGratingSignal_CheckedChanged(object sender, EventArgs e)
{
RobotManage.IgnoreGratingSignal((sender as CheckBox).Checked);
}
private void cb_IgnoreSafecheck_CheckedChanged(object sender, EventArgs e)
{
RobotManage.IgnoreSafecheck((sender as CheckBox).Checked);
}
private void cb_EnableBuzzer_CheckedChanged(object sender, EventArgs e)
{
Config.Set("EnableBuzzer", cb_EnableBuzzer.Checked);
AlarmBuzzer.Enable = cb_EnableBuzzer.Checked;
}
}
}
AutoScanAndLabel/UC/AgvControl.Designer.cs
......@@ -143,7 +143,7 @@ namespace AutoScanAndLabel.UC
this.lblCurMissionId.AutoSize = true;
this.lblCurMissionId.Location = new System.Drawing.Point(7, 29);
this.lblCurMissionId.Name = "lblCurMissionId";
this.lblCurMissionId.Size = new System.Drawing.Size(119, 14);
this.lblCurMissionId.Size = new System.Drawing.Size(152, 18);
this.lblCurMissionId.TabIndex = 3;
this.lblCurMissionId.Text = "当前的mission id";
//
......@@ -152,7 +152,7 @@ namespace AutoScanAndLabel.UC
this.lblMissionResult.AutoSize = true;
this.lblMissionResult.Location = new System.Drawing.Point(7, 169);
this.lblMissionResult.Name = "lblMissionResult";
this.lblMissionResult.Size = new System.Drawing.Size(112, 14);
this.lblMissionResult.Size = new System.Drawing.Size(143, 18);
this.lblMissionResult.TabIndex = 2;
this.lblMissionResult.Text = "mission运行结果";
//
......@@ -161,7 +161,7 @@ namespace AutoScanAndLabel.UC
this.lblMissionRunstate.AutoSize = true;
this.lblMissionRunstate.Location = new System.Drawing.Point(7, 130);
this.lblMissionRunstate.Name = "lblMissionRunstate";
this.lblMissionRunstate.Size = new System.Drawing.Size(112, 14);
this.lblMissionRunstate.Size = new System.Drawing.Size(143, 18);
this.lblMissionRunstate.TabIndex = 1;
this.lblMissionRunstate.Text = "mission运行状态";
//
......@@ -170,7 +170,7 @@ namespace AutoScanAndLabel.UC
this.lblCurRunMissionId.AutoSize = true;
this.lblCurRunMissionId.Location = new System.Drawing.Point(7, 97);
this.lblCurRunMissionId.Name = "lblCurRunMissionId";
this.lblCurRunMissionId.Size = new System.Drawing.Size(147, 14);
this.lblCurRunMissionId.Size = new System.Drawing.Size(188, 18);
this.lblCurRunMissionId.TabIndex = 0;
this.lblCurRunMissionId.Text = "正在运行的mission id";
//
......@@ -212,7 +212,7 @@ namespace AutoScanAndLabel.UC
this.txtStandbyId.Enabled = false;
this.txtStandbyId.Location = new System.Drawing.Point(286, 118);
this.txtStandbyId.Name = "txtStandbyId";
this.txtStandbyId.Size = new System.Drawing.Size(100, 23);
this.txtStandbyId.Size = new System.Drawing.Size(100, 27);
this.txtStandbyId.TabIndex = 13;
//
// label1
......@@ -220,7 +220,7 @@ namespace AutoScanAndLabel.UC
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 127);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(133, 14);
this.label1.Size = new System.Drawing.Size(170, 18);
this.label1.TabIndex = 12;
this.label1.Text = "去待机点任务编号：";
//
......@@ -229,7 +229,7 @@ namespace AutoScanAndLabel.UC
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(8, 185);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(77, 14);
this.label7.Size = new System.Drawing.Size(98, 18);
this.label7.TabIndex = 11;
this.label7.Text = "任务编号：";
//
......@@ -247,7 +247,7 @@ namespace AutoScanAndLabel.UC
//
this.txtMissionId.Location = new System.Drawing.Point(286, 182);
this.txtMissionId.Name = "txtMissionId";
this.txtMissionId.Size = new System.Drawing.Size(100, 23);
this.txtMissionId.Size = new System.Drawing.Size(100, 27);
this.txtMissionId.TabIndex = 9;
//
// txtLeaveId
......@@ -255,7 +255,7 @@ namespace AutoScanAndLabel.UC
this.txtLeaveId.Enabled = false;
this.txtLeaveId.Location = new System.Drawing.Point(658, 81);
this.txtLeaveId.Name = "txtLeaveId";
this.txtLeaveId.Size = new System.Drawing.Size(100, 23);
this.txtLeaveId.Size = new System.Drawing.Size(100, 27);
this.txtLeaveId.TabIndex = 8;
//
// label5
......@@ -263,7 +263,7 @@ namespace AutoScanAndLabel.UC
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(412, 81);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(126, 14);
this.label5.Size = new System.Drawing.Size(161, 18);
this.label5.TabIndex = 7;
this.label5.Text = "流出AGV任务编号：";
//
......@@ -272,7 +272,7 @@ namespace AutoScanAndLabel.UC
this.txtEnterId.Enabled = false;
this.txtEnterId.Location = new System.Drawing.Point(658, 26);
this.txtEnterId.Name = "txtEnterId";
this.txtEnterId.Size = new System.Drawing.Size(100, 23);
this.txtEnterId.Size = new System.Drawing.Size(100, 27);
this.txtEnterId.TabIndex = 6;
//
// label6
......@@ -280,7 +280,7 @@ namespace AutoScanAndLabel.UC
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(412, 29);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(126, 14);
this.label6.Size = new System.Drawing.Size(161, 18);
this.label6.TabIndex = 5;
this.label6.Text = "流入AGV任务编号：";
//
......@@ -289,7 +289,7 @@ namespace AutoScanAndLabel.UC
this.txtMoveRSTId.Enabled = false;
this.txtMoveRSTId.Location = new System.Drawing.Point(286, 72);
this.txtMoveRSTId.Name = "txtMoveRSTId";
this.txtMoveRSTId.Size = new System.Drawing.Size(100, 23);
this.txtMoveRSTId.Size = new System.Drawing.Size(100, 27);
this.txtMoveRSTId.TabIndex = 4;
//
// label3
......@@ -297,7 +297,7 @@ namespace AutoScanAndLabel.UC
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(8, 81);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(119, 14);
this.label3.Size = new System.Drawing.Size(152, 18);
this.label3.TabIndex = 3;
this.label3.Text = "去入口任务编号：";
//
......@@ -306,7 +306,7 @@ namespace AutoScanAndLabel.UC
this.txtMoveLSTId.Enabled = false;
this.txtMoveLSTId.Location = new System.Drawing.Point(286, 26);
this.txtMoveLSTId.Name = "txtMoveLSTId";
this.txtMoveLSTId.Size = new System.Drawing.Size(100, 23);
this.txtMoveLSTId.Size = new System.Drawing.Size(100, 27);
this.txtMoveLSTId.TabIndex = 2;
//
// label4
......@@ -314,7 +314,7 @@ namespace AutoScanAndLabel.UC
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(6, 29);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(119, 14);
this.label4.Size = new System.Drawing.Size(152, 18);
this.label4.TabIndex = 1;
this.label4.Text = "去出口任务编号：";
//
......@@ -323,7 +323,7 @@ namespace AutoScanAndLabel.UC
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(22, 266);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(54, 18);
this.checkBox1.Size = new System.Drawing.Size(66, 22);
this.checkBox1.TabIndex = 7;
this.checkBox1.Text = "手动";
this.checkBox1.UseVisualStyleBackColor = true;
......@@ -339,7 +339,7 @@ namespace AutoScanAndLabel.UC
this.Controls.Add(this.groupBox_right);
this.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "AgvControl";
this.Size = new System.Drawing.Size(973, 521);
this.Size = new System.Drawing.Size(924, 521);
this.groupBox_right.ResumeLayout(false);
this.groupBox_left.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
......
Config-原文件.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速时间,减速时间,原点低速度,原点高速,原点加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,,进料提升轴,Right_Batch_Axis,0,HC,,40000,200000,200000,2000,20000,80000,10,300,0,0
AXIS,,出料提升轴,Left_Batch_Axis,1,HC,,40000,200000,200000,2000,20000,80000,10,300,0,0
AXIS,,取料升降轴,Take_UpDown_Axis,2,HC,,40000,200000,200000,1000,4000,15000,10,300,0,0
AXIS,,取料旋转轴,Take_Middle_Axis,3,HC,,1000,18000,18000,500,3000,7000,10,1000,0,0
AXIS,,贴标移栽机构X轴,Label_X_Axis,5,HC,,90000,1500000,1500000,3000,30000,100000,10,1000,0,0
AXIS,,贴标移栽机构Y轴,Label_Y_Axis,4,HC,,90000,1500000,1500000,3000,30000,100000,10,1000,0,0
AXIS,,贴标移栽机构Z轴,Label_Z_Axis,6,HC,,90000,1500000,1500000,2000,10000,40000,10,100,0,0
AXIS,,贴标移栽机构R轴,Label_R_Axis,7,HC,,700,3000,3000,20,350,5000,500,100,0,0
,,,,,,,,,,,,,,,,
PRO,0,IO信号超时时间（秒）,IOSingle_TimerOut,15,,,,,,,,,,,,
PRO,0,气压检测超时,AirCheckSeconds,5,,,,,,,,,,,,
PRO,0,右侧提升轴每毫米脉冲,Right_Batch_ChangeValue,5555,,,,,,,,,,,,
PRO,0,左侧提升轴每毫米脉冲,Left_Batch_ChangeValue,5555,,,,,,,,,,,,
PRO,30,右侧相机名称,RightCameraName,GigE:MV-CE200-10GC (00E78064919),,,,,,,,,,,,
PRO,30,右侧轴心坐标X,Right_Batch_X,1757,,,,,,,,,,,,
PRO,30,右侧轴心坐标Y,Right_Batch_Y,1945,,,,,,,,,,,,
PRO,30,贴标R轴0位角度差,Label_R_Angle_Diff,85,,,,,,,,,,,,
PRO,30,贴标R轴偏置距离像素,Label_R_Offset,750,,,,,,,,,,,,
PRO,30,贴标R轴360度脉冲,Label_R_360,7000,,,,,,,,,,,,
PRO,0,贴标X轴基准点,Label_X_Base,8,,,,,,,,,,,,
PRO,0,贴标Y轴基准点,Label_Y_Base,7,,,,,,,,,,,,
PRO,30,图像/X轴比值,Cam_Pixel_X_Ratio,90,,,,,,,,,,,,
PRO,30,图像/Y轴比值,Cam_Pixel_Y_Ratio,90,,,,,,,,,,,,
PRO,0,像素偏离位置7寸,Label_Offset_Pixel_7,200,,,,,,,,,,,,
PRO,0,像素偏离位置13寸,Label_Offset_Pixel_13,200,,,,,,,,,,,,
PRO,0,像素偏离位置15寸,Label_Offset_Pixel_15,200,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,13,取料旋转轴待机点P1,Take_Middle_P1,22500,,,8000,,,,,,,,,
PRO,13,取料旋转轴右取料点P2,Take_Middle_P2,16800,,,8000,,,,,,,,,
PRO,13,取料旋转轴左取料点P3,Take_Middle_P3,28600,,,8000,,,,,,,,,
PRO,13,取料旋转轴NG放料点P5,Take_Middle_P5,1036,,,8000,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,12,取料升降轴待机点P1,Take_UpDown_P1,1000,,,65000,,,,,,,,,
PRO,12,取料升降轴取料高点P2,Take_UpDown_P2,60000,,,130000,,,,,,,,,
PRO,12,取料升降轴取右料低点P3,Take_UpDown_P3,194800,,,80000,,,,,,,,,
PRO,12,取料升降轴取左料低点P4,Take_UpDown_P4,196600,,,80000,,,,,,,,,
PRO,12,取料升降轴NG放料点P5,Take_UpDown_P5,165312,,,80000,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,10,进料升轴低点P1,Right_Batch_P1,1000,,,36000,,,,,,,,,
PRO,10,进料升轴高点P2,Right_Batch_P2,1056432,,,36000,,,,,,,,,
PRO,11,出料升轴低点P1,Left_Batch_P1,5,,,36000,,,,,,,,,
PRO,11,出料升轴高点P2,Left_Batch_P2,1013000,,,36000,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,15,贴标X轴待机点P1,Label_X_P1,5,,,95000,,,,,,,,,
PRO,15,贴标X轴取标点P2,Label_X_P2,80942,,,190000,,,,,,,,,
PRO,15,贴标X轴贴标基准点P3,Label_X_P3,96035,,,190000,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,14,贴标Y轴待机点P1,Label_Y_P1,5,,,200000,,,,,,,,,
PRO,14,贴标Y轴取标点P2,Label_Y_P2,11500,,,400000,,,,,,,,,
PRO,14,贴标Y轴贴标基准点P3,Label_Y_P3,503303,,,400000,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,16,贴标Z轴待机点P1,Label_Z_P1,5,,,50000,,,,,,,,,
PRO,16,贴标Z轴取标前点P2,Label_Z_P2,5,,,100000,,,,,,,,,
PRO,16,贴标Z轴取标点P3,Label_Z_P3,111300,,,100000,,,,,,,,,
PRO,16,贴标Z轴贴标前点P4,Label_Z_P4,5,,,100000,,,,,,,,,
PRO,16,贴标Z轴贴标点P5,Label_Z_P5,135100,,,100000,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,17,贴标R轴待机点P1,Label_R_P1,55,,,700,,,,,,,,,
PRO,17,贴标R轴取标点P2,Label_R_P2,1715,,,1400,,,,,,,,,
,,,,,,,,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,HC,X00,,,,,,,,,,
DI,0,进料口确认按钮,Right_BTN,1,HC,X01,,,,,,,,,,
DI,0,出料口确认按钮,Left_BTN,2,HC,X02,,,,,,,,,,
DI,0,后门左门禁,LeftBackDoor_Check,3,HC,X03,,,,,,,,,,
,0,后门右门禁,RightBackDoor_Check,4,HC,X04,,,,,,,,,,
DI,0,气压检测,Airpressure_Check,5,HC,X05,,,,,,,,,,
DI,0,光栅信号,GratingSignal_Check,6,HC,X06,,,,,,,,,,
DI,0,NG料箱检测,HasNgBox,7,HC,X07,,,,,,,,,,
DI,0,打印机到位检测,HasPrinter,8,HC,X08,,,,,,,,,,
DI,0,旋转臂进料侧检测,RightArm_Check,9,HC,X09,,,,,,,,,,
DI,0,旋转臂出料侧检测,LeftArm_Check,10,HC,X10,,,,,,,,,,
DI,0,进料口料车检测,RightCar_Check,11,HC,X11,,,,,,,,,,
DI,0,进料口前端料串检测,RightFornt_Check,12,HC,X12,,,,,,,,,,
DI,0,进料口料串到位检测,RightEnd_Check,13,HC,X13,,,,,,,,,,
DI,0,进料口阻挡气缸上升端,RightStopUP,14,HC,X14,,,,,,,,,,
DI,0,进料口阻挡气缸下降端,RightStopDown,15,HC,X15,,,,,,,,,,
DI,0,出料口料车检测,LeftCar_Check,16,HC,X16,,,,,,,,,,
DI,0,出料口前端料串检测,LeftFornt_Check,17,HC,X17,,,,,,,,,,
DI,0,出料口料串到位检测,LeftEnd_Check,18,HC,X18,,,,,,,,,,
DI,0,出料口阻挡气缸上升端,LeftStopUP,19,HC,X19,,,,,,,,,,
DI,0,出料口阻挡气缸下降端,LeftStopDown,20,HC,X20,,,,,,,,,,
DI,0,进料定位料盘检测,RightTop_Check,21,HC,X21,,,,,,,,,,
,0,进料定位料盘超限检测,RightOverHead_Check,22,HC,X22,,,,,,,,,,
DI,0,出料定位料盘检测,LeftTop_Check,23,HC,X23,,,,,,,,,,
,0,出料定位料盘超限检测,LeftOverHead_Check,24,HC,X24,,,,,,,,,,
DI,0,吸嘴气缸前进端,LabelCylinder_Fwd,25,HC,X25,,,,,,,,,,
DI,0,吸嘴气缸后退端,LabelCylinder_Bck,26,HC,X26,,,,,,,,,,
DI,0,吸盘压力检测,TraySize_7,27,HC,X27,,,,,,,,,,
DI,0,13寸料盘检测,TraySize_13,28,HC,X28,,,,,,,,,,
DI,0,15寸料盘检测,TraySize_15,29,HC,X29,,,,,,,,,,
,,,,,,,,,,,,,,,,
DO,0,自动指示灯,AutoRun_HddLed,0,HC,Y00,,,,,,,,,,
DO,0,故障指示灯,Alarm_HddLed,1,HC,Y01,,,,,,,,,,
DO,0,待机指示灯,RunSign_HddLed,2,HC,Y02,,,,,,,,,,
DO,0,报警蜂鸣器,Alarm_Buzzer,3,HC,Y03,,,,,,,,,,
DO,0,进料口状态指示灯,RightState_Led,4,HC,Y04,,,,,,,,,,
DO,0,出料口状态指示灯,LeftState_Led,5,HC,Y05,,,,,,,,,,
DO,0,设备照明,Device_Led,6,HC,Y06,,,,,,,,,,
DO,0,相机照明,Camera_Led,7,HC,Y07,,,,,,,,,,
DO,0,进料口电机启动,RightMoto_Run,8,HC,Y08,,,,,,,,,,
DO,0,进料口电机反转指令,RightMoto_Reverse,9,HC,Y09,,,,,,,,,,
DO,0,出料口电机启动,LeftMoto_Run,10,HC,Y10,,,,,,,,,,
DO,0,出料口电机反转指令,LeftMoto_Reverse,11,HC,Y11,,,,,,,,,,
DO,0,进料口阻挡气缸上升,RightStopUP,12,HC,Y12,,,,,,,,,,
DO,0,进料口阻挡气缸下降,RightStopDown,13,HC,Y13,,,,,,,,,,
DO,0,出料口阻挡气缸上升,LeftStopUP,14,HC,Y14,,,,,,,,,,
DO,0,出料口阻挡气缸下降,LeftStopDown,15,HC,Y15,,,,,,,,,,
DO,0,吸嘴气缸前进,LabelCylinder_Fwd,16,HC,Y16,,,,,,,,,,
DO,0,吸嘴气缸后退,LabelCylinder_Bck,17,HC,Y17,,,,,,,,,,
DO,0,吸嘴取标,LabelCylinder_Work,18,HC,Y18,,,,,,,,,,
DO,0,吸盘吸料,Sucker_Clamp,19,HC,Y19,,,,,,,,,,
DO,0,吸盘放料,Sucker_Release,20,HC,Y20,,,,,,,,,,
DeviceLibrary/AutoScanAndLabel/RobotManage.cs
......@@ -4,8 +4,6 @@ using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
......@@ -100,7 +98,6 @@ namespace DeviceLibrary
if (mainMachine.DeviceCheck())
mainMachine.BeginHomeReset(true);
});
}
public static void Stop()
......
DeviceLibrary/Config/Config.csv
......@@ -84,11 +84,13 @@ DI,0,进料定位料盘检测,RightTop_Check,21,HC,X21,,,,,,,,,,
,0,进料定位料盘超限检测,RightOverHead_Check,22,HC,X22,,,,,,,,,,
DI,0,出料定位料盘检测,LeftTop_Check,23,HC,X23,,,,,,,,,,
,0,出料定位料盘超限检测,LeftOverHead_Check,24,HC,X24,,,,,,,,,,
DI,0,吸嘴气缸前进端,LabelCylinder_Fwd,25,HC,X25,,,,,,,,,,
DI,0,吸嘴气缸后退端,LabelCylinder_Bck,26,HC,X26,,,,,,,,,,
DI,0,进料口AGV送料串请求,FeedAGV_Feed,25,HC,X25,,,,,,,,,,
DI,0,进料口AGV收料串请求,FeedAGV_Receiving,26,HC,X26,,,,,,,,,,
DI,0,吸盘压力检测,TraySize_7,27,HC,X27,,,,,,,,,,
DI,0,13寸料盘检测,TraySize_13,28,HC,X28,,,,,,,,,,
DI,0,15寸料盘检测,TraySize_15,29,HC,X29,,,,,,,,,,
DI,0,出料口AGV送料串请求,DischargeAGV_Feeding,30,HC,X30,,,,,,,,,,
DI,0,出料口AGV收料串请求,DischargeAGV_Receiving,31,HC,X31,,,,,,,,,,
,,,,,,,,,,,,,,,,
DO,0,自动指示灯,AutoRun_HddLed,0,HC,Y00,,,,,,,,,,
DO,0,故障指示灯,Alarm_HddLed,1,HC,Y01,,,,,,,,,,
......@@ -111,4 +113,5 @@ DO,0,吸嘴气缸后退,LabelCylinder_Bck,17,HC,Y17,,,,,,,,,,
DO,0,吸嘴取标,LabelCylinder_Work,18,HC,Y18,,,,,,,,,,
DO,0,吸盘吸料,Sucker_Clamp,19,HC,Y19,,,,,,,,,,
DO,0,吸盘放料,Sucker_Release,20,HC,Y20,,,,,,,,,,
,,,,,,,,,,,,,,,,
DO,0,进料口AGV请求应答,AgvRequest_ FeedPort,21,HC,Y21,,,,,,,,,,
DO,0,出料口AGV请求应答,AgvRequest_ Outlet,22,HC,Y22,,,,,,,,,,
LoadCVSLibrary/LoadCSVLibrary.csproj
......@@ -32,6 +32,9 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
......
LoadCVSLibrary/storeConfig/config/IO_Type.cs
......@@ -126,15 +126,27 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary>
/// DI,0,出料定位料盘超限检测,LeftOverHead_Check,24,HC,X24,,,,,,,,,,--不用
/// </summary>
// public static string LeftOverHead_Check = "LeftOverHead_Check";
// public static string LeftOverHead_Check = "LeftOverHead_Check";
#region 原X25、X26内容
/// <summary>
/// DI,0,吸嘴气缸前进端,LabelCylinder_Fwd,25,HC,X25,,,,,,,,,,
/// </summary>
public static string LabelCylinder_Fwd = "LabelCylinder_Fwd";
//public static string LabelCylinder_Fwd = "LabelCylinder_Fwd";
/// <summary>
/// DI,0,吸嘴气缸后退端,LabelCylinder_Bck,26,HC,X26,,,,,,,,,,
/// </summary>
public static string LabelCylinder_Bck = "LabelCylinder_Bck";
// public static string LabelCylinder_Bck = "LabelCylinder_Bck";
#endregion
#region 新X25/26内容
/// <summary>
/// DI,0,进料口AGV送料串请求,FeedAGV_Feed,25,HC,X25,,,,,,,,,,
/// </summary>
public static string FeedAGV_Feed = "FeedAGV_Feed";
/// <summary>
/// DI,0,进料口AGV收料串请求,FeedAGV_Receiving,26,HC,X26,,,,,,,,,,
/// </summary>
public static string FeedAGV_Receiving = "FeedAGV_Receiving";
#endregion
/// <summary>
/// DI,0,吸盘压力检测,TraySize_7,27,HC,X27,,,,,,,,,,
/// </summary>
......@@ -147,8 +159,16 @@ namespace OnlineStore.LoadCSVLibrary
/// DI,0,15寸料盘检测,TraySize_15,29,HC,X29,,,,,,,,,,
/// </summary>
public static string TraySize_15 = "TraySize_15";
#region 新X30、31内容
/// <summary>
/// DI,0,出料口AGV送料串请求,DischargeAGV_Feeding,30,HC,X30,,,,,,,,,,
/// </summary>
public static string DischargeAGV_Feeding = "DischargeAGV_Feeding";
/// <summary>
/// DI,0,出料口AGV收料串请求,DischargeAGV_Receiving,31,HC,X31,,,,,,,,,,
/// </summary>
public static string DischargeAGV_Receiving = "DischargeAGV_Receiving";
#endregion
/// <summary>
/// DO,0,自动指示灯,AutoRun_HddLed,0,HC,Y00,,,,,,,,,,
......@@ -236,6 +256,16 @@ namespace OnlineStore.LoadCSVLibrary
/// DO,0,吸盘放料,Sucker_Release,20,HC,Y20,,,,,,,,,,
/// </summary>
public static string Sucker_Release = "Sucker_Release";
#region 新Y21/Y22内容
/// <summary>
/// DO,0,进料口AGV请求应答,AgvRequest_ FeedPort,21,HC,Y21,,,,,,,,,,
/// </summary>
public static string AgvRequest_FeedPort = "AgvRequest_FeedPort";
/// <summary>
/// DO,0,出料口AGV请求应答,AgvRequest_ Outlet,22,HC,Y22,,,,,,,,,,
/// </summary>
public static string AgvRequest_Outlet = "AgvRequest_Outlet";
#endregion
}
public enum IO_VALUE
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!