From b69817d205bc0e0c93f208bef7d75bf2583c9081 Mon Sep 17 00:00:00 2001 From: ilia gurielidze Date: Mon, 23 Jun 2025 22:42:37 +0400 Subject: [PATCH] Fixed MCM AOIs, UDTs and Simulation --- PLC/AOIs/AOI_MCM_AOI.L5X | 1114 +++------- PLC/Simulations/MCM/OIP/MCM.tscn | 300 ++- .../MCM/PLC/AOIs/AOI_FLIP_FLOP_AOI.L5X | 21 +- PLC/Simulations/MCM/PLC/AOIs/AOI_MCM_AOI.L5X | 1114 +++------- PLC/Simulations/MCM/PLC/MCM.L5X | 1836 +++++++---------- .../MCM/PLC/UDTs/UDT_MCM_DataType.L5X | 988 ++++----- PLC/UDTs/MCM_DataTypes.L5X | 988 ++++----- 7 files changed, 2355 insertions(+), 4006 deletions(-) diff --git a/PLC/AOIs/AOI_MCM_AOI.L5X b/PLC/AOIs/AOI_MCM_AOI.L5X index 1783bb6..8ef21cc 100644 --- a/PLC/AOIs/AOI_MCM_AOI.L5X +++ b/PLC/AOIs/AOI_MCM_AOI.L5X @@ -1,481 +1,9 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -491,306 +19,244 @@ Faulted]]> - - - - - - - - - - + - + - + - - - - + - + - - - - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + - - - - - - - + - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - @@ -801,10 +267,7 @@ Faulted]]> - - - - + @@ -815,21 +278,18 @@ Faulted]]> - - - - - - - + - + + + + + + + - - - - + @@ -846,250 +306,284 @@ Faulted]]> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + + + + - + - - - - + - - - - + - - - - + - - - - + - + - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1113,8 +607,8 @@ Faulted]]> - + diff --git a/PLC/Simulations/MCM/OIP/MCM.tscn b/PLC/Simulations/MCM/OIP/MCM.tscn index 475d39d..ea5403a 100644 --- a/PLC/Simulations/MCM/OIP/MCM.tscn +++ b/PLC/Simulations/MCM/OIP/MCM.tscn @@ -1,14 +1,15 @@ -[gd_scene load_steps=8 format=4 uid="uid://7ipehu333jij"] +[gd_scene load_steps=9 format=4 uid="uid://7ipehu333jij"] [ext_resource type="PackedScene" uid="uid://dyhvoundu2kqc" path="res://parts/Building.tscn" id="1_2vilj"] -[ext_resource type="PackedScene" uid="uid://dvjrx5crpqs5f" path="res://parts/SideGuard.tscn" id="3_02owk"] -[ext_resource type="Shader" uid="uid://wtu5yyfpdcgl" path="res://assets/3DModels/Shaders/MetalShaderSideGuard.tres" id="4_2u643"] -[ext_resource type="PackedScene" uid="uid://gddgyvex6gdj" path="res://parts/PushButton.tscn" id="5_i2j2k"] +[ext_resource type="PackedScene" uid="uid://dvjrx5crpqs5f" path="res://parts/SideGuard.tscn" id="3_3lj72"] +[ext_resource type="Shader" uid="uid://wtu5yyfpdcgl" path="res://assets/3DModels/Shaders/MetalShaderSideGuard.tres" id="4_02owk"] +[ext_resource type="PackedScene" uid="uid://gddgyvex6gdj" path="res://parts/PushButton.tscn" id="5_02owk"] +[ext_resource type="Script" uid="uid://bympdptikwp6f" path="res://MCM.gd" id="5_2u643"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_3lj72"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_02owk"] render_priority = 0 -shader = ExtResource("4_2u643") -shader_parameter/Scale = 5.41902 +shader = ExtResource("4_02owk") +shader_parameter/Scale = 1.9343237 shader_parameter/Metallic = 0.94 shader_parameter/Roughness = 0.5 shader_parameter/Specular = 0.5 @@ -27,7 +28,7 @@ _surfaces = [{ }] blend_shape_mode = 0 -[sub_resource type="ArrayMesh" id="ArrayMesh_02owk"] +[sub_resource type="ArrayMesh" id="ArrayMesh_2u643"] resource_name = "RCSideGuard_RCSideGuard" _surfaces = [{ "aabb": AABB(-0.5, -0.00427932, -1.12983, 1, 0.604281, 0.169856), @@ -35,7 +36,7 @@ _surfaces = [{ "format": 34896613399, "index_count": 204, "index_data": PackedByteArray("AgAJAAcAAgAMAAkALAAIACgALAAGAAgADAAgACIADAADACAAHQAjACEAHQAmACMAHQAaACYAHQAYABoALwApADEALwAtACkAEQAyABMAEQAwADIAEAA3ADUAEAASADcAPQBCAEYAPQBBAEIAbQBDAEAAbQBpAEMARwBeADwARwBhAF4AWgBgAGUAWgBfAGAAWwBWAFQAWwBkAFYAcQBoAGwAcQByAGgATABzAHAATABPAHMATQB6AE4ATQB4AHoABAA7AAAABAA+ADsADgBFAAsADgBIAEUACgBqACoACgBEAGoAJABJAA0AJABjAEkAAQBcAB4AAQA6AFwAHwBYABwAHwBdAFgAJwBiACUAJwBnAGIAGwBmACcAGwBXAGYAHABSABYAHABZAFIAKgB0ADMAKgBqAHQAKwA/AAUAKwBrAD8ALgBrACsALgBuAGsAMwBQABQAMwB1AFAANABKAA8ANAB2AEoADwBvAC4ADwBLAG8AFQB7ADkAFQBRAHsAFwBVABkAFwBTAFUAOAB3ADYAOAB5AHcA"), -"material": SubResource("ShaderMaterial_3lj72"), +"material": SubResource("ShaderMaterial_02owk"), "name": "BeltTopDown", "primitive": 3, "uv_scale": Vector4(0, 0, 0, 0), @@ -48,184 +49,129 @@ shadow_mesh = SubResource("ArrayMesh_gn6s2") [node name="Simulation" type="Node3D"] [node name="Building" parent="." instance=ExtResource("1_2vilj")] +metadata/edit_lock = true +metadata/edit_group = true -[node name="SideGuard" parent="." instance=ExtResource("3_02owk")] -transform = Transform3D(5.41902, 0, 0, 0, 3.6896524, 0, 0, 0, 1, -4.536677, -1.9957205, 5.224233) -mesh = SubResource("ArrayMesh_02owk") -length = 5.41902 +[node name="SideGuard" parent="." instance=ExtResource("3_3lj72")] +transform = Transform3D(1.9343237, 0, 0, 0, 5.1363015, 0, 0, 0, 15.127822, -2.098621, -3.0168223, 22.859678) +mesh = SubResource("ArrayMesh_2u643") +length = 1.9343237 -[node name="PushButton" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.3469763, -0.10110474, 4.171868) -text = "Start" -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Start_PB_OIP" -lamp_tag_group_name = "TagGroup0" -lamp_tag_name = "Start_PB_LT_OIP" - -[node name="PushButton2" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.1358876, -0.6732417, 4.223874) -text = "Emergency STOP" +[node name="POWER_ON" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.9744997, -0.38508332, 6.6063375) +text = "POWER ON" toggle = true pressed = true lamp = true +button_color = Color(1, 1, 1, 1) enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "EStop_PB_OIP" -lamp_tag_group_name = "TagGroup0" -lamp_tag_name = "EStop_PB_LT_OIP" +pushbutton_tag_name = "POWER_ON_PB" +lamp_tag_name = "POWER_ON_PB_LT" -[node name="PushButton3" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.072766, -0.11155343, 4.171868) -text = "Fire Alarm" -toggle = true -pressed = true +[node name="MOTOR_FAULT" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.3379102, -0.38508332, 6.6063375) +text = "MOTOR FAULT" +button_color = Color(0.9666667, 1, 0, 1) enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Fire_Relay_OIP" -lamp_tag_group_name = "TagGroup0" +pushbutton_tag_name = "MOTOR_FAULT_RESET_PB" +lamp_tag_name = "MOTOR_FAULT_RESET_PB_LT" -[node name="PushButton4" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.516133, -0.10470921, 4.17172) -text = "VFD Fault Reset" +[node name="POWER_BRANCH_FAULT_RESET" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.7244716, -0.38508332, 6.6063375) +text = "POWER BRANCH FAULT RESET" +button_color = Color(0.96862745, 1, 0, 1) +enable_comms = true +pushbutton_tag_name = "POWER_BRANCH_FAULT_RESET_PB" +lamp_tag_name = "POWER_BRANCH_FAULT_RESET_PB_LT" + +[node name="LOW_AIR_PRESSURE" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.1599557, -0.38508332, 6.6063375) +text = "LOW AIR PRESSURE" +button_color = Color(0, 0.049999706, 1, 1) +enable_comms = true +pushbutton_tag_name = "LOW_AIR_PRESSURE_RESET_PB" +lamp_tag_name = "LOW_AIR_PRESSURE_RESET_PB_LT" + +[node name="E-STOP_ACTUATED" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.9744997, -0.9958613, 6.6063375) +text = "E-STOP ACTUATED" +enable_comms = true +pushbutton_tag_name = "E_STOP_ACTUATED_PB" +lamp_tag_name = "E_STOP_ACTUATED_PB_LT" + +[node name="START" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.3379102, -0.9958613, 6.6063375) +text = "START" +button_color = Color(5.7997554e-06, 0.68136346, 0.058624905, 1) +enable_comms = true +pushbutton_tag_name = "START_PB" +lamp_tag_name = "START_PB_LT" + +[node name="JAM_RESTART" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.1599557, -0.9958613, 6.6063375) +text = "JAM RESTART" +button_color = Color(1, 1, 1, 1) +enable_comms = true +pushbutton_tag_name = "JAM_RESTART_PB" +lamp_tag_name = "JAM_RESTART_PB_LT" + +[node name="EMERGENCY_STOP" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.9744997, -1.6067358, 6.6063375) +text = "EMERGENCY STOP" toggle = true +normally_closed = true +enable_comms = true +pushbutton_tag_name = "EMERGENCY_STOP_PB" +lamp_tag_name = "EMERGENCY_STOP_PB_LT" + +[node name="STOP" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.3379102, -1.6067358, 6.6063375) +normally_closed = true +enable_comms = true +pushbutton_tag_name = "STOP_PB" +lamp_tag_name = "STOP_PB_LT" + +[node name="BATTERY_FAULT" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -1.6423613, -0.67535853, 6.487621) +text = "BATTERY FAULT" +toggle = true +enable_comms = true +pushbutton_tag_name = "UPS_BATTERY_FAULT_PB" +lamp_tag_name = "UPS_BATTERY_FAULT_PB_LT" + +[node name="ON_BATTERY" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -2.1884327, -1.5352063, 6.487621) +text = "ON BATTERY" +toggle = true +enable_comms = true +pushbutton_tag_name = "ON_BATTERY_PB" +lamp_tag_name = "ON_BATTERY_PB_LT" + +[node name="UPS_BATTARY_LOW" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -2.4660864, -0.5395664, 6.487621) +text = "UPS BATTERY LOW" +toggle = true +enable_comms = true +pushbutton_tag_name = "UPS_BATTERY_LOW_PB" +lamp_tag_name = "UPS_BATTERY_LOW_PB_LT" + +[node name="NAT_SWITCH" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -3.0257194, -1.6492424, 6.487621) +text = "NAT SWITCH" +toggle = true +enable_comms = true +pushbutton_tag_name = "NAT_SWITCH_PB" +lamp_tag_name = "NAT_SWITCH_PB_LT" + +[node name="FIRE_INTERFACE" parent="." instance=ExtResource("5_02owk")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -1.2769504, -1.3426788, 6.487621) +text = "FIRE INTERFACE" +toggle = true +normally_closed = true lamp = true enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "VFD_Reset_PB_OIP" -lamp_tag_group_name = "TagGroup0" -lamp_tag_name = "VFD_Reset_PB_LT_OIP" +pushbutton_tag_name = "FIRE_INTERFACE_PB" +lamp_tag_name = "FIRE_INTERFACE_PB_LT" -[node name="PushButton5" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.361039, -0.66242963, 4.171868) -text = "Jam Reset" -toggle = true -lamp = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Jam_Reset_PB_OIP" -lamp_tag_group_name = "TagGroup0" -lamp_tag_name = "Jam_Reset_PB_LT_OIP" - -[node name="PushButton6" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.7573338, -0.66778094, 4.171868) -text = "Low Air Pressure Reset" -toggle = true -pressed = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Lap_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton7" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.7264605, -0.10488708, 4.2480364) -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Stop_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton8" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.7634006, -1.2595805, 4.1717205) -text = "Battery_Low" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Battery_Low_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton9" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.1056905, -1.176708, 4.3082232) -text = "Battery On" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Battery_On_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton10" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5194144, -1.1943264, 4.2827783) -text = "Battery Fault" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Battery_Fault_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton11" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.8770869, -1.2469459, 4.171868) -text = "Encoder Fault" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Encoder_Fault_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton12" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.2353883, -1.2367675, 4.171868) -text = "Communication Faulted" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Communication_Faulted_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton13" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5854666, -0.665677, 4.171868) -text = "VFD Faulted" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "VFD_Faulted_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton16" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.0124185, -0.665677, 4.171868) -text = "VFD Was Faulted" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "VFD_Was_Faulted_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton14" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.8399115, -0.09271735, 4.171868) -text = "Jam Faulted" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "Jam_Faulted_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton15" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.6218052, -1.2584901, 4.171868) -text = "Estop Actuated" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "EStop_Actuated_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="PushButton18" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.45295, -0.6501631, 4.171868) -text = "LAP Faulted" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "LAP_Fault_PB_OIP" -lamp_tag_group_name = "TagGroup0" -lamp_tag_name = "LAP_PB_LT_OIP" - -[node name="PushButton17" parent="." instance=ExtResource("5_i2j2k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.298913, -0.09271735, 4.171868) -text = "Estop Was Actuated" -toggle = true -enable_comms = true -pushbutton_tag_group_name = "TagGroup0" -pushbutton_tag_name = "EStop_Was_Actuated_PB_OIP" -lamp_tag_group_name = "TagGroup0" - -[node name="Label3D" type="Label3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.485878, 0.061478764, 4.542795) -text = "mcm START -" -font_size = 24 +[node name="Node" type="Node" parent="."] +script = ExtResource("5_2u643") diff --git a/PLC/Simulations/MCM/PLC/AOIs/AOI_FLIP_FLOP_AOI.L5X b/PLC/Simulations/MCM/PLC/AOIs/AOI_FLIP_FLOP_AOI.L5X index f2fe0a3..d09df72 100644 --- a/PLC/Simulations/MCM/PLC/AOIs/AOI_FLIP_FLOP_AOI.L5X +++ b/PLC/Simulations/MCM/PLC/AOIs/AOI_FLIP_FLOP_AOI.L5X @@ -1,8 +1,6 @@  - - - - + + @@ -21,9 +19,6 @@ - - - @@ -32,17 +27,11 @@ - - - - - - @@ -50,9 +39,6 @@ - - - @@ -64,9 +50,6 @@ - - - diff --git a/PLC/Simulations/MCM/PLC/AOIs/AOI_MCM_AOI.L5X b/PLC/Simulations/MCM/PLC/AOIs/AOI_MCM_AOI.L5X index 1783bb6..8ef21cc 100644 --- a/PLC/Simulations/MCM/PLC/AOIs/AOI_MCM_AOI.L5X +++ b/PLC/Simulations/MCM/PLC/AOIs/AOI_MCM_AOI.L5X @@ -1,481 +1,9 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -491,306 +19,244 @@ Faulted]]> - - - - - - - - - - + - + - + - - - - + - + - - - - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + - - - - - - - + - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - @@ -801,10 +267,7 @@ Faulted]]> - - - - + @@ -815,21 +278,18 @@ Faulted]]> - - - - - - - + - + + + + + + + - - - - + @@ -846,250 +306,284 @@ Faulted]]> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + + + + - + - - - - + - - - - + - - - - + - - - - + - + - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1113,8 +607,8 @@ Faulted]]> - + diff --git a/PLC/Simulations/MCM/PLC/MCM.L5X b/PLC/Simulations/MCM/PLC/MCM.L5X index 41215ef..0e04434 100644 --- a/PLC/Simulations/MCM/PLC/MCM.L5X +++ b/PLC/Simulations/MCM/PLC/MCM.L5X @@ -1,6 +1,6 @@  - - + @@ -56,6 +56,17 @@ Faulted]]> +