Skip to content

刘韬 / SO20031_TinStorage

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ec715035 由 刘韬
选项

1

1 个父辈 b0ebb49a
内嵌 并排
正在显示 6 个修改的文件 包含 46 行增加 和 28 行删除
DeviceLibrary/theMachine/MainMachine_Labeling.cs
......@@ -145,7 +145,7 @@ namespace DeviceLibrary
{
LabelingMoveInfo.log("在线程中检测到打印完成");
Task.Delay(2000).Wait();
CylinderMove(null, IO_Type.Label_Dock_Back, IO_Type.Label_Dock_Front, IO_VALUE.LOW);
//CylinderMove(null, IO_Type.Label_Dock_Back, IO_Type.Label_Dock_Front, IO_VALUE.LOW);
IOMove(IO_Type.Label_TakeBlow, IO_VALUE.HIGH, false, 1000);
break;
}
......@@ -261,30 +261,37 @@ namespace DeviceLibrary
break;
case MoveStep.Labeling12:
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling13);
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Back, IO_Type.Label_Dock_Front, IO_VALUE.LOW);
LabelingMoveInfo.log("开始贴标流程");
if (Setting_Init.Module_No.Val == Module_SO.SO20031)
{
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Back, IO_Type.Label_Dock_Front, IO_VALUE.LOW);
LabelingMoveInfo.log("开始贴标流程");
}
break;
case MoveStep.Labeling13:
if (CameraPointTest.TestHasLabelOnDock(true))
{
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling14);
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Down, IO_Type.Label_Dock_Up, IO_VALUE.HIGH);
LabelingMoveInfo.log("接标台上升");
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling14);
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Back, IO_Type.Label_Dock_Front, IO_VALUE.LOW);
LabelingMoveInfo.log("接标台后退");
}
else if(LabelingMoveInfo.IsTimeOut(2)) {
Msg.add(crc.GetString("Res0173.8a024375","没有检测到打印出的标签"), MsgLevel.alarm, ErrInfo.LabelInPaste);
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling10);
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Down, IO_Type.Label_Dock_Up, IO_VALUE.LOW);
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Back, IO_Type.Label_Dock_Front, IO_VALUE.HIGH);
CylinderMove(LabelingMoveInfo, IO_Type.Labeling_Left, IO_Type.Labeling_Right, IO_VALUE.HIGH);
//LabelingMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
//LabelingMoveInfo.MoveParam.IsNg = true;
//Setting_Init.Runtime_Posid = "NG";
//LabelingMoveInfo.MoveParam.NgMsg = crc.GetString("Res0173.8a024375","没有检测到打印出的标签");
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling13_1);
RobotManage.UserPause(crc.GetString("Res0173.8a024375","没有检测到打印出的标签"));
}
break;
case MoveStep.Labeling13_1:
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling10);
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Down, IO_Type.Label_Dock_Up, IO_VALUE.LOW);
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Back, IO_Type.Label_Dock_Front, IO_VALUE.HIGH);
CylinderMove(LabelingMoveInfo, IO_Type.Labeling_Left, IO_Type.Labeling_Right, IO_VALUE.HIGH);
break;
case MoveStep.Labeling14:
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling14_1);
CylinderMove(LabelingMoveInfo, IO_Type.Label_Dock_Down, IO_Type.Label_Dock_Up, IO_VALUE.HIGH);
LabelingMoveInfo.log("接标台上升");
break;
case MoveStep.Labeling14_1:
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling15);
IOMove(IO_Type.Label_Vacuum, IO_VALUE.HIGH);
if (Setting_Init.Module_No.Val==Module_SO.SO20031)
......
DeviceLibrary/theMachine/MainMachine_RFIDSelftest.cs
......@@ -149,7 +149,7 @@ namespace DeviceLibrary
}
}
if (!issame) {
if (RobotManage.RFID2.ReadEPC(16, out data))
if (RobotManage.RFID2!=null && RobotManage.RFID2.ReadEPC(16, out data))
{
if (data[0] != 0xFF)
{
......
DeviceLibrary/theMachine/MainMachine_Store.cs
......@@ -246,7 +246,7 @@ namespace DeviceLibrary
StoreMoveInfo.MoveParam.RFID = StoreMoveInfo.MoveParam.RFID.Substring(0, 16);
bool writeok = false;
var r=RobotManage.RFID.ReOpen();
var r1=RobotManage.RFID2.ReOpen();
var r1=RobotManage.RFID2?.ReOpen();
StoreMoveInfo.log("连接rfid:" + r+ "rfid2:" + r1);
for (int i = 0; i < 15; i++)
{
......@@ -274,7 +274,7 @@ namespace DeviceLibrary
}
}
}
if (!writeok) {
if (!writeok && RobotManage.RFID2!=null) {
RobotManage.RFID2.WriteByte(550, new byte[] { 0x40, 0x00 });
Thread.Sleep(300);
RobotManage.RFID2.WriteEPC(Encoding.ASCII.GetBytes(epc));
......@@ -503,7 +503,7 @@ namespace DeviceLibrary
}
}
}
if (!issame)
if (!issame && RobotManage.RFID2!=null)
{
if (RobotManage.RFID2.ReadEPC(16, out data))
{
......
DeviceLibrary/theMachine/MoveStep.cs
......@@ -126,7 +126,9 @@ namespace DeviceLibrary
Labeling11,
Labeling12,
Labeling13,
Labeling13_1,
Labeling14,
Labeling14_1,
Labeling15,
Labeling16,
Labeling50,
......
DeviceLibrary/theMachine/RobotManage.cs
......@@ -183,14 +183,22 @@ namespace DeviceLibrary
LogUtil.info("RFID连接成功,IP:"+ Setting_Init.Device_RFID_IP);
RFID2.IP = Setting_Init.Device_RFID_IP2;
RFID2.Open(Setting_Init.Device_RFID_IP2);
if (!RFID2.IsConn)
if (string.IsNullOrWhiteSpace(RFID2.IP))
{
IsLoadOk = false;
msg += crc.GetString("Res0142","RFID2连接失败,IP:") + $"{Setting_Init.Device_RFID_IP2}\n";
LogUtil.info("RFID2未配置");
RFID2 = null;
}
else
LogUtil.info("RFID2连接成功,IP:"+ Setting_Init.Device_RFID_IP2);
{
RFID2.Open(Setting_Init.Device_RFID_IP2);
if (!RFID2.IsConn)
{
IsLoadOk = false;
msg += crc.GetString("Res0142", "RFID2连接失败,IP:") + $"{Setting_Init.Device_RFID_IP2}\n";
}
else
LogUtil.info("RFID2连接成功,IP:" + Setting_Init.Device_RFID_IP2);
}
//RFID.AntennaPower = 4;
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
......
TheMachine/IOControls.cs
......@@ -157,7 +157,7 @@ namespace TheMachine
private void button9_Click(object sender, EventArgs e)
{
var r= RobotManage.RFID.ReOpen();
RobotManage.RFID2.ReOpen();
RobotManage.RFID2?.ReOpen();
LogUtil.info("RFID.ReOpen:" + r);
for (int i = 0; i < 6;i++) {
Thread.Sleep(200);
......@@ -168,7 +168,7 @@ namespace TheMachine
return;
}
}
if (RobotManage.RFID2.ReadEPC(16, out data))
if (RobotManage.RFID2!=null && RobotManage.RFID2.ReadEPC(16, out data))
{
if (data[0] != 0xFF)
{
......@@ -185,14 +185,15 @@ namespace TheMachine
var epc = InputBox("Write EPC, maximum 16 words.", "Please enter EPC data, maximum 16 words.", "");
var r = RobotManage.RFID.ReOpen();
RobotManage.RFID2.ReOpen();
RobotManage.RFID2?.ReOpen();
LogUtil.info("RFID.ReOpen:" + r+",epc="+ epc);
epc = epc.PadRight(16);
RobotManage.RFID.WriteByte(550, new byte[] { 0x40, 0x00 });
Thread.Sleep(300);
var result = RobotManage.RFID.WriteEPC(Encoding.ASCII.GetBytes(epc));
result = RobotManage.RFID2.WriteEPC(Encoding.ASCII.GetBytes(epc));
if (result)
var result2 = RobotManage.RFID2?.WriteEPC(Encoding.ASCII.GetBytes(epc));
if (result || result2.GetValueOrDefault())
{
MessageBox.Show(crc.GetString("Res0144","写入成功"));
return;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!