From 984b1af114c41d217f5cdaefe67fc83d538a8227 Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 2 Feb 2026 11:37:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=82=D1=81=D0=BB=D0=B5=D0=B6=D0=B8=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=8F=D1=8307?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/pribor-prd-k.gd | 4 ++-- scenes/pribor-prd-n/pribor-prd-n.gd | 4 ++-- scenes/pribor-prd-v/pribor-prd-v.gd | 4 ++-- scripts/pribor-prd.gd | 8 ++++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scenes/pribor-prd-k/pribor-prd-k.gd b/scenes/pribor-prd-k/pribor-prd-k.gd index e59e3bcf..425777b7 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.gd +++ b/scenes/pribor-prd-k/pribor-prd-k.gd @@ -41,8 +41,6 @@ func _process(_delta: float) -> void: func _on_start_control() -> void: set_default_state(get_tree().get_nodes_in_group('default_reset')) set_default_state(get_tree().get_nodes_in_group('power_amplifier')) - await get_tree().create_timer(1.0).timeout - on_press_device(unit_prd_k.self_name) static func set_default_state(default_reset_array_node: Array) -> void: @@ -103,6 +101,7 @@ static func power_fill(pow_dic: Dictionary, fs_result: Dictionary, power_amplifi func on_press_device(_name_davice: String) -> void: + if not is_inside_tree(): return var control_data: Dictionary = unit_prd_k.get_control_results() control_data['nodes_y5'] = get_tree().get_nodes_in_group('y-5') control_data['node_ip_power_arr'] = get_tree().get_nodes_in_group('power_supply') @@ -191,6 +190,7 @@ func find_labels(node1: Node): func _on_status_updated(status_text: String) -> void: _update_status_text(status_text) + on_press_device(unit_prd_k.self_name) func _update_status_text(text: String) -> void: diff --git a/scenes/pribor-prd-n/pribor-prd-n.gd b/scenes/pribor-prd-n/pribor-prd-n.gd index 6404c911..81e28c05 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.gd +++ b/scenes/pribor-prd-n/pribor-prd-n.gd @@ -41,8 +41,6 @@ func _on_start_control() -> void: set_default_state(get_tree().get_nodes_in_group('power_amplifier')) for um in get_tree().get_nodes_in_group('power_amplifier'): um.value0 = [0, 0, 0, 0, 0, 0] - await get_tree().create_timer(1.0).timeout - on_press_device(unit_prd_n.self_name) static func set_default_state(default_reset_array_node: Array) -> void: @@ -94,6 +92,7 @@ static func power_fill(pow_dic: Dictionary, fs_result: Dictionary, power_amplifi func on_press_device(_device_name: String) -> void: + if not is_inside_tree(): return var nodes_y5: Array = get_tree().get_nodes_in_group('y-5') var node_ip_power_arr: Array = get_tree().get_nodes_in_group('power_supply') var fs_nodes: Array = get_tree().get_nodes_in_group('fs_group') @@ -189,6 +188,7 @@ func find_labels(node1: Node): func _on_status_updated(status_text: String) -> void: _update_status_text(status_text) + on_press_device(unit_prd_n.self_name) func _update_status_text(text: String) -> void: diff --git a/scenes/pribor-prd-v/pribor-prd-v.gd b/scenes/pribor-prd-v/pribor-prd-v.gd index 626f208b..5d33037e 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.gd +++ b/scenes/pribor-prd-v/pribor-prd-v.gd @@ -41,8 +41,6 @@ func _on_start_control() -> void: set_default_state(get_tree().get_nodes_in_group('power_amplifier')) for um in get_tree().get_nodes_in_group('power_amplifier'): um.value0 = [0, 0, 0, 0, 0, 0] - await get_tree().create_timer(1.0).timeout - on_press_device(unit_prd_v.self_name) static func set_default_state(default_reset_array_node: Array) -> void: @@ -93,6 +91,7 @@ static func power_fill(pow_dic: Dictionary, fs_result: Dictionary, power_amplifi func on_press_device(_device_name: String) -> void: + if not is_inside_tree(): return var nodes_y5: Array = get_tree().get_nodes_in_group('y-5') var node_ip_power_arr: Array = get_tree().get_nodes_in_group('power_supply') var fs_nodes: Array = get_tree().get_nodes_in_group('fs_group') @@ -186,6 +185,7 @@ func find_labels(node1: Node): func _on_status_updated(status_text: String) -> void: _update_status_text(status_text) + on_press_device(unit_prd_v.self_name) func _update_status_text(text: String) -> void: diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index e34ba3a8..363958a0 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -883,11 +883,15 @@ func on_mode_changed(in_tree: bool) -> void: # Вызывается при смене связи я ячейков ЯУ-07Б func on_line_changed_yau07(_status: Object)->void: - _set_status('Ожидание запуска контроля') flags.control_is_over = false flags.no_trust_yau07 = false flags.only_fs = false restore_default_states() + block_kasseta_y5_config.yau07 = _status.online + if _status.online: + _set_status('Ожидание запуска контроля') + else: + _set_status('Ячейка ЯУ-07Б: Нет связи') #endregion @@ -1358,7 +1362,7 @@ func restore_default_states() -> void: ems_6666_timer.stop() machine_timer.stop() - _set_status('Состояния сброшены к значениям по умолчанию') + #'Состояния сброшены к значениям по умолчанию' ## Получение текущих состояний для отладки