This commit is contained in:
ChiKyun Kim
2025-09-09 08:25:50 +09:00
parent 9a7d1d27c7
commit adb66451ca
79 changed files with 4195 additions and 2213 deletions

View File

@@ -349,47 +349,47 @@ namespace Project
}
else if (pin == eDIName.BUT_EMGF)
{
if (PUB.system.ReverseSIG_Emgergency) curValue = !curValue;
if (SETTING.System.ReverseSIG_Emgergency) curValue = !curValue;
}
else if (pin == eDIName.PICKER_SAFE)
{
if (PUB.system.ReverseSIG_PickerSafe) curValue = !curValue;
if (SETTING.System.ReverseSIG_PickerSafe) curValue = !curValue;
}
else if (pin == eDIName.BUT_AIRF)
{
if (PUB.system.ReverseSIG_ButtonAir) curValue = !curValue;
if (SETTING.System.ReverseSIG_ButtonAir) curValue = !curValue;
}
else if (pin == eDIName.DOORF1 || pin == eDIName.DOORF2 || pin == eDIName.DOORF3)
{
if (PUB.system.ReverseSIG_DoorF) curValue = !curValue;
if (SETTING.System.ReverseSIG_DoorF) curValue = !curValue;
}
else if (pin == eDIName.DOORR1 || pin == eDIName.DOORR2 || pin == eDIName.DOORR3)
{
if (PUB.system.ReverseSIG_DoorR) curValue = !curValue;
if (SETTING.System.ReverseSIG_DoorR) curValue = !curValue;
}
else if (pin == eDIName.AIR_DETECT)
{
if (PUB.system.ReverseSIG_AirCheck) curValue = !curValue;
if (SETTING.System.ReverseSIG_AirCheck) curValue = !curValue;
}
else if (pin == eDIName.PORTL_LIM_UP || pin == eDIName.PORTC_LIM_UP || pin == eDIName.PORTR_LIM_UP)
{
if (PUB.system.ReverseSIG_PortLimitUp) curValue = !curValue;
if (SETTING.System.ReverseSIG_PortLimitUp) curValue = !curValue;
}
else if (pin == eDIName.PORTL_LIM_DN || pin == eDIName.PORTC_LIM_DN || pin == eDIName.PORTR_LIM_DN)
{
if (PUB.system.ReverseSIG_PortLimitDn) curValue = !curValue;
if (SETTING.System.ReverseSIG_PortLimitDn) curValue = !curValue;
}
else if (pin == eDIName.PORTL_DET_UP)
{
if (PUB.system.ReverseSIG_PortDetect0Up) curValue = !curValue;
if (SETTING.System.ReverseSIG_PortDetect0Up) curValue = !curValue;
}
else if (pin == eDIName.PORTC_DET_UP)
{
if (PUB.system.ReverseSIG_PortDetect1Up) curValue = !curValue;
if (SETTING.System.ReverseSIG_PortDetect1Up) curValue = !curValue;
}
else if (pin == eDIName.PORTR_DET_UP)
{
if (PUB.system.ReverseSIG_PortDetect2Up) curValue = !curValue;
if (SETTING.System.ReverseSIG_PortDetect2Up) curValue = !curValue;
}
//else if(pin == eDIName.L_CYLUP) //임시코드
//{
@@ -401,11 +401,11 @@ namespace Project
//}
//else if (pin == eDIName.L_EXT_READY)
//{
// if (PUB.system.ReverseSIG_ExtConvReady) curValue = !curValue;
// if (SETTING.System.ReverseSIG_ExtConvReady) curValue = !curValue;
//}
//else if (pin == eDIName.R_EXT_READY)
//{
// if (PUB.system.ReverseSIG_ExtConvReady) curValue = !curValue;
// if (SETTING.System.ReverseSIG_ExtConvReady) curValue = !curValue;
//}
else if (pin == eDIName.L_CONV1 || pin == eDIName.L_CONV4 || pin == eDIName.L_CONV3)
curValue = !curValue;

View File

@@ -31,8 +31,8 @@ namespace Project
for (short i = 0; i < PUB.mot.DeviceCount; i++)
{
if (PUB.mot.IsUse(i) == false) continue; //미사용축은 제외한다.
//if (PUB.system.UseAxis(i) == false) continue;
//if (PUB.system.UseOriginSignal(i) == false) continue;
//if (SETTING.System.UseAxis(i) == false) continue;
//if (SETTING.System.UseOriginSignal(i) == false) continue;
if (PUB.mot.IsLimit(i)) return true;
}
return false;
@@ -58,7 +58,7 @@ namespace Project
//accr 범위가 지정되잇다며 ㄴ그것을 사용한다
if (inpaccr == 0f)
inpaccr = 0.1f;// PUB.system.INPAccurary(axis);
inpaccr = 0.1f;// SETTING.System.INPAccurary(axis);
//X축을 그립위치까지 이동함
@@ -377,7 +377,7 @@ namespace Project
retval.Speed = Math.Min(retval.Speed, AR.SETTING.Data.LimitSpeed);
////시스템설정의 속도 체크 220524
//var maxspeed = PUB.system.GetMaxSpeed;
//var maxspeed = SETTING.System.GetMaxSpeed;
//var motidx = (int)axis;
//if (motidx >= 0 && motidx < maxspeed.Length && maxspeed[motidx] > 0)
//{
@@ -385,7 +385,7 @@ namespace Project
//}
////시스템설정의 가속도체크
//var maxAcc = PUB.system.GetMaxAcc;
//var maxAcc = SETTING.System.GetMaxAcc;
//if (motidx >= 0 && motidx < maxAcc.Length && maxAcc[motidx] > 0)
//{
// retval.Acc = Math.Min(retval.Acc, maxAcc[motidx]);