From 46d7ef9d6be851220ba0c8777f3de8d9fb72e6bc Mon Sep 17 00:00:00 2001 From: "gigi.mamaladze" Date: Thu, 19 Jun 2025 16:51:14 +0400 Subject: [PATCH 1/2] Updated JPE AOI --- PLC/AOIs/AOI_JPE_AOI.L5X | 673 ++-------------- PLC/Simulations/JPE/PLC/AOI/AOI_JPE_AOI.L5X | 545 +------------ PLC/Simulations/JPE/PLC/JPE.L5X | 340 +++----- .../JPE/PLC/UDT/UDT_JPE_DataType.L5X | 96 +++ .../JPE/PLC/UDT/UDT_PE_DataType.L5X | 759 ------------------ PLC/UDTs/JPE_DataTypes.L5X | 744 +---------------- 6 files changed, 308 insertions(+), 2849 deletions(-) create mode 100644 PLC/Simulations/JPE/PLC/UDT/UDT_JPE_DataType.L5X delete mode 100644 PLC/Simulations/JPE/PLC/UDT/UDT_PE_DataType.L5X diff --git a/PLC/AOIs/AOI_JPE_AOI.L5X b/PLC/AOIs/AOI_JPE_AOI.L5X index 8d4e703..4faef21 100644 --- a/PLC/AOIs/AOI_JPE_AOI.L5X +++ b/PLC/AOIs/AOI_JPE_AOI.L5X @@ -1,513 +1,10 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -519,13 +16,10 @@ Stopped by Station Stop PushButton]]> - + - - - @@ -534,9 +28,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -545,9 +36,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -556,20 +44,14 @@ Stopped by Station Stop PushButton]]> - - - - + - + - - - @@ -578,16 +60,13 @@ Stopped by Station Stop PushButton]]> - - - - + - + @@ -596,9 +75,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -613,9 +89,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -624,9 +97,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -641,9 +111,38 @@ Stopped by Station Stop PushButton]]> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -654,70 +153,64 @@ Stopped by Station Stop PushButton]]> - + - + - + - + - + - + - + - + - + - + + + Run up +]]> + - + - - - - - - - - - - @@ -726,61 +219,11 @@ Stopped by Station Stop PushButton]]> - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -792,12 +235,12 @@ Stopped by Station Stop PushButton]]> - + - + diff --git a/PLC/Simulations/JPE/PLC/AOI/AOI_JPE_AOI.L5X b/PLC/Simulations/JPE/PLC/AOI/AOI_JPE_AOI.L5X index 145ae3f..4faef21 100644 --- a/PLC/Simulations/JPE/PLC/AOI/AOI_JPE_AOI.L5X +++ b/PLC/Simulations/JPE/PLC/AOI/AOI_JPE_AOI.L5X @@ -1,474 +1,9 @@  - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -481,13 +16,10 @@ Stopped by Station Stop PushButton]]> - + - - - @@ -496,9 +28,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -507,9 +36,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -518,20 +44,14 @@ Stopped by Station Stop PushButton]]> - - - - + - + - - - @@ -540,16 +60,13 @@ Stopped by Station Stop PushButton]]> - - - - + - + @@ -558,9 +75,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -575,9 +89,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -586,9 +97,6 @@ Stopped by Station Stop PushButton]]> - - - @@ -603,22 +111,16 @@ Stopped by Station Stop PushButton]]> - - - - + - - - - - + + @@ -627,9 +129,6 @@ Stopped by Station Stop PushButton]]> Timer is Done Full Fault is reported]]> - - - @@ -640,23 +139,31 @@ Fault is reported]]> + + + + + + + + - + - + - + @@ -666,17 +173,17 @@ Fault is reported]]> - + - + - + @@ -686,12 +193,12 @@ Fault is reported]]> - + - + diff --git a/PLC/Simulations/JPE/PLC/JPE.L5X b/PLC/Simulations/JPE/PLC/JPE.L5X index 6fcded1..26cfdf7 100644 --- a/PLC/Simulations/JPE/PLC/JPE.L5X +++ b/PLC/Simulations/JPE/PLC/JPE.L5X @@ -1,6 +1,6 @@  - - + @@ -44,6 +44,11 @@ + @@ -495,6 +500,11 @@ + @@ -603,7 +613,7 @@ Stopped by Station Stop PushButton]]> - - - - @@ -1364,7 +1349,7 @@ Pressed]]> - @@ -1377,7 +1362,7 @@ Pressed]]> - + @@ -1421,9 +1406,9 @@ Pressed]]> - + - + @@ -1443,9 +1428,9 @@ Pressed]]> - + - + @@ -1508,13 +1493,13 @@ Pressed]]> - + - + - - + + @@ -1536,6 +1521,17 @@ Fault is reported]]> + + + + + + + + + + + @@ -1547,12 +1543,12 @@ Fault is reported]]> - + - + @@ -1562,17 +1558,17 @@ Fault is reported]]> - + - + - + @@ -1582,12 +1578,12 @@ Fault is reported]]> - + - + @@ -1818,7 +1814,7 @@ NEEDS CLARIFICATION]]> - - + - + @@ -1850,9 +1846,9 @@ NEEDS CLARIFICATION]]> - + - + @@ -1915,12 +1911,12 @@ NEEDS CLARIFICATION]]> - + - + @@ -1939,15 +1935,10 @@ NEEDS CLARIFICATION]]> - + - - - - - @@ -1956,43 +1947,43 @@ NEEDS CLARIFICATION]]> - + - + - + - + - + - + - + - + - + @@ -2008,7 +1999,7 @@ NEEDS CLARIFICATION]]> - + @@ -3154,14 +3145,6 @@ NEEDS CLARIFICATION]]> - - - - - - - - - + - + - + ],[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' + ]],[[1],5],[[0],[3]]]]]> - - + + - - + + @@ -3389,7 +3373,7 @@ NEEDS CLARIFICATION]]> - + @@ -3400,97 +3384,16 @@ NEEDS CLARIFICATION]]> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3499,40 +3402,19 @@ NEEDS CLARIFICATION]]> - - + + - - - - - - - - - - - - - - - - - - + + + - - - - - - @@ -3557,6 +3439,7 @@ NEEDS CLARIFICATION]]> + @@ -3586,7 +3469,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],0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[[40,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],[8,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,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]]]]]> @@ -3708,7 +3591,7 @@ NEEDS CLARIFICATION]]> - + @@ -3745,10 +3628,10 @@ NEEDS CLARIFICATION]]> - + - + @@ -3916,6 +3799,14 @@ NEEDS CLARIFICATION]]> + + + + + + + + @@ -3940,6 +3831,14 @@ NEEDS CLARIFICATION]]> + + + + + + + + @@ -3954,42 +3853,47 @@ NEEDS CLARIFICATION]]> - + - + - + - + - + - + - + - + + + + + + @@ -3998,7 +3902,7 @@ NEEDS CLARIFICATION]]> - + diff --git a/PLC/Simulations/JPE/PLC/UDT/UDT_JPE_DataType.L5X b/PLC/Simulations/JPE/PLC/UDT/UDT_JPE_DataType.L5X new file mode 100644 index 0000000..b3fe037 --- /dev/null +++ b/PLC/Simulations/JPE/PLC/UDT/UDT_JPE_DataType.L5X @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PLC/Simulations/JPE/PLC/UDT/UDT_PE_DataType.L5X b/PLC/Simulations/JPE/PLC/UDT/UDT_PE_DataType.L5X deleted file mode 100644 index 26658ab..0000000 --- a/PLC/Simulations/JPE/PLC/UDT/UDT_PE_DataType.L5X +++ /dev/null @@ -1,759 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Run up -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PLC/UDTs/JPE_DataTypes.L5X b/PLC/UDTs/JPE_DataTypes.L5X index 8b11b66..b3fe037 100644 --- a/PLC/UDTs/JPE_DataTypes.L5X +++ b/PLC/UDTs/JPE_DataTypes.L5X @@ -1,288 +1,7 @@  - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -415,414 +92,5 @@ Stopped by Station Stop PushButton]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f89ce8991918238dabf4c8820c6ca720fd481910 Mon Sep 17 00:00:00 2001 From: "gigi.mamaladze" Date: Thu, 19 Jun 2025 16:54:14 +0400 Subject: [PATCH 2/2] Updated OIP --- PLC/Simulations/JPE/OIP/JPE.tscn | 57 ++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/PLC/Simulations/JPE/OIP/JPE.tscn b/PLC/Simulations/JPE/OIP/JPE.tscn index e344216..c024d39 100644 --- a/PLC/Simulations/JPE/OIP/JPE.tscn +++ b/PLC/Simulations/JPE/OIP/JPE.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=3 uid="uid://bk07gw07dmxox"] +[gd_scene load_steps=15 format=3 uid="uid://ceb5ontjww6ju"] [ext_resource type="PackedScene" uid="uid://dyhvoundu2kqc" path="res://parts/Building.tscn" id="1_w8dh7"] [ext_resource type="PackedScene" uid="uid://bqlkj4ar8q1ws" path="res://parts/assemblies/BeltConveyorAssembly.tscn" id="3_uc4id"] @@ -10,7 +10,7 @@ [ext_resource type="PackedScene" uid="uid://c1mup2vown0ak" path="res://parts/BladeStop.tscn" id="9_uxtiq"] [ext_resource type="PackedScene" uid="uid://gddgyvex6gdj" path="res://parts/PushButton.tscn" id="10_uc4id"] [ext_resource type="PackedScene" uid="uid://bl73u0rvt2orv" path="res://parts/Despawner.tscn" id="10_uxtiq"] -[ext_resource type="Script" uid="uid://d3tupsiesqjfd" path="res://node.gd" id="11_uc4id"] +[ext_resource type="Script" path="res://node.gd" id="11_uc4id"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_p2jmr"] friction = 0.5 @@ -18,7 +18,8 @@ friction = 0.5 [sub_resource type="Resource" id="Resource_uc4id"] resource_local_to_scene = true script = ExtResource("8_7heji") -active = true +active = false +segment_color = Color(1, 0.501961, 0, 1) [sub_resource type="Resource" id="Resource_qdmhf"] resource_local_to_scene = true @@ -30,40 +31,37 @@ segment_datas = [SubResource("Resource_uc4id")] [node name="Building" parent="." instance=ExtResource("1_w8dh7")] [node name="FL2078_2" parent="." instance=ExtResource("3_uc4id")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.079997, -0.308412, -1.61317) -local_floor_plane = Plane(0, 1, 0, -1.691588) -enable_physics = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.08, -0.308412, -1.61317) +local_floor_plane = Plane(0, 1, 0, -1.69159) speed = 0.0 belt_physics_material = SubResource("PhysicsMaterial_p2jmr") enable_comms = true speed_tag_name = "FL2078_2_OIP" running_tag_name = "" metadata/hijack_scale = true -size = Vector3(9.898334, 0.5, 1.524) +size = Vector3(9.89833, 0.5, 1.524) metadata/hijack_scale = true [node name="FL2078_3" parent="." instance=ExtResource("3_uc4id")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.7759213, -0.308412, -1.6148496) -local_floor_plane = Plane(0, 1, 0, -1.691588) -enable_physics = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.77592, -0.308412, -1.61485) +local_floor_plane = Plane(0, 1, 0, -1.69159) speed = 0.0 belt_physics_material = SubResource("PhysicsMaterial_p2jmr") enable_comms = true speed_tag_name = "FL2078_3_OIP" running_tag_name = "" metadata/hijack_scale = true -size = Vector3(9.790354, 0.5, 1.524) +size = Vector3(9.79035, 0.5, 1.524) metadata/hijack_scale = true [node name="DiffuseSensor" parent="." instance=ExtResource("5_wkvk5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.117357, -0.12398285, -2.7922192) -max_range = 2.4790000000066357 +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.1174, -0.123983, -2.79222) +max_range = 2.479 enable_comms = true -tag_name = "FL2078_2_JPE2_OIP" +tag_name = "FL2078_3_JPE1_OIP" [node name="StackLight" parent="." instance=ExtResource("6_yqk3b")] -transform = Transform3D(3, 0, 0, 0, 0.45, 0, 0, 0, 3, -3.2132263, -0.07517958, -0.62508947) -light_value = 1 +transform = Transform3D(3, 0, 0, 0, 0.45, 0, 0, 0, 3, -3.21323, -0.0751796, -0.625089) _data = SubResource("Resource_qdmhf") "Light 1" = SubResource("Resource_uc4id") enable_comms = true @@ -71,40 +69,51 @@ tag_groups = null tag_name = "FL2078_2_BCN_OIP" [node name="BoxSpawner" parent="." instance=ExtResource("9_k8u6b")] -transform = Transform3D(1, 2.30012e-09, -9.31322e-10, -2.30012e-09, 1, 8.84756e-09, 9.31322e-10, -8.84756e-09, 1, -8.1694765, 0.21153003, -1.7249484) +transform = Transform3D(1, 2.30012e-09, -9.31322e-10, -2.30012e-09, 1, 8.84756e-09, 9.31322e-10, -8.84756e-09, 1, -8.44228, 0.21153, -1.72495) disable = true [node name="BladeStop" parent="." instance=ExtResource("9_uxtiq")] -transform = Transform3D(-0.9997747, 0.021221608, 0, -0.021221608, -0.9997747, 0, 0, 0, 0.44799998, 0.9591316, 1.0177468, -1.5270932) -active = true +transform = Transform3D(-0.999775, 0.0212216, 0, -0.0212216, -0.999775, 0, 0, 0, 0.448, 0.959132, 1.01775, -1.52709) [node name="PushButton" parent="." instance=ExtResource("10_uc4id")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.3526835, -0.5374822, -0.7148958) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.35268, -0.30861, -0.714896) text = "MCM" toggle = true pressed = true +button_color = Color(0, 1, 0, 1) enable_comms = true pushbutton_tag_group_name = "TagGroup0" pushbutton_tag_name = "MCM_OIP" lamp_tag_group_name = "TagGroup0" [node name="Despawner" parent="." instance=ExtResource("10_uxtiq")] -transform = Transform3D(2, 0, 0, 0, 1, 0, 0, 0, 2, 11.619551, -1.5000005, -1.6647763) +transform = Transform3D(2, 0, 0, 0, 1, 0, 0, 0, 2, 11.6196, -1.5, -1.66478) [node name="Node" type="Node" parent="."] script = ExtResource("11_uc4id") [node name="PushButton2" parent="." instance=ExtResource("10_uc4id")] -transform = Transform3D(0.9999978, 0, 0.0021118468, 0, 1, 0, -0.0021118468, 0, 0.9999978, -0.61429477, -0.4994974, -0.65500927) +transform = Transform3D(0.999998, 0, 0.00211185, 0, 1, 0, -0.00211185, 0, 0.999998, -0.614295, -0.294131, -0.655009) text = "Station Partner" +button_color = Color(0.823212, 0.823212, 0.823212, 1) enable_comms = true pushbutton_tag_group_name = "TagGroup0" pushbutton_tag_name = "Jam_PB_OIP" lamp_tag_group_name = "TagGroup0" [node name="DiffuseSensor2" parent="." instance=ExtResource("5_wkvk5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.022300601, -0.19195116, -2.9047625) -max_range = 1.849000000001979 +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0223006, -0.03558, -2.90476) +max_range = 1.849 normally_closed = true enable_comms = true tag_name = "FL2078_2_JPE1_OIP" + +[node name="PushButton3" parent="." instance=ExtResource("10_uc4id")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.34897, -0.728368, -0.714896) +text = "Maintenance_Mode" +toggle = true +button_color = Color(0.769044, 0.429336, 0.316485, 1) +enable_comms = true +pushbutton_tag_group_name = "TagGroup0" +pushbutton_tag_name = "TOGGLE_MAINT_MODE" +lamp_tag_group_name = "TagGroup0"