..
This commit is contained in:
@@ -266,12 +266,6 @@ namespace Project
|
||||
//둘중 하나라도 켜져있드면 비상 상태이다
|
||||
var b1 = GetIOInput(eDIName.BUT_EMGF);
|
||||
return b1;
|
||||
//BitArray ba1 = new BitArray(8);
|
||||
//ba1.Set(0, GetIOInput(eDIName.BUT_EMG1));
|
||||
//ba1.Set(1, GetIOInput(eDIName.BUT_EMG2));
|
||||
//ba1.Set(2, GetIOInput(eDIName.BUT_EMG3));
|
||||
//ba1.Set(3, GetIOInput(eDIName.BUT_EMG4));
|
||||
//return ba1.ValueI();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -391,22 +385,6 @@ namespace Project
|
||||
{
|
||||
if (SETTING.System.ReverseSIG_PortDetect2Up) curValue = !curValue;
|
||||
}
|
||||
//else if(pin == eDIName.L_CYLUP) //임시코드
|
||||
//{
|
||||
// curValue = !curValue;
|
||||
//}
|
||||
//else if(pin == eDIName.R_CYLUP) //임시코드
|
||||
//{
|
||||
// curValue = !curValue;
|
||||
//}
|
||||
//else if (pin == eDIName.L_EXT_READY)
|
||||
//{
|
||||
// if (SETTING.System.ReverseSIG_ExtConvReady) curValue = !curValue;
|
||||
//}
|
||||
//else if (pin == eDIName.R_EXT_READY)
|
||||
//{
|
||||
// if (SETTING.System.ReverseSIG_ExtConvReady) curValue = !curValue;
|
||||
//}
|
||||
else if (pin == eDIName.L_CONV1 || pin == eDIName.L_CONV4 || pin == eDIName.L_CONV3)
|
||||
curValue = !curValue;
|
||||
else if (pin == eDIName.R_CONV1 || pin == eDIName.R_CONV4 || pin == eDIName.R_CONV3)
|
||||
@@ -425,30 +403,6 @@ namespace Project
|
||||
return PUB.dio.GetDOValue(pindef.terminalno);
|
||||
}
|
||||
|
||||
///// <summary>
|
||||
///// A/D Link Digital input Pin number
|
||||
///// </summary>
|
||||
///// <param name="pin"></param>
|
||||
///// <returns></returns>
|
||||
//public static int GetDINum(eDIName pin)
|
||||
//{
|
||||
// return (int)pin + 1;
|
||||
// //return COMM.SETTING.Data.DI[(byte)pin];
|
||||
//}
|
||||
|
||||
///// <summary>
|
||||
///// adlink digital output in number
|
||||
///// </summary>
|
||||
///// <param name="pin"></param>
|
||||
///// <returns></returns>
|
||||
//public static int Pin[eDOName pin)
|
||||
//{
|
||||
// return (int)pin + 1;
|
||||
// //return COMM.SETTING.Data.DO[(byte)pin];
|
||||
|
||||
//}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 포트내의 안전센서 여부
|
||||
/// </summary>
|
||||
@@ -478,17 +432,17 @@ namespace Project
|
||||
{
|
||||
if (idx == 0)
|
||||
{
|
||||
if (AR.SETTING.Data.Disable_safty_F0) return true;
|
||||
if (SETTING.System.Disable_safty_F0) return true;
|
||||
else return DIO.GetIOInput(eDIName.DOORF1) == false;
|
||||
}
|
||||
else if (idx == 1)
|
||||
{
|
||||
if (AR.SETTING.Data.Disable_safty_F1) return true;
|
||||
if (AR.SETTING.System.Disable_safty_F1) return true;
|
||||
else return DIO.GetIOInput(eDIName.DOORF2) == false;
|
||||
}
|
||||
else if (idx == 2)
|
||||
{
|
||||
if (AR.SETTING.Data.Disable_safty_F2) return true;
|
||||
if (AR.SETTING.System.Disable_safty_F2) return true;
|
||||
else return DIO.GetIOInput(eDIName.DOORF3) == false;
|
||||
}
|
||||
}
|
||||
@@ -497,9 +451,9 @@ namespace Project
|
||||
|
||||
public static Boolean isSaftyDoorR(int idx, Boolean RealSensor)
|
||||
{
|
||||
if (RealSensor == false && idx == 0 && AR.SETTING.Data.Disable_safty_R0 == true) return true;
|
||||
else if (RealSensor == false && idx == 1 && AR.SETTING.Data.Disable_safty_R1 == true) return true;
|
||||
else if (RealSensor == false && idx == 2 && AR.SETTING.Data.Disable_safty_R2 == true) return true;
|
||||
if (RealSensor == false && idx == 0 && AR.SETTING.System.Disable_safty_R0 == true) return true;
|
||||
else if (RealSensor == false && idx == 1 && AR.SETTING.System.Disable_safty_R1 == true) return true;
|
||||
else if (RealSensor == false && idx == 2 && AR.SETTING.System.Disable_safty_R2 == true) return true;
|
||||
else if (idx == 0 && DIO.GetIOInput(eDIName.DOORR1) == false) return true;
|
||||
else if (idx == 1 && DIO.GetIOInput(eDIName.DOORR2) == false) return true;
|
||||
else if (idx == 2 && DIO.GetIOInput(eDIName.DOORR3) == false) return true;
|
||||
|
||||
Reference in New Issue
Block a user