From 426da5ff04f88862bb5f4af34e1bf69a6372ce51 Mon Sep 17 00:00:00 2001 From: TotMaxim Date: Sun, 7 Dec 2025 21:05:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-uf/pribor-uf.gd | 2 +- scenes/pribor-uf/uf-ctl.gd | 6 +++--- scenes/контроль/контроль.tscn | 6 +++--- scripts/pribor-prd.gd | 14 ++++++-------- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/scenes/pribor-uf/pribor-uf.gd b/scenes/pribor-uf/pribor-uf.gd index a35bc36d..4ae83252 100644 --- a/scenes/pribor-uf/pribor-uf.gd +++ b/scenes/pribor-uf/pribor-uf.gd @@ -13,7 +13,7 @@ func _ready() -> void: if Engine.is_editor_hint(): return #control_vk() uf_control = get_parent().uf_control - uf_control.connect('update_uf_serviceability', on_update_uf_serviceability) + signaller.connect('update_uf_serviceability', on_update_uf_serviceability) var uf_status = uf_control.get_current_status() control_ems(uf_status) find_labels(self) diff --git a/scenes/pribor-uf/uf-ctl.gd b/scenes/pribor-uf/uf-ctl.gd index 602eb439..c9c48e64 100644 --- a/scenes/pribor-uf/uf-ctl.gd +++ b/scenes/pribor-uf/uf-ctl.gd @@ -10,7 +10,7 @@ var uf_status: Dictionary = {'УФ-онлайн': false, 'КЭМС-Б1': false, var _self_name: String var _serviceability: int = STATE_VAL.NONE -var serviceability: int: +var serviceability_uf: int: get: return _serviceability set(value): @@ -58,7 +58,7 @@ func get_current_status() -> Dictionary: func is_operational() -> bool: '''Проверка, все ли системы работают нормально''' - return serviceability and uf_status.get('УФ-онлайн', false) + return serviceability_uf and uf_status.get('УФ-онлайн', false) func update_serviceability() -> void: @@ -75,7 +75,7 @@ func update_serviceability() -> void: new_serviceability = STATE_VAL.ERROR break # Новое значение через setter - self.serviceability = new_serviceability + self.serviceability_uf = new_serviceability #endregion #region Вспомогательные методы diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index 6be0fd78..7e4ad11f 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -566,7 +566,6 @@ metadata/unit_name = ["уарэп-эмс"] metadata/online_proc = "on_line_changed" [node name="label" type="Label" parent="pribor_uf"] -self_modulate = Color(0, 1, 0, 1) layout_mode = 0 offset_left = 15.0 offset_top = -44.0 @@ -1937,6 +1936,7 @@ offset_top = 15.0 offset_right = 1408.0 offset_bottom = 49.0 theme_override_font_sizes/font_size = 22 +disabled = true text = "Показать функциональную схему Э2" flat = true @@ -1996,9 +1996,9 @@ default_color = Color(1, 1, 1, 0.352941) [node name="control_prd_button" type="Button" parent="."] layout_mode = 0 -offset_left = 1043.0 +offset_left = 1040.0 offset_top = 64.0 -offset_right = 1390.0 +offset_right = 1416.0 offset_bottom = 104.0 focus_mode = 0 theme_override_colors/font_hover_color = Color(1, 1, 1, 1) diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index c603ea10..e95e9494 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -390,7 +390,6 @@ func _handle_init_state() -> void: if _get_current_ecm(): return state = STATE_MACHINE.CHEK_KASSETA_Y5 else: - if _get_current_ecm(): return # Завершение контроля если литеры закончились flags.control_is_over = true power_result = prep_power(power_for_litera, self_name) @@ -996,18 +995,17 @@ static func on_y5_control_result(block_kasseta: Dictionary) -> bool: ## Установка угла и аттенюации для УМ static func on_ug_setting(prd_unit: Object, settings_ug: Dictionary, prd_cmd_array: Array, cur_litera: int) -> bool: var result_1: int - var result_2: int if cur_litera == 1: result_1 = ((settings_ug.ATT_UM_1 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_1, result_1]]) prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_3, settings_ug.ATT_UM_3]]) else: - #if cur_litera in [2, 4, 6]: - result_1 = ((settings_ug.ATT_UM_1 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) - prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_1, result_1]]) - #elif cur_litera in [3, 5, 7]: - result_2 = ((settings_ug.ATT_UM_2 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) - prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_2, result_2]]) + if cur_litera in [2, 4, 6]: + result_1 = ((settings_ug.ATT_UM_1 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) + prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_1, result_1]]) + elif cur_litera in [3, 5, 7]: + result_1 = ((settings_ug.ATT_UM_2 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) + prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_2, result_1]]) return true