This commit is contained in:
atvstdla
2025-09-26 18:15:59 +09:00
parent 54c64a06bd
commit 16da4a5ffa
65 changed files with 5700 additions and 3514 deletions

View File

@@ -110,6 +110,7 @@ namespace Project
//process barcode
BarcodeProcess();
AutoOutConveyor();
}
string lastridv1 = string.Empty;
@@ -119,7 +120,7 @@ namespace Project
void PortMagnet()
{
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET0) && DIO.GetIOOutput(eDOName.CART_MAG0) == false)
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET0) && DIO.GetIOOutput(eDOName.PORTL_MAGNET) == false)
{
var ts = DateTime.Now - VAR.TIME[(int)eVarTime.MAGNET0];
if (ts.TotalMilliseconds > AR.SETTING.Data.WaitTime_Magnet0)
@@ -128,12 +129,12 @@ namespace Project
PUB.flag.set(eVarBool.FG_WAT_MAGNET0, false, "SPS-MAGON");
}
}
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET0) == true && DIO.GetIOOutput(eDOName.CART_MAG0) == true)
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET0) == true && DIO.GetIOOutput(eDOName.PORTL_MAGNET) == true)
{
PUB.flag.set(eVarBool.FG_WAT_MAGNET0, false, "SPS-MAGOFF");
}
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET1) && DIO.GetIOOutput(eDOName.CART_MAG1) == false)
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET1) && DIO.GetIOOutput(eDOName.PORTC_MAGNET) == false)
{
var ts = DateTime.Now - VAR.TIME[(int)eVarTime.MAGNET1];
if (ts.TotalMilliseconds > AR.SETTING.Data.WaitTime_Magnet1)
@@ -142,13 +143,13 @@ namespace Project
PUB.flag.set(eVarBool.FG_WAT_MAGNET1, false, "SPS-MAGON");
}
}
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET1) == true && DIO.GetIOOutput(eDOName.CART_MAG1) == true)
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET1) == true && DIO.GetIOOutput(eDOName.PORTC_MAGNET) == true)
{
PUB.flag.set(eVarBool.FG_WAT_MAGNET1, false, "SPS-MAGOFF");
}
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET2) && DIO.GetIOOutput(eDOName.CART_MAG2) == false)
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET2) && DIO.GetIOOutput(eDOName.PORTR_MAGNET) == false)
{
var ts = DateTime.Now - VAR.TIME[(int)eVarTime.MAGNET2];
if (ts.TotalMilliseconds > AR.SETTING.Data.WaitTime_Magnet2)
@@ -157,7 +158,7 @@ namespace Project
PUB.flag.set(eVarBool.FG_WAT_MAGNET2, false, "SPS-MAGON");
}
}
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET2) == true && DIO.GetIOOutput(eDOName.CART_MAG2) == true)
if (PUB.flag.get(eVarBool.FG_WAT_MAGNET2) == true && DIO.GetIOOutput(eDOName.PORTR_MAGNET) == true)
{
PUB.flag.set(eVarBool.FG_WAT_MAGNET2, false, "SPS-MAGOFF");
}