Skip to content

刘韬 / 1053_CycleLine

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

1

1 个父辈 972f6287
全部展开
内嵌 并排
正在显示 18 个修改的文件 包含 90 行增加 和 258 行删除
DeviceLibrary/DeviceLibrary.csproj
...@@ -135,7 +135,6 @@ ...@@ -135,7 +135,6 @@
<Compile Include="DeviceLibrary\IOManager.cs" /> <Compile Include="DeviceLibrary\IOManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="theMachine\sub\IDevice.cs" /> <Compile Include="theMachine\sub\IDevice.cs" />
<Compile Include="theMachine\sub\CI.cs" />
<Compile Include="theMachine\sub\MI.cs" /> <Compile Include="theMachine\sub\MI.cs" />
<Compile Include="theMachine\sub\TrayStop.cs" /> <Compile Include="theMachine\sub\TrayStop.cs" />
<Compile Include="theMachine\sub\TransplantMove.cs" /> <Compile Include="theMachine\sub\TransplantMove.cs" />
......
DeviceLibrary/DeviceLibrary/CylinderManger.cs
using OnlineStore.Common; using ConfigHelper;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -15,14 +16,21 @@ namespace DeviceLibrary ...@@ -15,14 +16,21 @@ namespace DeviceLibrary
string DeviceGroup; string DeviceGroup;
string Name; string Name;
IO_VALUE currentIOvalue = IO_VALUE.None; IO_VALUE currentIOvalue = IO_VALUE.None;
bool disable =false;
public CylinderManger(string name,string devicegroup,string high,string low) { public CylinderManger(string name,string devicegroup,string high,string low) {
High = high; High = high;
Low = low; Low = low;
Name = name; Name = name;
DeviceGroup = devicegroup; DeviceGroup = devicegroup;
SafetyDevice.AddDevice(this); SafetyDevice.AddDevice(this);
if (!RobotManage.Config.DOList[devicegroup].ContainsKey(high))
{
disable=true;
LogUtil.info($"{Name},没有找到 {devicegroup} 的IO {high} 已禁止");
}
} }
public void ToHigh(MoveInfo moveInfo) { public void ToHigh(MoveInfo moveInfo) {
if (disable) return;
currentIOvalue = IO_VALUE.HIGH; currentIOvalue = IO_VALUE.HIGH;
if (moveInfo != null) if (moveInfo != null)
{ {
...@@ -37,6 +45,7 @@ namespace DeviceLibrary ...@@ -37,6 +45,7 @@ namespace DeviceLibrary
} }
public void ToLow(MoveInfo moveInfo) public void ToLow(MoveInfo moveInfo)
{ {
if (disable) return;
currentIOvalue = IO_VALUE.LOW; currentIOvalue = IO_VALUE.LOW;
if (moveInfo != null) if (moveInfo != null)
{ {
...@@ -52,6 +61,7 @@ namespace DeviceLibrary ...@@ -52,6 +61,7 @@ namespace DeviceLibrary
public void Pause() public void Pause()
{ {
if (disable) return;
LogUtil.info($"{Name},停止运行"); LogUtil.info($"{Name},停止运行");
if (currentIOvalue == IO_VALUE.None) { if (currentIOvalue == IO_VALUE.None) {
LogUtil.info($"{Name},没有在运行"); LogUtil.info($"{Name},没有在运行");
...@@ -73,6 +83,7 @@ namespace DeviceLibrary ...@@ -73,6 +83,7 @@ namespace DeviceLibrary
public void Resume(bool islog=true) public void Resume(bool islog=true)
{ {
if (disable) return;
if (currentIOvalue == IO_VALUE.None) if (currentIOvalue == IO_VALUE.None)
return; return;
IOManager.IOMove(Low, currentIOvalue == IO_VALUE.LOW ? IO_VALUE.HIGH : IO_VALUE.LOW, DeviceGroup); IOManager.IOMove(Low, currentIOvalue == IO_VALUE.LOW ? IO_VALUE.HIGH : IO_VALUE.LOW, DeviceGroup);
......
DeviceLibrary/theMachine/DeviceBase.cs
...@@ -49,7 +49,7 @@ namespace DeviceLibrary ...@@ -49,7 +49,7 @@ namespace DeviceLibrary
public static bool FwdFree(int curaddr) { public static bool FwdFree(int curaddr) {
int nextaddr = curaddr + 1; int nextaddr = curaddr + 1;
if (nextaddr > 20) if (nextaddr > 21)
nextaddr = 0; nextaddr = 0;
if (!DeviceListByAddr.ContainsKey(nextaddr)) if (!DeviceListByAddr.ContainsKey(nextaddr))
......
DeviceLibrary/theMachine/MainMachine.cs
...@@ -60,7 +60,6 @@ namespace DeviceLibrary ...@@ -60,7 +60,6 @@ namespace DeviceLibrary
TrayManager.Init(DeviceGroup); TrayManager.Init(DeviceGroup);
MI.Init(Config, DeviceGroup, out m); MI.Init(Config, DeviceGroup, out m);
CI.Init(Config, DeviceGroup, out m);
msg += m; msg += m;
#region 初始化led灯 #region 初始化led灯
RunningLed = new Led(Config.DOList["root"][IO_Type.Run_Led].GetIOAddr(), LedColor.green); RunningLed = new Led(Config.DOList["root"][IO_Type.Run_Led].GetIOAddr(), LedColor.green);
...@@ -164,7 +163,6 @@ namespace DeviceLibrary ...@@ -164,7 +163,6 @@ namespace DeviceLibrary
TransplantMove.DeviceList.Values.ToList().ForEach(s => s.Stop()); TransplantMove.DeviceList.Values.ToList().ForEach(s => s.Stop());
TrayStop.DeviceList.Values.ToList().ForEach(s => s.Stop()); TrayStop.DeviceList.Values.ToList().ForEach(s => s.Stop());
MI.DeviceList.Values.ToList().ForEach(s => s.Stop()); MI.DeviceList.Values.ToList().ForEach(s => s.Stop());
CI.DeviceList.Values.ToList().ForEach(s => s.Stop());
IOMove(IO_Type.Line_Run, IO_VALUE.LOW); IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
ResetEvent.Set(); ResetEvent.Set();
Alarm(AlarmType.None); Alarm(AlarmType.None);
...@@ -185,7 +183,6 @@ namespace DeviceLibrary ...@@ -185,7 +183,6 @@ namespace DeviceLibrary
TransplantMove.DeviceList.Values.ToList().ForEach(s => s.Start()); TransplantMove.DeviceList.Values.ToList().ForEach(s => s.Start());
TrayStop.DeviceList.Values.ToList().ForEach(s => s.Start()); TrayStop.DeviceList.Values.ToList().ForEach(s => s.Start());
MI.DeviceList.Values.ToList().ForEach(s => s.Start()); MI.DeviceList.Values.ToList().ForEach(s => s.Start());
CI.DeviceList.Values.ToList().ForEach(s => s.Start());
} }
......
DeviceLibrary/theMachine/RobotManage.cs
...@@ -34,13 +34,13 @@ namespace DeviceLibrary ...@@ -34,13 +34,13 @@ namespace DeviceLibrary
public static Dictionary<string, RobotPosition> MI1Postion; public static Dictionary<string, RobotPosition> MI1Postion;
public static Dictionary<string, RobotPosition> MI2Postion; public static Dictionary<string, RobotPosition> MI2Postion;
public static Dictionary<string, RobotPosition> CIPostion; //public static Dictionary<string, RobotPosition> CIPostion;
public static URRobotControl Robot_MI1; public static URRobotControl Robot_MI1;
public static URRobotControl Robot_MI2; public static URRobotControl Robot_MI2;
public static URRobotControl Robot_CI; //public static URRobotControl Robot_CI;
public static VStoreCollection VStoreCollection; public static VStoreCollection VStoreCollection;
public static ShareFolderWatcher folderWatcher; //public static ShareFolderWatcher folderWatcher;
public static void Init() { public static void Init() {
string msg = ""; string msg = "";
try try
...@@ -61,20 +61,18 @@ namespace DeviceLibrary ...@@ -61,20 +61,18 @@ namespace DeviceLibrary
msg += crc.GetString("Res0180", "找不到库位配置文件") + "\n"; msg += crc.GetString("Res0180", "找不到库位配置文件") + "\n";
} }
folderWatcher = new ShareFolderWatcher(Setting_Init.Device_VJCounterFolder); //folderWatcher = new ShareFolderWatcher(Setting_Init.Device_VJCounterFolder);
if (!folderWatcher.Start(out string errmsg)) //if (!folderWatcher.Start(out string errmsg))
{ //{
IsLoadOk = false; // IsLoadOk = false;
msg += errmsg + "\n"; // msg += errmsg + "\n";
LogUtil.error("ShareFolderWatcher:"+errmsg); // LogUtil.error("ShareFolderWatcher:"+errmsg);
} //}
string MI1PostionFile = "config\\MI1Postion.csv"; string MI1PostionFile = "config\\MI1Postion.csv";
string MI2PostionFile = "config\\MI2Postion.csv"; string MI2PostionFile = "config\\MI2Postion.csv";
string CIPostionFile = "config\\CIPostion.csv";
MI1Postion = CSVPositionReader<RobotPosition>.LoadCSVFile(MI1PostionFile); MI1Postion = CSVPositionReader<RobotPosition>.LoadCSVFile(MI1PostionFile);
MI2Postion = CSVPositionReader<RobotPosition>.LoadCSVFile(MI2PostionFile); MI2Postion = CSVPositionReader<RobotPosition>.LoadCSVFile(MI2PostionFile);
CIPostion = CSVPositionReader<RobotPosition>.LoadCSVFile(CIPostionFile);
Robot_MI1 = new URRobotControl(Setting_Init.URRobot_MI1_IP, "Robot-R1", Setting_Init.URRobot_MI1_ListenPort); Robot_MI1 = new URRobotControl(Setting_Init.URRobot_MI1_IP, "Robot-R1", Setting_Init.URRobot_MI1_ListenPort);
Robot_MI1.Name = "R1"; Robot_MI1.Name = "R1";
...@@ -82,8 +80,6 @@ namespace DeviceLibrary ...@@ -82,8 +80,6 @@ namespace DeviceLibrary
Robot_MI2 = new URRobotControl(Setting_Init.URRobot_MI2_IP, "Robot-R2", Setting_Init.URRobot_MI2_ListenPort); Robot_MI2 = new URRobotControl(Setting_Init.URRobot_MI2_IP, "Robot-R2", Setting_Init.URRobot_MI2_ListenPort);
Robot_MI2.Name = "R2"; Robot_MI2.Name = "R2";
Robot_MI2.SetSpeedRate(Setting_Init.URRobot_MI2_Speed_Rate); Robot_MI2.SetSpeedRate(Setting_Init.URRobot_MI2_Speed_Rate);
Robot_CI = new URRobotControl(Setting_Init.URRobot_CI_IP, "Robot-CI", Setting_Init.URRobot_CI_ListenPort);
Robot_CI.SetSpeedRate(Setting_Init.URRobot_CI_Speed_Rate);
VStoreCollection = new VStoreCollection(); VStoreCollection = new VStoreCollection();
...@@ -112,7 +108,6 @@ namespace DeviceLibrary ...@@ -112,7 +108,6 @@ namespace DeviceLibrary
DeviceRunControl.AddDevice("TransplantMove", TransplantMove.DeviceList.Values.ToList<IDevice>()); DeviceRunControl.AddDevice("TransplantMove", TransplantMove.DeviceList.Values.ToList<IDevice>());
//DeviceRunControl.AddDevice("TrayStop", TrayStop.DeviceList.Values.ToList<IDevice>()); //DeviceRunControl.AddDevice("TrayStop", TrayStop.DeviceList.Values.ToList<IDevice>());
DeviceRunControl.AddDevice("MI", MI.DeviceList.Values.ToList<IDevice>()); DeviceRunControl.AddDevice("MI", MI.DeviceList.Values.ToList<IDevice>());
DeviceRunControl.AddDevice("CI", CI.DeviceList.Values.ToList<IDevice>());
TrayStop.DeviceList.Values.ToList<IDevice>().ForEach(device => { DeviceRunControl.AddDevice(device.GroupName, new List<IDevice>() { device }); }); TrayStop.DeviceList.Values.ToList<IDevice>().ForEach(device => { DeviceRunControl.AddDevice(device.GroupName, new List<IDevice>() { device }); });
if (G.simulate) if (G.simulate)
...@@ -169,7 +164,6 @@ namespace DeviceLibrary ...@@ -169,7 +164,6 @@ namespace DeviceLibrary
VStoreCollection.ShutDown(); VStoreCollection.ShutDown();
Robot_MI1.StopRobot(); Robot_MI1.StopRobot();
Robot_MI2.StopRobot(); Robot_MI2.StopRobot();
Robot_CI.StopRobot();
} }
public static void UserPause(bool userpause) public static void UserPause(bool userpause)
{ {
......
DeviceLibrary/theMachine/TrayManager.cs
...@@ -160,23 +160,23 @@ namespace DeviceLibrary ...@@ -160,23 +160,23 @@ namespace DeviceLibrary
return false; return false;
var ttt = 0; var ttt = 0;
if (curaddr1 == 9) if (curaddr1 == 10)
ttt = 15; ttt = 16;
else if (curaddr1 == 4) else if (curaddr1 == 4)
ttt = 19; ttt = 20;
else if (curaddr1 == 19) else if (curaddr1 == 20)
ttt = 4; ttt = 4;
//当前托盘到需求距离 //当前托盘到需求距离
var ts = dis(a.Addr, ttt); var ts = dis(a.Addr, ttt);
return !(trayaddrs.Where(t1 => dis(a.Addr, t1) < ts).Count() > 0); return !(trayaddrs.Where(t1 => dis(a.Addr, t1) < ts).Count() > 0);
}; };
//ls3处判断,出库任务数量大于值时治具托盘全部从LS3转移走 //ls3处判断,出库任务数量大于值时治具托盘全部从LS3转移走
//ls3地址=19 //ls3地址=20
if (curaddr1 == 19 && RobotManage.mainMachine?.ServerCM.OutMaterialTaskCount > Setting_Init.Device_LS3_MTP2_OutTaskMaxCount && trayType == TrayTypeE.MTP2) if (curaddr1 == 20 && RobotManage.mainMachine?.ServerCM.OutMaterialTaskCount > Setting_Init.Device_LS3_MTP2_OutTaskMaxCount && trayType == TrayTypeE.MTP2)
{ {
return true; return true;
} }
if (curaddr1 == 19 && RobotManage.mainMachine?.ServerCM.OutReelTaskCount > Setting_Init.Device_LS3_MTP1_OutTaskMaxCount && trayType == TrayTypeE.MTP1) if (curaddr1 == 20 && RobotManage.mainMachine?.ServerCM.OutReelTaskCount > Setting_Init.Device_LS3_MTP1_OutTaskMaxCount && trayType == TrayTypeE.MTP1)
{ {
return true; return true;
} }
...@@ -189,12 +189,12 @@ namespace DeviceLibrary ...@@ -189,12 +189,12 @@ namespace DeviceLibrary
{ {
if (destaddr == -1) if (destaddr == -1)
return false; return false;
if (curaddr == 9 && (destaddr > 15 || destaddr < 9)) if (curaddr == 10 && (destaddr > 16 || destaddr < 10))
return true; return true;
if (curaddr == 4 && (destaddr > 19 || destaddr < 4)) if (curaddr == 4 && (destaddr > 20 || destaddr < 4))
return true; return true;
if (curaddr == 19 && (destaddr > 4 && destaddr < 19)) if (curaddr == 20 && (destaddr > 4 && destaddr < 20))
return true; return true;
return false; return false;
} }
...@@ -204,7 +204,7 @@ namespace DeviceLibrary ...@@ -204,7 +204,7 @@ namespace DeviceLibrary
if (d >= 0) if (d >= 0)
return d; return d;
else else
return d + 20; return d + 21;
} }
} }
public static void SetToEmpty(string rfid) public static void SetToEmpty(string rfid)
......
DeviceLibrary/theMachine/sub/MI.cs
...@@ -833,10 +833,8 @@ namespace DeviceLibrary ...@@ -833,10 +833,8 @@ namespace DeviceLibrary
if (device == "AMH-MI1") if (device == "AMH-MI1")
return RobotManage.MI1Postion[pos]; return RobotManage.MI1Postion[pos];
else if (device == "AMH-MI2") else // (device == "AMH-MI2")
return RobotManage.MI2Postion[pos]; return RobotManage.MI2Postion[pos];
else
return RobotManage.CIPostion[pos];
} }
int GetWeight(ReelParam reelParam) { int GetWeight(ReelParam reelParam) {
......
DeviceLibrary/theMachine/sub/TrayStop.cs
...@@ -245,59 +245,17 @@ namespace DeviceLibrary ...@@ -245,59 +245,17 @@ namespace DeviceLibrary
MoveInfo.NextMoveStep(MoveStep.TrayStop_04); MoveInfo.NextMoveStep(MoveStep.TrayStop_04);
return; return;
} }
else if (GroupName == "CI" && trayInfo.TrayType == TrayTypeE.MTP1) #endregion
{ if (stop && !trayInfo.HasLoad)
MoveInfo.log($"在CI设备:{trayInfo.DestinationAddr}=={DeviceGroup.addr_1}");
var device = CI.DeviceList[GroupName];
if (!device.ManualCount)
{
MoveInfo.log($"点料机当前不可用,NG处理");
RequestLoadInfo RequestLoadInfo = new RequestLoadInfo();
RequestLoadInfo.LoadParam = trayInfo.TrayParam.clone();
RequestLoadInfo.LoadParam.IsNg = true;
RequestLoadInfo.LoadParam.NgMsg = "XRay not enable";
RequestLoadInfo.DeviceGroupName = "AMH-MI2";
RequestLoadInfo.TrayType = trayInfo.TrayType.ToString();
RequestLoadInfo.IsEmpty = false;
TrayManager.SetTrayLoadInfo(CurrrentRFID, RequestLoadInfo);
//查询新库位, 检查料仓状态
MoveInfo.NextMoveStep(MoveStep.TrayStop_03);
return;
}
if (!trayInfo.HasLoad && IOValue(IO_Type.MI_Reel_Check).Equals(IO_VALUE.LOW))
{
MoveInfo.log("开始处理出料");
MoveInfo.NextMoveStep(MoveStep.TrayStop_07);
//请求的空托盘到达时
if (!device.HasJob(null))
MoveInfo.NextMoveStep(MoveStep.TrayStop_04);
else
{
MoveInfo.NextMoveStep(MoveStep.TrayStop_07);
//device.StartOutStore();
}
}
else if (trayInfo.DestinationAddr == DeviceGroup.addr_1 && trayInfo.HasLoad)
{ {
MoveInfo.log("开始处理入料"); if (IOValue(IO_Type.MI_Reel_Check).Equals(IO_VALUE.HIGH))
//抵达了一个有物料的托盘等待处理
if (!device.HasJob(trayInfo.TrayParam))
MoveInfo.NextMoveStep(MoveStep.TrayStop_04);
else
{ {
MoveInfo.NextMoveStep(MoveStep.TrayStop_07); TrayManager.SetTrayError(CurrrentRFID);
device.StartInStore(trayInfo.TrayParam); Msg.add("Pallet data is empty, but material is sensed, please check.", MsgLevel.alarm);
} MoveInfo.log("托盘数据为空,但时间感应到物料,请检查");
}
else
MoveInfo.NextMoveStep(MoveStep.TrayStop_04); MoveInfo.NextMoveStep(MoveStep.TrayStop_04);
return; return;
} }
#endregion
if (stop && !trayInfo.HasLoad && IOValue(IO_Type.MI_Reel_Check).Equals(IO_VALUE.LOW))
{
//空托盘 //空托盘
MoveInfo.NextMoveStep(MoveStep.TrayStop_07); MoveInfo.NextMoveStep(MoveStep.TrayStop_07);
RemoteLoad remoteLoad = new RemoteLoad(); RemoteLoad remoteLoad = new RemoteLoad();
...@@ -309,7 +267,7 @@ namespace DeviceLibrary ...@@ -309,7 +267,7 @@ namespace DeviceLibrary
MoveInfo.remoteLoad = remoteLoad; MoveInfo.remoteLoad = remoteLoad;
if (RemoteService.SendAndWait(GroupName, remoteLoad) != RemoteResult.True) if (RemoteService.SendAndWait(GroupName, remoteLoad) != RemoteResult.True)
MoveInfo.NextMoveStep(MoveStep.TrayStop_04); MoveInfo.NextMoveStep(MoveStep.TrayStop_03);
SRec.info(crc.GetString("Res0042","托盘挡停"), GroupName, crc.GetString("Res0030","空托盘"), crc.GetString("Res0043","准备接料"), CurrrentRFID); SRec.info(crc.GetString("Res0042","托盘挡停"), GroupName, crc.GetString("Res0030","空托盘"), crc.GetString("Res0043","准备接料"), CurrrentRFID);
return; return;
...@@ -321,7 +279,7 @@ namespace DeviceLibrary ...@@ -321,7 +279,7 @@ namespace DeviceLibrary
TrayManager.SetTrayError(CurrrentRFID); TrayManager.SetTrayError(CurrrentRFID);
Msg.add(crc.GetString("Res0034", "托盘没有检测到物料"), MsgLevel.alarm); Msg.add(crc.GetString("Res0034", "托盘没有检测到物料"), MsgLevel.alarm);
MoveInfo.log("托盘没有检测到物料"); MoveInfo.log("托盘没有检测到物料");
MoveInfo.NextMoveStep(MoveStep.TrayStop_04); MoveInfo.NextMoveStep(MoveStep.TrayStop_03);
return; return;
} }
//有物料 //有物料
......
LoadCVSLibrary/Config/Config.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速时间,减速时间,原点低速度,原点高速,原点加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位 类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速时间,减速时间,原点低速度,原点高速,原点加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,AMH-SBSH2伺服移栽,AMH_SBSH2_Axis,0,HC,,60000,0,0,0,10000,0,10,700,0,0 AXIS,0,AMH-SBSH2伺服移栽,AMH_SBSH2_Axis,0,HC,,60000,0,0,0,40000,0,10,700,0,0
AXIS,0,AMH-SBDH2-1伺服移栽,AMH_SBDH2_1_Axis,1,HC,,20000,0,0,0,40000,0,10,700,0,0 AXIS,0,AMH-SBDH2-1伺服移栽,AMH_SBDH2_1_Axis,1,HC,,20000,0,0,0,40000,0,10,700,0,0
AXIS,0,AMH-SBDH2-2伺服移栽,AMH_SBDH2_2_Axis,2,HC,,60000,0,0,0,10000,0,10,700,0,0 AXIS,0,AMH-SBDH2-2伺服移栽,AMH_SBDH2_2_Axis,2,HC,,60000,0,0,0,40000,0,10,700,0,0
AXIS,0,AMH-SBSH1伺服移栽,AMH_SBSH1_Axis,3,HC,,20000,0,0,0,40000,0,10,700,0,0 AXIS,0,AMH-SBSH1伺服移栽,AMH_SBSH1_Axis,3,HC,,20000,0,0,0,40000,0,10,700,0,0
AXIS,0,MI1压紧伺服,MI1_Axis,4,HC,,60000,0,0,0,10000,0,10,700,0,0 AXIS,0,MI1压紧伺服,MI1_Axis,4,HC,,600000,0,0,0,50000,0,10,700,0,0
AXIS,0,MI1定位伺服,MI1_Rotate_Axis,5,HC,,60000,0,0,0,10000,0,10,700,0,0 AXIS,0,MI1定位伺服,MI1_Rotate_Axis,5,HC,,60000,0,0,0,10000,0,10,700,0,0
AXIS,0,AMH-SBDH3-1伺服移栽,AMH_SBDH3_1_Axis,6,HC,,20000,0,0,0,40000,0,10,700,0,0 AXIS,0,AMH-SBDH3-1伺服移栽,AMH_SBDH3_1_Axis,6,HC,,20000,0,0,0,40000,0,10,700,0,0
AXIS,0,AMH-SBDH3-2伺服移栽,AMH_SBDH3_2_Axis,7,HC,,60000,0,0,0,10000,0,10,700,0,0 AXIS,0,AMH-SBDH3-2伺服移栽,AMH_SBDH3_2_Axis,7,HC,,60000,0,0,0,40000,0,10,700,0,0
AXIS,0,AMH-SBDH1-1伺服移栽,AMH_SBDH1_1_Axis,8,HC,,20000,0,0,0,40000,0,10,700,0,0 AXIS,0,AMH-SBDH1-1伺服移栽,AMH_SBDH1_1_Axis,8,HC,,20000,0,0,0,40000,0,10,700,0,0
AXIS,0,AMH-SBDH1-2伺服移栽,AMH_SBDH1_2_Axis,9,HC,,60000,0,0,0,10000,0,10,700,0,0 AXIS,0,AMH-SBDH1-2伺服移栽,AMH_SBDH1_2_Axis,9,HC,,60000,0,0,0,40000,0,10,700,0,0
AXIS,0,MI2压紧伺服,MI2_Axis,10,HC,,20000,0,0,0,40000,0,10,700,0,0 AXIS,0,MI2压紧伺服,MI2_Axis,10,HC,,20000,0,0,0,40000,0,10,700,0,0
AXIS,0,MI1定位伺服,MI2_Rotate_Axis,11,HC,,60000,0,0,0,10000,0,10,700,0,0 AXIS,0,MI2定位伺服,MI2_Rotate_Axis,11,HC,,60000,0,0,0,10000,0,10,700,0,0
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,50,IO信号超时时间（秒）,IOSingle_TimerOut,5,,,,,,,,,,,, PRO,50,IO信号超时时间（秒）,IOSingle_TimerOut,15,,,,,,,,,,,,
PRO,0,气压检测超时,AirCheckSeconds,5,,,,,,,,,,,, PRO,0,气压检测超时,AirCheckSeconds,5,,,,,,,,,,,,
PRO,10,AMH移栽设备每毫米脉冲,AMH_TS_PoToMM,1000,,,,,,,,,,,, PRO,10,AMH移栽设备每毫米脉冲,AMH_TS_PoToMM,1000,,,,,,,,,,,,
PRO,10,AMH移栽设备待机点P1,AMH_TS_P1,1000,,,10000,,,,,,,,, PRO,10,AMH移栽设备待机点P1,AMH_TS_P1,500,,,60000,,,,,,,,,
PRO,10,AMH移栽设备取料P2-8mm,AMH_TS_P2,1000,,,10000,,,,,,,,, PRO,10,AMH移栽设备取料P2-8mm,AMH_TS_P2,1000,,,60000,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,14,机器人压紧轴每毫米脉冲,AMH_RoboComp_PoToMM,1000,,,,,,,,,,,, PRO,14,机器人压紧轴每毫米脉冲,AMH_RoboComp_PoToMM,1000,,,,,,,,,,,,
PRO,14,机器人压紧轴待机点P1,AMH_RoboMI1_Comp_P1,1000,,,10000,,,,,,,,, PRO,14,机器人压紧轴待机点P1,AMH_RoboMI1_Comp_P1,0,,,200000,,,,,,,,,
PRO,14,机器人压紧轴8mm压紧点,AMH_RoboMI1_Comp_P2,1000,,,10000,,,,,,,,, PRO,14,机器人压紧轴8mm压紧点,AMH_RoboMI1_Comp_P2,62000,,,60000,,,,,,,,,
PRO,15,托盘旋转轴每度脉冲,AMH_Route_PoToMM,1000,,,10000,,,,,,,,, PRO,15,托盘旋转轴每度脉冲,AMH_Route_PoToMM,1000,,,10000,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,,X00,,,,,,,,,, DI,0,急停,SuddenStop_BTN,0,,X00,,,,,,,,,,
...@@ -124,17 +124,15 @@ DI,0,AMH-SBDH1-2托盘物料检测,AMH_Reel_Check,89,AMH-SBDH1-2,X89,,,,,,,,,, ...@@ -124,17 +124,15 @@ DI,0,AMH-SBDH1-2托盘物料检测,AMH_Reel_Check,89,AMH-SBDH1-2,X89,,,,,,,,,,
DI,0,AMH-SBDH1-2移栽气缸前进端,AMH_Trans_Fwd,90,AMH-SBDH1-2,X90,,,,,,,,,, DI,0,AMH-SBDH1-2移栽气缸前进端,AMH_Trans_Fwd,90,AMH-SBDH1-2,X90,,,,,,,,,,
DI,0,AMH-SBDH1-2移栽气缸后退端,AMH_Trans_Bwd,91,AMH-SBDH1-2,X91,,,,,,,,,, DI,0,AMH-SBDH1-2移栽气缸后退端,AMH_Trans_Bwd,91,AMH-SBDH1-2,X91,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
DI,0,AMH-CI顶升上升端,MI_Location_Up,92,CI,X92,,,,,,,,,, DI,0,AMH-CI-OUT顶升上升端,MI_Location_Up,92,CI-OUT,X92,,,,,,,,,,
DI,0,AMH-CI顶升下降端,MI_Location_Down,93,CI,X93,,,,,,,,,, DI,0,AMH-CI-OUT顶升下降端,MI_Location_Down,93,CI-OUT,X93,,,,,,,,,,
DI,0,AMH-CI托盘前阻挡检测,MI_Front_Check,94,CI,X94,,,,,,,,,, DI,0,AMH-CI-OUT托盘前阻挡检测,MI_Front_Check,94,CI-OUT,X94,,,,,,,,,,
DI,0,AMH-CI托盘到位检测,MI_In_Check,95,CI,X95,,,,,,,,,, DI,0,AMH-CI-OUT托盘到位检测,MI_In_Check,95,CI-OUT,X95,,,,,,,,,,
DI,0,AMH-CI托盘物料检测,MI_Reel_Check,96,CI,X96,,,,,,,,,, DI,0,AMH-CI-OUT托盘物料检测,MI_Reel_Check,96,CI-OUT,X96,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
DI,0,CI点料完成,CI_Count_Finished,97,CI,X97,,,,,,,,,, DI,0,AMH-CI-IN托盘前阻挡检测,MI_Front_Check,97,CI-IN,X97,,,,,,,,,,
DI,0,CI物料放置区门开启按钮,CI_Cache_Door_Open,98,CI,X98,,,,,,,,,, DI,0,AMH-CI-IN托盘到位检测,MI_In_Check,98,CI-IN,X98,,,,,,,,,,
DI,0,CI物料放置区门关闭按钮,CI_Cache_Door_Close,99,CI,X99,,,,,,,,,, DI,0,AMH-CI-IN托盘物料检测,MI_Reel_Check,99,CI-IN,X99,,,,,,,,,,
DI,0,CI物料放置区门关闭检测,CI_Cache_Door_Close_Check,100,CI,X100,,,,,,,,,,
DI,0,CI物料检测,CI_Cache_Reel_Check,101,CI,X101,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
DI,0,LS3-1顶升上升端,Ls_A_Location_Up,112,LS3,X112,,,,,,,,,, DI,0,LS3-1顶升上升端,Ls_A_Location_Up,112,LS3,X112,,,,,,,,,,
DI,0,LS3-1顶升下降端,Ls_A_Location_Down,113,LS3,X113,,,,,,,,,, DI,0,LS3-1顶升下降端,Ls_A_Location_Down,113,LS3,X113,,,,,,,,,,
...@@ -288,20 +286,13 @@ DO,0,AMH-SBDH1-2托盘前阻挡下降,AMH_Front_Stop,90,AMH-SBDH1-2,Y90,,,,,,,,,, ...@@ -288,20 +286,13 @@ DO,0,AMH-SBDH1-2托盘前阻挡下降,AMH_Front_Stop,90,AMH-SBDH1-2,Y90,,,,,,,,,,
DO,0,AMH-SBDH1-2托盘阻挡下降,AMH_Tray_Stop,91,AMH-SBDH1-2,Y91,,,,,,,,,, DO,0,AMH-SBDH1-2托盘阻挡下降,AMH_Tray_Stop,91,AMH-SBDH1-2,Y91,,,,,,,,,,
DO,0,AMH-SBDH1-2吸盘放料,AMH_Sucker_Release,105,AMH-SBDH1-2,Y105,,,,,,,,,, DO,0,AMH-SBDH1-2吸盘放料,AMH_Sucker_Release,105,AMH-SBDH1-2,Y105,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
DO,0,AMH-CI顶升上升,MI_Location_Up,92,CI,Y92,,,,,,,,,, DO,0,AMH-CI-OUT顶升上升,MI_Location_Up,92,CI-OUT,Y92,,,,,,,,,,
DO,0,AMH-CI顶升下降,MI_Location_Down,93,CI,Y93,,,,,,,,,, DO,0,AMH-CI-OUT顶升下降,MI_Location_Down,93,CI-OUT,Y93,,,,,,,,,,
DO,0,AMH-CI托盘前阻挡下降,AMH_Front_Stop,94,CI,Y94,,,,,,,,,, DO,0,AMH-CI-OUT托盘前阻挡下降,AMH_Front_Stop,94,CI-OUT,Y94,,,,,,,,,,
DO,0,AMH-CI托盘阻挡下降,AMH_Tray_Stop,95,CI,Y95,,,,,,,,,, DO,0,AMH-CI-OUT托盘阻挡下降,AMH_Tray_Stop,95,CI-OUT,Y95,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
DO,0,CI物料放置区门锁打开,CI_Cache_Door_UNLock,96,CI,Y96,,,,,,,,,, DO,0,AMH-CI-IN托盘前阻挡下降,AMH_Front_Stop,100,CI-IN,Y100,,,,,,,,,,
DO,0,ROBOT-CI吸盘吸料,AMH_Sucker,97,CI,Y97,,,,,,,,,, DO,0,AMH-CI-IN托盘阻挡下降,AMH_Tray_Stop,101,CI-IN,Y101,,,,,,,,,,
DO,0,CI物料放置区照明开启,CI_Cache_Light,98,CI,Y98,,,,,,,,,,
DO,0,CI启动,CI_Start,99,CI,Y99,,,,,,,,,,
DO,0,CI物料放置区门可开启指示灯,CI_Cache_Door_StandbyLED,100,CI,Y100,,,,,,,,,,
DO,0,CI物料放置区物料NG指示灯,CI_Cache_Door_NGLED,101,CI,Y101,,,,,,,,,,
DO,0,ROBOT-CI吸盘吸料,AMH_Sucker_Release,106,CI,Y106,,,,,,,,,,
DO,0,ROBOT-CI远程开机,MI_Robot_PowerON,109,CI,Y109,,,,,,,,,,
DO,0,ROBOT-CI远程关机,MI_Robot_PowerOFF,110,CI,Y110,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
DO,0,LS3横移电机正转,Ls_A_LineRun,112,LS3,Y112,,,,,,,,,, DO,0,LS3横移电机正转,Ls_A_LineRun,112,LS3,Y112,,,,,,,,,,
DO,0,LS3横移电机反转,Ls_A_LineRwd,113,LS3,Y113,,,,,,,,,, DO,0,LS3横移电机反转,Ls_A_LineRwd,113,LS3,Y113,,,,,,,,,,
......
LoadCVSLibrary/Config/DeviceGroup.csv
设备组,名称,设备类型,RFID-1,RFID-2,伺服轴号,伺服轴号2,地址号-1,地址号-2,设备侧8mm放料点,料仓侧8mm放料点,位置,优先级,高度,宽度 设备组,名称,设备类型,RFID-1,RFID-2,伺服轴号,伺服轴号2,地址号-1,地址号-2,设备侧8mm放料点,料仓侧8mm放料点,位置,优先级,高度,宽度
LS1,横移,LS,,,,,11,12,,,,,, LS1,横移,LS,,,,,12,13,,,,,,
LS2,横移,LS,192.168.103.115,,,,8,15,,,,,, LS2,横移,LS,192.168.103.115,,,,10,16,,,,,,
LS3,横移,LS,192.168.103.110,192.168.103.106,,,4,19,,,,,, LS3,横移,LS,192.168.103.110,192.168.103.106,,,4,20,,,,,,
LS4,横移,LS,,,,,0,1,,,,,, LS4,横移,LS,,,,,0,1,,,,,,
,,,,,,,,,,,,,, ,,,,,,,,,,,,,,
AMH-MI1,定位,RT,192.168.103.103,,4,9,16,,,345,,,, AMH-MI1,定位,RT,192.168.103.103,,4,905,17,-1,-1,61500,,,,
AMH-MI2,定位,RT,192.168.103.107,,10,11,20,,,345,,,, AMH-MI2,定位,RT,192.168.103.107,,10,911,21,-1,-1,59500,,,,
,,,,,,,,,,,,,, ,,,,,,,,,,,,,,
AMH-ML5-1,定位,RT,192.168.103.108,,-1,,2,,,,,,, AMH-ML5-1,定位,RT,192.168.103.108,,-1,,2,,,,,,,
AMH-ML5-2,定位,RT,192.168.103.109,,-1,,3,,,,,,, AMH-ML5-2,定位,RT,192.168.103.109,,-1,,3,,,,,,,
,,,,,,,,,,,,,, ,,,,,,,,,,,,,,
CI,定位,RT,192.168.103.111,,-1,,5,,,,,,, CI-IN,定位,RT,192.168.103.117,,-1,,5,,,,,,,
CI-OUT,定位,RT,192.168.103.111,,-1,,6,,,,,,,
,,,,,,,,,,,,,, ,,,,,,,,,,,,,,
AMH-SBSH2,移栽,SISO,192.168.103.116,,0,,10,,123,234,,,, AMH-SBSH2,移栽,SISO,192.168.103.116,,0,-1,11,-1,50600,74000,,,,
AMH-SBDH2-1,移栽,SISO,192.168.103.101,,1,,13,,123,234,,,, AMH-SBDH2-1,移栽,SISO,192.168.103.101,,1,-1,14,-1,58000,74523,,,,
AMH-SBDH2-2,移栽,SISO,192.168.103.102,,2,,14,,123,234,,,, AMH-SBDH2-2,移栽,SISO,192.168.103.102,,2,-1,15,-1,63500,85000,,,,
AMH-SBSH1,移栽,SISO,192.168.103.114,,3,,8,,123,234,,,, AMH-SBSH1,移栽,SISO,192.168.103.114,,3,-1,9,-1,57564,75500,,-1,-1,-1
AMH-SBDH3-1,移栽,SISO,192.168.103.112,,6,,6,,123,234,,,, AMH-SBDH3-1,移栽,SISO,192.168.103.112,,6,-1,7,-1,74000,125100,,,,
AMH-SBDH3-2,移栽,SISO,192.168.103.113,,7,,7,,123,234,,,, AMH-SBDH3-2,移栽,SISO,192.168.103.113,,7,-1,8,-1,48142,70000,,,,
AMH-SBDH1-1,移栽,SISO,192.168.103.104,,8,,17,,123,234,,,, AMH-SBDH1-1,移栽,SISO,192.168.103.104,,8,-1,18,-1,54973,79000,,-1,-1,-1
AMH-SBDH1-2,移栽,SISO,192.168.103.105,,9,,18,,123,234,,,, AMH-SBDH1-2,移栽,SISO,192.168.103.105,,9,-1,19,-1,64520,74679,,,,
LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -82,10 +82,7 @@ ...@@ -82,10 +82,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
<None Include="Config\DeviceGroup.csv"> <Content Include="Config\DeviceGroup.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Config\CIPostion.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Config\MI2Postion.csv"> <Content Include="Config\MI2Postion.csv">
......
LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -51,26 +51,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -51,26 +51,6 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
public static string ML5_DoorSafeCheck = "ML5_DoorSafeCheck"; public static string ML5_DoorSafeCheck = "ML5_DoorSafeCheck";
/// <summary> /// <summary>
/// DI,0,CI点料完成,CI_Count_Finished,97,,X97,,,,,,,,,,
/// </summary>
public static string CI_Count_Finished = "CI_Count_Finished";
/// <summary>
/// DI,0,CI物料放置区门开启按钮,CI_Cache_Door_Open,98,,X98,,,,,,,,,,
/// </summary>
public static string CI_Cache_Door_Open = "CI_Cache_Door_Open";
/// <summary>
/// DI,0,CI物料放置区门关闭按钮,CI_Cache_Door_Close,99,,X99,,,,,,,,,,
/// </summary>
public static string CI_Cache_Door_Close = "CI_Cache_Door_Close";
/// <summary>
/// DI,0,CI物料放置区门关闭检测,CI_Cache_Door_Close_Check,100,,X100,,,,,,,,,,
/// </summary>
public static string CI_Cache_Door_Close_Check = "CI_Cache_Door_Close_Check";
/// <summary>
/// DI,0,CI物料检测,CI_Cache_Reel_Check,101,,X101,,,,,,,,,,
/// </summary>
public static string CI_Cache_Reel_Check = "CI_Cache_Reel_Check";
/// <summary>
/// DO,0,LS3-2顶升上升端,Ls_B_Location_Up,116,HY3,X116,,,,,,,,,, /// DO,0,LS3-2顶升上升端,Ls_B_Location_Up,116,HY3,X116,,,,,,,,,,
/// </summary> /// </summary>
public static string Ls_B_Location_Up = "Ls_B_Location_Up"; public static string Ls_B_Location_Up = "Ls_B_Location_Up";
...@@ -207,30 +187,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -207,30 +187,6 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
public static string MI_Robot_Light = "MI_Robot_Light"; public static string MI_Robot_Light = "MI_Robot_Light";
/// <summary> /// <summary>
/// DO,0,CI物料放置区门锁打开,CI_Cache_Door_UNLock,96,,Y96,,,,,,,,,,
/// </summary>
public static string CI_Cache_Door_UNLock = "CI_Cache_Door_UNLock";
/// <summary>
/// DO,0,ROBOT-CI吸盘吸料,CI_sa,97,,Y97,,,,,,,,,,
/// </summary>
public static string CI_sa = "CI_sa";
/// <summary>
/// DO,0,CI物料放置区照明开启,CI_Cache_Light,98,,Y98,,,,,,,,,,
/// </summary>
public static string CI_Cache_Light = "CI_Cache_Light";
/// <summary>
/// DO,0,CI启动,CI_Start,99,,Y99,,,,,,,,,,
/// </summary>
public static string CI_Start = "CI_Start";
/// <summary>
/// DO,0,CI物料放置区门可开启指示灯,CI_Cache_Door_StandbyLED,100,,Y100,,,,,,,,,,
/// </summary>
public static string CI_Cache_Door_StandbyLED = "CI_Cache_Door_StandbyLED";
/// <summary>
/// DO,0,CI物料放置区物料NG指示灯,CI_Cache_Door_NGLED,101,,Y101,,,,,,,,,,
/// </summary>
public static string CI_Cache_Door_NGLED = "CI_Cache_Door_NGLED";
/// <summary>
/// DO,0,LS3横移电机反转,Ls_A_LineRwd,113,HY3,Y113,,,,,,,,,, /// DO,0,LS3横移电机反转,Ls_A_LineRwd,113,HY3,Y113,,,,,,,,,,
/// </summary> /// </summary>
public static string Ls_A_LineRwd = "Ls_A_LineRwd"; public static string Ls_A_LineRwd = "Ls_A_LineRwd";
......
TheMachine/Form1.cs
...@@ -77,7 +77,7 @@ namespace TheMachine ...@@ -77,7 +77,7 @@ namespace TheMachine
DeviceControl<TrayStopControl> ml = new DeviceControl<TrayStopControl>(); DeviceControl<TrayStopControl> ml = new DeviceControl<TrayStopControl>();
DeviceControl<TrayStopControl> mi = new DeviceControl<TrayStopControl>(); DeviceControl<TrayStopControl> mi = new DeviceControl<TrayStopControl>();
DeviceControl<TrayStopControl> ci = new DeviceControl<TrayStopControl>(); DeviceControl<TrayStopControl> ci = new DeviceControl<TrayStopControl>();
CIDebugControl cidebug = new CIDebugControl();
AxisControl ac = new AxisControl(); AxisControl ac = new AxisControl();
SettingControl sc = new SettingControl(); SettingControl sc = new SettingControl();
MycronicControl mc = new MycronicControl(); MycronicControl mc = new MycronicControl();
...@@ -185,8 +185,6 @@ namespace TheMachine ...@@ -185,8 +185,6 @@ namespace TheMachine
AddForm("tab_traystopCI", "MT-CI", ci); AddForm("tab_traystopCI", "MT-CI", ci);
AddForm("tab_traysetting", crc.GetString("Form1_tabc_tab_setting__SettingControl_tabControl1_tabPage1_Text","治具设置"), sc); AddForm("tab_traysetting", crc.GetString("Form1_tabc_tab_setting__SettingControl_tabControl1_tabPage1_Text","治具设置"), sc);
AddForm("tab_other", "MI", mc); AddForm("tab_other", "MI", mc);
ci.AddForm("tab_ciconfig", "CI-Test", cidebug);
crc.LanguageProcess(this); crc.LanguageProcess(this);
} }
......
TheMachine/TheMachine.csproj
...@@ -100,12 +100,6 @@ ...@@ -100,12 +100,6 @@
<Compile Include="DeviceControl.Designer.cs"> <Compile Include="DeviceControl.Designer.cs">
<DependentUpon>DeviceControl.cs</DependentUpon> <DependentUpon>DeviceControl.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="device\CIDebugControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="device\CIDebugControl.Designer.cs">
<DependentUpon>CIDebugControl.cs</DependentUpon>
</Compile>
<Compile Include="device\HYControl.cs"> <Compile Include="device\HYControl.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
...@@ -239,9 +233,6 @@ ...@@ -239,9 +233,6 @@
<EmbeddedResource Include="DeviceControl.resx"> <EmbeddedResource Include="DeviceControl.resx">
<DependentUpon>DeviceControl.cs</DependentUpon> <DependentUpon>DeviceControl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="device\CIDebugControl.resx">
<DependentUpon>CIDebugControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="device\HYControl.resx"> <EmbeddedResource Include="device\HYControl.resx">
<DependentUpon>HYControl.cs</DependentUpon> <DependentUpon>HYControl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
TheMachine/UC/RobotPosControl.cs
...@@ -200,8 +200,6 @@ namespace TheMachine ...@@ -200,8 +200,6 @@ namespace TheMachine
return RobotManage.Robot_MI1; return RobotManage.Robot_MI1;
else if (_aCStorePosition.PositionNum.StartsWith("MI2")) else if (_aCStorePosition.PositionNum.StartsWith("MI2"))
return RobotManage.Robot_MI2; return RobotManage.Robot_MI2;
else if (_aCStorePosition.PositionNum.StartsWith("CI"))
return RobotManage.Robot_CI;
return RobotManage.Robot_MI1; return RobotManage.Robot_MI1;
} }
......
TheMachine/device/Other/MycronicControl.Designer.cs
...@@ -42,8 +42,6 @@ namespace TheMachine.device.Other ...@@ -42,8 +42,6 @@ namespace TheMachine.device.Other
this.uc_boxdebug1 = new TheMachine.uc_boxdebug(); this.uc_boxdebug1 = new TheMachine.uc_boxdebug();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.uc_boxdebug2 = new TheMachine.uc_boxdebug(); this.uc_boxdebug2 = new TheMachine.uc_boxdebug();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.uc_boxdebug3 = new TheMachine.uc_boxdebug();
this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabPage5 = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox(); this.groupBox5 = new System.Windows.Forms.GroupBox();
this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
...@@ -53,22 +51,18 @@ namespace TheMachine.device.Other ...@@ -53,22 +51,18 @@ namespace TheMachine.device.Other
this.ucurRobot1 = new URRobot.UCURRobot(); this.ucurRobot1 = new URRobot.UCURRobot();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.ucurRobot2 = new URRobot.UCURRobot(); this.ucurRobot2 = new URRobot.UCURRobot();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.ucurRobot3 = new URRobot.UCURRobot();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage4.SuspendLayout(); this.tabPage4.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// tabControl1 // tabControl1
...@@ -76,7 +70,6 @@ namespace TheMachine.device.Other ...@@ -76,7 +70,6 @@ namespace TheMachine.device.Other
this.tabControl1.Controls.Add(this.tabPage4); this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage5); this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Location = new System.Drawing.Point(0, 0);
...@@ -204,27 +197,6 @@ namespace TheMachine.device.Other ...@@ -204,27 +197,6 @@ namespace TheMachine.device.Other
this.uc_boxdebug2.Size = new System.Drawing.Size(986, 542); this.uc_boxdebug2.Size = new System.Drawing.Size(986, 542);
this.uc_boxdebug2.TabIndex = 0; this.uc_boxdebug2.TabIndex = 0;
// //
// tabPage3
//
this.tabPage3.Controls.Add(this.uc_boxdebug3);
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(992, 548);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "CI 点位";
this.tabPage3.UseVisualStyleBackColor = true;
//
// uc_boxdebug3
//
this.uc_boxdebug3.Config = null;
this.uc_boxdebug3.Dock = System.Windows.Forms.DockStyle.Fill;
this.uc_boxdebug3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uc_boxdebug3.Location = new System.Drawing.Point(3, 3);
this.uc_boxdebug3.Name = "uc_boxdebug3";
this.uc_boxdebug3.Size = new System.Drawing.Size(986, 542);
this.uc_boxdebug3.TabIndex = 0;
//
// tabPage5 // tabPage5
// //
this.tabPage5.Controls.Add(this.groupBox5); this.tabPage5.Controls.Add(this.groupBox5);
...@@ -274,7 +246,6 @@ namespace TheMachine.device.Other ...@@ -274,7 +246,6 @@ namespace TheMachine.device.Other
// //
this.flowLayoutPanel1.Controls.Add(this.groupBox1); this.flowLayoutPanel1.Controls.Add(this.groupBox1);
this.flowLayoutPanel1.Controls.Add(this.groupBox3); this.flowLayoutPanel1.Controls.Add(this.groupBox3);
this.flowLayoutPanel1.Controls.Add(this.groupBox4);
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2);
...@@ -322,26 +293,6 @@ namespace TheMachine.device.Other ...@@ -322,26 +293,6 @@ namespace TheMachine.device.Other
this.ucurRobot2.Size = new System.Drawing.Size(306, 197); this.ucurRobot2.Size = new System.Drawing.Size(306, 197);
this.ucurRobot2.TabIndex = 17; this.ucurRobot2.TabIndex = 17;
// //
// groupBox4
//
this.groupBox4.Controls.Add(this.ucurRobot3);
this.groupBox4.Location = new System.Drawing.Point(630, 2);
this.groupBox4.Margin = new System.Windows.Forms.Padding(2);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Padding = new System.Windows.Forms.Padding(2);
this.groupBox4.Size = new System.Drawing.Size(310, 215);
this.groupBox4.TabIndex = 2;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "CI";
//
// ucurRobot3
//
this.ucurRobot3.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucurRobot3.Location = new System.Drawing.Point(2, 16);
this.ucurRobot3.Name = "ucurRobot3";
this.ucurRobot3.Size = new System.Drawing.Size(306, 197);
this.ucurRobot3.TabIndex = 17;
//
// timer1 // timer1
// //
this.timer1.Enabled = true; this.timer1.Enabled = true;
...@@ -361,14 +312,12 @@ namespace TheMachine.device.Other ...@@ -361,14 +312,12 @@ namespace TheMachine.device.Other
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.tabPage5.ResumeLayout(false); this.tabPage5.ResumeLayout(false);
this.groupBox5.ResumeLayout(false); this.groupBox5.ResumeLayout(false);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -379,9 +328,7 @@ namespace TheMachine.device.Other ...@@ -379,9 +328,7 @@ namespace TheMachine.device.Other
private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TabPage tabPage2;
private uc_boxdebug uc_boxdebug1; private uc_boxdebug uc_boxdebug1;
private System.Windows.Forms.TabPage tabPage3;
private uc_boxdebug uc_boxdebug2; private uc_boxdebug uc_boxdebug2;
private uc_boxdebug uc_boxdebug3;
private System.Windows.Forms.TabPage tabPage4; private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.Button btn_manualout; private System.Windows.Forms.Button btn_manualout;
private System.Windows.Forms.TextBox txt_reelid; private System.Windows.Forms.TextBox txt_reelid;
...@@ -392,8 +339,6 @@ namespace TheMachine.device.Other ...@@ -392,8 +339,6 @@ namespace TheMachine.device.Other
private URRobot.UCURRobot ucurRobot1; private URRobot.UCURRobot ucurRobot1;
private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox3;
private URRobot.UCURRobot ucurRobot2; private URRobot.UCURRobot ucurRobot2;
private System.Windows.Forms.GroupBox groupBox4;
private URRobot.UCURRobot ucurRobot3;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private DoubleBufferListView stateView; private DoubleBufferListView stateView;
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
......
TheMachine/device/Other/MycronicControl.cs
...@@ -23,11 +23,9 @@ namespace TheMachine.device.Other ...@@ -23,11 +23,9 @@ namespace TheMachine.device.Other
{ {
uc_boxdebug1.Init(RobotManage.MI1Postion); uc_boxdebug1.Init(RobotManage.MI1Postion);
uc_boxdebug2.Init(RobotManage.MI2Postion); uc_boxdebug2.Init(RobotManage.MI2Postion);
uc_boxdebug3.Init(RobotManage.CIPostion);
ucurRobot1.Init(RobotManage.Robot_MI1); ucurRobot1.Init(RobotManage.Robot_MI1);
ucurRobot2.Init(RobotManage.Robot_MI2); ucurRobot2.Init(RobotManage.Robot_MI2);
ucurRobot3.Init(RobotManage.Robot_CI);
#region 状态信息listview初始化 #region 状态信息listview初始化
stateView.View = View.Details; stateView.View = View.Details;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!