From d7b94473ecd9d96369a9dc5a7825bd3996870008 Mon Sep 17 00:00:00 2001
From: "b.makharadze" <81828475+bmidf@users.noreply.github.com>
Date: Fri, 6 Jun 2025 14:37:46 +0400
Subject: [PATCH 1/2] Update JR PB alarms
---
.../STATION_EPC/PLC/STATION_EPC.L5X | 86 +---
.../PLC/UDTs/STATION_EPC_DataType.L5X | 122 +++++
.../PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X | 377 +--------------
.../STATION_JR_PB/PLC/STATION_JR_PB.L5X | 279 +++++------
.../PLC/UDTs/STATION_JR_PB_DataTypes.L5X | 437 +-----------------
5 files changed, 265 insertions(+), 1036 deletions(-)
create mode 100644 PLC/Simulations/STATION_EPC/PLC/UDTs/STATION_EPC_DataType.L5X
diff --git a/PLC/Simulations/STATION_EPC/PLC/STATION_EPC.L5X b/PLC/Simulations/STATION_EPC/PLC/STATION_EPC.L5X
index d0a3904..fd542b0 100644
--- a/PLC/Simulations/STATION_EPC/PLC/STATION_EPC.L5X
+++ b/PLC/Simulations/STATION_EPC/PLC/STATION_EPC.L5X
@@ -1,6 +1,6 @@
-
-
+
@@ -659,48 +659,16 @@ Stopped by Station Stop PushButton]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2823,7 +2791,7 @@ NEEDS CLARIFICATION]]>
@@ -2848,7 +2816,7 @@ NEEDS CLARIFICATION]]>
-
+
@@ -2919,13 +2887,11 @@ NEEDS CLARIFICATION]]>
-
@@ -2944,36 +2910,20 @@ NEEDS CLARIFICATION]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -3009,9 +2959,7 @@ NEEDS CLARIFICATION]]>
],[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
],[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
]],[[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
- ],[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
- ],[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
- ],[0],0,0,0,0],[[2,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
+ ],[0],0],[[2,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
]],[4,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
],0]]]]]>
@@ -3030,27 +2978,11 @@ NEEDS CLARIFICATION]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/PLC/Simulations/STATION_EPC/PLC/UDTs/STATION_EPC_DataType.L5X b/PLC/Simulations/STATION_EPC/PLC/UDTs/STATION_EPC_DataType.L5X
new file mode 100644
index 0000000..acb2006
--- /dev/null
+++ b/PLC/Simulations/STATION_EPC/PLC/UDTs/STATION_EPC_DataType.L5X
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 be85f51..9a502b3 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,348 +1,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -378,9 +37,6 @@ Stopped by Station Stop PushButton]]>
-
-
-
@@ -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]]>
-
-
-
-
-
-
@@ -463,15 +107,10 @@ Stopped by Station Stop PushButton]]>
-
+
-
-
-
-
-
@@ -480,7 +119,7 @@ Stopped by Station Stop PushButton]]>
-
+
@@ -489,7 +128,7 @@ Stopped by Station Stop PushButton]]>
-
+
@@ -498,7 +137,7 @@ Stopped by Station Stop PushButton]]>
-
+
@@ -507,7 +146,7 @@ Stopped by Station Stop PushButton]]>
-
+
@@ -516,7 +155,7 @@ Stopped by Station Stop PushButton]]>
-
+
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 d88f18d..24267a2 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 @@
-
-
+
@@ -19,6 +19,11 @@
+
+
+
+
+
@@ -598,28 +603,18 @@ Stopped by Station Stop PushButton]]>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -629,19 +624,12 @@ Stopped by Station Stop PushButton]]>
-
-
-
-
-
-
-
+
+
-
-
@@ -1065,7 +1053,7 @@ Pressed]]>
-
-
+
-
-
-
-
-
@@ -1203,7 +1186,7 @@ Pressed]]>
-
+
@@ -1212,7 +1195,7 @@ Pressed]]>
-
+
@@ -1221,7 +1204,7 @@ Pressed]]>
-
+
@@ -1230,7 +1213,7 @@ Pressed]]>
-
+
@@ -1239,7 +1222,7 @@ Pressed]]>
-
+
@@ -2403,23 +2386,23 @@ Pressed]]>
-
+
-
+
-
+
-
-
+
+
-
+
@@ -2442,114 +2425,19 @@ Pressed]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+ ],0]]]]]>
@@ -2557,7 +2445,7 @@ Pressed]]>
-
+
@@ -2566,29 +2454,15 @@ Pressed]]>
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
@@ -2611,7 +2485,84 @@ Pressed]]>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2620,10 +2571,10 @@ Pressed]]>
-
+
-
+
@@ -2658,7 +2609,7 @@ Pressed]]>
],[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
],[0],0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[[0,0,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
],[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
- ],0,0],[0,0,0,4,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
+ ],0,0],[0,0,0,0,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
],0]]]]]>
@@ -2785,7 +2736,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 90fbd8e..9c4d213 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,204 +1,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -212,6 +15,11 @@ Stopped by Station Stop PushButton]]>
+
+
+
+
+
@@ -299,28 +107,18 @@ Stopped by Station Stop PushButton]]>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -330,230 +128,17 @@ Stopped by Station Stop PushButton]]>
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 0a7dfe804a1e32cf263046c67077bee74df39f44 Mon Sep 17 00:00:00 2001
From: "b.makharadze" <81828475+bmidf@users.noreply.github.com>
Date: Fri, 6 Jun 2025 15:17:24 +0400
Subject: [PATCH 2/2] Removed/Added stuff
---
.../PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X | 14 +-
.../STATION_JR_PB/PLC/STATION_JR_PB.L5X | 136 ++++++++----------
.../PLC/UDTs/STATION_JR_PB_DataTypes.L5X | 39 +++--
3 files changed, 87 insertions(+), 102 deletions(-)
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 9a502b3..fc61420 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 @@
-
+
-
-
+
-
+
@@ -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 24267a2..a059336 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 @@
-
-
+
@@ -598,36 +598,19 @@ Stopped by Station Stop PushButton]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -774,6 +757,21 @@ Pressed]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
@@ -1210,7 +1208,7 @@ Pressed]]>
]]>
-
+
@@ -1219,7 +1217,7 @@ Pressed]]>
]]>
-
+
@@ -1238,7 +1236,7 @@ Pressed]]>
-
+
@@ -2386,23 +2384,23 @@ Pressed]]>
-
+
-
+
-
+
-
-
+
+
-
+
@@ -2425,19 +2423,18 @@ Pressed]]>
-
+
-
+
-
+
@@ -2445,33 +2442,28 @@ Pressed]]>
-
+
-
-
-
-
-
-
+
+
-
-
+
-
+
-
+
-
+
@@ -2480,12 +2472,12 @@ Pressed]]>
-
+
-
+
-
+
@@ -2494,10 +2486,10 @@ Pressed]]>
-
+
-
+
@@ -2510,11 +2502,10 @@ Pressed]]>
-
+ ],1]]]]]>
@@ -2522,24 +2513,19 @@ Pressed]]>
-
+
-
-
-
-
-
-
+
+
-
-
+
@@ -2562,7 +2548,7 @@ Pressed]]>
-
+
@@ -2571,10 +2557,10 @@ Pressed]]>
-
+
-
+
@@ -2609,7 +2595,7 @@ Pressed]]>
],[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
],[0],0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[[0,0,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
],[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
- ],0,0],[0,0,0,0,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
+ ],0,0],[0,0,0,4,[0,'$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00$00'
],0]]]]]>
@@ -2736,7 +2722,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 9c4d213..9ff20e0 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 @@
-
+
@@ -102,43 +102,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+