From 802ac0afd75790e763cf57a8195c35017341ebec Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 17 Dec 2025 08:12:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/pribor-prd-k.gd | 57 +++++++++-------------------- scenes/pribor-prd-n/pribor-prd-n.gd | 17 ++------- scenes/pribor-prd-v/pribor-prd-v.gd | 16 ++------ 3 files changed, 26 insertions(+), 64 deletions(-) diff --git a/scenes/pribor-prd-k/pribor-prd-k.gd b/scenes/pribor-prd-k/pribor-prd-k.gd index 14f73714..e28fbbe9 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.gd +++ b/scenes/pribor-prd-k/pribor-prd-k.gd @@ -30,15 +30,12 @@ func _ready() -> void: func _process(_delta: float) -> void: if Engine.is_editor_hint(): return - set_frame($input_0, unit_prd_k.ems_g_sock_dic.ems_input_1) - set_frame($input_1, unit_prd_k.ems_g_sock_dic.ems_input_2) - set_frame($input_2, unit_prd_k.ems_g_sock_dic.ems_input_lit_1) - set_frame($output_0, unit_prd_k.ems_g_sock_dic.ems_output_1) - set_frame($output_1, unit_prd_k.ems_g_sock_dic.ems_output_2) - set_frame($output_2, unit_prd_k.ems_g_sock_dic.ems_output_lit_1) - - -func set_frame(node_frame: Node, val: int): node_frame.set_frame(val) + $input_0.set_frame(unit_prd_k.ems_g_sock_dic.ems_input_1) + $input_1.set_frame(unit_prd_k.ems_g_sock_dic.ems_input_2) + $input_2.set_frame(unit_prd_k.ems_g_sock_dic.ems_input_lit_1) + $output_0.set_frame(unit_prd_k.ems_g_sock_dic.ems_output_1) + $output_1.set_frame(unit_prd_k.ems_g_sock_dic.ems_output_2) + $output_2.set_frame(unit_prd_k.ems_g_sock_dic.ems_output_lit_1) func _on_start_control() -> void: @@ -60,12 +57,6 @@ func _enter_tree() -> void: _update_status_text(unit_prd_k.get_current_status()) -func _exit_tree() -> void: - if Engine.is_editor_hint(): - return - #prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]]) - - static func temperature_fill(temperature_arr_node: Array, temperature_dic: Dictionary)->void: for i_node_temperature in temperature_arr_node: var temperature_meta: String = i_node_temperature.get_meta('um') @@ -112,31 +103,18 @@ static func power_fill(pow_dic: Dictionary, fs_result: Dictionary, power_amplifi func on_press_device(_name_davice: String) -> void: - 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') - var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier') - var default_reset_array_node: Array = get_tree().get_nodes_in_group('default_reset') - var module_fs_1: Node = $kasseta_fs_kd/ref_A2 - var module_fs_6: Node = $kasseta_fs_kd/ref_A4 - var dou_6: Node = $dou6_A7 - var module_fs_7: Node = $kasseta_fs_kd/ref_A7 - var dou_7: Node = $dou7_A8 var control_data: Dictionary = unit_prd_k.get_control_results() - var for_control_result: Dictionary = { - 'nodes_y5': nodes_y5, - 'node_ip_power_arr': node_ip_power_arr, - 'fs_nodes': fs_nodes, - 'power_amplifier': power_amplifier, - 'default_reset_array_node': default_reset_array_node, - 'module_fs_1': module_fs_1, - 'module_fs_6': module_fs_6, - 'dou_6': dou_6, - 'module_fs_7': module_fs_7, - 'dou_7': dou_7, - } - for_control_result.merge(control_data, true) - on_control_result(for_control_result) + 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') + control_data['fs_nodes'] = get_tree().get_nodes_in_group('fs_group') + control_data['power_amplifier'] = get_tree().get_nodes_in_group('power_amplifier') + control_data['default_reset_array_node'] = get_tree().get_nodes_in_group('default_reset') + control_data['module_fs_1'] = $kasseta_fs_kd/ref_A2 + control_data['module_fs_6'] = $kasseta_fs_kd/ref_A4 + control_data['dou_6'] = $dou6_A7 + control_data['module_fs_7'] = $kasseta_fs_kd/ref_A7 + control_data['dou_7'] = $dou7_A8 + on_control_result(control_data) static func on_control_result(for_result_dic: Dictionary) -> void: @@ -169,6 +147,7 @@ static func on_control_result(for_result_dic: Dictionary) -> void: set_default_state(for_result_dic.default_reset_array_node) set_default_state(for_result_dic.power_amplifier) return + var result_dic: Dictionary = for_result_dic.result_dic for f in for_result_dic.fs_nodes: var fs_meta: String = f.get_meta('fs') diff --git a/scenes/pribor-prd-n/pribor-prd-n.gd b/scenes/pribor-prd-n/pribor-prd-n.gd index 8cb1684d..e712464e 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.gd +++ b/scenes/pribor-prd-n/pribor-prd-n.gd @@ -30,13 +30,10 @@ func _ready() -> void: func _process(_delta: float) -> void: if Engine.is_editor_hint(): return - set_frame($input_0, unit_prd_n.ems_g_sock_dic.ems_input_1) - set_frame($input_1, unit_prd_n.ems_g_sock_dic.ems_input_2) - set_frame($output_0, unit_prd_n.ems_g_sock_dic.ems_output_1) - set_frame($output_1, unit_prd_n.ems_g_sock_dic.ems_output_2) - - -func set_frame(node_frame: Node, val: int): node_frame.set_frame(val) + $input_0.set_frame(unit_prd_n.ems_g_sock_dic.ems_input_1) + $input_1.set_frame(unit_prd_n.ems_g_sock_dic.ems_input_2) + $output_0.set_frame(unit_prd_n.ems_g_sock_dic.ems_output_1) + $output_1.set_frame(unit_prd_n.ems_g_sock_dic.ems_output_2) func _on_start_control() -> void: @@ -60,12 +57,6 @@ func _enter_tree() -> void: _update_status_text(unit_prd_n.get_current_status()) -func _exit_tree() -> void: - if Engine.is_editor_hint(): - return - #prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]]) - - static func temperature_fill(temperature_arr_node: Array, temperature_dic: Dictionary)->void: for i_node_temperature in temperature_arr_node: var temperature_meta: String = i_node_temperature.get_meta('um') diff --git a/scenes/pribor-prd-v/pribor-prd-v.gd b/scenes/pribor-prd-v/pribor-prd-v.gd index 3b55452f..626f208b 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.gd +++ b/scenes/pribor-prd-v/pribor-prd-v.gd @@ -30,13 +30,10 @@ func _ready() -> void: func _process(_delta: float) -> void: if Engine.is_editor_hint(): return - set_frame($input_0, unit_prd_v.ems_g_sock_dic.ems_input_1) - set_frame($input_1, unit_prd_v.ems_g_sock_dic.ems_input_2) - set_frame($output_0, unit_prd_v.ems_g_sock_dic.ems_output_1) - set_frame($output_1, unit_prd_v.ems_g_sock_dic.ems_output_2) - - -func set_frame(node_frame: Node, val: int): node_frame.set_frame(val) + $input_0.set_frame(unit_prd_v.ems_g_sock_dic.ems_input_1) + $input_1.set_frame(unit_prd_v.ems_g_sock_dic.ems_input_2) + $output_0.set_frame(unit_prd_v.ems_g_sock_dic.ems_output_1) + $output_1.set_frame(unit_prd_v.ems_g_sock_dic.ems_output_2) func _on_start_control() -> void: @@ -60,11 +57,6 @@ func _enter_tree() -> void: _update_status_text(unit_prd_v.get_current_status()) -func _exit_tree() -> void: - if Engine.is_editor_hint(): - return - - static func temperature_fill(temperature_arr_node: Array, temperature_dic: Dictionary)->void: for i_node_temperature in temperature_arr_node: var temperature_meta: String = i_node_temperature.get_meta('um')