Skip to content

张东亮 / DoubleLineClient_3D

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

1228

1 个父辈 a94baefa
内嵌 并排
正在显示 5 个修改的文件 包含 35 行增加 和 35 行删除
source/DeviceLibrary/LineConfig/DoubleLineConfig.csv
...@@ -53,8 +53,8 @@ DI,上料工位顶升上升端1,S1_TopCylinderUp1,4,PRO_AOI_IP_2,0,上料工位顶升上升端1,X2 ...@@ -53,8 +53,8 @@ DI,上料工位顶升上升端1,S1_TopCylinderUp1,4,PRO_AOI_IP_2,0,上料工位顶升上升端1,X2
DI,上料工位顶升下降端1,S1_TopCylinderDown1,5,PRO_AOI_IP_2,0,上料工位顶升下降端1,X26,X26,0 DI,上料工位顶升下降端1,S1_TopCylinderDown1,5,PRO_AOI_IP_2,0,上料工位顶升下降端1,X26,X26,0
DI,上料工位顶升上升端2,S1_TopCylinderUp2,6,PRO_AOI_IP_2,0,上料工位顶升上升端2,X27,X27,0 DI,上料工位顶升上升端2,S1_TopCylinderUp2,6,PRO_AOI_IP_2,0,上料工位顶升上升端2,X27,X27,0
DI,上料工位顶升下降端2,S1_TopCylinderDown2,7,PRO_AOI_IP_2,0,上料工位顶升下降端2,X28,X28,0 DI,上料工位顶升下降端2,S1_TopCylinderDown2,7,PRO_AOI_IP_2,0,上料工位顶升下降端2,X28,X28,0
DI,J1接驳台有料检测,ABB1_TrayCheck,8,PRO_AOI_IP_2,0,J1接驳台有料检测,X29,X29,0 DI,J1接驳台有料检测,ABB2_TrayCheck,8,PRO_AOI_IP_2,0,J1接驳台有料检测,X29,X29,0
DI,J2接驳台有料检测,ABB2_TrayCheck,9,PRO_AOI_IP_2,0,J2接驳台有料检测,X30,X30,0 DI,J2接驳台有料检测,ABB1_TrayCheck,9,PRO_AOI_IP_2,0,J2接驳台有料检测,X30,X30,0
DI,右升降气缸上升端,R_Updown_Up,10,PRO_AOI_IP_2,0,右侧升降气缸上升端,X31,X31,0 DI,右升降气缸上升端,R_Updown_Up,10,PRO_AOI_IP_2,0,右侧升降气缸上升端,X31,X31,0
DI,右升降气缸下降端,R_Updown_Down,11,PRO_AOI_IP_2,0,右侧升降气缸下降端,X32,X32,0 DI,右升降气缸下降端,R_Updown_Down,11,PRO_AOI_IP_2,0,右侧升降气缸下降端,X32,X32,0
DI,右下层线体阻挡1检测,R_StopCheck1,12,PRO_AOI_IP_2,0,右侧下层线体阻挡1检测,X33,X33,0 DI,右下层线体阻挡1检测,R_StopCheck1,12,PRO_AOI_IP_2,0,右侧下层线体阻挡1检测,X33,X33,0
...@@ -161,8 +161,8 @@ DO,右升降气缸下降,R_Updown_Down,9,PRO_AOI_IP_3,0,右升降气缸下降,Y50,Y50,0 ...@@ -161,8 +161,8 @@ DO,右升降气缸下降,R_Updown_Down,9,PRO_AOI_IP_3,0,右升降气缸下降,Y50,Y50,0
,,,,,,,,, ,,,,,,,,,
,,,,,,,,, ,,,,,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,ABB机器人1IP,ABB1_IP,192.168.101.21,,,,,, PRO,ABB机器人1IP,ABB1_IP,192.168.102.21,,,,,,
PRO,ABB机器人2IP,ABB2_IP,192.168.102.21,,,,,, PRO,ABB机器人2IP,ABB2_IP,192.168.101.21,,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,双层线左侧提升机,L_Updown_Rfid,192.168.103.51,,,,,, PRO,双层线左侧提升机,L_Updown_Rfid,192.168.103.51,,,,,,
PRO,双层线中间提升机,M_Updown_Rfid,192.168.103.52,,,,,, PRO,双层线中间提升机,M_Updown_Rfid,192.168.103.52,,,,,,
......
source/DeviceLibrary/doubleLine/DoubleLineBean.cs
...@@ -28,8 +28,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -28,8 +28,8 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Elapsed += timersTimer_Elapsed; mainTimer.Elapsed += timersTimer_Elapsed;
ledTimer.Elapsed += Led_timer_Tick; ledTimer.Elapsed += Led_timer_Tick;
LeftRobot = new RobotMoveBean(1, config.ABB1_IP, "左侧ABB", IO_Type.ABB1_TrayCheck); LeftRobot = new RobotMoveBean(2, config.ABB2_IP, "左侧ABB", IO_Type.ABB2_TrayCheck);
RightRobot = new RobotMoveBean(2, config.ABB2_IP, "右侧ABB", IO_Type.ABB2_TrayCheck); RightRobot = new RobotMoveBean(1, config.ABB1_IP, "右侧ABB", IO_Type.ABB1_TrayCheck);
//添加调试 //添加调试
IsDebug = ConfigAppSettings.GetIntValue(Setting_Init.IsInDebug).Equals(1); IsDebug = ConfigAppSettings.GetIntValue(Setting_Init.IsInDebug).Equals(1);
......
source/DeviceLibrary/doubleLine/DoubleLineBean_S1Shelf.cs
...@@ -1157,8 +1157,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1157,8 +1157,8 @@ namespace OnlineStore.DeviceLibrary
#region 机器人干涉判断 #region 机器人干涉判断
internal bool ABBCanStart(int robotNum, bool isMyPoint) internal bool ABBCanStart(int robotNum, bool isMyPoint)
{ {
//左侧是1号机器人，右侧是2号机器人 //左侧是2号机器人，右侧是1号机器人
if (robotNum.Equals(2)) if (robotNum.Equals(1))
{ {
if (!LeftRobot.MoveInfo.MoveType.Equals(LineMoveType.None)) if (!LeftRobot.MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
...@@ -1172,7 +1172,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1172,7 +1172,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
if (robotNum.Equals(1)) if (robotNum.Equals(2))
{ {
if (!RightRobot.MoveInfo.MoveType.Equals(LineMoveType.None)) if (!RightRobot.MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
......
source/DeviceLibrary/doubleLine/RobotMoveBean.cs
...@@ -35,7 +35,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -35,7 +35,7 @@ namespace OnlineStore.DeviceLibrary
int smallEnd = 46; int smallEnd = 46;
int bigStart = 1; int bigStart = 1;
int bigEnd = 6; int bigEnd = 6;
if (num.Equals(2)) if (num.Equals(1))
{ {
smallStart = 47; smallStart = 47;
smallEnd = 92; smallEnd = 92;
......
source/DoubleLineClient_3D/FrmDbLineIO.Designer.cs
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
this.M_LineRun = new System.Windows.Forms.Button(); this.M_LineRun = new System.Windows.Forms.Button();
this.M_LineBackRun = new System.Windows.Forms.Button(); this.M_LineBackRun = new System.Windows.Forms.Button();
this.M_Updown_Up = new System.Windows.Forms.Label(); this.M_Updown_Up = new System.Windows.Forms.Label();
this.ABB2_TrayCheck = new System.Windows.Forms.Label(); this.ABB1_TrayCheck = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.Line_StopCylinder = new System.Windows.Forms.Button(); this.Line_StopCylinder = new System.Windows.Forms.Button();
this.Line_InCheck = new System.Windows.Forms.Label(); this.Line_InCheck = new System.Windows.Forms.Label();
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
this.S1StopDown = new System.Windows.Forms.Button(); this.S1StopDown = new System.Windows.Forms.Button();
this.btnS1Stop = new System.Windows.Forms.Button(); this.btnS1Stop = new System.Windows.Forms.Button();
this.groupBox8 = new System.Windows.Forms.GroupBox(); this.groupBox8 = new System.Windows.Forms.GroupBox();
this.ABB1_TrayCheck = new System.Windows.Forms.Label(); this.ABB2_TrayCheck = new System.Windows.Forms.Label();
this.groupBox9 = new System.Windows.Forms.GroupBox(); this.groupBox9 = new System.Windows.Forms.GroupBox();
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
...@@ -888,17 +888,17 @@ ...@@ -888,17 +888,17 @@
this.M_Updown_Up.Text = "X12上升到位"; this.M_Updown_Up.Text = "X12上升到位";
this.M_Updown_Up.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.M_Updown_Up.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// ABB2_TrayCheck // ABB1_TrayCheck
// //
this.ABB2_TrayCheck.AutoSize = true; this.ABB1_TrayCheck.AutoSize = true;
this.ABB2_TrayCheck.BackColor = System.Drawing.Color.LightGray; this.ABB1_TrayCheck.BackColor = System.Drawing.Color.LightGray;
this.ABB2_TrayCheck.Location = new System.Drawing.Point(343, 22); this.ABB1_TrayCheck.Location = new System.Drawing.Point(343, 22);
this.ABB2_TrayCheck.Margin = new System.Windows.Forms.Padding(3); this.ABB1_TrayCheck.Margin = new System.Windows.Forms.Padding(3);
this.ABB2_TrayCheck.Name = "ABB2_TrayCheck"; this.ABB1_TrayCheck.Name = "ABB1_TrayCheck";
this.ABB2_TrayCheck.Size = new System.Drawing.Size(176, 17); this.ABB1_TrayCheck.Size = new System.Drawing.Size(176, 17);
this.ABB2_TrayCheck.TabIndex = 7; this.ABB1_TrayCheck.TabIndex = 7;
this.ABB2_TrayCheck.Text = "右侧_分盘装置2料盘检测_ABB2"; this.ABB1_TrayCheck.Text = "右侧_分盘装置2料盘检测_ABB1";
this.ABB2_TrayCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.ABB1_TrayCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// groupBox1 // groupBox1
// //
...@@ -1388,8 +1388,8 @@ ...@@ -1388,8 +1388,8 @@
// groupBox8 // groupBox8
// //
this.groupBox8.BackColor = System.Drawing.Color.Wheat; this.groupBox8.BackColor = System.Drawing.Color.Wheat;
this.groupBox8.Controls.Add(this.ABB1_TrayCheck);
this.groupBox8.Controls.Add(this.ABB2_TrayCheck); this.groupBox8.Controls.Add(this.ABB2_TrayCheck);
this.groupBox8.Controls.Add(this.ABB1_TrayCheck);
this.groupBox8.Location = new System.Drawing.Point(306, 317); this.groupBox8.Location = new System.Drawing.Point(306, 317);
this.groupBox8.Name = "groupBox8"; this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(554, 58); this.groupBox8.Size = new System.Drawing.Size(554, 58);
...@@ -1397,17 +1397,17 @@ ...@@ -1397,17 +1397,17 @@
this.groupBox8.TabStop = false; this.groupBox8.TabStop = false;
this.groupBox8.Text = "接驳台信号"; this.groupBox8.Text = "接驳台信号";
// //
// ABB1_TrayCheck // ABB2_TrayCheck
// //
this.ABB1_TrayCheck.AutoSize = true; this.ABB2_TrayCheck.AutoSize = true;
this.ABB1_TrayCheck.BackColor = System.Drawing.Color.LightGray; this.ABB2_TrayCheck.BackColor = System.Drawing.Color.LightGray;
this.ABB1_TrayCheck.Location = new System.Drawing.Point(92, 22); this.ABB2_TrayCheck.Location = new System.Drawing.Point(92, 22);
this.ABB1_TrayCheck.Margin = new System.Windows.Forms.Padding(3); this.ABB2_TrayCheck.Margin = new System.Windows.Forms.Padding(3);
this.ABB1_TrayCheck.Name = "ABB1_TrayCheck"; this.ABB2_TrayCheck.Name = "ABB2_TrayCheck";
this.ABB1_TrayCheck.Size = new System.Drawing.Size(176, 17); this.ABB2_TrayCheck.Size = new System.Drawing.Size(176, 17);
this.ABB1_TrayCheck.TabIndex = 7; this.ABB2_TrayCheck.TabIndex = 7;
this.ABB1_TrayCheck.Text = "左侧_分盘装置1料盘检测_ABB1"; this.ABB2_TrayCheck.Text = "左侧_分盘装置1料盘检测_ABB2";
this.ABB1_TrayCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.ABB2_TrayCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// groupBox9 // groupBox9
// //
...@@ -1645,7 +1645,7 @@ ...@@ -1645,7 +1645,7 @@
private System.Windows.Forms.Button btnMDown; private System.Windows.Forms.Button btnMDown;
private System.Windows.Forms.Label M_Updown_Down; private System.Windows.Forms.Label M_Updown_Down;
private System.Windows.Forms.Button btnMUp; private System.Windows.Forms.Button btnMUp;
private System.Windows.Forms.Label ABB2_TrayCheck; private System.Windows.Forms.Label ABB1_TrayCheck;
private System.Windows.Forms.Button M_LineRun; private System.Windows.Forms.Button M_LineRun;
private System.Windows.Forms.Button M_LineBackRun; private System.Windows.Forms.Button M_LineBackRun;
private System.Windows.Forms.Label M_Updown_Up; private System.Windows.Forms.Label M_Updown_Up;
...@@ -1687,7 +1687,7 @@ ...@@ -1687,7 +1687,7 @@
internal System.Windows.Forms.Button S1StopDown; internal System.Windows.Forms.Button S1StopDown;
internal System.Windows.Forms.Button btnS1Stop; internal System.Windows.Forms.Button btnS1Stop;
private System.Windows.Forms.GroupBox groupBox8; private System.Windows.Forms.GroupBox groupBox8;
private System.Windows.Forms.Label ABB1_TrayCheck; private System.Windows.Forms.Label ABB2_TrayCheck;
private System.Windows.Forms.GroupBox groupBox9; private System.Windows.Forms.GroupBox groupBox9;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.GroupBox grpBxState; private System.Windows.Forms.GroupBox grpBxState;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!