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

@@ -29,13 +29,13 @@ namespace Project
// try
// {
// DateTime SetTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " " + COMM.SETTING.Data.datetime_Reset_1 + ":00");
// DateTime LastClearTime = Pub.counter.;
// DateTime LastClearTime = SETTING.Counter.;
// //현재 시간이 클리어대상 시간보다 크고, 마지막으로 클리어한 시간이 지정시간보다 작아야함
// if (DateTime.Now > SetTime && LastClearTime < SetTime)
// {
// Pub.log.AddI("Count Reset #1");
// Pub.counter.ClearDay();
// SETTING.Counter.ClearDay();
// }
// }
// catch { }
@@ -46,13 +46,13 @@ namespace Project
// try
// {
// DateTime SetTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " " + COMM.SETTING.Data.datetime_Reset_2 + ":00");
// DateTime LastClearTime = Pub.counter.CountReset;
// DateTime LastClearTime = SETTING.Counter.CountReset;
// //현재 시간이 클리어대상 시간보다 크고, 마지막으로 클리어한 시간이 지정시간보다 작아야함
// if (DateTime.Now > SetTime && LastClearTime < SetTime)
// {
// Pub.log.AddI("Count Reset #2");
// Pub.counter.ClearDay();
// SETTING.Counter.ClearDay();
// }
// }
// catch { }

View File

@@ -30,8 +30,8 @@ namespace Project
lbCntLeft.Text = $"{VAR.I32[eVarInt32.LPickOfCount]}";
lbCntRight.Text = $"{VAR.I32[eVarInt32.RPickOfCount]}";
lbCntPicker.Text = $"{VAR.I32[eVarInt32.PickOfCount]}";
//lbCntPrnL.Text = $"{PUB.counter.CountPrintL}";
//lbCnrPrnR.Text = $"{PUB.counter.CountPrintR}";
//lbCntPrnL.Text = $"{SETTING.Counter.CountPrintL}";
//lbCnrPrnR.Text = $"{SETTING.Counter.CountPrintR}";
if (AR.SETTING.Data.Enable_SpeedLimit)
grpProgress.Text = $"작업 수량(속도제한:{AR.SETTING.Data.LimitSpeed})";

View File

@@ -237,25 +237,25 @@ namespace Project
hmi1.arVar_Port[0].LimitUpper = DIO.GetIOInput(eDIName.PORTL_LIM_UP);
hmi1.arVar_Port[0].DetectUp = DIO.GetIOInput(eDIName.PORTL_DET_UP);
hmi1.arVar_Port[0].SaftyErr = !DIO.isSaftyDoorF(0, false);
hmi1.arVar_Port[0].reelCount = PUB.counter.CountP0;
hmi1.arVar_Port[0].reelCount = SETTING.Counter.CountP0;
hmi1.arVar_Port[0].CartSize = (int)DIO.getCartSize(0);
hmi1.arVar_Port[1].LimitLower = DIO.GetIOInput(eDIName.PORTC_LIM_DN); //front-right
hmi1.arVar_Port[1].LimitUpper = DIO.GetIOInput(eDIName.PORTC_LIM_UP);
hmi1.arVar_Port[1].DetectUp = DIO.GetIOInput(eDIName.PORTC_DET_UP);
hmi1.arVar_Port[1].SaftyErr = !DIO.isSaftyDoorF(1, false);
hmi1.arVar_Port[1].reelCount = PUB.counter.CountP1;
hmi1.arVar_Port[1].reelCount = SETTING.Counter.CountP1;
hmi1.arVar_Port[1].CartSize = (int)DIO.getCartSize(1);
hmi1.arVar_Port[2].LimitLower = DIO.GetIOInput(eDIName.PORTR_LIM_DN); //front-left
hmi1.arVar_Port[2].LimitUpper = DIO.GetIOInput(eDIName.PORTR_LIM_UP);
hmi1.arVar_Port[2].DetectUp = DIO.GetIOInput(eDIName.PORTR_DET_UP);
hmi1.arVar_Port[2].SaftyErr = !DIO.isSaftyDoorF(2, false);
hmi1.arVar_Port[2].reelCount = PUB.counter.CountP2;
hmi1.arVar_Port[2].reelCount = SETTING.Counter.CountP2;
hmi1.arVar_Port[2].CartSize = (int)DIO.getCartSize(2);
hmi1.arCountPrint0 = PUB.counter.CountPrintL;
hmi1.arCountPrint1 = PUB.counter.CountPrintR;
hmi1.arCountPrint0 = SETTING.Counter.CountPrintL;
hmi1.arCountPrint1 = SETTING.Counter.CountPrintR;
if (VAR.BOOL[eVarBool.Use_Conveyor])
{
@@ -263,9 +263,9 @@ namespace Project
hmi1.arVar_Port[2].reelCount = VAR.I32[eVarInt32.RIGT_ITEM_COUNT];
}
hmi1.arCountV1 = PUB.counter.CountV1;
hmi1.arCountV0 = PUB.counter.CountV0;
hmi1.arCountV2 = PUB.counter.CountV2;
hmi1.arCountV1 = SETTING.Counter.CountV1;
hmi1.arCountV0 = SETTING.Counter.CountV0;
hmi1.arCountV2 = SETTING.Counter.CountV2;
//피커 백큠감지 상태(Front)
hmi1.arVar_Picker[0].VacOutput[0] = DIO.GetIOOutput(eDOName.PICK_VAC1);

View File

@@ -64,7 +64,7 @@ namespace Project
var limport = new List<string>();
if (PUB.mot.HasLimitError == true)
{
for (short i = 0; i < PUB.system.MotaxisCount; i++)
for (short i = 0; i < SETTING.System.MotaxisCount; i++)
{
if (PUB.mot.IsUse(i) == false) continue;
if (PUB.mot.IsLimitN(i))