diff --git a/Simulations/STATION_JR_PB/OIP/STATION_JR_PB.tscn b/Simulations/STATION_JR_PB/OIP/STATION_JR_PB.tscn index df29a7c..63a5c01 100644 --- a/Simulations/STATION_JR_PB/OIP/STATION_JR_PB.tscn +++ b/Simulations/STATION_JR_PB/OIP/STATION_JR_PB.tscn @@ -25,15 +25,14 @@ size = Vector3(14.7823, 0.5, 1.524) metadata/hijack_scale = true [node name="BladeStop" parent="." instance=ExtResource("3_gvmjx")] -transform = Transform3D(-1, -5.96046e-08, 0, 5.96046e-08, -1, 0, 0, 0, 0.448, 2.55519, 1.10247, -1.69079) -active = true +transform = Transform3D(-1, -5.96046e-08, 0, 5.96046e-08, -1, 0, 0, 0, 0.448, 2.55572, 1.10247, -1.72712) [node name="BoxSpawner" parent="." instance=ExtResource("4_6eg1i")] transform = Transform3D(1, 2.30012e-09, -9.31322e-10, -2.30012e-09, 1, 8.84756e-09, 9.31322e-10, -8.84756e-09, 1, -6.66841, 0.177073, -1.71267) disable = true [node name="Despawner" parent="." instance=ExtResource("5_rcr4s")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.60256, 0.176073, -1.63491) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.60256, 0.176073, 0.00769222) [node name="UL1_3_JR_PB1" parent="." instance=ExtResource("8_kfv3x")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.73416, -0.180284, -0.714896) diff --git a/Simulations/STATION_JR_PB/OIP/station_jr_pb.gd b/Simulations/STATION_JR_PB/OIP/station_jr_pb.gd index a36d351..a4c4552 100644 --- a/Simulations/STATION_JR_PB/OIP/station_jr_pb.gd +++ b/Simulations/STATION_JR_PB/OIP/station_jr_pb.gd @@ -9,26 +9,28 @@ var tag_group = "TagGroup0" var display_color_1 var display_color_2 -func _ready() -> void: - - SimulationEvents.simulation_started.connect(_on_simulation_started) - -func _on_simulation_started() -> void: - - OIPComms.register_tag(tag_group, "[PLC]UL1_3_JR_PB1.CTRL.STS.Log.LEN", 1) - OIPComms.register_tag(tag_group, "[PLC]UL1_3_JR_PB1.HMI.STATE", 1) - - # Register all 82 DATA tags - for i in range(82): - var data_tag = "[PLC]UL1_3_JR_PB1.CTRL.STS.Log.DATA[" + str(i) + "]" - OIPComms.register_tag(tag_group, data_tag, 1) - -func _physics_process(delta: float) -> void: - - box_spawner.disable = ul_1_3.speed == 0 - #print(OIPComms.read_int32(tag_group,"[PLC]UL1_3_JR_PB1.HMI.STATE")) - - - #print("Log String: ", Utils.read_string(tag_group, "UL1_3_JR_PB1.CTRL.STS.Log")) +#func _on_simulation_started() -> void: +# + ##OIPComms.register_tag(tag_group, "[PLC]UL1_3_JR_PB1.CTRL.STS.Log.LEN", 1) + ##OIPComms.register_tag(tag_group, "[PLC]UL1_3_JR_PB1.HMI.STATE", 1) + ## + ### Register all 82 DATA tags + ##for i in range(82): + ##var data_tag = "[PLC]UL1_3_JR_PB1.CTRL.STS.Log.DATA[" + str(i) + "]" + ##OIPComms.register_tag(tag_group, data_tag, 1) + #pass +#func _ready() -> void: + # + #SimulationEvents.simulation_started.connect(_on_simulation_started) +# +# +# +#func _physics_process(delta: float) -> void: + # + #box_spawner.disable = ul_1_3.speed == 0 + ##print(OIPComms.read_int32(tag_group,"[PLC]UL1_3_JR_PB1.HMI.STATE")) +# +# + ##print("Log String: ", Utils.read_string(tag_group, "UL1_3_JR_PB1.CTRL.STS.Log")) diff --git a/Simulations/STATION_JR_PB/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X b/Simulations/STATION_JR_PB/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X index bca6585..be85f51 100644 --- a/Simulations/STATION_JR_PB/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X +++ b/Simulations/STATION_JR_PB/PLC/AOIs/AOI_STATION_JR_PB_AOI.L5X @@ -1,7 +1,7 @@  - + @@ -315,7 +315,7 @@ Stopped by Station Stop PushButton]]> - - + + + + + + + + @@ -432,7 +444,7 @@ Stopped by Station Stop PushButton]]> - + @@ -442,7 +454,7 @@ Stopped by Station Stop PushButton]]> - @@ -451,31 +463,60 @@ Stopped by Station Stop PushButton]]> - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Simulations/STATION_JR_PB/PLC/AOIs/AOI_VFD_AOI.L5X b/Simulations/STATION_JR_PB/PLC/AOIs/AOI_VFD_AOI.L5X index 5c5b0d0..9664a72 100644 --- a/Simulations/STATION_JR_PB/PLC/AOIs/AOI_VFD_AOI.L5X +++ b/Simulations/STATION_JR_PB/PLC/AOIs/AOI_VFD_AOI.L5X @@ -1,6 +1,6 @@  - + @@ -510,6 +510,11 @@ Stopped by Station Stop PushButton]]> + - -