From dc362ad26f458f5bc9f4c00ca2035f196cf29df9 Mon Sep 17 00:00:00 2001 From: TotMaxim Date: Mon, 17 Nov 2025 15:07:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=86=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BC=D0=BF=D0=B5=D1=80=D0=B0=D1=82=D1=83=D1=80=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=83=D1=81=D0=B8=D0=BB=D0=B8=D1=82=D0=B5=D0=BB=D1=8F?= =?UTF-8?q?=D1=85=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/frame-ecm-list/frm-ecm-list.tscn | 2 +- scenes/grid-buttons-ecm/grid-buttons-ecm.tscn | 2 +- scenes/pribor-prd-n/pribor-prd-n.gd | 4 +- scenes/pribor-prd-v/pribor-prd-v.gd | 47 ------------------- scenes/контроль/блок-в.tscn | 6 +-- scenes/контроль/блок-к.tscn | 4 +- 6 files changed, 8 insertions(+), 57 deletions(-) diff --git a/scenes/frame-ecm-list/frm-ecm-list.tscn b/scenes/frame-ecm-list/frm-ecm-list.tscn index e008661..db6c658 100644 --- a/scenes/frame-ecm-list/frm-ecm-list.tscn +++ b/scenes/frame-ecm-list/frm-ecm-list.tscn @@ -65,7 +65,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 strips_rotation = 15.0 -text = "СПРС" +text = "JTIDS" metadata/rfi_name = "sprs" [node name="btn_kupd" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")] diff --git a/scenes/grid-buttons-ecm/grid-buttons-ecm.tscn b/scenes/grid-buttons-ecm/grid-buttons-ecm.tscn index a1b2522..d938451 100644 --- a/scenes/grid-buttons-ecm/grid-buttons-ecm.tscn +++ b/scenes/grid-buttons-ecm/grid-buttons-ecm.tscn @@ -147,6 +147,6 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 strips_rotation = 30.0 -text = "ЕПРЛС" +text = "ЕРЛС" disabled = true metadata/rfi_name = "eprls" diff --git a/scenes/pribor-prd-n/pribor-prd-n.gd b/scenes/pribor-prd-n/pribor-prd-n.gd index 745ae02..7562d1e 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.gd +++ b/scenes/pribor-prd-n/pribor-prd-n.gd @@ -17,10 +17,8 @@ func _ready() -> void: var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier') for temp in power_amplifier: temp.value1 = -70 - temp.max_value1 = 70 - temp.min_value1 = -40 unit_prd_n.connect('control_is_over', Callable(self, 'on_press_device')) - #unit_prd_n.power_amplify = power_amplifier + start_control() on_press_device() diff --git a/scenes/pribor-prd-v/pribor-prd-v.gd b/scenes/pribor-prd-v/pribor-prd-v.gd index a3d9f4c..7ad3b6d 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.gd +++ b/scenes/pribor-prd-v/pribor-prd-v.gd @@ -83,53 +83,6 @@ static func power_fill(pow_dic: Dictionary, fs_result: Dictionary, power_amplifi i_powapm.state = status -## Проверка температур УМ от УКП -static func check_temperature_um(status_prd: PackedByteArray, power_amplifier: Array) -> bool: - if power_amplifier.size() < 1: return false - const Constants: Dictionary = { - 'CONST_MIN_TEMP': -25, - 'MAXIMUM_CODE_ADC': 3796, - 'MINIMUM_CODE_AD': 2660, - 'TEMPERATURE_UKP_1': 47, - 'TEMPERATURE_UKP_2': 79, - } - const TEMP: float = 115.0 / (Constants.MAXIMUM_CODE_ADC - Constants.MINIMUM_CODE_AD) - var ukp1_online: int = (status_prd[0] >> 2) & 1 - var ukp2_online = (status_prd[0] >> 3) & 1 - var all_temp_is_ok: bool = true - - if ukp1_online: - var tmp_1: int - var temperature_ukp_1: int - for i_temp in 6: - temperature_ukp_1 = status_prd.decode_u16(Constants.TEMPERATURE_UKP_1 + 2 * i_temp) - tmp_1 = round(Constants.CONST_MIN_TEMP + (Constants.MAXIMUM_CODE_ADC - temperature_ukp_1) * TEMP + 3) - power_amplifier[i_temp].value1 = tmp_1 - if tmp_1>70: - all_temp_is_ok = false - - if power_amplifier.size() > 12: # Темпуратура от УМ литеры 1 - temperature_ukp_1 = status_prd.decode_u16(Constants.TEMPERATURE_UKP_1 + 2 * 7) - tmp_1 = round(Constants.CONST_MIN_TEMP + (Constants.MAXIMUM_CODE_ADC - temperature_ukp_1) * TEMP + 3) - power_amplifier[6].value1 = tmp_1 - if tmp_1>70: - all_temp_is_ok = false - - if ukp2_online: - for i_temp in 6: - var temperature_ukp_2: int = status_prd.decode_u16(Constants.TEMPERATURE_UKP_2 + 2 * i_temp) - var tmp_2: int = round(Constants.CONST_MIN_TEMP + (Constants.MAXIMUM_CODE_ADC - temperature_ukp_2) * TEMP + 3) - if power_amplifier.size() > 12: - power_amplifier[i_temp+7].value1 = tmp_2 - if tmp_2>70: - all_temp_is_ok = false - else: - power_amplifier[i_temp+6].value1 = tmp_2 - if tmp_2>70: - all_temp_is_ok = false - return all_temp_is_ok - - func on_press_device() -> 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') diff --git a/scenes/контроль/блок-в.tscn b/scenes/контроль/блок-в.tscn index 8765cf4..1b9b7f1 100644 --- a/scenes/контроль/блок-в.tscn +++ b/scenes/контроль/блок-в.tscn @@ -35,7 +35,7 @@ signal pressed(control: PanelContainer) if not is_inside_tree(): return $margin/vbox/grid1/level7.value = v - $margin/vbox/grid1/level7.tint_progress = Color.RED if v >= 70 else Color.GOLD if v >= 60 else Color.WHITE + $margin/vbox/grid1/level7.tint_progress = Color.RED if v >= 50 else Color.GOLD if v >= 40 else Color.WHITE @export var min_value0: float: @@ -275,7 +275,7 @@ textures = [ExtResource("1_n1aqt"), ExtResource("2_rim3u"), ExtResource("3_3w8fg value0 = [20.0, 30.0, 40.0, 50.0, 60.0, 70.0] min_value1 = -40.0 max_value0 = 1400.0 -max_value1 = 70.0 +max_value1 = 60.0 step0 = 1.0 step1 = 1.0 value_name0 = "P,%" @@ -479,7 +479,7 @@ tooltip_text = " Диапазон: -40.00…70.00" mouse_filter = 0 min_value = -40.0 -max_value = 70.0 +max_value = 60.0 fill_mode = 3 nine_patch_stretch = true stretch_margin_left = 8 diff --git a/scenes/контроль/блок-к.tscn b/scenes/контроль/блок-к.tscn index 968fa31..be62235 100644 --- a/scenes/контроль/блок-к.tscn +++ b/scenes/контроль/блок-к.tscn @@ -262,7 +262,7 @@ value0 = [20.0, 30.0, 40.0, 50.0, 60.0, 70.0] value1 = -40.0 min_value1 = -40.0 max_value0 = 1400.0 -max_value1 = 70.0 +max_value1 = 60.0 step0 = 1.0 step1 = 1.0 value_name0 = "P,%" @@ -369,7 +369,7 @@ tooltip_text = " Диапазон: -40.00…70.00" mouse_filter = 0 min_value = -40.0 -max_value = 70.0 +max_value = 60.0 value = -40.0 fill_mode = 3 nine_patch_stretch = true