Skip to content

李娜 / AutoCountMachine

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

贴标增加配置。调试bug修改。

1 个父辈 081d831e
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 40 行增加 和 30 行删除
RC1266-AutoCountMachine/source/AutoCountClient/App.config
...@@ -45,6 +45,8 @@ ...@@ -45,6 +45,8 @@
<add key ="LabelName" value ="test2"/> <add key ="LabelName" value ="test2"/>
<!--打印机名称--> <!--打印机名称-->
<add key ="PrinterName" value ="ZDesigner GT800-300dpi EPL"/> <add key ="PrinterName" value ="ZDesigner GT800-300dpi EPL"/>
<!--是否启用打印标签-->
<add key ="NeedPrintLabel" value ="0"/>
</appSettings> </appSettings>
<log4net> <log4net>
......
RC1266-AutoCountMachine/source/Common/Setting_Init.cs
...@@ -78,5 +78,6 @@ namespace OnlineStore.Common ...@@ -78,5 +78,6 @@ namespace OnlineStore.Common
public static string LabelName = "LabelName"; public static string LabelName = "LabelName";
public static string PrinterName = "PrinterName"; public static string PrinterName = "PrinterName";
public static string NeedPrintLabel = "NeedPrintLabel";
} }
} }
RC1266-AutoCountMachine/source/DeviceLibrary/RobotConfig/Config_OutputEquip.csv
...@@ -16,14 +16,14 @@ PRO,0,出料提升轴P3速度,BatchAxis_P3Speed,1500,,,,, ...@@ -16,14 +16,14 @@ PRO,0,出料提升轴P3速度,BatchAxis_P3Speed,1500,,,,,
PRO,0,出料提升轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,10446,,,,, PRO,0,出料提升轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,10446,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,0,取料X轴待机点-P1,MoveX_P1,2001,,,,, PRO,0,取料X轴待机点-P1,MoveX_P1,2001,,,,,
PRO,0,取料X轴-取料点-P2集合,MoveX_P2List,0=150000;8=150000;12=150000;16=150000;24=150000;32=140000;44=120000;56=100000;13=4710;15=1350;11=10120;7=15900,,,,, PRO,0,取料X轴-取料点-P2集合,MoveX_P2List,0=15900;8=150000;12=150000;16=150000;24=150000;32=140000;44=120000;56=100000;13=4710;15=1350;11=10120;7=15900,,,,,
PRO,0,取料X轴-放料点-P3,MoveX_P3,77100,,,,, PRO,0,取料X轴-放料点-P3,MoveX_P3,77100,,,,,
PRO,0,取料X轴P1速度,MoveX_P1Speed,500,,,,, PRO,0,取料X轴P1速度,MoveX_P1Speed,500,,,,,
PRO,0,取料X轴P2速度,MoveX_P2Speed,500,,,,, PRO,0,取料X轴P2速度,MoveX_P2Speed,500,,,,,
PRO,0,取料X轴P3速度,MoveX_P3Speed,500,,,,, PRO,0,取料X轴P3速度,MoveX_P3Speed,500,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,0,取料Z轴待机点-P1,MoveZ_P1,2000,,,,, PRO,0,取料Z轴待机点-P1,MoveZ_P1,2000,,,,,
PRO,0,取料Z轴-取料点-P2集合,MoveZ_P2List,0=120000;8=448700;12=443900;16=440000;24=429900;32=420100;44=409000;56=398620,,,,, PRO,0,取料Z轴-取料点-P2集合,MoveZ_P2List,0=448700;8=448700;12=443900;16=440000;24=429900;32=420100;44=409000;56=398620,,,,,
PRO,0,取料Z轴-放料点-P3集合,MoveZ_P3List,0=108750;8=109700;12=100000;16=99000;24=93000;32=89000;44=74000;56=63500,,,,, PRO,0,取料Z轴-放料点-P3集合,MoveZ_P3List,0=108750;8=109700;12=100000;16=99000;24=93000;32=89000;44=74000;56=63500,,,,,
PRO,0,取料Z轴P1速度,MoveZ_P1Speed,1000,,,,, PRO,0,取料Z轴P1速度,MoveZ_P1Speed,1000,,,,,
PRO,0,取料Z轴P2速度,MoveZ_P2Speed,1000,,,,, PRO,0,取料Z轴P2速度,MoveZ_P2Speed,1000,,,,,
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip.cs
...@@ -37,9 +37,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -37,9 +37,10 @@ namespace OnlineStore.DeviceLibrary
this.DeviceID = config.Id; this.DeviceID = config.Id;
this.Config = config; this.Config = config;
IsDebug = config.IsDebug.Equals(1); IsDebug = config.IsDebug.Equals(1);
baseConfig = config;
Name = (" " + "出料模块" + " ").ToUpper(); Name = (" " + "出料模块" + " ").ToUpper();
Init(); Init();
ledProcessTimer.Elapsed += LedProcess;
IoCheckTimer.Elapsed += IoCheckTimerProcess;
MoveInfo = new RobotMoveInfo(" 取放料 "); MoveInfo = new RobotMoveInfo(" 取放料 ");
SecMoveInfo = new RobotMoveInfo( " 贴标 "); SecMoveInfo = new RobotMoveInfo( " 贴标 ");
ShelfMoveInfo = new RobotMoveInfo(" ShelfMove "); ShelfMoveInfo = new RobotMoveInfo(" ShelfMove ");
...@@ -380,14 +381,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -380,14 +381,16 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
if (MoveInfo.MoveType.Equals(RobotMoveType.Working))
{
WorkingProcess();
}
if (SecMoveInfo.MoveType.Equals(RobotMoveType.Labelling)) if (SecMoveInfo.MoveType.Equals(RobotMoveType.Labelling))
{ {
LabellingProcess(); LabellingProcess();
} }
if (MoveInfo.MoveType.Equals(RobotMoveType.Working))
{
WorkingProcess();
}
if (ShelfMoveInfo.MoveType.Equals(RobotMoveType.ShelfPro)) if (ShelfMoveInfo.MoveType.Equals(RobotMoveType.ShelfPro))
{ {
ShelfMoveProcess(); ShelfMoveProcess();
...@@ -422,7 +425,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -422,7 +425,8 @@ namespace OnlineStore.DeviceLibrary
if (NoErrorAlarm() && IOValue(IO_Type.Out_TrayCheck).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.X_OLine_Run).Equals(IO_VALUE.LOW)) if (NoErrorAlarm() && IOValue(IO_Type.Out_TrayCheck).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.X_OLine_Run).Equals(IO_VALUE.LOW))
{ {
//料串准备好才能取料 //料串准备好才能取料
if (OutReelCount >= 0 && SecMoveInfo.MoveType.Equals(RobotMoveType.None)) if (OutReelCount >= 0)
//if (OutReelCount >= 0 && SecMoveInfo.MoveType.Equals(RobotMoveType.None))
{ {
StartWorking(new WorkParam()); StartWorking(new WorkParam());
} }
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/RobotBean.cs
...@@ -174,7 +174,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -174,7 +174,7 @@ namespace OnlineStore.DeviceLibrary
//重置通用处理 //重置通用处理
mainTimer.Interval = 1000; mainTimer.Interval = 1000;
maxSeconds = 10; // maxSeconds = 10;
alarmType = AlarmType.None; alarmType = AlarmType.None;
mainTimer.Enabled = false; mainTimer.Enabled = false;
isInSuddenDown = false; isInSuddenDown = false;
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip.cs
...@@ -27,6 +27,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -27,6 +27,8 @@ namespace OnlineStore.DeviceLibrary
Name = (" " + "XRay" + " ").ToUpper(); Name = (" " + "XRay" + " ").ToUpper();
Init(); Init();
ledProcessTimer.Elapsed += LedProcess;
IoCheckTimer.Elapsed += IoCheckTimerProcess;
MoveInfo = new RobotMoveInfo(Name); MoveInfo = new RobotMoveInfo(Name);
SecMoveInfo = new RobotMoveInfo( Name.Trim() + "-SMove"); SecMoveInfo = new RobotMoveInfo( Name.Trim() + "-SMove");
} }
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs
...@@ -49,7 +49,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -49,7 +49,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.MoveParam.SetReelInfo(Work_ReelInfo); MoveInfo.MoveParam.SetReelInfo(Work_ReelInfo);
MoveInfo.NextMoveStep(StepEnum.XW06_WaitTime); MoveInfo.NextMoveStep(StepEnum.XW06_WaitTime);
WorkLog("扫描区有料["+Work_ReelInfo.ToStr()+"]，还未进行点料，开始处理"); WorkLog("扫描区有料["+Work_ReelInfo.ToStr()+"]，还未进行点料，开始处理");
IOMove(IO_Type.X_InLine_Run, IO_VALUE.HIGH); //IOMove(IO_Type.X_InLine_Run, IO_VALUE.HIGH);
IOMove(IO_Type.X_MLine_Run, IO_VALUE.HIGH); IOMove(IO_Type.X_MLine_Run, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.X_ReelCheck, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.X_ReelCheck, IO_VALUE.HIGH));
......
RC1266-AutoCountMachine/source/DeviceLibrary/model/MoveStep.cs
...@@ -536,10 +536,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -536,10 +536,10 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
OT03_MoveXToP2, OT03_MoveXToP2,
/// <summary> ///// <summary>
/// 取料: 判断是否需要拍照， ///// 取料: 判断是否需要拍照，
/// </summary> ///// </summary>
OT04_CheckNeedImage, //OT04_CheckNeedImage,
/// <summary> /// <summary>
/// 取料: 拍照并开始识别 /// 取料: 拍照并开始识别
...@@ -587,7 +587,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -587,7 +587,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 取料: 取料X轴回到P1 /// 取料: 取料X轴回到P1
/// </summary> /// </summary>
OT16_MoveXToP1, OT16_MoveXToP2,
/// <summary> /// <summary>
/// 取料: NG料，取料X轴到P1 /// 取料: NG料，取料X轴到P1
...@@ -642,21 +642,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -642,21 +642,21 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 贴标: 贴标气缸后退，吸盘停止输出，贴标Z轴到待机点P1 /// 贴标: 贴标气缸后退，吸盘停止输出，贴标Z轴到待机点P1,取码气缸前进
/// </summary> /// </summary>
OL01_Paste_Back = 3601, OL01_Paste_Back = 3601,
/// <summary> ///// <summary>
/// 贴标: 取码气缸前进，贴标XYR都到待机点P2 ///// 贴标: 取码气缸前进，贴标XYR都到待机点P2
/// </summary> ///// </summary>
OL02_TakeForward, //OL02_TakeForward,
/// <summary> /// <summary>
/// 贴标: 打印标签， /// 贴标: 打印标签，
/// </summary> /// </summary>
OL03_PrintLabel, OL03_PrintLabel,
/// <summary> ///// <summary>
/// 贴标: 等待 贴标机打码OK信号 ///// 贴标: 等待 贴标机打码OK信号
/// </summary> ///// </summary>
OL04_PrintOk, //OL04_PrintOk,
/// <summary> /// <summary>
/// 贴标: 取码气缸后退 /// 贴标: 取码气缸后退
/// </summary> /// </summary>
...@@ -673,10 +673,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -673,10 +673,10 @@ namespace OnlineStore.DeviceLibrary
/// 贴标: 标签吸盘取码 /// 贴标: 标签吸盘取码
/// </summary> /// </summary>
OL08_Nozzle_Work, OL08_Nozzle_Work,
/// <summary> ///// <summary>
/// 贴标: 等待吸盘信号到位 ///// 贴标: 等待吸盘信号到位
/// </summary> ///// </summary>
OL09_WaitGetLabel, //OL09_WaitGetLabel,
/// <summary> /// <summary>
/// 贴标: Z轴到P1点 /// 贴标: Z轴到P1点
/// </summary> /// </summary>
...@@ -717,8 +717,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -717,8 +717,9 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 贴标: XYR返回待机点P1 /// 贴标: XYR返回待机点P1
/// </summary> /// </summary>
OL19_XYRBackToP1, OL19_XYRBackToP2,
#endregion #endregion
#region 出料模块料串处理 3701 开始 #region 出料模块料串处理 3701 开始
/// <summary> /// <summary>
/// 出料料串：升降盘不在后退端，提升伺服到P2 /// 出料料串：升降盘不在后退端，提升伺服到P2
......
RC1266-AutoCountMachine/source/DeviceLibrary/model/RobotBase.cs
...@@ -230,7 +230,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -230,7 +230,7 @@ namespace OnlineStore.DeviceLibrary
ledProcessTimer.Enabled = false; ledProcessTimer.Enabled = false;
IoCheckTimer = new System.Timers.Timer(); IoCheckTimer = new System.Timers.Timer();
IoCheckTimer.Interval = 200; IoCheckTimer.Interval = 300;
// IoCheckTimer.Elapsed += IoCheckTimerProcess; // IoCheckTimer.Elapsed += IoCheckTimerProcess;
IoCheckTimer.AutoReset = true; IoCheckTimer.AutoReset = true;
IoCheckTimer.Enabled = false; IoCheckTimer.Enabled = false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!