Skip to content

李娜 / SO664-AssemblyLine

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

bug修改

1 个父辈 7127ef2c
全部展开
内嵌 并排
正在显示 19 个修改的文件 包含 155 行增加 和 109 行删除
source/AssemblyLineClient/FrmLineStore.cs
...@@ -984,6 +984,7 @@ namespace OnlineStore.AssemblyLine ...@@ -984,6 +984,7 @@ namespace OnlineStore.AssemblyLine
MessageBox.Show("[" + seleEquip.Name + "]启动调试失败：" + seleEquip.WarnMsg, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("[" + seleEquip.Name + "]启动调试失败：" + seleEquip.WarnMsg, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
} }
selControl.BackColor = seleEquip.GetShowColor();
} }
} }
...@@ -995,6 +996,7 @@ namespace OnlineStore.AssemblyLine ...@@ -995,6 +996,7 @@ namespace OnlineStore.AssemblyLine
{ {
LogUtil.info(Name + "点击：停止运行[" + seleEquip.Name + "]"); LogUtil.info(Name + "点击：停止运行[" + seleEquip.Name + "]");
seleEquip.Reset(); seleEquip.Reset();
selControl.BackColor = seleEquip.GetShowColor();
} }
} }
} }
...@@ -1029,6 +1031,7 @@ namespace OnlineStore.AssemblyLine ...@@ -1029,6 +1031,7 @@ namespace OnlineStore.AssemblyLine
seleEquip.ChangeDebug(false); seleEquip.ChangeDebug(false);
LogUtil.info(seleEquip.Name + "用户切换【" + seleEquip.Name + "】到正常工作状态 "); LogUtil.info(seleEquip.Name + "用户切换【" + seleEquip.Name + "】到正常工作状态 ");
control_Stop.Text = "✔ 已启用"; control_Stop.Text = "✔ 已启用";
selControl.BackColor = seleEquip.GetShowColor();
} }
} }
else else
...@@ -1056,6 +1059,7 @@ namespace OnlineStore.AssemblyLine ...@@ -1056,6 +1059,7 @@ namespace OnlineStore.AssemblyLine
seleEquip.ChangeDebug(true); seleEquip.ChangeDebug(true);
LogUtil.info(seleEquip.Name + "用户切换【" + seleEquip.Name + "】到调试状态 "); LogUtil.info(seleEquip.Name + "用户切换【" + seleEquip.Name + "】到调试状态 ");
control_Stop.Text = "✘ 未启用"; control_Stop.Text = "✘ 未启用";
selControl.BackColor = seleEquip.GetShowColor();
} }
} }
} }
...@@ -1100,7 +1104,20 @@ namespace OnlineStore.AssemblyLine ...@@ -1100,7 +1104,20 @@ namespace OnlineStore.AssemblyLine
return; return;
} }
LineManager.DisLeftOutLine = chbLeftDis.Checked; LineManager.DisLeftOutLine = chbLeftDis.Checked;
LogUtil.error("界面点击勾选：" + chbLeftDis.Text+"="+ LineManager.DisLeftOutLine);
if (LineManager.DisLeftOutLine)
{
List<int> leftHYs = new List<int>() { 205, 207, 210 };
foreach (int id in leftHYs)
{
LineManager.Line.HYEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbLeftDis.Text + "=" + LineManager.DisLeftOutLine+"，设置 HY5，HY7，HY10 为调试状态");
}
else
{
LogUtil.info("界面点击勾选：" + chbLeftDis.Text + "=" + LineManager.DisLeftOutLine);
}
} }
private void chbRightDis_CheckedChanged(object sender, EventArgs e) private void chbRightDis_CheckedChanged(object sender, EventArgs e)
...@@ -1113,8 +1130,96 @@ namespace OnlineStore.AssemblyLine ...@@ -1113,8 +1130,96 @@ namespace OnlineStore.AssemblyLine
{ {
return; return;
} }
LineManager.DisRightOutLine = chbRightDis.Checked; LineManager.DisRightOutLine = chbRightDis.Checked;
LogUtil.error("界面点击勾选：" + chbRightDis.Text + "="+ LineManager.DisRightOutLine); if (LineManager.DisRightOutLine)
{
List<int> rightHYs = new List<int>() { 212, 214, 217 };
foreach (int id in rightHYs)
{
LineManager.Line.HYEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbRightDis.Text + "=" + LineManager.DisRightOutLine + "，设置 HY12，HY14，HY17 为调试状态");
}
else
{
LogUtil.info("界面点击勾选：" + chbRightDis.Text + "=" + LineManager.DisRightOutLine);
}
}
private void chbDisSL_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (LineManager.DisSLEquip.Equals(chbDisSL.Checked))
{
return;
}
LineManager.DisSLEquip = chbDisSL.Checked;
if (LineManager.DisSLEquip)
{
List<int> rightHYs = new List<int>() { 101, 102, 103,104,105 };
foreach (int id in rightHYs)
{
LineManager.Line.FeedingEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbDisSL.Text + "=" + LineManager.DisSLEquip + "，设置所有上料模块（T1~T5）为调试状态");
}
else
{
LogUtil.info("界面点击勾选：" + chbDisSL.Text + "=" + LineManager.DisSLEquip);
}
}
private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (LineManager.DisAllHy.Equals(chbDisHy.Checked))
{
return;
}
LineManager.DisAllHy = chbDisHy.Checked;
if (LineManager.DisAllHy)
{
foreach (int id in LineManager.Line.HYEquipMap.Keys)
{
LineManager.Line.HYEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbDisHy.Text + "=" + LineManager.DisAllHy + "，设置所有HY为调试状态");
}
else
{
LogUtil.info("界面点击勾选：" + chbDisHy.Text + "=" + LineManager.DisAllHy);
}
}
private void chbDisMove_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (LineManager.DisAllMove.Equals(chbDisMove.Checked))
{
return;
}
LineManager.DisAllMove = chbDisMove.Checked;
if (LineManager.DisAllMove)
{
foreach (int id in LineManager.Line.MoveEquipMap.Keys)
{
LineManager.Line.MoveEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbDisMove.Text + "=" + LineManager.DisAllMove + "，设置所有进仓为调试状态");
}
else
{
LogUtil.info("界面点击勾选：" + chbDisMove.Text + "=" + LineManager.DisAllMove);
}
} }
} }
} }
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.LightGreen; this.BackColor = System.Drawing.Color.White;
this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.Controls.Add(this.panName); this.Controls.Add(this.panName);
this.Controls.Add(this.lblBox); this.Controls.Add(this.lblBox);
......
source/DeviceLibrary/LineConfig/Config_DischargeLine_1.csv deleted 100644 → 0
类型,分类编号,说明,名称,属性值,设备名称,电器定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,GigE:MV-CE200-10GC (00D76546944),,
,,,,,,
DI,0,出料皮带线体1急停,DLine_SuddenStop,0,PRO_AOI_IP_2,X021
DI,0,出料皮带线体1复位,DLine_Reset,1,PRO_AOI_IP_2,X022
DI,0,皮带线1入口定位检测,EntryLocation_Check1,2,PRO_AOI_IP_2,X023
DI,0,皮带线1出口定位检测,ExitLocation_Check1,3,PRO_AOI_IP_2,X024
DI,0,皮带线1出口料盘检测,ExitTray_Check1,4,PRO_AOI_IP_2,X025
DI,0,皮带线2入口定位检测,EntryLocation_Check2,5,PRO_AOI_IP_2,X026
DI,0,皮带线2出口定位检测,ExitLocation_Check2,6,PRO_AOI_IP_2,X027
DI,0,皮带线2出口料盘检测,ExitTray_Check2,7,PRO_AOI_IP_2,X028
DI,0,皮带线3定位检测,Location_Check3,8,PRO_AOI_IP_2,X029
DI,0,皮带线3入口料盘检测,EntryTray_Check3,9,PRO_AOI_IP_2,X030
DI,0,皮带线3中间位置料盘检测,MiddleTray_Check3,10,PRO_AOI_IP_2,X031
DI,0,皮带线3出口料盘检测,ExitTray_Check3,11,PRO_AOI_IP_2,X032
DI,0,分盘装置1定位气缸上升端,SeparateDevice_Up,12,PRO_AOI_IP_2,X033
DI,0,分盘装置1定位气缸下降端,SeparateDevice_Down,13,PRO_AOI_IP_2,X034
DI,0,分盘装置1料盘检测,SeparateDevice_Check,14,PRO_AOI_IP_2,X035
DI,0,扫码NG料气缸1后退端,ScanNGCylinder_Back,15,PRO_AOI_IP_2,X036
,,,,,,
DO,0,出料皮带线体1运行状态,DLine_RunStatus,0,PRO_AOI_IP_2,Y021
DO,0,出料皮带线体1故障状态,DLine_RunAlarm,1,PRO_AOI_IP_2,Y022
DO,0,出料皮带线1运转,DLine_Run1,2,PRO_AOI_IP_2,Y023
DO,0,出料皮带线2运转,DLine_Run2,3,PRO_AOI_IP_2,Y024
DO,0,出料皮带线3运转,DLine_Run3,4,PRO_AOI_IP_2,Y025
DO,0,分盘装置电机1驱动,SeparateDevice_Run,5,PRO_AOI_IP_2,Y026
DO,0,分盘装置1定位气缸上升SOL,SeparateDevice_Up,6,PRO_AOI_IP_2,Y027
DO,0,分盘装置1定位气缸下降SOL,SeparateDevice_Down,7,PRO_AOI_IP_2,Y028
DO,0,扫码NG料气缸1前进SOL,ScanNGCylinder_Forward,8,PRO_AOI_IP_2,Y029
DO,0,扫码NG料气缸1后退SOL,ScanNGCylinder_Back,9,PRO_AOI_IP_2,Y030
DO,0,分盘装置电机1驱动反转,SeparateDevice_BackRun,10,PRO_AOI_IP_2,Y031
DO,0,皮带线1滚刷电机运行,DLine_Brush1,11,PRO_AOI_IP_2,Y032
DO,0,皮带线2滚刷电机运行,DLine_Brush2,12,PRO_AOI_IP_2,Y033
,0,,,13,PRO_AOI_IP_2,Y034
,0,,,14,PRO_AOI_IP_2,Y035
,0,,,15,PRO_AOI_IP_2,Y036
source/DeviceLibrary/LineConfig/Config_DischargeLine_2.csv deleted 100644 → 0
类型,分类编号,说明,名称,属性值,设备名称,电器定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,GigE:MV-CE200-10GC (00D76546876),,
,,,,,,
DI,0,出料皮带线体2急停,DLine_SuddenStop,0,PRO_AOI_IP_3,X041
DI,0,出料皮带线体2复位,DLine_Reset,1,PRO_AOI_IP_3,X042
DI,0,皮带线4入口定位检测,EntryLocation_Check1,2,PRO_AOI_IP_3,X043
DI,0,皮带线4出口定位检测,ExitLocation_Check1,3,PRO_AOI_IP_3,X044
DI,0,皮带线4出口料盘检测,ExitTray_Check1,4,PRO_AOI_IP_3,X045
DI,0,皮带线5入口定位检测,EntryLocation_Check2,5,PRO_AOI_IP_3,X046
DI,0,皮带线5出口定位检测,ExitLocation_Check2,6,PRO_AOI_IP_3,X047
DI,0,皮带线5出口料盘检测,ExitTray_Check2,7,PRO_AOI_IP_3,X048
DI,0,皮带线6定位检测,Location_Check3,8,PRO_AOI_IP_3,X049
DI,0,皮带线6入口料盘检测,EntryTray_Check3,9,PRO_AOI_IP_3,X050
DI,0,皮带线6中间位置料盘检测,MiddleTray_Check3,10,PRO_AOI_IP_3,X051
DI,0,皮带线6出口料盘检测,ExitTray_Check3,11,PRO_AOI_IP_3,X052
DI,0,分盘装置2定位气缸上升端,SeparateDevice_Up,12,PRO_AOI_IP_3,X053
DI,0,分盘装置2定位气缸下降端,SeparateDevice_Down,13,PRO_AOI_IP_3,X054
DI,0,分盘装置2料盘检测,SeparateDevice_Check,14,PRO_AOI_IP_3,X055
DI,0,扫码NG料气缸2后退端,ScanNGCylinder_Back,15,PRO_AOI_IP_3,X056
,,,,,,
DO,0,出料皮带线体2运行状态,DLine_RunStatus,0,PRO_AOI_IP_3,Y041
DO,0,出料皮带线体2故障状态,DLine_RunAlarm,1,PRO_AOI_IP_3,Y042
DO,0,出料皮带线4运转,DLine_Run1,2,PRO_AOI_IP_3,Y043
DO,0,出料皮带线5运转,DLine_Run2,3,PRO_AOI_IP_3,Y044
DO,0,出料皮带线6运转,DLine_Run3,4,PRO_AOI_IP_3,Y045
DO,0,分盘装置电机2驱动,SeparateDevice_Run,5,PRO_AOI_IP_3,Y046
DO,0,分盘装置2定位气缸上升SOL,SeparateDevice_Up,6,PRO_AOI_IP_3,Y047
DO,0,分盘装置2定位气缸下降SOL,SeparateDevice_Down,7,PRO_AOI_IP_3,Y048
DO,0,扫码NG料气缸2前进SOL,ScanNGCylinder_Forward,8,PRO_AOI_IP_3,Y049
DO,0,扫码NG料气缸2后退SOL,ScanNGCylinder_Back,9,PRO_AOI_IP_3,Y050
,0,,,10,PRO_AOI_IP_3,Y051
DO,0,皮带线3滚刷电机运行,DLine_Brush1,11,PRO_AOI_IP_3,Y052
DO,0,皮带线4滚刷电机运行,DLine_Brush2,12,PRO_AOI_IP_3,Y053
,0,,,13,PRO_AOI_IP_3,Y054
,0,,,14,PRO_AOI_IP_3,Y055
,0,,,15,PRO_AOI_IP_3,Y056
,,,,,,
DI,0,NG料盘推出气缸前进端,NGCylinder_Before,4,PRO_AOI_IP_1,X005
DI,0,NG料盘推出气缸后退端,NGCylinder_After,5,PRO_AOI_IP_1,X006
,,,,,,
DO,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,PRO_AOI_IP_1,Y010
DO,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,PRO_AOI_IP_1,Y011
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
...@@ -14,7 +14,7 @@ PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,53600,, ...@@ -14,7 +14,7 @@ PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,53600,,
PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,4000,, PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,4000,,
PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,4000,, PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,4000,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,500,, PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,500,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,11000,, PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,100,,
,,,,,, ,,,,,,
AXIS,0,轴二移栽上下轴,UpDown_Axis,12,HC,,3000,10000,10000,500,4000,15000,10,100,0,0 AXIS,0,轴二移栽上下轴,UpDown_Axis,12,HC,,3000,10000,10000,500,4000,15000,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,10,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,10,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
...@@ -24,4 +24,4 @@ PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,1500,, ...@@ -24,4 +24,4 @@ PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,1500,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1500,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1500,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,
,,,,,,
\ No newline at end of file \ No newline at end of file
,,,,,,
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
...@@ -24,4 +24,4 @@ PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,1500,, ...@@ -24,4 +24,4 @@ PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,1500,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1500,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1500,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,
,,,,,,
\ No newline at end of file \ No newline at end of file
,,,,,,
source/DeviceLibrary/LineConfig/Config_FeedingEquip_5.csv
...@@ -25,4 +25,4 @@ PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1500,, ...@@ -25,4 +25,4 @@ PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1500,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,
,,,,,, ,,,,,,
,,,,,,
\ No newline at end of file \ No newline at end of file
,,,,,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_09.csv
...@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,, ...@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
,,,,,, ,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,7,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0 AXIS,0,移栽上下轴,UpDown_Axis,7,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=9718;16=9519;24=110000;32=98000;44=76000;48=73700;56=61000;8=8638,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=9162;16=8943;24=110000;32=98000;44=76000;48=73700;56=61000;8=9856,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=9944;16=9803;24=138200;32=116800;44=92500;48=90000;56=95000;8=8252,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=9325;16=9175;24=138200;32=116800;44=92500;48=90000;56=95000;8=10110,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=8638;7X16=9519;7X12=9718,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=9856;7X16=8943;7X12=9162,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_10.csv
...@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,, ...@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
,,,,,, ,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,8,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0 AXIS,0,移栽上下轴,UpDown_Axis,8,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=9778;16=9502;24=110000;32=98000;44=76000;48=73700;56=61000;8=10408,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=8883;16=8848;24=110000;32=98000;44=76000;48=73700;56=61000;8=9938,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=10113;16=9792;24=138200;32=116800;44=92500;48=90000;56=95000;8=10800,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=9513;16=9150;24=138200;32=116800;44=92500;48=90000;56=95000;8=10153,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=10408;7X12=9778;7X16=9502,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=9938;7X12=8883;7X16=8848,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_15.csv
...@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,, ...@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
,,,,,, ,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,18,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0 AXIS,0,移栽上下轴,UpDown_Axis,18,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=141200;16=8029;24=110000;32=5427;44=4435;48=73700;56=3201;8=150000,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=9078;16=8104;24=7426;32=6564;44=5480;48=73700;56=3630;8=150000,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=157500;16=7916;24=138200;32=6124;44=5345;48=90000;56=4191;8=160000,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=10281;16=9431;24=8746;32=7967;44=6836;48=90000;56=5259;8=160000,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3201;15X44=4517,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3630;15X44=4992;15X32=5797;13X44=5480;13X32=6564;13X24=7426;13X16=8104;13X12=8244;11X12=9078,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_23.csv
...@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,, ...@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
,,,,,, ,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,2,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0 AXIS,0,移栽上下轴,UpDown_Axis,2,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=141200;16=392;24=110000;32=107;44=4578;48=73700;56=3239;8=150000,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=8652;16=7327;24=6642;32=5383;44=4736;48=73700;56=2931;8=150000,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=157500;16=570;24=138200;32=408;44=6806;48=90000;56=5839;8=160000,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=10635;16=9672;24=8644;32=8215;44=6839;48=90000;56=5374;8=160000,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,13X16=392;15X32=107;15X44=4578;15X56=3239,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,13X16=7327;15X32=5184;15X44=4124;15X56=2931;13X44=4736;13X32=5517;13X24=6642;13X12=7281;11X12=8652,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_24.csv
...@@ -4,10 +4,10 @@ PRO,0,是否存放的大料盘,IsBigTray,1 ...@@ -4,10 +4,10 @@ PRO,0,是否存放的大料盘,IsBigTray,1
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
,,,,,, ,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0 AXIS,0,移栽上下轴,UpDown_Axis,1,HC,,3000,4000,4000,1000,5000,20000,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-500,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=927;12=141200;16=605;24=110000;32=313;44=119;48=73700;56=61000;8=150000,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=927;12=8494;16=7941;24=7941;32=6347;44=5347;48=73700;56=3342;8=150000,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=1193;12=157500;16=774;24=138200;32=590;44=434;48=90000;56=95000;8=160000,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=1193;12=10732;16=10382;24=10488;32=8650;44=7402;48=90000;56=5679;8=160000,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=927;13X8=927;13X12=605;13X16=605;15X32=313;15X44=119,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=927;13X8=927;13X12=8494;13X16=7941;15X32=5509;15X44=4483;11X12=8850;15X56=3342;13X44=5342;13X32=6046;13X24=6998,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -224,6 +224,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -224,6 +224,19 @@ namespace OnlineStore.DeviceLibrary
LogInfo("从调试状态切换到正常状态！"); LogInfo("从调试状态切换到正常状态！");
} }
} }
else
{
if (isDebug)
{
IsDebug = true;
LogInfo("从正常状态切换到调试状态！");
}
else
{
IsDebug = false;
LogInfo("从调试状态切换到正常状态！");
}
}
} }
...@@ -618,7 +631,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -618,7 +631,14 @@ namespace OnlineStore.DeviceLibrary
{ {
if (runStatus.Equals(LineRunStatus.Wait)) if (runStatus.Equals(LineRunStatus.Wait))
{ {
return Color.White; if (IsDebug)
{
return Color.LightGray;
}
else
{
return Color.White;
}
} }
else if (alarmType.Equals(LineAlarmType.IoSingleTimeOut)) else if (alarmType.Equals(LineAlarmType.IoSingleTimeOut))
{ {
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
...@@ -371,9 +371,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -371,9 +371,7 @@ namespace OnlineStore.DeviceLibrary
//如果再出库中直接出库 //如果再出库中直接出库
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.Runing; runStatus = LineRunStatus.Runing;
// MoveInfo.NextMoveStep(LineMoveStep.FO_39_OutLineRun); OutLog("准备出库料架完成");
OutLog("准备出库料架完成");
// FO_11_AxisDownMove();
} }
else else
{ {
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -157,7 +157,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -157,7 +157,7 @@ namespace OnlineStore.DeviceLibrary
{ {
return "启动失败：设备未初始化完成"; return "启动失败：设备未初始化完成";
} }
if (HCBoardManager.CardInitOk()) if (!HCBoardManager.CardInitOk())
{ {
return "启动失败：板卡未初始化完成"; return "启动失败：板卡未初始化完成";
} }
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
...@@ -17,6 +17,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -17,6 +17,9 @@ namespace OnlineStore.DeviceLibrary
public static bool DisLeftOutLine = false ; public static bool DisLeftOutLine = false ;
public static bool DisRightOutLine = false ; public static bool DisRightOutLine = false ;
public static bool DisSLEquip = false;
public static bool DisAllHy = false;
public static bool DisAllMove = false;
public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
private static bool isInit = false; private static bool isInit = false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!