Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 721b49e4 由 张东亮
选项

添加单料门屏蔽

1 个父辈 5cf3d1bc
内嵌 并排
正在显示 8 个修改的文件 包含 59 行增加 和 17 行删除
Common/Setting_Init.cs
......@@ -138,5 +138,12 @@ namespace OnlineStore.Common
public static MyConfig<string> CID = "";
[MyConfigComment("温湿度串口号")]
public static MyConfig<string> Device_Humiture_Port = "CMO1";
[MyConfigComment("屏蔽升降轴保护")]
public static MyConfig<bool> Device_DisableUpdownProtect = true;
[MyConfigComment("屏蔽单料门")]
public static MyConfig<bool> Device_DisableSingleDoor = false;
[MyConfigComment("屏蔽料串门")]
public static MyConfig<bool> Device_Disable_StringDoor = false;
}
}
Common/util/SMF.cs
......@@ -11,7 +11,7 @@ namespace OnlineStore.Common
public class SMF
{
public static string DeviceType = "MIMO_G2";
static string _server = ConfigHelper.Config.Get("http_server");
static string _server = Setting_Init.http_server;
static string server
{
get
......
DeviceLibrary/DeviceLibrary/Camera.cs
......@@ -20,7 +20,6 @@ public class HIKCamera
public event EventHandler<Bitmap> camera_event;
public string DeviceName = "monitor1";
public PictureBox picture = new PictureBox();
//bool enableCamera = ConfigHelper.Config.Get("Func_EnableCam", true);
//public bool LoadCameraConfig(out string msg, object preview = null)
//{
// msg = "";
......
DeviceLibrary/DeviceLibrary/ServerCommunication_AgvProcess.cs
......@@ -31,9 +31,9 @@ namespace DeviceLibrary
if (YDataCheck(dataMap, "Y10", out v) || YDataCheck(dataMap, "Y11", out v))
{
if (v)
RobotManage.mainMachine.SingleDoor.ToHigh(null);
RobotManage.mainMachine.OpenSingleDoor(null);
else
RobotManage.mainMachine.SingleDoor.ToLow(null);
RobotManage.mainMachine.CloseSingleDoor(null);
}
//折叠门 1开门 0关门
if (YDataCheck(dataMap, "Y15", out v) || YDataCheck(dataMap, "Y14", out v))
......
DeviceLibrary/theMachine/MainMachine.cs
......@@ -377,6 +377,29 @@ namespace DeviceLibrary
ResetMoveInfo.log("开始回原");
ResetMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
}
public void OpenSingleDoor(MoveInfo moveInfo)
{
if(!RobotManage.DisableSingleDoor)
{
SingleDoor.ToHigh(moveInfo);
}
else
{
LogUtil.info($"单料门已屏蔽，不开门");
}
}
public void CloseSingleDoor(MoveInfo moveInfo)
{
if (!RobotManage.DisableSingleDoor)
{
SingleDoor.ToLow(moveInfo);
}
else
{
LogUtil.info($"单料门已屏蔽，不关门");
}
}
//强制回原
bool forceHome = true;
void HomeReset()
......@@ -417,7 +440,7 @@ namespace DeviceLibrary
}
if (!ConfigHelper.Config.Get("Device_Disable_StringDoor", false))
if (!Setting_Init.Device_Disable_StringDoor)
StringDoorClose(null);
break;
case MoveStep.H02_HomeReset_01:
......@@ -428,7 +451,8 @@ namespace DeviceLibrary
Batch_Axis.MonitorAxisLoadRate(Setting_Init.Device_BatchMaxLoadRate);
CylinderMove(ResetMoveInfo, IO_Type.StringPosChecker_Home, IO_Type.StringPosChecker_Work, IO_VALUE.LOW);
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
SingleDoor.ToLow(ResetMoveInfo);
//SingleDoor.ToLow(ResetMoveInfo);
CloseSingleDoor(ResetMoveInfo);
break;
case MoveStep.H02_HomeReset:
ResetMoveInfo.NextMoveStep(MoveStep.H03_HomeReset);
......@@ -505,7 +529,8 @@ namespace DeviceLibrary
ResetMoveInfo.NextMoveStep(MoveStep.H13_HomeReset);
ResetMoveInfo.log("打开NG口门");
//CylinderMove(null, IO_Type.NGDoor_Close, IO_Type.NGDoor_Open, IO_VALUE.HIGH);
SingleDoor.ToHigh(null);
// SingleDoor.ToHigh(null);
OpenSingleDoor(null);
break;
case MoveStep.H13_HomeReset:
ResetMoveInfo.NextMoveStep(MoveStep.H14_HomeReset);
......@@ -520,7 +545,8 @@ namespace DeviceLibrary
RobotManage.UserPause(crc.GetString("x29_low_no_reel", "传感器未检测到单料口料盘."));
}
//CylinderMove(ResetMoveInfo, IO_Type.NGDoor_Close, IO_Type.NGDoor_Open, IO_VALUE.HIGH);
SingleDoor.ToHigh(ResetMoveInfo);
//SingleDoor.ToHigh(ResetMoveInfo);
OpenSingleDoor(ResetMoveInfo);
break;
case MoveStep.H14_HomeReset:
h = NGDoor_Tray_Test_Reel;
......@@ -577,7 +603,8 @@ namespace DeviceLibrary
ResetMoveInfo.NextMoveStep(MoveStep.HEND_HomeReset);
ResetMoveInfo.log("关门NG口门");
//CylinderMove(ResetMoveInfo, IO_Type.NGDoor_Close, IO_Type.NGDoor_Open, IO_VALUE.LOW);
SingleDoor.ToLow(ResetMoveInfo);
// SingleDoor.ToLow(ResetMoveInfo);
CloseSingleDoor(ResetMoveInfo);
OpenFlipDoor(ResetMoveInfo);
}
else
......
DeviceLibrary/theMachine/MainMachine_Clamp.cs
......@@ -263,7 +263,8 @@ namespace DeviceLibrary
ClampMoveInfo.NextMoveStep(MoveStep.NGOUT_02);
ClampMoveInfo.log("打开单料口门");
//CylinderMove(null, IO_Type.NGDoor_Close, IO_Type.NGDoor_Open, IO_VALUE.HIGH);
SingleDoor.ToHigh(null);
// SingleDoor.ToHigh(null);
OpenSingleDoor(null);
CodeManager.TestHasRight = true;
break;
case MoveStep.NGOUT_02:
......@@ -283,7 +284,8 @@ namespace DeviceLibrary
RobotManage.UserPause(crc.GetString("Res0005", "传感器X29未检测到单料口料盘"));
}
}
SingleDoor.ToHigh(ClampMoveInfo);
//SingleDoor.ToHigh(ClampMoveInfo);
OpenSingleDoor(ClampMoveInfo);
break;
case MoveStep.NGOUT_03:
Msg.add(ClampMoveInfo.MoveParam.NgMsg, MsgLevel.warning);
......@@ -338,7 +340,8 @@ namespace DeviceLibrary
ClampMoveInfo.NextMoveStep(MoveStep.NGOUT_06);
ClampMoveInfo.log("关门NG口门");
//CylinderMove(ClampMoveInfo, IO_Type.NGDoor_Close, IO_Type.NGDoor_Open, IO_VALUE.LOW);
SingleDoor.ToLow(ClampMoveInfo);
// SingleDoor.ToLow(ClampMoveInfo);
CloseSingleDoor(ClampMoveInfo);
OpenFlipDoor(ClampMoveInfo);
}
else
......@@ -358,7 +361,8 @@ namespace DeviceLibrary
ClampMoveInfo.NextMoveStep(MoveStep.SingleInReady);
ClampMoveInfo.log("开始单盘入库, 打开紧急料口");
//CylinderMove(ClampMoveInfo, IO_Type.NGDoor_Close, IO_Type.NGDoor_Open, IO_VALUE.HIGH);
SingleDoor.ToHigh(ClampMoveInfo);
// SingleDoor.ToHigh(ClampMoveInfo);
OpenSingleDoor(ClampMoveInfo);
break;
case MoveStep.SingleInReady:
Msg.add(crc.GetString(L.wait_put_reel_into_ngdoor, "等待放入单盘入库料盘"), MsgLevel.warning);
......@@ -366,7 +370,8 @@ namespace DeviceLibrary
case MoveStep.SingleInRun:
ClampMoveInfo.NextMoveStep(MoveStep.ReelClamp_09);
//CylinderMove(ClampMoveInfo, IO_Type.NGDoor_Close, IO_Type.NGDoor_Open, IO_VALUE.LOW);
SingleDoor.ToLow(ClampMoveInfo);
// SingleDoor.ToLow(ClampMoveInfo);
CloseSingleDoor(ClampMoveInfo);
ClampMoveInfo.MoveParam.PlateW = 7;
ClampMoveInfo.MoveParam.PlateH = 100;
......
DeviceLibrary/theMachine/RobotManage.cs
......@@ -22,7 +22,11 @@ namespace DeviceLibrary
public static bool InoutDebugMode = false;
public static bool DisableUpdownProtect
{
get => ConfigHelper.Config.Get("Device_DisableUpdownProtect", false);
get => Setting_Init.Device_DisableUpdownProtect;
}
public static bool DisableSingleDoor
{
get => Setting_Init.Device_DisableSingleDoor;
}
public delegate void LoadFinish(bool state, string msg);
public static event LoadFinish LoadFinishEvent;
......
TheMachine/IOControls.cs
......@@ -76,12 +76,12 @@ namespace TheMachine
private void btn_ngdooropen_Click(object sender, EventArgs e)
{
RobotManage.mainMachine.SingleDoor.ToHigh(null);
RobotManage.mainMachine.OpenSingleDoor(null);
}
private void btn_ngdoorclose_Click(object sender, EventArgs e)
{
RobotManage.mainMachine.SingleDoor.ToLow(null);
RobotManage.mainMachine.CloseSingleDoor(null);
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!