From 712814c789cdbc9fb248f35a4a966772a058f7b1 Mon Sep 17 00:00:00 2001 From: ilia gurielidze Date: Wed, 6 Aug 2025 15:08:35 +0400 Subject: [PATCH] Revert "Merge pull request 'updated aois, mapped ints to colors' (#96) from updated_aois into main" This reverts commit 6358db69dbbf6e9c345147ca9727064857ec15d5, reversing changes made to e127458fe645a1d04342b7d9e81ef7a064e261b7. --- PLC/AOIs/{AOI_APF.L5X => AOI_APF_AOI.L5X} | 370 ++-- ..._CB_MONITOR.L5X => AOI_CB_MONITOR_AOI.L5X} | 8 +- ...OI_D2C_CHUTE.L5X => AOI_D2C_CHUTE_AOI.L5X} | 112 +- PLC/AOIs/{AOI_DJ_PE.L5X => AOI_DJ_PE_AOI.L5X} | 188 +- PLC/AOIs/{AOI_DPM.L5X => AOI_DPM_AOI.L5X} | 28 +- .../{AOI_ENCODER.L5X => AOI_ENCODER_AOI.L5X} | 158 +- .../{AOI_EXTENDO.L5X => AOI_EXTENDO_AOI.L5X} | 76 +- PLC/AOIs/AOI_FIO.L5X | 294 --- PLC/AOIs/AOI_FIO_AOI.L5X | 158 ++ ...OI_FLIP_FLOP.L5X => AOI_FLIP_FLOP_AOI.L5X} | 8 +- ...{AOI_FL_CHUTE.L5X => AOI_FL_CHUTE_AOI.L5X} | 2 +- ...MH_EXTENDO.L5X => AOI_FMH_EXTENDO_AOI.L5X} | 106 +- PLC/AOIs/{AOI_FPE.L5X => AOI_FPE_AOI.L5X} | 209 ++- PLC/AOIs/AOI_HUB.L5X | 260 --- PLC/AOIs/AOI_HUB_AOI.L5X | 133 ++ ...{AOI_IO_BLOCK.L5X => AOI_IO_BLOCK_AOI.L5X} | 28 +- PLC/AOIs/{AOI_JPE.L5X => AOI_JPE_AOI.L5X} | 212 ++- PLC/AOIs/{AOI_LPE.L5X => AOI_LPE_AOI.L5X} | 18 +- PLC/AOIs/{AOI_MCM.L5X => AOI_MCM_AOI.L5X} | 11 +- ...{AOI_PB_CHUTE.L5X => AOI_PB_CHUTE_AOI.L5X} | 95 +- PLC/AOIs/{AOI_PMM.L5X => AOI_PMM_AOI.L5X} | 32 +- PLC/AOIs/{AOI_RACK.L5X => AOI_RACK_AOI.L5X} | 8 +- PLC/AOIs/AOI_SIO.L5X | 283 --- PLC/AOIs/AOI_SIO_AOI.L5X | 150 ++ ...TATION_EPC.L5X => AOI_STATION_EPC_AOI.L5X} | 31 +- ...CHUTE.L5X => AOI_STATION_JR_CHUTE_AOI.L5X} | 76 +- ...ON_JR_PB.L5X => AOI_STATION_JR_PB_AOI.L5X} | 52 +- ...ON_SS_PB.L5X => AOI_STATION_SS_PB_AOI.L5X} | 245 +-- ...TION_S_PB.L5X => AOI_STATION_S_PB_AOI.L5X} | 242 +-- .../{AOI_TIPPER.L5X => AOI_TIPPER_AOI.L5X} | 350 +++- PLC/AOIs/AOI_VFD.L5X | 1580 ----------------- PLC/AOIs/AOI_VFD_AOI.L5X | 930 ++++++++++ ...Control.L5X => Banner_ZMX_Control_AOI.L5X} | 8 +- .../{OIP_Beacon.L5X => OIP_Beacon_AOI.L5X} | 4 +- PLC/AOIs/{OIP_Chute.L5X => OIP_Chute_AOI.L5X} | 4 +- 35 files changed, 2685 insertions(+), 3784 deletions(-) rename PLC/AOIs/{AOI_APF.L5X => AOI_APF_AOI.L5X} (87%) rename PLC/AOIs/{AOI_CB_MONITOR.L5X => AOI_CB_MONITOR_AOI.L5X} (97%) rename PLC/AOIs/{AOI_D2C_CHUTE.L5X => AOI_D2C_CHUTE_AOI.L5X} (95%) rename PLC/AOIs/{AOI_DJ_PE.L5X => AOI_DJ_PE_AOI.L5X} (89%) rename PLC/AOIs/{AOI_DPM.L5X => AOI_DPM_AOI.L5X} (93%) rename PLC/AOIs/{AOI_ENCODER.L5X => AOI_ENCODER_AOI.L5X} (77%) rename PLC/AOIs/{AOI_EXTENDO.L5X => AOI_EXTENDO_AOI.L5X} (95%) delete mode 100644 PLC/AOIs/AOI_FIO.L5X create mode 100644 PLC/AOIs/AOI_FIO_AOI.L5X rename PLC/AOIs/{AOI_FLIP_FLOP.L5X => AOI_FLIP_FLOP_AOI.L5X} (84%) rename PLC/AOIs/{AOI_FL_CHUTE.L5X => AOI_FL_CHUTE_AOI.L5X} (99%) rename PLC/AOIs/{AOI_FMH_EXTENDO.L5X => AOI_FMH_EXTENDO_AOI.L5X} (84%) rename PLC/AOIs/{AOI_FPE.L5X => AOI_FPE_AOI.L5X} (76%) delete mode 100644 PLC/AOIs/AOI_HUB.L5X create mode 100644 PLC/AOIs/AOI_HUB_AOI.L5X rename PLC/AOIs/{AOI_IO_BLOCK.L5X => AOI_IO_BLOCK_AOI.L5X} (93%) rename PLC/AOIs/{AOI_JPE.L5X => AOI_JPE_AOI.L5X} (83%) rename PLC/AOIs/{AOI_LPE.L5X => AOI_LPE_AOI.L5X} (54%) rename PLC/AOIs/{AOI_MCM.L5X => AOI_MCM_AOI.L5X} (98%) rename PLC/AOIs/{AOI_PB_CHUTE.L5X => AOI_PB_CHUTE_AOI.L5X} (87%) rename PLC/AOIs/{AOI_PMM.L5X => AOI_PMM_AOI.L5X} (80%) rename PLC/AOIs/{AOI_RACK.L5X => AOI_RACK_AOI.L5X} (92%) delete mode 100644 PLC/AOIs/AOI_SIO.L5X create mode 100644 PLC/AOIs/AOI_SIO_AOI.L5X rename PLC/AOIs/{AOI_STATION_EPC.L5X => AOI_STATION_EPC_AOI.L5X} (94%) rename PLC/AOIs/{AOI_STATION_JR_CHUTE.L5X => AOI_STATION_JR_CHUTE_AOI.L5X} (82%) rename PLC/AOIs/{AOI_STATION_JR_PB.L5X => AOI_STATION_JR_PB_AOI.L5X} (86%) rename PLC/AOIs/{AOI_STATION_SS_PB.L5X => AOI_STATION_SS_PB_AOI.L5X} (79%) rename PLC/AOIs/{AOI_STATION_S_PB.L5X => AOI_STATION_S_PB_AOI.L5X} (79%) rename PLC/AOIs/{AOI_TIPPER.L5X => AOI_TIPPER_AOI.L5X} (73%) delete mode 100644 PLC/AOIs/AOI_VFD.L5X create mode 100644 PLC/AOIs/AOI_VFD_AOI.L5X rename PLC/AOIs/{Banner_ZMX_Control.L5X => Banner_ZMX_Control_AOI.L5X} (98%) rename PLC/AOIs/{OIP_Beacon.L5X => OIP_Beacon_AOI.L5X} (98%) rename PLC/AOIs/{OIP_Chute.L5X => OIP_Chute_AOI.L5X} (95%) diff --git a/PLC/AOIs/AOI_APF.L5X b/PLC/AOIs/AOI_APF_AOI.L5X similarity index 87% rename from PLC/AOIs/AOI_APF.L5X rename to PLC/AOIs/AOI_APF_AOI.L5X index e457355..346c456 100644 --- a/PLC/AOIs/AOI_APF.L5X +++ b/PLC/AOIs/AOI_APF_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -11,9 +11,21 @@ - - - - @@ -324,7 +438,7 @@ - + @@ -983,118 +1097,6 @@ Pressed]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1488,82 +1490,82 @@ HMI.Alarm.Maintenance_Mode is raised while Maintenance_Mode is active. ]]> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/PLC/AOIs/AOI_CB_MONITOR.L5X b/PLC/AOIs/AOI_CB_MONITOR_AOI.L5X similarity index 97% rename from PLC/AOIs/AOI_CB_MONITOR.L5X rename to PLC/AOIs/AOI_CB_MONITOR_AOI.L5X index 9d103e6..037d45d 100644 --- a/PLC/AOIs/AOI_CB_MONITOR.L5X +++ b/PLC/AOIs/AOI_CB_MONITOR_AOI.L5X @@ -1,6 +1,6 @@  - - + + @@ -160,8 +160,8 @@ - + diff --git a/PLC/AOIs/AOI_D2C_CHUTE.L5X b/PLC/AOIs/AOI_D2C_CHUTE_AOI.L5X similarity index 95% rename from PLC/AOIs/AOI_D2C_CHUTE.L5X rename to PLC/AOIs/AOI_D2C_CHUTE_AOI.L5X index 4227594..09cae6e 100644 --- a/PLC/AOIs/AOI_D2C_CHUTE.L5X +++ b/PLC/AOIs/AOI_D2C_CHUTE_AOI.L5X @@ -1,6 +1,6 @@  - - + + @@ -1153,7 +1153,7 @@ Not Available at thsi time.]]> - @@ -1678,86 +1678,6 @@ Not Available at thsi time.]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1933,32 +1853,32 @@ HMI.Alarms.No_Container – no container present - + - + - + - + - + - + @@ -2011,37 +1931,37 @@ HMI.Alarms.No_Container – no container present ]]> - + - + - + - + - + - + - + diff --git a/PLC/AOIs/AOI_DJ_PE.L5X b/PLC/AOIs/AOI_DJ_PE_AOI.L5X similarity index 89% rename from PLC/AOIs/AOI_DJ_PE.L5X rename to PLC/AOIs/AOI_DJ_PE_AOI.L5X index 969be05..dbaa057 100644 --- a/PLC/AOIs/AOI_DJ_PE.L5X +++ b/PLC/AOIs/AOI_DJ_PE_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -140,9 +140,9 @@ @@ -186,28 +181,58 @@ - - + @@ -440,8 +506,8 @@ - + @@ -730,46 +796,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -869,7 +895,7 @@ ]]> - + @@ -878,7 +904,7 @@ ]]> - + @@ -888,7 +914,7 @@ ]]> - + @@ -898,7 +924,7 @@ ]]> - + @@ -907,7 +933,7 @@ ]]> - + diff --git a/PLC/AOIs/AOI_DPM.L5X b/PLC/AOIs/AOI_DPM_AOI.L5X similarity index 93% rename from PLC/AOIs/AOI_DPM.L5X rename to PLC/AOIs/AOI_DPM_AOI.L5X index bb75b03..33c0aac 100644 --- a/PLC/AOIs/AOI_DPM.L5X +++ b/PLC/AOIs/AOI_DPM_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -151,8 +151,8 @@ - + @@ -294,22 +294,6 @@ - - - - - - - - - - - - - - - - @@ -351,12 +335,12 @@ The system raises HMI.Alarm.Communication_Faulted whenever the switch itself los - + - + diff --git a/PLC/AOIs/AOI_ENCODER.L5X b/PLC/AOIs/AOI_ENCODER_AOI.L5X similarity index 77% rename from PLC/AOIs/AOI_ENCODER.L5X rename to PLC/AOIs/AOI_ENCODER_AOI.L5X index f3356d4..78797bc 100644 --- a/PLC/AOIs/AOI_ENCODER.L5X +++ b/PLC/AOIs/AOI_ENCODER_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -56,45 +56,75 @@ - - - + diff --git a/PLC/AOIs/AOI_EXTENDO.L5X b/PLC/AOIs/AOI_EXTENDO_AOI.L5X similarity index 95% rename from PLC/AOIs/AOI_EXTENDO.L5X rename to PLC/AOIs/AOI_EXTENDO_AOI.L5X index f279f74..6705a05 100644 --- a/PLC/AOIs/AOI_EXTENDO.L5X +++ b/PLC/AOIs/AOI_EXTENDO_AOI.L5X @@ -1,5 +1,5 @@  - + @@ -435,7 +435,7 @@ - @@ -761,62 +761,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1085,37 +1029,37 @@ HMI.Alarm.Extendo_Faulted – raised when Extendo Faulted is true. ]]> - + - + - + - + - + - + - + @@ -1132,8 +1076,6 @@ HMI.Alarm.Extendo_Faulted – raised when Extendo Faulted is true. - - diff --git a/PLC/AOIs/AOI_FIO.L5X b/PLC/AOIs/AOI_FIO.L5X deleted file mode 100644 index d17d93c..0000000 --- a/PLC/AOIs/AOI_FIO.L5X +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PLC/AOIs/AOI_FIO_AOI.L5X b/PLC/AOIs/AOI_FIO_AOI.L5X new file mode 100644 index 0000000..f3a57cc --- /dev/null +++ b/PLC/AOIs/AOI_FIO_AOI.L5X @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PLC/AOIs/AOI_FLIP_FLOP.L5X b/PLC/AOIs/AOI_FLIP_FLOP_AOI.L5X similarity index 84% rename from PLC/AOIs/AOI_FLIP_FLOP.L5X rename to PLC/AOIs/AOI_FLIP_FLOP_AOI.L5X index 19e5897..1bb45d9 100644 --- a/PLC/AOIs/AOI_FLIP_FLOP.L5X +++ b/PLC/AOIs/AOI_FLIP_FLOP_AOI.L5X @@ -1,11 +1,11 @@  - - + + - + diff --git a/PLC/AOIs/AOI_FL_CHUTE.L5X b/PLC/AOIs/AOI_FL_CHUTE_AOI.L5X similarity index 99% rename from PLC/AOIs/AOI_FL_CHUTE.L5X rename to PLC/AOIs/AOI_FL_CHUTE_AOI.L5X index 0e36643..5aed955 100644 --- a/PLC/AOIs/AOI_FL_CHUTE.L5X +++ b/PLC/AOIs/AOI_FL_CHUTE_AOI.L5X @@ -1,5 +1,5 @@  - + diff --git a/PLC/AOIs/AOI_FMH_EXTENDO.L5X b/PLC/AOIs/AOI_FMH_EXTENDO_AOI.L5X similarity index 84% rename from PLC/AOIs/AOI_FMH_EXTENDO.L5X rename to PLC/AOIs/AOI_FMH_EXTENDO_AOI.L5X index 8f0ab56..ebd7231 100644 --- a/PLC/AOIs/AOI_FMH_EXTENDO.L5X +++ b/PLC/AOIs/AOI_FMH_EXTENDO_AOI.L5X @@ -1,5 +1,5 @@  - + @@ -45,14 +45,14 @@ - @@ -137,7 +137,7 @@ - @@ -269,63 +269,15 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -387,12 +339,12 @@ E-Stop Sets HMI.State to 5]]> - + - + @@ -402,12 +354,12 @@ E-Stop Sets HMI.State to 5]]> - + - + @@ -417,7 +369,7 @@ E-Stop Sets HMI.State to 5]]> - + @@ -432,17 +384,17 @@ E-Stop Sets HMI.State to 5]]> - + - + - + @@ -457,7 +409,7 @@ E-Stop Sets HMI.State to 5]]> - + @@ -467,32 +419,32 @@ E-Stop Sets HMI.State to 5]]> - + - + - + - + - + - + diff --git a/PLC/AOIs/AOI_FPE.L5X b/PLC/AOIs/AOI_FPE_AOI.L5X similarity index 76% rename from PLC/AOIs/AOI_FPE.L5X rename to PLC/AOIs/AOI_FPE_AOI.L5X index bbdaa0e..eaaa2c4 100644 --- a/PLC/AOIs/AOI_FPE.L5X +++ b/PLC/AOIs/AOI_FPE_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -11,12 +11,7 @@ - - - - - - - - @@ -251,8 +280,8 @@ - + diff --git a/PLC/AOIs/AOI_HUB.L5X b/PLC/AOIs/AOI_HUB.L5X deleted file mode 100644 index aa044f0..0000000 --- a/PLC/AOIs/AOI_HUB.L5X +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PLC/AOIs/AOI_HUB_AOI.L5X b/PLC/AOIs/AOI_HUB_AOI.L5X new file mode 100644 index 0000000..b546975 --- /dev/null +++ b/PLC/AOIs/AOI_HUB_AOI.L5X @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PLC/AOIs/AOI_IO_BLOCK.L5X b/PLC/AOIs/AOI_IO_BLOCK_AOI.L5X similarity index 93% rename from PLC/AOIs/AOI_IO_BLOCK.L5X rename to PLC/AOIs/AOI_IO_BLOCK_AOI.L5X index 022ce10..62c402e 100644 --- a/PLC/AOIs/AOI_IO_BLOCK.L5X +++ b/PLC/AOIs/AOI_IO_BLOCK_AOI.L5X @@ -1,6 +1,6 @@  - - + + @@ -150,8 +150,8 @@ - + @@ -268,22 +268,6 @@ - - - - - - - - - - - - - - - - @@ -325,12 +309,12 @@ The system raises HMI.Alarm.Communication_Faulted whenever IOBlock itself loses - + - + diff --git a/PLC/AOIs/AOI_JPE.L5X b/PLC/AOIs/AOI_JPE_AOI.L5X similarity index 83% rename from PLC/AOIs/AOI_JPE.L5X rename to PLC/AOIs/AOI_JPE_AOI.L5X index ef78af7..e80c26b 100644 --- a/PLC/AOIs/AOI_JPE.L5X +++ b/PLC/AOIs/AOI_JPE_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -11,12 +11,7 @@ - - - - - - - - @@ -322,7 +351,8 @@ - + @@ -422,8 +452,8 @@ - + diff --git a/PLC/AOIs/AOI_LPE.L5X b/PLC/AOIs/AOI_LPE_AOI.L5X similarity index 54% rename from PLC/AOIs/AOI_LPE.L5X rename to PLC/AOIs/AOI_LPE_AOI.L5X index 52e451f..bbc4353 100644 --- a/PLC/AOIs/AOI_LPE.L5X +++ b/PLC/AOIs/AOI_LPE_AOI.L5X @@ -1,11 +1,11 @@  - - + + - + @@ -20,15 +20,7 @@ - - - - - - - - - + diff --git a/PLC/AOIs/AOI_MCM.L5X b/PLC/AOIs/AOI_MCM_AOI.L5X similarity index 98% rename from PLC/AOIs/AOI_MCM.L5X rename to PLC/AOIs/AOI_MCM_AOI.L5X index 7108924..dba91b6 100644 --- a/PLC/AOIs/AOI_MCM.L5X +++ b/PLC/AOIs/AOI_MCM_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -169,7 +169,8 @@ Faulted]]> - + @@ -269,8 +270,8 @@ Faulted]]> - + diff --git a/PLC/AOIs/AOI_PB_CHUTE.L5X b/PLC/AOIs/AOI_PB_CHUTE_AOI.L5X similarity index 87% rename from PLC/AOIs/AOI_PB_CHUTE.L5X rename to PLC/AOIs/AOI_PB_CHUTE_AOI.L5X index 37a4a59..1b191c8 100644 --- a/PLC/AOIs/AOI_PB_CHUTE.L5X +++ b/PLC/AOIs/AOI_PB_CHUTE_AOI.L5X @@ -1,6 +1,6 @@  - - + + @@ -165,7 +165,8 @@ - + @@ -265,8 +266,8 @@ - + @@ -472,70 +473,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -671,27 +608,27 @@ HMI.Alarms.PR_PB_Pressed – package-release button held - + - + - + - + - + @@ -701,27 +638,27 @@ HMI.Alarms.PR_PB_Pressed – package-release button held ]]> - + - + - + - + - + diff --git a/PLC/AOIs/AOI_PMM.L5X b/PLC/AOIs/AOI_PMM_AOI.L5X similarity index 80% rename from PLC/AOIs/AOI_PMM.L5X rename to PLC/AOIs/AOI_PMM_AOI.L5X index 954a864..1334ee2 100644 --- a/PLC/AOIs/AOI_PMM.L5X +++ b/PLC/AOIs/AOI_PMM_AOI.L5X @@ -1,6 +1,6 @@  - - + + @@ -39,8 +39,8 @@ - + @@ -102,22 +102,6 @@ - - - - - - - - - - - - - - - - @@ -138,7 +122,7 @@ ]]> - + @@ -147,7 +131,7 @@ ]]> - + @@ -165,10 +149,6 @@ - - - - diff --git a/PLC/AOIs/AOI_RACK.L5X b/PLC/AOIs/AOI_RACK_AOI.L5X similarity index 92% rename from PLC/AOIs/AOI_RACK.L5X rename to PLC/AOIs/AOI_RACK_AOI.L5X index 79e8e77..ff50e11 100644 --- a/PLC/AOIs/AOI_RACK.L5X +++ b/PLC/AOIs/AOI_RACK_AOI.L5X @@ -1,6 +1,6 @@  - - + + @@ -21,8 +21,8 @@ - + diff --git a/PLC/AOIs/AOI_SIO.L5X b/PLC/AOIs/AOI_SIO.L5X deleted file mode 100644 index b2d8d8c..0000000 --- a/PLC/AOIs/AOI_SIO.L5X +++ /dev/null @@ -1,283 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PLC/AOIs/AOI_SIO_AOI.L5X b/PLC/AOIs/AOI_SIO_AOI.L5X new file mode 100644 index 0000000..60ebeee --- /dev/null +++ b/PLC/AOIs/AOI_SIO_AOI.L5X @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PLC/AOIs/AOI_STATION_EPC.L5X b/PLC/AOIs/AOI_STATION_EPC_AOI.L5X similarity index 94% rename from PLC/AOIs/AOI_STATION_EPC.L5X rename to PLC/AOIs/AOI_STATION_EPC_AOI.L5X index 1057cd9..dc9fe6f 100644 --- a/PLC/AOIs/AOI_STATION_EPC.L5X +++ b/PLC/AOIs/AOI_STATION_EPC_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -192,7 +192,8 @@ - + @@ -292,8 +293,8 @@ - + @@ -447,22 +448,6 @@ - - - - - - - - - - - - - - - - @@ -521,7 +506,7 @@ ]]> - + @@ -530,7 +515,7 @@ ]]> - + diff --git a/PLC/AOIs/AOI_STATION_JR_CHUTE.L5X b/PLC/AOIs/AOI_STATION_JR_CHUTE_AOI.L5X similarity index 82% rename from PLC/AOIs/AOI_STATION_JR_CHUTE.L5X rename to PLC/AOIs/AOI_STATION_JR_CHUTE_AOI.L5X index 89fcc7b..8ed87ce 100644 --- a/PLC/AOIs/AOI_STATION_JR_CHUTE.L5X +++ b/PLC/AOIs/AOI_STATION_JR_CHUTE_AOI.L5X @@ -1,6 +1,6 @@  - - + + @@ -165,7 +165,7 @@ - @@ -259,62 +259,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -341,17 +285,17 @@ - + - + - + @@ -369,22 +313,22 @@ ]]> - + - + - + - + diff --git a/PLC/AOIs/AOI_STATION_JR_PB.L5X b/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X similarity index 86% rename from PLC/AOIs/AOI_STATION_JR_PB.L5X rename to PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X index cd9c512..34b6a68 100644 --- a/PLC/AOIs/AOI_STATION_JR_PB.L5X +++ b/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X @@ -1,8 +1,8 @@  - - + + @@ -131,8 +131,8 @@ - + @@ -213,38 +213,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -327,12 +295,12 @@ HMI.Alarm.Pressed is raised whenever the physical Jam-Reset push-button is press - + - + @@ -350,7 +318,7 @@ HMI.Alarm.Pressed is raised whenever the physical Jam-Reset push-button is press ]]> - + @@ -359,7 +327,7 @@ HMI.Alarm.Pressed is raised whenever the physical Jam-Reset push-button is press ]]> - + @@ -368,7 +336,7 @@ HMI.Alarm.Pressed is raised whenever the physical Jam-Reset push-button is press ]]> - + @@ -377,7 +345,7 @@ HMI.Alarm.Pressed is raised whenever the physical Jam-Reset push-button is press ]]> - + diff --git a/PLC/AOIs/AOI_STATION_SS_PB.L5X b/PLC/AOIs/AOI_STATION_SS_PB_AOI.L5X similarity index 79% rename from PLC/AOIs/AOI_STATION_SS_PB.L5X rename to PLC/AOIs/AOI_STATION_SS_PB_AOI.L5X index 04d2dec..982c8bc 100644 --- a/PLC/AOIs/AOI_STATION_SS_PB.L5X +++ b/PLC/AOIs/AOI_STATION_SS_PB_AOI.L5X @@ -1,7 +1,7 @@  - - + + @@ -106,45 +106,75 @@ - - -