From b40b15e7744ada62c265e36cd721b0f4bc99f12e Mon Sep 17 00:00:00 2001 From: "gigi.mamaladze" Date: Wed, 18 Jun 2025 21:23:24 +0400 Subject: [PATCH] MTN6-262 --- PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X | 399 +-------------- .../PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X | 28 +- .../STATION_JR_PB/PLC/STATION_JR_PB.L5X | 87 ++-- .../PLC/UDTs/STATION_JR_PB_DataTypes.L5X | 38 +- PLC/UDTs/STATION_JR_PB_DataTypes.L5X | 458 +----------------- 5 files changed, 117 insertions(+), 893 deletions(-) diff --git a/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X b/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X index 46da99d..8c7ac7a 100644 --- a/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X +++ b/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X @@ -1,348 +1,10 @@  - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - + - + - - - @@ -391,9 +47,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -402,9 +55,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -413,17 +63,11 @@ Stopped by Station Stop PushButton]]> - - - - - - @@ -439,12 +83,12 @@ Stopped by Station Stop PushButton]]> - + - + @@ -463,15 +107,10 @@ Stopped by Station Stop PushButton]]> - + - - - - - @@ -480,43 +119,43 @@ Stopped by Station Stop PushButton]]> - + - + - + - + - + - + - + - + - + @@ -532,7 +171,7 @@ Stopped by Station Stop PushButton]]> - + diff --git a/PLC/Simulations/STATION_JR_PB/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X b/PLC/Simulations/STATION_JR_PB/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X index fc61420..8c7ac7a 100644 --- a/PLC/Simulations/STATION_JR_PB/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X +++ b/PLC/Simulations/STATION_JR_PB/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X @@ -1,10 +1,10 @@  - + - - + - + - + - + @@ -83,12 +83,12 @@ - + - + @@ -107,7 +107,7 @@ - + @@ -125,7 +125,7 @@ ]]> - + @@ -134,7 +134,7 @@ ]]> - + @@ -143,7 +143,7 @@ ]]> - + @@ -152,7 +152,7 @@ ]]> - + @@ -171,7 +171,7 @@ - + diff --git a/PLC/Simulations/STATION_JR_PB/PLC/STATION_JR_PB.L5X b/PLC/Simulations/STATION_JR_PB/PLC/STATION_JR_PB.L5X index a059336..3603b0d 100644 --- a/PLC/Simulations/STATION_JR_PB/PLC/STATION_JR_PB.L5X +++ b/PLC/Simulations/STATION_JR_PB/PLC/STATION_JR_PB.L5X @@ -1,6 +1,6 @@  - - + @@ -401,6 +401,11 @@ + @@ -608,9 +613,20 @@ Stopped by Station Stop PushButton]]> - - - - - - - + - + @@ -1083,9 +1084,9 @@ Pressed]]> - + - + @@ -1148,12 +1149,12 @@ Pressed]]> - + - + @@ -1172,7 +1173,7 @@ Pressed]]> - + @@ -1190,7 +1191,7 @@ Pressed]]> ]]> - + @@ -1199,7 +1200,7 @@ Pressed]]> ]]> - + @@ -1208,7 +1209,7 @@ Pressed]]> ]]> - + @@ -1217,7 +1218,7 @@ Pressed]]> ]]> - + @@ -1236,7 +1237,7 @@ Pressed]]> - + @@ -2432,7 +2433,7 @@ Pressed]]> @@ -2441,8 +2442,8 @@ Pressed]]> - - + + @@ -2451,11 +2452,10 @@ Pressed]]> - + - @@ -2479,6 +2479,7 @@ Pressed]]> + @@ -2503,7 +2504,7 @@ Pressed]]> @@ -2512,8 +2513,8 @@ Pressed]]> - - + + @@ -2522,11 +2523,10 @@ Pressed]]> - + - @@ -2550,6 +2550,7 @@ Pressed]]> + @@ -2793,7 +2794,7 @@ Pressed]]> - + diff --git a/PLC/Simulations/STATION_JR_PB/PLC/UDTs/STATION_JR_PB_DataTypes.L5X b/PLC/Simulations/STATION_JR_PB/PLC/UDTs/STATION_JR_PB_DataTypes.L5X index 9ff20e0..c5db933 100644 --- a/PLC/Simulations/STATION_JR_PB/PLC/UDTs/STATION_JR_PB_DataTypes.L5X +++ b/PLC/Simulations/STATION_JR_PB/PLC/UDTs/STATION_JR_PB_DataTypes.L5X @@ -1,5 +1,5 @@  - + @@ -98,6 +98,11 @@ + @@ -112,32 +117,27 @@ - - - - - diff --git a/PLC/UDTs/STATION_JR_PB_DataTypes.L5X b/PLC/UDTs/STATION_JR_PB_DataTypes.L5X index a882152..c5db933 100644 --- a/PLC/UDTs/STATION_JR_PB_DataTypes.L5X +++ b/PLC/UDTs/STATION_JR_PB_DataTypes.L5X @@ -1,204 +1,7 @@  - + - - - - - - - - - - - - - - - - + @@ -290,270 +98,46 @@ Stopped by Station Stop PushButton]]> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -