Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 272204ef 由 LN
选项

1

1 个父辈 575b1e51
全部展开
内嵌 并排
正在显示 12 个修改的文件 包含 101 行增加 和 68 行删除
dll/RFID/Asa.RFID.xml
......@@ -44,6 +44,11 @@
是否存在ID卡
</summary>
</member>
<member name="P:Asa.RFID.Reader.ID">
<summary>
ID号码
</summary>
</member>
<member name="M:Asa.RFID.Reader.Connect">
<summary>
连接
......@@ -115,6 +120,13 @@
修改IP地址
</summary>
<param name="IP"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.GetLocalIP">
<summary>
获取本地IPv4地址
</summary>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.Receive(System.Object)">
<summary>
......
dll/RFID/ReadMe.txt 0 → 100644
1.0.0.0 2019-11-19
1、钉盘上传
\ No newline at end of file
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -124,9 +124,9 @@
this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5);
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(3, 527);
this.groupBox1.Location = new System.Drawing.Point(3, 476);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(394, 243);
this.groupBox1.Size = new System.Drawing.Size(394, 158);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -273,7 +273,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(488, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 516);
this.groupBox4.Size = new System.Drawing.Size(240, 463);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -290,7 +290,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(229, 496);
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 443);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -300,7 +300,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 516);
this.groupBox3.Size = new System.Drawing.Size(240, 463);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -317,7 +317,7 @@
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(229, 496);
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 443);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupBox5
......@@ -342,7 +342,7 @@
this.groupBox5.Controls.Add(this.btnFeedSideWay);
this.groupBox5.Location = new System.Drawing.Point(974, 6);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(384, 516);
this.groupBox5.Size = new System.Drawing.Size(384, 463);
this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
......@@ -657,7 +657,7 @@
this.tabControl1.Location = new System.Drawing.Point(5, 69);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1373, 806);
this.tabControl1.Size = new System.Drawing.Size(1373, 675);
this.tabControl1.TabIndex = 257;
//
// tabPage1
......@@ -672,7 +672,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1365, 776);
this.tabPage1.Size = new System.Drawing.Size(1365, 645);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -685,9 +685,9 @@
this.groupBox6.Controls.Add(this.lblAgvInfo);
this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(403, 527);
this.groupBox6.Location = new System.Drawing.Point(403, 476);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(955, 245);
this.groupBox6.Size = new System.Drawing.Size(955, 160);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
......@@ -733,7 +733,7 @@
this.groupBox7.Controls.Add(this.tableLayoutPanel3);
this.groupBox7.Location = new System.Drawing.Point(247, 6);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(240, 516);
this.groupBox7.Size = new System.Drawing.Size(240, 463);
this.groupBox7.TabIndex = 279;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "DI列表";
......@@ -750,7 +750,7 @@
this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(229, 496);
this.tableLayoutPanel3.Size = new System.Drawing.Size(229, 443);
this.tableLayoutPanel3.TabIndex = 102;
//
// groupBox8
......@@ -760,7 +760,7 @@
this.groupBox8.Controls.Add(this.tableLayoutPanel4);
this.groupBox8.Location = new System.Drawing.Point(728, 6);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(240, 516);
this.groupBox8.Size = new System.Drawing.Size(240, 463);
this.groupBox8.TabIndex = 280;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "DO列表";
......@@ -777,7 +777,7 @@
this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 496);
this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 443);
this.tableLayoutPanel4.TabIndex = 103;
//
// tabPage2
......@@ -1078,7 +1078,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1384, 881);
this.ClientSize = new System.Drawing.Size(1384, 750);
this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -82,7 +82,7 @@ namespace OnlineStore.AssemblyLine
{
text = text.PadLeft(10, ' ');
TabPage lineTabPage = new TabPage(text);
lineTabPage.AutoScroll = true;
// lineTabPage.AutoScroll = true;
lineTabPage.Tag = lineBean;
Panel linePan = new Panel();
linePan.Dock = DockStyle.Fill;
......
source/DeviceLibrary/LineConfig/Config_Line.csv
类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
PRO,0,当多久没操作时流水线休眠（秒）,Sleep_MSeconds,600,,,,,
PRO,0,气压检测信号关闭需要持续的时间,AirCheckSeconds,600,,,,,
PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,15000,,,,,
PRO,0,IO模块对应的DI数量,IO_DILength,192.168.101.30#8;192.168.101.32#8;192.168.101.34#8;192.168.101.36#8;192.168.101.38#8;,,,,,
PRO,0,模块对应的DO数量,IO_DOLength,192.168.101.30#8;192.168.101.32#8;192.168.101.34#8;192.168.101.36#8;192.168.101.38#8;,,,,,
,,,,,,,,,
,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X001,X001
DI,0,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X002,X002
DI,0,联动,Start_BTN,2,PRO_AOI_IP_1,0,联动,X003,X003
DI,0,气压检测,Airpressure_Check,3,PRO_AOI_IP_1,0,气压检测,X004,X004
DI,0,NG料盘推出气缸前进端,NGCylinder_Before,4,PRO_AOI_IP_1,0,NG料盘推出气缸前进端,X005,X005
DI,0,NG料盘推出气缸后退端,NGCylinder_After,5,PRO_AOI_IP_1,0,NG料盘推出气缸后退端,X006,X006
DI,0,环形线横移4定位上升端,SW4_LocationCylinder_Up,6,PRO_AOI_IP_1,0,环形线横移4定位上升端,X007,X007
DI,0,环形线横移4定位下降端,SW4_LocationCylinder_Down,7,PRO_AOI_IP_1,0,环形线横移4定位下降端,X008,X008
,0,,,8,PRO_AOI_IP_1,0,,X009,X009
,0,,,9,PRO_AOI_IP_1,0,,X010,X010
,0,,,10,PRO_AOI_IP_1,0,,X011,X011
,0,,,11,PRO_AOI_IP_1,0,,X012,X012
,0,,,12,PRO_AOI_IP_1,0,,X013,X013
,0,,,13,PRO_AOI_IP_1,0,,X014,X014
,0,,,14,PRO_AOI_IP_1,0,,X015,X015
,0,,,15,PRO_AOI_IP_1,0,,X016,X016
,,,,,,,,,
DO,0,待机状态（指示灯）,AutoRun_HddLed,0,PRO_AOI_IP_1,0,待机状态（指示灯）,Y001,Y001
DO,0,运行状态（指示灯）,RunSign_HddLed,1,PRO_AOI_IP_1,0,运行状态（指示灯）,Y002,Y002
DO,0,故障状态（指示灯）,Alarm_HddLed,2,PRO_AOI_IP_1,0,故障状态（指示灯）,Y003,Y003
DO,0,故障状态（蜂鸣器）,Alarm_Buzzer,3,PRO_AOI_IP_1,0,故障状态（蜂鸣器）,Y004,Y004
DO,0,驱动电机1正转,DriveMotor_Run1,4,PRO_AOI_IP_1,0,驱动电机1正转,Y005,Y005
DO,0,驱动电机2正转,DriveMotor_Run2,5,PRO_AOI_IP_1,0,驱动电机2正转,Y006,Y006
DO,0,驱动电机3正转,DriveMotor_Run3,6,PRO_AOI_IP_1,0,驱动电机3正转,Y007,Y007
DO,0,驱动电机4正转,DriveMotor_Run4,7,PRO_AOI_IP_1,0,驱动电机4正转,Y008,Y008
DO,0,环形线横移4电机运转,SW4_MotorRun,8,PRO_AOI_IP_1,0,环形线横移4电机运转,Y009,Y009
DO,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,PRO_AOI_IP_1,0,NG料盘推出气缸前进SOL,Y010,Y010
DO,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,PRO_AOI_IP_1,0,NG料盘推出气缸后退SOL,Y011,Y011
DO,0,环形线横移4定位上升SOL,SW4_LocationCylinder_Up,11,PRO_AOI_IP_1,0,环形线横移4定位上升SOL,Y012,Y012
DO,0,环形线横移4定位下降SOL,SW4_LocationCylinder_Down,12,PRO_AOI_IP_1,0,环形线横移4定位下降SOL,Y013,Y013
,0,,,13,PRO_AOI_IP_1,0,,Y014,Y014
,0,,,14,PRO_AOI_IP_1,0,,Y015,Y015
,0,,,15,PRO_AOI_IP_1,0,,Y016,Y016
,,,,,,,,,
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
,,,,,,,,,
PRO,0,流水线总电器箱,PRO_AOI_IP_1,192.168.101.21,,,,,
PRO,0,出料皮带线1,PRO_AOI_IP_2,192.168.101.22,,,,,
......@@ -73,7 +33,6 @@ PRO,0,移载装置(上下为气缸）15、16-模块2,PRO_AOI_IP_34,192.168.101.47,,,,,
PRO,0,移载装置(上下为气缸）17、18-模块1,PRO_AOI_IP_35,192.168.101.48,,,,,
PRO,0,移载装置(上下为气缸）17、18-模块2,PRO_AOI_IP_36,192.168.101.49,,,,,
,,,,,,,,,
,,,,,,,,,
PRO,0,移栽装置1-托盘-RFID-IP,PRO_RFIP_001,192.168.210.103,,,,,
PRO,0,移栽装置2-托盘-RFID-IP,PRO_RFIP_002,192.168.210.104,,,,,
PRO,0,移栽装置3-托盘-RFID-IP,PRO_RFIP_003,192.168.210.105,,,,,
......@@ -104,3 +63,45 @@ PRO,0,入料流水线1-上料模块-RFID-IP,PRO_RFIP_101-1,192.168.210.102,,,,,
PRO,0,入料流水线2-上料模块-RFID-IP,PRO_RFIP_102-1,192.168.210.109,,,,,
PRO,0,入料流水线3-上料模块-RFID-IP,PRO_RFIP_103-1,192.168.210.115,,,,,
PRO,0,入料流水线4-上料模块-RFID-IP,PRO_RFIP_104-1,192.168.210.118,,,,,
,,,,,,,,,
PRO,0,当多久没操作时流水线休眠（秒）,Sleep_MSeconds,600,,,,,
PRO,0,气压检测信号关闭需要持续的时间,AirCheckSeconds,600,,,,,
PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,15000,,,,,
PRO,0,IO模块对应的DI数量,IO_DILength,192.168.101.33#8;192.168.101.35#8;192.168.101.37#8;192.168.101.39#8;192.168.101.41#8;,,,,,
PRO,0,模块对应的DO数量,IO_DOLength,192.168.101.33#8;192.168.101.35#8;192.168.101.37#8;192.168.101.39#8;192.168.101.41#8;,,,,,
,,,,,,,,,
,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X001,X001
DI,0,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X002,X002
DI,0,联动,Start_BTN,2,PRO_AOI_IP_1,0,联动,X003,X003
DI,0,气压检测,Airpressure_Check,3,PRO_AOI_IP_1,0,气压检测,X004,X004
DI,0,NG料盘推出气缸前进端,NGCylinder_Before,4,PRO_AOI_IP_1,0,NG料盘推出气缸前进端,X005,X005
DI,0,NG料盘推出气缸后退端,NGCylinder_After,5,PRO_AOI_IP_1,0,NG料盘推出气缸后退端,X006,X006
DI,0,环形线横移4定位上升端,SW4_LocationCylinder_Up,6,PRO_AOI_IP_1,0,环形线横移4定位上升端,X007,X007
DI,0,环形线横移4定位下降端,SW4_LocationCylinder_Down,7,PRO_AOI_IP_1,0,环形线横移4定位下降端,X008,X008
,0,,,8,PRO_AOI_IP_1,0,,X009,X009
,0,,,9,PRO_AOI_IP_1,0,,X010,X010
,0,,,10,PRO_AOI_IP_1,0,,X011,X011
,0,,,11,PRO_AOI_IP_1,0,,X012,X012
,0,,,12,PRO_AOI_IP_1,0,,X013,X013
,0,,,13,PRO_AOI_IP_1,0,,X014,X014
,0,,,14,PRO_AOI_IP_1,0,,X015,X015
,0,,,15,PRO_AOI_IP_1,0,,X016,X016
,,,,,,,,,
DO,0,待机状态（指示灯）,AutoRun_HddLed,0,PRO_AOI_IP_1,0,待机状态（指示灯）,Y001,Y001
DO,0,运行状态（指示灯）,RunSign_HddLed,1,PRO_AOI_IP_1,0,运行状态（指示灯）,Y002,Y002
DO,0,故障状态（指示灯）,Alarm_HddLed,2,PRO_AOI_IP_1,0,故障状态（指示灯）,Y003,Y003
DO,0,故障状态（蜂鸣器）,Alarm_Buzzer,3,PRO_AOI_IP_1,0,故障状态（蜂鸣器）,Y004,Y004
DO,0,驱动电机1正转,DriveMotor_Run1,4,PRO_AOI_IP_1,0,驱动电机1正转,Y005,Y005
DO,0,驱动电机2正转,DriveMotor_Run2,5,PRO_AOI_IP_1,0,驱动电机2正转,Y006,Y006
DO,0,驱动电机3正转,DriveMotor_Run3,6,PRO_AOI_IP_1,0,驱动电机3正转,Y007,Y007
DO,0,驱动电机4正转,DriveMotor_Run4,7,PRO_AOI_IP_1,0,驱动电机4正转,Y008,Y008
DO,0,环形线横移4电机运转,SW4_MotorRun,8,PRO_AOI_IP_1,0,环形线横移4电机运转,Y009,Y009
DO,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,PRO_AOI_IP_1,0,NG料盘推出气缸前进SOL,Y010,Y010
DO,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,PRO_AOI_IP_1,0,NG料盘推出气缸后退SOL,Y011,Y011
DO,0,环形线横移4定位上升SOL,SW4_LocationCylinder_Up,11,PRO_AOI_IP_1,0,环形线横移4定位上升SOL,Y012,Y012
DO,0,环形线横移4定位下降SOL,SW4_LocationCylinder_Down,12,PRO_AOI_IP_1,0,环形线横移4定位下降SOL,Y013,Y013
,0,,,13,PRO_AOI_IP_1,0,,Y014,Y014
,0,,,14,PRO_AOI_IP_1,0,,Y015,Y015
,0,,,15,PRO_AOI_IP_1,0,,Y016,Y016
,,,,,,,,,
\ No newline at end of file
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -18,7 +18,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public partial class LineBean : KTK_Store
{
public bool IsDebug = false;
/// <summary>
/// 灯闪烁定时器
/// </summary>
......@@ -64,6 +65,8 @@ namespace OnlineStore.DeviceLibrary
MoveInfo = new LineMoveInfo(DeviceID, "流水线-Move ");
Name = (" 流水线_" + Config.CID + " ").ToUpper();
IsDebug = Config.IsDebug.Equals(1);
AllEquipMap = new Dictionary<int, EquipBase>();
MoveEquipMap = new Dictionary<int, MoveEquip>();
FeedingEquipMap = new Dictionary<int, FeedingEquip>();
......@@ -113,13 +116,23 @@ namespace OnlineStore.DeviceLibrary
//初始化摄像机配置
CodeManager.LoadConfig();
if (IsDebug)
{
ioList = new List<string>();
FeedingEquip feed = FeedingEquipMap[103];
ioList.AddRange(feed.Config.IOIPList);
}
Task.Factory.StartNew(delegate
{
//连接rfip
RFIDManager.ConnectRFIOList(new List<string>(DeviceConfig.ProRFIpMap.Values));
Thread.Sleep(5);
IOManager.instance.ConnectionIOList(ioList);
Thread.Sleep(5);
Task.Factory.StartNew(delegate
{
//连接rfip
RFIDManager.ConnectRFIOList(new List<string>(DeviceConfig.ProRFIpMap.Values));
});
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN));
......@@ -131,7 +144,7 @@ namespace OnlineStore.DeviceLibrary
});
}
private void AddDeviceName(List<string> targetList, List<string> list)
{
foreach (string str in list)
......
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
......@@ -129,7 +129,7 @@ namespace OnlineStore.DeviceLibrary
aioBox.SetInput(Asa.IOModule.Box_Type.DI, DILength);
aioBox.SetOutput(Asa.IOModule.Box_Type.DO, DOLength);
//DI主动上传
aioBox.AutoReadInput(true);
aioBox.AutoReadInput(true,DIMS);
aioBox.AutoReadOutput(true, DOMS);
......
source/DeviceLibrary/deviceLibrary/RFID/RFIDManager.cs
......@@ -91,7 +91,7 @@ namespace OnlineStore.DeviceLibrary
try
{
LogUtil.debug("开始连接" + logName + "，尝试重连3次");
for (int i = 1; i <= 3; i++)
for (int i = 1; i <= 1; i++)
{
rfidReader = new Reader();
// rfidReader.LocalIP = "192.168.100.101";
......@@ -101,7 +101,6 @@ namespace OnlineStore.DeviceLibrary
{
rfidReader.AutoScan(true);
LogUtil.info("第【" + i + "】次连接 " + logName + " 成功：");
Thread.Sleep(10);
RFReaderMap.Add(rfid, rfidReader);
if (RfIPList.Contains(rfid))
{
......
source/LoadCVSLibrary/storeConfig/config/Line_Config.cs
......@@ -30,6 +30,12 @@ namespace OnlineStore.LoadCSVLibrary
}
/// <summary>
/// 设备是否处于调试状态（1=调试，0=正常）
/// </summary>
[ConfigProAttribute("IsDebug",false)]
public int IsDebug { get; set; }
/// <summary>
/// 气压检测信号关闭需要持续的时间
/// </summary>
[ConfigProAttribute("AirCheckSeconds")]
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!