From 56a0fd8af891d431a372d98281e3ffebb41b0ffb Mon Sep 17 00:00:00 2001 From: TotMaxim Date: Mon, 17 Nov 2025 12:49:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=B9=20=D0=BB=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D1=8B=20=D0=B2=20=D0=B4=D1=83=D1=80=D0=B3?= =?UTF-8?q?=D1=83=D1=8E,=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D0=BA=D1=80?= =?UTF-8?q?=D0=B0=20ecm,=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/pribor-prd-k.tscn | 53 ++++++++++----------------- scenes/pribor-prd-n/pribor-prd-n.tscn | 46 ++++++++--------------- scenes/pribor-prd-v/pribor-prd-v.tscn | 46 ++++++++--------------- scenes/контроль/блок-в.tscn | 4 +- scenes/контроль/блок-к.tscn | 3 ++ scripts/pribor-prd.gd | 10 ++++- 6 files changed, 66 insertions(+), 96 deletions(-) diff --git a/scenes/pribor-prd-k/pribor-prd-k.tscn b/scenes/pribor-prd-k/pribor-prd-k.tscn index 404443e0..bb6d8906 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.tscn +++ b/scenes/pribor-prd-k/pribor-prd-k.tscn @@ -122,7 +122,7 @@ offset_bottom = 337.0 value0 = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0] fname = "УМ1535Б" rname = "A10" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_1" @@ -134,7 +134,7 @@ offset_right = 652.0 offset_bottom = 432.0 fname = "УМ1535Б" rname = "A11" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_2" @@ -146,7 +146,7 @@ offset_right = 652.0 offset_bottom = 527.0 fname = "УМ1535Б" rname = "A12" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_3" @@ -158,7 +158,7 @@ offset_right = 652.0 offset_bottom = 622.0 fname = "УМ1535Б" rname = "A13" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_4" @@ -170,7 +170,7 @@ offset_right = 652.0 offset_bottom = 717.0 fname = "УМ1535Б" rname = "A14" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_5" @@ -182,7 +182,7 @@ offset_right = 652.0 offset_bottom = 812.0 fname = "УМ1535Б" rname = "A15" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_6" @@ -194,6 +194,8 @@ offset_right = 652.0 offset_bottom = 907.0 fname = "УТМ80" rname = "A9" +value0_info = "Мощность" +value1_info = "Температура,°C" metadata/um = "um_8" [node name="rm1620m_A16" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] @@ -204,7 +206,7 @@ offset_right = 175.0 offset_bottom = 337.0 fname = "РМ16-20М" rname = "A16" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_9" @@ -216,7 +218,7 @@ offset_right = 173.0 offset_bottom = 432.0 fname = "РМ16-20М" rname = "A17" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_10" @@ -228,7 +230,7 @@ offset_right = 175.0 offset_bottom = 527.0 fname = "РМ16-20М" rname = "A18" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_11" @@ -240,7 +242,7 @@ offset_right = 175.0 offset_bottom = 622.0 fname = "РМ16-20М" rname = "A19" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_12" @@ -252,7 +254,7 @@ offset_right = 175.0 offset_bottom = 717.0 fname = "РМ16-20М" rname = "A20" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_13" @@ -264,7 +266,7 @@ offset_right = 175.0 offset_bottom = 812.0 fname = "РМ16-20М" rname = "A21" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_14" @@ -347,40 +349,25 @@ horizontal_alignment = 1 metadata/_edit_lock_ = true [node name="input_0" type="AnimatedSprite2D" parent="."] -position = Vector2(234, 177) +position = Vector2(353, 618) sprite_frames = SubResource("SpriteFrames_di0aa") -[node name="Label" type="Label" parent="input_0"] -offset_left = -38.0 -offset_top = 16.0 -offset_right = 30.0 -offset_bottom = 35.0 -text = "Вход ЕМС" - [node name="input_1" type="AnimatedSprite2D" parent="."] -position = Vector2(277, 177) +position = Vector2(405, 618) sprite_frames = SubResource("SpriteFrames_di0aa") [node name="input_2" type="AnimatedSprite2D" parent="."] -position = Vector2(188, 177) +position = Vector2(255, 619) sprite_frames = SubResource("SpriteFrames_di0aa") [node name="output_0" type="AnimatedSprite2D" parent="."] -position = Vector2(421, 177) +position = Vector2(406, 464) sprite_frames = SubResource("SpriteFrames_di0aa") -[node name="Label" type="Label" parent="output_0"] -offset_left = -40.0 -offset_top = 14.0 -offset_right = 36.0 -offset_bottom = 33.0 -text = "Модуляция" -metadata/_edit_use_anchors_ = true - [node name="output_1" type="AnimatedSprite2D" parent="."] -position = Vector2(462, 177) +position = Vector2(355, 466) sprite_frames = SubResource("SpriteFrames_di0aa") [node name="output_2" type="AnimatedSprite2D" parent="."] -position = Vector2(383, 177) +position = Vector2(255, 464) sprite_frames = SubResource("SpriteFrames_di0aa") diff --git a/scenes/pribor-prd-n/pribor-prd-n.tscn b/scenes/pribor-prd-n/pribor-prd-n.tscn index 68571cef..de605fe6 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.tscn +++ b/scenes/pribor-prd-n/pribor-prd-n.tscn @@ -300,7 +300,7 @@ offset_right = 652.0 offset_bottom = 337.0 fname = "УМ1535А" rname = "A7" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_1" @@ -312,7 +312,7 @@ offset_right = 652.0 offset_bottom = 432.0 fname = "УМ1535А" rname = "A8" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_2" @@ -324,7 +324,7 @@ offset_right = 652.0 offset_bottom = 527.0 fname = "УМ1535А" rname = "A9" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_3" @@ -336,7 +336,7 @@ offset_right = 652.0 offset_bottom = 622.0 fname = "УМ1535А" rname = "A10" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_4" @@ -348,7 +348,7 @@ offset_right = 652.0 offset_bottom = 717.0 fname = "УМ1535А" rname = "A11" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_5" @@ -360,7 +360,7 @@ offset_right = 652.0 offset_bottom = 812.0 fname = "УМ1535А" rname = "A12" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_6" @@ -372,7 +372,7 @@ offset_right = 175.0 offset_bottom = 337.0 fname = "УМ1535А" rname = "A13" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_9" @@ -384,7 +384,7 @@ offset_right = 175.0 offset_bottom = 432.0 fname = "УМ1535А" rname = "A14" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_10" @@ -396,7 +396,7 @@ offset_right = 175.0 offset_bottom = 527.0 fname = "УМ1535А" rname = "A15" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_11" @@ -408,7 +408,7 @@ offset_right = 175.0 offset_bottom = 622.0 fname = "УМ1535А" rname = "A16" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_12" @@ -420,7 +420,7 @@ offset_right = 175.0 offset_bottom = 717.0 fname = "УМ1535А" rname = "A17" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_13" @@ -432,7 +432,7 @@ offset_right = 175.0 offset_bottom = 812.0 fname = "УМ1535А" rname = "A18" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_14" @@ -446,31 +446,17 @@ horizontal_alignment = 1 metadata/_edit_lock_ = true [node name="input_0" type="AnimatedSprite2D" parent="."] -position = Vector2(234, 177) +position = Vector2(456, 589) sprite_frames = SubResource("SpriteFrames_1wf07") -[node name="Label" type="Label" parent="input_0"] -offset_left = -15.0 -offset_top = 15.0 -offset_right = 53.0 -offset_bottom = 34.0 -text = "Вход ЕМС" - [node name="input_1" type="AnimatedSprite2D" parent="."] -position = Vector2(277, 177) +position = Vector2(207, 586) sprite_frames = SubResource("SpriteFrames_1wf07") [node name="output_0" type="AnimatedSprite2D" parent="."] -position = Vector2(381, 177) +position = Vector2(458, 476) sprite_frames = SubResource("SpriteFrames_1wf07") -[node name="Label" type="Label" parent="output_0"] -offset_left = -19.0 -offset_top = 14.0 -offset_right = 57.0 -offset_bottom = 33.0 -text = "Модуляция" - [node name="output_1" type="AnimatedSprite2D" parent="."] -position = Vector2(422, 177) +position = Vector2(210, 477) sprite_frames = SubResource("SpriteFrames_1wf07") diff --git a/scenes/pribor-prd-v/pribor-prd-v.tscn b/scenes/pribor-prd-v/pribor-prd-v.tscn index 1910aa16..03476d98 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.tscn +++ b/scenes/pribor-prd-v/pribor-prd-v.tscn @@ -249,7 +249,7 @@ offset_right = 652.0 offset_bottom = 337.0 fname = "УМ1535А" rname = "A7" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_1" @@ -261,7 +261,7 @@ offset_right = 652.0 offset_bottom = 432.0 fname = "УМ1535А" rname = "A8" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_2" @@ -273,7 +273,7 @@ offset_right = 652.0 offset_bottom = 527.0 fname = "УМ1535А" rname = "A9" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_3" @@ -285,7 +285,7 @@ offset_right = 652.0 offset_bottom = 622.0 fname = "УМ1535А" rname = "A10" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_4" @@ -297,7 +297,7 @@ offset_right = 652.0 offset_bottom = 717.0 fname = "УМ1535А" rname = "A11" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_5" @@ -309,7 +309,7 @@ offset_right = 652.0 offset_bottom = 812.0 fname = "УМ1535А" rname = "A12" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_6" @@ -321,7 +321,7 @@ offset_right = 175.0 offset_bottom = 337.0 fname = "УМ1535А" rname = "A13" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_9" @@ -333,7 +333,7 @@ offset_right = 175.0 offset_bottom = 432.0 fname = "УМ1535А" rname = "A14" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_10" @@ -345,7 +345,7 @@ offset_right = 175.0 offset_bottom = 527.0 fname = "УМ1535А" rname = "A15" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_11" @@ -357,7 +357,7 @@ offset_right = 175.0 offset_bottom = 622.0 fname = "УМ1535А" rname = "A16" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_12" @@ -369,7 +369,7 @@ offset_right = 175.0 offset_bottom = 717.0 fname = "УМ1535А" rname = "A17" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_13" @@ -381,7 +381,7 @@ offset_right = 175.0 offset_bottom = 812.0 fname = "УМ1535А" rname = "A18" -value0_info = "Мощность, Вт" +value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_14" @@ -395,31 +395,17 @@ horizontal_alignment = 1 metadata/_edit_lock_ = true [node name="input_0" type="AnimatedSprite2D" parent="."] -position = Vector2(234, 177) +position = Vector2(209, 578) sprite_frames = SubResource("SpriteFrames_s5gcy") -[node name="Label" type="Label" parent="input_0"] -offset_left = -15.0 -offset_top = 15.0 -offset_right = 53.0 -offset_bottom = 34.0 -text = "Вход ЕМС" - [node name="input_1" type="AnimatedSprite2D" parent="."] -position = Vector2(277, 177) +position = Vector2(457, 578) sprite_frames = SubResource("SpriteFrames_s5gcy") [node name="output_0" type="AnimatedSprite2D" parent="."] -position = Vector2(381, 177) +position = Vector2(457, 482) sprite_frames = SubResource("SpriteFrames_s5gcy") -[node name="Label" type="Label" parent="output_0"] -offset_left = -19.0 -offset_top = 14.0 -offset_right = 57.0 -offset_bottom = 33.0 -text = "Модуляция" - [node name="output_1" type="AnimatedSprite2D" parent="."] -position = Vector2(422, 177) +position = Vector2(209, 482) sprite_frames = SubResource("SpriteFrames_s5gcy") diff --git a/scenes/контроль/блок-в.tscn b/scenes/контроль/блок-в.tscn index 669b072e..8765cf4a 100644 --- a/scenes/контроль/блок-в.tscn +++ b/scenes/контроль/блок-в.tscn @@ -273,6 +273,7 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_3nd2u") script = SubResource("GDScript_oj3k3") 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 step0 = 1.0 @@ -475,8 +476,9 @@ size_flags_horizontal = 3 size_flags_vertical = 3 tooltip_text = " Текущее: 0.00 -Диапазон: 0.00…70.00" +Диапазон: -40.00…70.00" mouse_filter = 0 +min_value = -40.0 max_value = 70.0 fill_mode = 3 nine_patch_stretch = true diff --git a/scenes/контроль/блок-к.tscn b/scenes/контроль/блок-к.tscn index 9156160d..ac05dd96 100644 --- a/scenes/контроль/блок-к.tscn +++ b/scenes/контроль/блок-к.tscn @@ -259,6 +259,8 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_3nd2u") script = SubResource("GDScript_oj3k3") textures = [ExtResource("1_uojqc"), ExtResource("2_a8ar3"), ExtResource("3_xwd13")] 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 step0 = 1.0 @@ -366,6 +368,7 @@ tooltip_text = " Текущее: 0.00 Диапазон: 0.00…70.00" mouse_filter = 0 +min_value = -40.0 max_value = 70.0 fill_mode = 3 nine_patch_stretch = true diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index 23c64768..b26198f3 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -247,7 +247,6 @@ func on_fs_update_state(packet_type_7: Dictionary, fs_mapping: Dictionary) -> vo func state_control_machine() -> void: match state: STATE_MACHINE.INIT: - print("Start control for %s device %s litera" % [self_name, current_litera]) _handle_init_state() STATE_MACHINE.FS_TURN_ON: _handle_fs_turn_on_state() @@ -341,7 +340,14 @@ func state_control_machine() -> void: ## 'Выполняется инициализация ФС-%s' % current_litera func _handle_init_state() -> void: if current_litera in [1, 2, 3, 4, 5, 6, 7]: - if not ecms.size(): + var flag_ecm: bool = false + for key in ecms: + var params = ecms[key].params.freq + if fs_parameters[current_litera].freq == params: + var kni = ecms[key].kni + if pribor_config[self_name].angle == kni: + flag_ecm = true + if not flag_ecm: state = STATE_MACHINE.FS_TURN_ON else: control_results = on_control_result(block_ip_config, control_results)