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

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-n/pribor-prd-n.gd
+++ b/scenes/pribor-prd-n/pribor-prd-n.gd
@@ -12,7 +12,7 @@ const constants_n = {
    'ADDR_UG_LITERA_3': 0x10A,
    'TEMP_THRESHOLD': 70,
    'POWER_THRESHOLD': 40,
-    'TIMER_DELAY': 5.0,
+    'TIMER_DELAY': 0.10,
    'RAY_DOU_NUM': 0x3,
    'ATT_UM_2': 0x7,
    'ATT_UM_3': 0x7,
@@ -163,7 +163,22 @@ 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[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_n.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_n = control_prd_n.block_kasseta_y5_config
    var nodes_y5: Array = get_tree().get_nodes_in_group('y-5')
@@ -172,7 +187,7 @@ func on_control_result(result_dic: Dictionary) -> void:
        if block_kasseta_y5_prd_config_n.has(meta_y5):
            if block_kasseta_y5_prd_config_n['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_n[meta_y5] else STATE_VAL.ERROR

    block_ip_config_n = control_prd_n.block_ip_config
@@ -199,6 +214,8 @@ func on_control_result(result_dic: Dictionary) -> void:
        $kasseta_FS_ND/ref_A3.state = STATE_VAL.GOOD if dkm.dkm_3 else STATE_VAL.ERROR
        $dou3_A6.state = STATE_VAL.GOOD if result_dic.dou_3 else STATE_VAL.ERROR

+    power_fill(power_dic)
+
    var result = true
    for device in result_dic.values():
        if not device:
@@ -207,7 +224,7 @@ func on_control_result(result_dic: Dictionary) -> void:
    var name_prd = control_prd_n.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-n/pribor-prd-n.tscn
+++ b/scenes/pribor-prd-n/pribor-prd-n.tscn
@@ -5,8 +5,8 @@
 [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="3_meukj"]
 [ext_resource type="PackedScene" uid="uid://bk1655p4e8y4u" path="res://scenes/контроль/кассета-у-5-нв.tscn" id="4_xkifg"]
 [ext_resource type="Script" uid="uid://crpedygm3gohi" path="res://scenes/контроль/кассета.gd" id="6_b5wvk"]
+[ext_resource type="PackedScene" uid="uid://bcyxqni7gxvtq" path="res://scenes/контроль/блок-в.tscn" id="7_bnnv3"]
 [ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="7_eoqf2"]
-[ext_resource type="PackedScene" uid="uid://bkxblfoj7ejv0" path="res://scenes/контроль/блок-а.tscn" id="8_sia5h"]
 [ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="9_k1x0o"]
 [ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="10_7dcjd"]
 [ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="11_ius1v"]
@@ -223,161 +223,149 @@ text = "Кассета П-1"
 horizontal_alignment = 1
 vertical_alignment = 1

-[node name="um1535_A7" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A7" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 485.0
 offset_top = 242.0
 offset_right = 652.0
 offset_bottom = 337.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
-fname = "УМ1535А"
+fname = "УМ1535Б"
 rname = "A7"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_1"

-[node name="um1535_A8" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A8" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 485.0
 offset_top = 337.0
 offset_right = 652.0
 offset_bottom = 432.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A8"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_2"

-[node name="um1535_A9" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A9" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 485.0
 offset_top = 432.0
 offset_right = 652.0
 offset_bottom = 527.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A9"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_3"

-[node name="um1535_A10" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A10" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 485.0
 offset_top = 527.0
 offset_right = 652.0
 offset_bottom = 622.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A10"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_4"

-[node name="um1535_A11" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A11" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 485.0
 offset_top = 622.0
 offset_right = 652.0
 offset_bottom = 717.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A11"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_5"

-[node name="um1535_A12" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A12" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 485.0
 offset_top = 717.0
 offset_right = 652.0
 offset_bottom = 812.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A12"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_6"

-[node name="um1535_A13" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A13" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 8.0
 offset_top = 242.0
 offset_right = 175.0
 offset_bottom = 337.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A13"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_7"

-[node name="um1535_A14" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A14" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 8.0
 offset_top = 337.0
 offset_right = 175.0
 offset_bottom = 432.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A14"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_8"

-[node name="um1535_A15" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A15" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 8.0
 offset_top = 432.0
 offset_right = 175.0
 offset_bottom = 527.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A15"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_9"

-[node name="um1535_A16" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A16" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 8.0
 offset_top = 527.0
 offset_right = 175.0
 offset_bottom = 622.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A16"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_10"

-[node name="um1535_A17" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A17" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 8.0
 offset_top = 622.0
 offset_right = 175.0
 offset_bottom = 717.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A17"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_11"

-[node name="um1535_A18" parent="." groups=["power_amplifier"] instance=ExtResource("8_sia5h")]
+[node name="um1535_A18" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")]
 layout_mode = 0
 offset_left = 8.0
 offset_top = 717.0
 offset_right = 175.0
 offset_bottom = 812.0
-value_name0 = "°C"
-value_name1 = "P, %"
-name_min_size0 = Vector2i(35, 20)
-name_min_size1 = Vector2i(35, 20)
 fname = "УМ1535А"
 rname = "A18"
+value0_info = "Мощность, Вт"
+value1_info = "Температура,°C"
+metadata/um = "um_12"

 [node name="Monitoring_panel" type="Panel" parent="."]
 visible = false