Добавление обработки мощности от ум и заполнение сцены

2025-08-25 11:52:28 +03:00
parent 488f7cb8b3
commit a2c7f5185f
8 changed files with 282 additions and 205 deletions
--- a/scenes/pribor-prd-k/pribor-prd-k.gd
+++ b/scenes/pribor-prd-k/pribor-prd-k.gd
@@ -13,7 +13,7 @@ const constants_k: Dictionary = {
    'ADDR_UG_LITERA_3': 0x10A,
    'TEMP_THRESHOLD': 40,
    'POWER_THRESHOLD': 40,
-    'TIMER_DELAY': 5.0,
+    'TIMER_DELAY': 0.50,
    'RAY_DOU_NUM': 0x3,
    'ATT_UM_1': 0x0,
    'ATT_UM_6': 0x7,
@@ -97,11 +97,6 @@ func _ready() -> void:

 func on_state_mashine() -> void:
    control_prd_k.state_control_machine()
-    $um1535_A10.value0 = [10, 20, 30, 40, 50, 60]
-    $um1535_A11.value0 = [60, 50, 40, 30, 20, 10]
-    $um1535_A12.set_value0_by_index(5, 100)
-    $um1535_A13.set_value0_by_index(2, 0)
-    $um1535_A13.value1 = -20


 func initialize_connections() -> void:
@@ -174,7 +169,25 @@ func on_mode_changed(in_tree: bool) -> void:
        mashine_timer.start()


-func on_control_result(result_dic: Dictionary) -> void:
+func power_fill(pow_dic: Dictionary) -> void:
+    var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier')
+    for i_powapm in power_amplifier:
+        var powamp_meta: String = i_powapm.get_meta('um')
+        var status = STATE_VAL.GOOD if pow_dic else STATE_VAL.NONE
+        if pow_dic:
+            if not pow_dic.has(powamp_meta):
+                break
+            if pow_dic[powamp_meta].size() < 6:
+                status = STATE_VAL.ERROR
+            else:
+                i_powapm.value0 = pow_dic[powamp_meta]
+                for i_p in pow_dic[powamp_meta]:
+                    if i_p < constants_k.POWER_THRESHOLD:
+                        status = STATE_VAL.ERROR
+            i_powapm.state = status
+
+
+func on_control_result(result_dic: Dictionary, power_dic: Dictionary) -> void:
    mashine_timer.stop()
    block_kasseta_y5_prd_config_k = control_prd_k.block_kasseta_y5_config
    var nodes_y5: Array = get_tree().get_nodes_in_group('y-5')
@@ -183,7 +196,7 @@ func on_control_result(result_dic: Dictionary) -> void:
        if block_kasseta_y5_prd_config_k.has(meta_y5):
            if block_kasseta_y5_prd_config_k['yau07'] == false:
                node_y5.state = STATE_VAL.ERROR if meta_y5 == 'yau07' else STATE_VAL.NONE
-                return
+                break
            node_y5.state = STATE_VAL.GOOD if block_kasseta_y5_prd_config_k[meta_y5] else STATE_VAL.ERROR

    block_ip_config_k = control_prd_k.block_ip_config
@@ -212,6 +225,8 @@ func on_control_result(result_dic: Dictionary) -> void:
        $kasseta_fs_kd/ref_A7.state = STATE_VAL.GOOD if dkm.dkm_7 else STATE_VAL.ERROR
        $dou7_A8.state = STATE_VAL.GOOD if result_dic.dou_7 else STATE_VAL.ERROR

+    power_fill(power_dic)
+
    var result = true
    for device in result_dic.values():
        if not device:
@@ -220,7 +235,7 @@ func on_control_result(result_dic: Dictionary) -> void:
    var name_prd = control_prd_k.self_name
    if result:
        $control_result.text = 'Прибор ПРД-%s исправен' % name_prd
-        $control_result.add_theme_color_override('font_color', Color.AQUAMARINE)
+        $control_result.add_theme_color_override('font_color', Color.GREEN)
    else:
        $control_result.text = 'Прибор ПРД-%s неисправен' % name_prd
-        $control_result.add_theme_color_override('font_color', Color.CRIMSON)
+        $control_result.add_theme_color_override('font_color', Color.RED)
--- a/scenes/pribor-prd-k/pribor-prd-k.tscn
+++ b/scenes/pribor-prd-k/pribor-prd-k.tscn
@@ -1,11 +1,10 @@
-[gd_scene load_steps=16 format=3 uid="uid://m5s87q7m66lj"]
+[gd_scene load_steps=15 format=3 uid="uid://m5s87q7m66lj"]

 [ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="1_8dmgr"]
 [ext_resource type="Script" uid="uid://cwvikiygf8b1m" path="res://scenes/pribor-prd-k/pribor-prd-k.gd" id="1_tpdyp"]
 [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="2_14h25"]
 [ext_resource type="PackedScene" uid="uid://cm5jd4gjrrpba" path="res://scenes/контроль/кассета-у-5-к.tscn" id="2_tb85r"]
 [ext_resource type="PackedScene" uid="uid://bcyxqni7gxvtq" path="res://scenes/контроль/блок-в.tscn" id="5_c7lv8"]
-[ext_resource type="PackedScene" uid="uid://bkxblfoj7ejv0" path="res://scenes/контроль/блок-а.tscn" id="6_fmhtx"]
 [ext_resource type="PackedScene" uid="uid://bmagw8nd0ulhj" path="res://scenes/pribor-prd-k/kasseta-fs-kd.tscn" id="7_ia27q"]
 [ext_resource type="Script" uid="uid://crpedygm3gohi" path="res://scenes/контроль/кассета.gd" id="7_xpa2n"]
 [ext_resource type="PackedScene" uid="uid://dq31j24gv5vi4" path="res://scenes/контроль/кассета-п-2.tscn" id="8_6fdp7"]
@@ -120,10 +119,12 @@ offset_left = 485.0
 offset_top = 242.0
 offset_right = 652.0
 offset_bottom = 337.0
+value0 = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
 fname = "УМ1535Б"
 rname = "A10"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_1"

 [node name="um1535_A11" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -135,6 +136,7 @@ fname = "УМ1535Б"
 rname = "A11"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_2"

 [node name="um1535_A12" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -146,6 +148,7 @@ fname = "УМ1535Б"
 rname = "A12"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_3"

 [node name="um1535_A13" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -157,6 +160,7 @@ fname = "УМ1535Б"
 rname = "A13"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_4"

 [node name="um1535_A14" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -168,6 +172,7 @@ fname = "УМ1535Б"
 rname = "A14"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_5"

 [node name="um1535_A15" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -179,17 +184,19 @@ fname = "УМ1535Б"
 rname = "A15"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_6"

-[node name="utm80_A9" parent="." groups=["power_amplifier"] instance=ExtResource("6_fmhtx")]
+[node name="utm80_A9" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
 offset_left = 485.0
 offset_top = 812.0
 offset_right = 652.0
 offset_bottom = 907.0
-value_name0 = "°C"
-value_name1 = "P, %"
 fname = "УТМ80"
 rname = "A9"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_7"

 [node name="rm1620m_A16" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -201,6 +208,7 @@ fname = "РМ16-20М"
 rname = "A16"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_8"

 [node name="rm1620m_A17" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -212,6 +220,7 @@ fname = "РМ16-20М"
 rname = "A17"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_9"

 [node name="rm1620m_A18" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -223,6 +232,7 @@ fname = "РМ16-20М"
 rname = "A18"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_10"

 [node name="rm1620m_A19" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -234,6 +244,7 @@ fname = "РМ16-20М"
 rname = "A19"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_11"

 [node name="rm1620m_A20" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -245,6 +256,7 @@ fname = "РМ16-20М"
 rname = "A20"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_12"

 [node name="rm1620m_A21" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")]
 layout_mode = 0
@@ -256,6 +268,7 @@ fname = "РМ16-20М"
 rname = "A21"
 value0_info = "Мощность, Вт"
 value1_info = "Температура,°C"
+metadata/um = "um_13"

 [node name="kasseta_fs_kd" parent="." instance=ExtResource("7_ia27q")]
 layout_mode = 0