Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 2249979a
内嵌 并排
正在显示 10 个修改的文件 包含 47 行增加 和 44 行删除
source/AssemblyLineClient/FrmIOStatus.Designer.cs
......@@ -324,7 +324,7 @@
//
this.btnSw3Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw3Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw3Location.Location = new System.Drawing.Point(22, 266);
this.btnSw3Location.Location = new System.Drawing.Point(22, 270);
this.btnSw3Location.Name = "btnSw3Location";
this.btnSw3Location.Size = new System.Drawing.Size(140, 34);
this.btnSw3Location.TabIndex = 285;
......@@ -336,7 +336,7 @@
//
this.btnSw3Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw3Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw3Top.Location = new System.Drawing.Point(22, 313);
this.btnSw3Top.Location = new System.Drawing.Point(22, 312);
this.btnSw3Top.Name = "btnSw3Top";
this.btnSw3Top.Size = new System.Drawing.Size(140, 34);
this.btnSw3Top.TabIndex = 284;
......@@ -348,7 +348,7 @@
//
this.btnSw2Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw2Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw2Location.Location = new System.Drawing.Point(185, 172);
this.btnSw2Location.Location = new System.Drawing.Point(185, 176);
this.btnSw2Location.Name = "btnSw2Location";
this.btnSw2Location.Size = new System.Drawing.Size(140, 34);
this.btnSw2Location.TabIndex = 283;
......@@ -360,7 +360,7 @@
//
this.btnSw2Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw2Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw2Top.Location = new System.Drawing.Point(185, 219);
this.btnSw2Top.Location = new System.Drawing.Point(185, 218);
this.btnSw2Top.Name = "btnSw2Top";
this.btnSw2Top.Size = new System.Drawing.Size(140, 34);
this.btnSw2Top.TabIndex = 282;
......@@ -372,7 +372,7 @@
//
this.btnSw1Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw1Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw1Location.Location = new System.Drawing.Point(22, 172);
this.btnSw1Location.Location = new System.Drawing.Point(22, 176);
this.btnSw1Location.Name = "btnSw1Location";
this.btnSw1Location.Size = new System.Drawing.Size(140, 34);
this.btnSw1Location.TabIndex = 281;
......@@ -384,7 +384,7 @@
//
this.btnSw4Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw4Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw4Location.Location = new System.Drawing.Point(185, 266);
this.btnSw4Location.Location = new System.Drawing.Point(185, 270);
this.btnSw4Location.Name = "btnSw4Location";
this.btnSw4Location.Size = new System.Drawing.Size(140, 34);
this.btnSw4Location.TabIndex = 276;
......@@ -396,7 +396,7 @@
//
this.btnSw4Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw4Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw4Top.Location = new System.Drawing.Point(185, 313);
this.btnSw4Top.Location = new System.Drawing.Point(185, 312);
this.btnSw4Top.Name = "btnSw4Top";
this.btnSw4Top.Size = new System.Drawing.Size(140, 34);
this.btnSw4Top.TabIndex = 269;
......@@ -408,7 +408,7 @@
//
this.btnSw1Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw1Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw1Top.Location = new System.Drawing.Point(22, 219);
this.btnSw1Top.Location = new System.Drawing.Point(22, 218);
this.btnSw1Top.Name = "btnSw1Top";
this.btnSw1Top.Size = new System.Drawing.Size(140, 34);
this.btnSw1Top.TabIndex = 280;
......@@ -420,7 +420,7 @@
//
this.btnSw3Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw3Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw3Run.Location = new System.Drawing.Point(22, 125);
this.btnSw3Run.Location = new System.Drawing.Point(22, 124);
this.btnSw3Run.Name = "btnSw3Run";
this.btnSw3Run.Size = new System.Drawing.Size(140, 34);
this.btnSw3Run.TabIndex = 279;
......@@ -432,7 +432,7 @@
//
this.btnSw2Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw2Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw2Run.Location = new System.Drawing.Point(185, 78);
this.btnSw2Run.Location = new System.Drawing.Point(185, 82);
this.btnSw2Run.Name = "btnSw2Run";
this.btnSw2Run.Size = new System.Drawing.Size(140, 34);
this.btnSw2Run.TabIndex = 278;
......@@ -444,7 +444,7 @@
//
this.btnSw1Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw1Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw1Run.Location = new System.Drawing.Point(22, 78);
this.btnSw1Run.Location = new System.Drawing.Point(22, 82);
this.btnSw1Run.Name = "btnSw1Run";
this.btnSw1Run.Size = new System.Drawing.Size(140, 34);
this.btnSw1Run.TabIndex = 277;
......@@ -494,7 +494,7 @@
//
this.btnSW4Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSW4Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSW4Run.Location = new System.Drawing.Point(185, 125);
this.btnSW4Run.Location = new System.Drawing.Point(185, 124);
this.btnSW4Run.Name = "btnSW4Run";
this.btnSW4Run.Size = new System.Drawing.Size(140, 34);
this.btnSW4Run.TabIndex = 262;
......
source/AssemblyLineClient/FrmIOStatus.cs
......@@ -309,19 +309,19 @@ namespace OnlineStore.AssemblyLine
private void btnSw1Location_Click(object sender, EventArgs e)
{
BtnMove(btnSw4Top, "环形线横移4定位上升", "环形线横移4定位下降", IO_Type.SW4_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
BtnMove(btnSw1Location, "环形线横移1定位上升", "环形线横移1定位下降", IO_Type.SW1_LocationCylinder_Down, IO_Type.SW1_LocationCylinder_Up);
}
private void btnSw2Location_Click(object sender, EventArgs e)
{
BtnMove(btnSw2Top, "环形线横移2定位上升", "环形线横移2定位下降", IO_Type.SW2_LocationCylinder_Down, IO_Type.SW2_LocationCylinder_Up);
BtnMove(btnSw2Location, "环形线横移2定位上升", "环形线横移2定位下降", IO_Type.SW2_LocationCylinder_Down, IO_Type.SW2_LocationCylinder_Up);
}
private void btnSw3Location_Click(object sender, EventArgs e)
{
BtnMove(btnSw3Top, "环形线横移3定位上升", "环形线横移3定位下降", IO_Type.SW3_LocationCylinder_Down, IO_Type.SW3_LocationCylinder_Up);
BtnMove(btnSw3Location, "环形线横移3定位上升", "环形线横移3定位下降", IO_Type.SW3_LocationCylinder_Down, IO_Type.SW3_LocationCylinder_Up);
}
private void btnSw4Location_Click(object sender, EventArgs e)
{
BtnMove(btnSw4Top, "环形线横移4定位上升", "环形线横移4定位下降", IO_Type.SW4_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
BtnMove(btnSw4Location, "环形线横移4定位上升", "环形线横移4定位下降", IO_Type.SW4_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
}
private void btnSw1Top_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/记录.txt
......@@ -37,7 +37,9 @@ D2(上料模块出口)
4.料架进入小车后，AGV发送Actions.FinishOut
横移不需要定位
放料需要定位和顶升。
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
......@@ -74,7 +74,7 @@ DO,0,SL1状态指示灯,SL_HddLed,0,PRO_AOI_IP_11,0,SL1状态指示灯,Y101,Y101
DO,0,SL1进料线体运转,SL_Line_Run,1,PRO_AOI_IP_11,0,SL1进料线体运转,Y102,Y102
DO,0,SL1线体定位横移电机运转,SL_LocationSideWay_Run,2,PRO_AOI_IP_11,0,SL1线体定位横移电机运转,Y103,Y103
DO,0,SL1线体出口横移电机运转,SL_OutSideWay_Run,3,PRO_AOI_IP_11,0,SL1线体出口横移电机运转,Y104,Y104
DO,1000,环形线横移1电机运转,SW1_Motor_Run,4,PRO_AOI_IP_11,0,环形线横移1电机运转,Y105,Y105
DO,1000,环形线横移1电机运转,SW1_MotorRun,4,PRO_AOI_IP_11,0,环形线横移1电机运转,Y105,Y105
DO,0,SL1进料阻挡下降SOL,SL_Entry_StopDown,5,PRO_AOI_IP_11,0,SL1进料阻挡下降SOL,Y106,Y106
DO,0,SL1缓冲阻挡,SL_Buffer_StopDown,6,PRO_AOI_IP_11,0,SL1缓冲阻挡,Y107,Y107
DO,0,SL1出料阻挡下降SOL,SL_Out_StopDown,7,PRO_AOI_IP_11,0,SL1出料阻挡下降SOL,Y108,Y108
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
......@@ -74,7 +74,7 @@ DO,0,SL3状态指示灯,SL_HddLed,0,PRO_AOI_IP_15,0,SL3状态指示灯,Y181,Y181
DO,0,SL3进料线体运转,SL_Line_Run,1,PRO_AOI_IP_15,0,SL3进料线体运转,Y182,Y182
DO,0,SL3线体定位横移电机运转,SL_LocationSideWay_Run,2,PRO_AOI_IP_15,0,SL3线体定位横移电机运转,Y183,Y183
DO,0,SL3线体出口横移电机运转,SL_OutSideWay_Run,3,PRO_AOI_IP_15,0,SL3线体出口横移电机运转,Y184,Y184
DO,1000,环形线横移2电机运转,SW2_Motor_Run,4,PRO_AOI_IP_15,0,环形线横移2电机运转,Y185,Y185
DO,1000,环形线横移2电机运转,SW2_MotorRun,4,PRO_AOI_IP_15,0,环形线横移2电机运转,Y185,Y185
DO,0,SL3进料阻挡下降SOL,SL_Entry_StopDown,5,PRO_AOI_IP_15,0,SL3进料阻挡下降SOL,Y186,Y186
DO,0,SL3缓冲阻挡,SL_Buffer_StopDown,6,PRO_AOI_IP_15,0,SL3缓冲阻挡,Y187,Y187
DO,0,SL3出料阻挡下降SOL,SL_Out_StopDown,7,PRO_AOI_IP_15,0,SL3出料阻挡下降SOL,Y188,Y188
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
......@@ -74,7 +74,7 @@ DO,0,SL4状态指示灯,SL_HddLed,0,PRO_AOI_IP_17,0,SL4状态指示灯,Y221,Y221
DO,0,SL4进料线体运转,SL_Line_Run,1,PRO_AOI_IP_17,0,SL4进料线体运转,Y222,Y222
DO,0,SL4线体定位横移电机运转,SL_LocationSideWay_Run,2,PRO_AOI_IP_17,0,SL4线体定位横移电机运转,Y223,Y223
DO,0,SL4线体出口横移电机运转,SL_OutSideWay_Run,3,PRO_AOI_IP_17,0,SL4线体出口横移电机运转,Y224,Y224
DO,1000,环行线横移3电机运转,SW3_Motor_Run,4,PRO_AOI_IP_17,0,环行线横移3电机运转,Y225,Y225
DO,1000,环行线横移3电机运转,SW3_MotorRun,4,PRO_AOI_IP_17,0,环行线横移3电机运转,Y225,Y225
DO,0,SL4进料阻挡下降SOL,SL_Entry_StopDown,5,PRO_AOI_IP_17,0,SL4进料阻挡下降SOL,Y226,Y226
DO,0,SL4缓冲阻挡,SL_Buffer_StopDown,6,PRO_AOI_IP_17,0,SL4缓冲阻挡,Y227,Y227
DO,0,SL4出料阻挡下降SOL,SL_Out_StopDown,7,PRO_AOI_IP_17,0,SL4出料阻挡下降SOL,Y228,Y228
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -273,7 +273,7 @@ namespace OnlineStore.DeviceLibrary
LineServer.StartServer(ConfigAppSettings.GetIntValue(Setting_Init.TCPServerPort));
RHomeOp();
foreach (MoveEquip moveEquip in this.AllEquipMap.Values)
foreach (EquipBase moveEquip in this.AllEquipMap.Values)
{
EquipStartRun(moveEquip);
}
......@@ -322,20 +322,24 @@ namespace OnlineStore.DeviceLibrary
WriteDrivetMotorRun( IO_VALUE.LOW);
//NG气缸后退
CylinderMove(MoveInfo, IO_Type.NGCylinder_Before, IO_Type.NGCylinder_After);
// CylinderMove(MoveInfo, IO_Type.NGCylinder_Before, IO_Type.NGCylinder_After);
//横移轨道下降
SideWayStop();
//定位下降
CylinderMove(MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW2_LocationCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW3_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
//顶升下降
CylinderMove(MoveInfo, IO_Type.SW2_TopCylinder_Up, IO_Type.SW2_TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW3_TopCylinder_Up, IO_Type.SW3_TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW1_TopCylinder_Up, IO_Type.SW1_TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW4_TopCylinder_Up, IO_Type.SW4_TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW2_LocationCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW3_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
}
......@@ -366,7 +370,7 @@ namespace OnlineStore.DeviceLibrary
//重置通用处理
RHomeOp();
foreach (MoveEquip equip in AllEquipMap.Values)
foreach (EquipBase equip in AllEquipMap.Values)
{
EquipReset(equip, isNeedAllReset);
}
......@@ -473,7 +477,7 @@ namespace OnlineStore.DeviceLibrary
{
return true;
}
foreach (MoveEquip move in AllEquipMap.Values)
foreach (EquipBase move in AllEquipMap.Values)
{
if (!move.IsDebug && (!move.runStatus.Equals(LineRunStatus.Runing)))
{
......@@ -840,7 +844,7 @@ namespace OnlineStore.DeviceLibrary
internal override void StopMove()
{
foreach (MoveEquip equip in this.AllEquipMap.Values)
foreach (EquipBase equip in this.AllEquipMap.Values)
{
if (!equip.IsDebug)
{
......@@ -876,7 +880,7 @@ namespace OnlineStore.DeviceLibrary
bool isOk = true;
//判断是否所有的已经返回完成
foreach (MoveEquip moveEquip in this.AllEquipMap.Values)
foreach (EquipBase moveEquip in this.AllEquipMap.Values)
{
if ((moveEquip.runStatus.Equals(LineRunStatus.HomeMoving) || moveEquip.runStatus.Equals(LineRunStatus.Reset)) && moveEquip.IsDebug.Equals(false))
{
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -441,8 +441,10 @@ namespace OnlineStore.DeviceLibrary
// TrayManager.UpdateSWState(1, 2);
SW41_MoveInfo.NewMove(LineMoveType.InStore);
SW41_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
SWLog("横移轨道41： 等待横移4托盘检测信号 ");
SWLog("横移轨道41：定位气缸下降， 等待横移4托盘检测信号 ");
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH));
CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
CylinderMove(SW41_MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
}
else if (!SideWay41IsWait)
{
......@@ -476,8 +478,10 @@ namespace OnlineStore.DeviceLibrary
//TrayManager.UpdateSWState(3, 2);
SW23_MoveInfo.NewMove(LineMoveType.InStore);
SW23_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
SWLog("横移轨道23： 等待横移4托盘检测信号 ");
SWLog("横移轨道23：定位气缸下降， 等待横移4托盘检测信号 ");
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_TrayCheck, IO_VALUE.HIGH));
CylinderMove(SW23_MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
CylinderMove(SW23_MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
}
else if (!SideWay23IsWait)
{
......
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
......@@ -92,12 +92,17 @@ namespace OnlineStore.DeviceLibrary
if (AIOMap.ContainsKey(ioIp))
{
aioBox = AIOMap[ioIp];
try
{
if (null != aioBox)
{
aioBox.Close();
aioBox = null;
}
}catch(Exception ex)
{
LogUtil.error("关闭Io模块【" + ioIp + "】出错：" + ex);
}
AIOMap.Remove(ioIp);
}
if (DIValueMap.ContainsKey(ioIp))
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
......@@ -324,19 +324,7 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
public static string DriveMotor_Run4 = "DriveMotor_Run4";
///// <summary>
///// DO 0 环形线横移4电机运转 DriveMotorRun Y009
///// </summary>
//public static string SW4_DriveMotor = "SW_DriveMotor";
///// <summary>
///// DI/DO 环形线横移4定位上升端 SW_TopCylinder_UP X007
///// </summary>
//public static string SW4_TopCylinder_UP = "SW4_TopCylinder_UP";
///// <summary>
///// DI/DO 环形线横移4定位下降端 SW_TopCylinder_Down X008
///// </summary>
//public static string SW4_TopCylinder_Down = "SW4_TopCylinder_Down";
#endregion
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!