From a3e03c7da1298907ea621a59b40e93110f6e80a2 Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 7 Feb 2025 06:39:02 +0300 Subject: [PATCH] module fs half-stable --- scripts/FS.gd | 2 -- scripts/PRD.gd | 13 +++++++++---- scripts/network.gd | 8 ++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/FS.gd b/scripts/FS.gd index 4fa8390..dddf9a2 100644 --- a/scripts/FS.gd +++ b/scripts/FS.gd @@ -119,8 +119,6 @@ class FGOS: var peer = peerstream_fs.get_stream_peer() if peer: peer.put_data(data_to_sand) - else: - print_debug('client_fs.get_status != 2 !!!') #func _parse(rx_data: PackedByteArray): diff --git a/scripts/PRD.gd b/scripts/PRD.gd index 75d86b9..66df434 100644 --- a/scripts/PRD.gd +++ b/scripts/PRD.gd @@ -137,8 +137,10 @@ func _ready() -> void: Network.connect('yau_status_line', Callable(self, '_on_yau_status')) Network.connect('yau_receive', Callable(self, '_on_data_received')) Network.connect('yau_read_isa', Callable(self, '_on_read_isa')) - Network.connect('port_fs_opened_1', _on_port_changed_fs_1.bind(Color.GREEN)) - Network.connect('port_fs_opened_2', _on_port_changed_fs_2.bind(Color.GREEN)) + Network.connect('port_fs_opened_1', _on_port_changed_fs_1.bind(Color.AQUAMARINE)) + Network.connect('port_fs_closed_1', _on_port_changed_fs_1.bind(Color.CRIMSON)) + Network.connect('port_fs_opened_2', _on_port_changed_fs_2.bind(Color.AQUAMARINE)) + Network.connect('port_fs_closed_2', _on_port_changed_fs_2.bind(Color.CRIMSON)) Network.connect('data_from_fs_1', _on_data_fs_1) Network.connect('data_from_fs_2', _on_data_fs_2) @@ -528,8 +530,9 @@ func set_bits(v, a, m): ## 1 ФС -func _on_port_changed_fs_1(port_name: String, _color: Color) -> void: +func _on_port_changed_fs_1(port_name: String, color: Color) -> void: $TabContainer/PRD/body_grid/litera_2_4_6/fs_control.set_node_text(1, 1, port_name) + $TabContainer/PRD/body_grid/litera_2_4_6/fs_control.get_node2(1,1).modulate = color func _on_start_fs_1(): @@ -550,8 +553,10 @@ func _on_set_att_1(att: String): ## 2 ФС -func _on_port_changed_fs_2(port_name: String, _color: Color) -> void: +func _on_port_changed_fs_2(port_name: String, color: Color) -> void: $TabContainer/PRD/body_grid/litera_3_5_7/fs_control.set_node_text(1, 1, port_name) + $TabContainer/PRD/body_grid/litera_3_5_7/fs_control.get_node2(1, 1).modulate = color + func _on_start_fs_2(): Network.start_work_fs_2() diff --git a/scripts/network.gd b/scripts/network.gd index d90588b..69f5199 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -40,7 +40,8 @@ signal data_from_fs_1(data:PackedByteArray) signal data_from_fs_2(data:PackedByteArray) signal port_fs_opened_1(port_name: String) signal port_fs_opened_2(port_name: String) -signal port_closed(port_name: String) +signal port_fs_closed_1(port_name: String) +signal port_fs_closed_2(port_name: String) signal port_error(error_str: String) @@ -78,7 +79,10 @@ func poll_receive_fs(client: StreamPeerTCP, peerstream: PacketPeer, ip_fs: Strin return # Проверяем состояние подключения if client.get_status() != StreamPeerTCP.STATUS_CONNECTED: - emit_signal("port_closed", ip_fs) + if client == client_fs_1: + emit_signal("port_fs_closed_1", ip_fs) + elif client == client_fs_2: + emit_signal("port_fs_closed_2", ip_fs) return if peer.get_available_bytes() > 0: