Глобальное изменение: Параллеьный контроль. Новая ветка prd-control. Первый коммит инициализации.

README.md

@@ -36,3 +36,4 @@
 - После клонирования запустить скрипт `git-hooks-config.sh`
 - В среде **Windows** запуск скрипта `git-hooks-config.sh` производить из оболочки `git bash`
 - Нужно обновить `settings.json`
+- поиск циклических зависимостей

check-graph.py

@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*-
+import os
+import re
+import networkx as nx
+
+# pip install networkx plotly numpy scipy
+
+def build_class_graph(directory):
+    """Builds a directed acyclic graph of class dependencies."""
+    # Create a graph to store the dependencies
+    graph = nx.DiGraph()
+    dependencies = {}
+
+    # Find all .gd files in the directory
+    for root, dirs, files in os.walk(directory):
+        for file in files:
+            if not file.endswith(".gd"):
+                continue
+
+            file_path = os.path.join(root, file)
+            # Find the class name in the file
+            with open(file_path, "r", encoding="utf-8") as f:
+                contents = f.read()
+                match = re.search(r"^class_name\s+(\w+)", contents, re.MULTILINE)
+                if not match:
+                    continue
+
+                class_name = match.group(1)
+                graph.add_node(class_name)
+
+                # Find the dependencies of the class
+                for dep_match in re.finditer(
+                    r"^\s*extends\s+(\w+)", contents, re.MULTILINE
+                ):
+                    dep_name = dep_match.group(1)
+                    graph.add_edge(class_name, dep_name)
+
+                # Find all uses of the class name in other files
+                for root2, dirs2, files2 in os.walk(directory):
+                    for file2 in files2:
+                        if not file2.endswith(".gd"):
+                            continue
+
+                        if file_path == os.path.join(root2, file2):
+                            continue
+
+                        with open(os.path.join(root2, file2), "r", encoding="utf-8") as f2:
+                            contents2 = f2.read()
+                            if re.search(rf"\b{class_name}\b", contents2):
+                                print(
+                                    file2.ljust(30, " "),
+                                    f"--> class_name {class_name}".ljust(50, " "),
+                                    f" from {file}",
+                                )
+                                graph.add_edge(class_name, file2)
+                                dependencies[file2] = file
+
+    pos = nx.planar_layout(graph)
+
+    # Set the node positions in the graph
+    nx.set_node_attributes(graph, pos, "pos")
+
+    return graph, dependencies
+
+
+def debug_graph(graph):
+    """Builds and visualizes a graph of class dependencies in the directory."""
+    import plotly.graph_objects as go
+
+    # Create the plotly figure
+    fig = go.Figure()
+
+    # Add the nodes to the figure
+    for node in graph.nodes():
+        x, y = graph.nodes[node]["pos"]
+        fig.add_trace(
+            go.Scatter(
+                x=[x],
+                y=[y],
+                text=[node],
+                hovertext=[f"Class: {node}"],
+                mode="markers",
+                marker=dict(
+                    symbol="circle", size=20, line=dict(width=1, color="black"),
+                ),
+                name=node,
+            )
+        )
+
+    # Add the edges to the figure
+    for edge in graph.edges():
+        x0, y0 = graph.nodes[edge[0]]["pos"]
+        x1, y1 = graph.nodes[edge[1]]["pos"]
+        fig.add_trace(
+            go.Scatter(
+                x=[x0, x1],
+                y=[y0, y1],
+                text=[f"{edge[0]} -> {edge[1]}", ""],
+                hovertext=[f"Depends on: {edge[1]}", ""],
+                mode="lines+markers+text",
+                line=dict(width=2, color="black"),
+                marker=dict(size=0),
+                textposition="middle right",
+                showlegend=True,
+            )
+        )
+
+    # Customize the layout and style of the figure
+    fig.update_layout(
+        title="Class Dependency Graph",
+        title_font_size=24,
+        margin=dict(l=20, r=20, t=50, b=20),
+        hovermode="closest",
+        plot_bgcolor="white",
+        showlegend=True,
+    )
+
+    # Show the figure
+    fig.show()
+
+
+def find_circular_dependencies(dependencies):
+    """Finds circular dependencies between classes in the directory."""
+
+    circular_dependencies = []
+
+    for file, dependency in dependencies.items():
+        visited = set()
+        path = [file]
+
+        while dependency and dependency not in visited:
+            visited.add(dependency)
+            path.append(dependency)
+            dependency = dependencies.get(dependency)
+
+            # Circular check
+            if dependency in path:
+                start_index = path.index(dependency)
+                circular_dependency = path[start_index:]
+                if circular_dependency not in circular_dependencies:
+                    circular_dependencies.append(circular_dependency)
+                break
+
+    # Convert circular_dependencies to dependency paths
+    dependency_paths = []
+    for circular_dependency in circular_dependencies:
+        dependency_path = " -> ".join(circular_dependency)
+        dependency_paths.append(dependency_path)
+
+    return dependency_paths
+
+
+# Example usage
+graph, dependencies = build_class_graph("./")
+debug_graph(graph)
+circular_deps = find_circular_dependencies(dependencies)
+print("----------------------------------")
+if circular_deps:
+    print(" Circular dependencies found!")
+    for dep in circular_deps:
+        print("\t", dep)
+else:
+    print(" No circular dependencies found.")
+print("----------------------------------")

scenes/pribor-prd-k/pribor-prd-k.gd

@@ -59,64 +59,70 @@ var ug_work_1: int = 3  ## Аттенюация усилителей мощно
 var ug_work_2: int = 2  ## Аттенюация усилителей мощности
 var ug_work_3: int = 0  ## Аттенюация усилителей мощности
 var mashine_timer: Timer = Timer.new()
-var prd_k_module: Object
+#var prd_k_module: Object
 var unit_prd_k: Object
-var control_prd_k: Object
+#var control_prd_k: Object
 # Результаты контроля
-var control_results_k: Dictionary = {
-    'block_ip': false,     # Проверка касет П1 и ИП МА2000
-    'temperature': true,
-    'dkm_1': false,
-    'dkm_6': false,
-    'dkm_7': false,
-    'dou_6': false,
-    'dou_7': false,
-    'fs_1': 2,
-    'fs_6': 2,
-    'fs_7': 2,
-}
+#var control_results_k: Dictionary = {
+    #'block_ip': false,     # Проверка касет П1 и ИП МА2000
+    #'temperature': true,
+    #'dkm_1': false,
+    #'dkm_6': false,
+    #'dkm_7': false,
+    #'dou_6': false,
+    #'dou_7': false,
+    #'fs_1': 2,
+    #'fs_6': 2,
+    #'fs_7': 2,
+#}
 
-var test_control_k = preload('res://scripts/pribor-prd.gd')
 var ctrl_pos = 30
 
 
 func _ready() -> void:
     if Engine.is_editor_hint():
         return
+    var unit_name = get_meta('unit_name')[0]
+    var prd_k_module = prd.prd_dict[unit_name]
+    unit_prd_k = prd_k_module.unit_control
 
-    initialize_connections()
+    unit_prd_k.connect('control_is_over', Callable(self, 'on_control_result'))
+
+
+func start_control() -> void:
+    #initialize_connections()
     setup_timer()
     set_default_state()
     find_labels(self)
 
 
-func on_state_mashine() -> void:
-    control_prd_k.state_control_machine()
+#func on_state_mashine() -> void:
+    #control_prd_k.state_control_machine()
 
 
-func initialize_connections() -> void:
-    var unit_name = get_meta('unit_name')[0]
-    prd_k_module = prd.prd_dict[unit_name]
-    unit_prd_k = prd_k_module.unit_yau07
-
-    unit_prd_k.connect('line_changed', Callable(self, 'on_line_changed'))
-    var power_amplifiers: Array = get_tree().get_nodes_in_group('power_amplifier')
-    var init_data: Dictionary = {
-        'control_label': $control_result,
-        'power_amplifiers': power_amplifiers,
-        'unit_prd': unit_prd_k,
-        'module_prd' : prd_k_module,
-        'constants': constants_k,
-        'prd_config': PRIBOR_CONFIG,
-        'fs_params': FS_PARAMS,
-        'block_ip_prd_config': block_ip_config_k,
-        'block_kasseta_y5_prd_config': block_kasseta_y5_prd_config_k,
-        'control_results': control_results_k,
-        'current_litera': start_litera,
-    }
-    control_prd_k = test_control_k.TestPRD.new(init_data)
-    add_child(control_prd_k)
-    control_prd_k.connect('control_is_over', Callable(self, 'on_control_result'))
+#func initialize_connections() -> void:
+    #var unit_name = get_meta('unit_name')[0]
+    #prd_k_module = prd.prd_dict[unit_name]
+    #unit_prd_k = prd_k_module.unit_yau07
+#
+    #unit_prd_k.connect('line_changed', Callable(self, 'on_line_changed'))
+    #var power_amplifiers: Array = get_tree().get_nodes_in_group('power_amplifier')
+    #var init_data: Dictionary = {
+        #'control_label': $control_result,
+        #'power_amplifiers': power_amplifiers,
+        #'unit_prd': unit_prd_k,
+        #'module_prd' : prd_k_module,
+        #'constants': constants_k,
+        #'prd_config': PRIBOR_CONFIG,
+        #'fs_params': FS_PARAMS,
+        #'block_ip_prd_config': block_ip_config_k,
+        #'block_kasseta_y5_prd_config': block_kasseta_y5_prd_config_k,
+        #'control_results': control_results_k,
+        #'current_litera': start_litera,
+    #}
+    #control_prd_k = test_control_k.TestPRD.new(init_data)
+    #add_child(control_prd_k)
+    #control_prd_k.connect('control_is_over', Callable(self, 'on_control_result'))
 
 
 func setup_timer() -> void:
@@ -149,7 +155,7 @@ func _enter_tree() -> void:
 func _exit_tree() -> void:
     if Engine.is_editor_hint():
         return
-    prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])
+    #prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])
 
 
 func on_line_changed(unit_pribor: Object) -> void:
@@ -159,13 +165,15 @@ func on_line_changed(unit_pribor: Object) -> void:
 
 func on_mode_changed(in_tree: bool) -> void:
     if not in_tree:
-        mashine_timer.stop()
-        prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])
-        signaller.emit_signal('interfer_off_all')
+        print_debug('Выход из сцены')
+        #mashine_timer.stop()
+        #prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])
+        #signaller.emit_signal('interfer_off_all')
     else:
-        set_default_state()
-        control_prd_k.state = control_prd_k.STATE_MASHINE.INIT
-        mashine_timer.start()
+        print_debug('Вход в сцену')
+        #set_default_state()
+        #control_prd_k.state = control_prd_k.STATE_MASHINE.INIT
+        #mashine_timer.start()
 
 
 func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:
@@ -193,7 +201,7 @@ func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:
 
 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
+    block_kasseta_y5_prd_config_k = unit_prd_k.block_kasseta_y5_config
     var nodes_y5: Array = get_tree().get_nodes_in_group('y-5')
     for node_y5 in nodes_y5:
         var meta_y5  = node_y5.get_meta('y5')
@@ -203,7 +211,7 @@ func on_control_result(result_dic: Dictionary, power_dic: Dictionary) -> void:
                 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
+    block_ip_config_k = unit_prd_k.block_ip_config
     var node_ip_power_arr: Array = get_tree().get_nodes_in_group('power_supply')
     for power_supply in node_ip_power_arr:
         var meta_ip  = power_supply.get_meta('ip')
@@ -240,13 +248,8 @@ func on_control_result(result_dic: Dictionary, power_dic: Dictionary) -> void:
         if not device:
             result = false
 
-    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.GREEN)
-    else:
-        $control_result.text = 'Прибор ПРД-%s неисправен' % name_prd
-        $control_result.add_theme_color_override('font_color', Color.RED)
+    var name_prd = unit_prd_k.self_name
+    log.message(Logger.INFO, 'Прибор ПРД-%s %s' % [name_prd, ['неисправен', 'исправен'][int(result)]])
 
 
 func find_labels(node1: Node):

scenes/pribor-prd-n/pribor-prd-n.gd

@@ -78,7 +78,10 @@ func on_state_mashine() -> void:
 func _ready() -> void:
     if Engine.is_editor_hint():
         return
+    print_debug('В сцене ПРД-Н!')
 
+
+func start_control() -> void:
     initialize_connections()
     setup_timer()
     set_default_state()
@@ -111,10 +114,11 @@ func initialize_connections() -> void:
 
 
 func setup_timer() -> void:
-    add_child(mashine_timer)
-    mashine_timer.connect('timeout', Callable(self, 'on_state_mashine'))
-    mashine_timer.wait_time = constants_n.STATE_MASHINE_TIMER
-    mashine_timer.start()
+    pass
+    #add_child(mashine_timer)
+    #mashine_timer.connect('timeout', Callable(self, 'on_state_mashine'))
+    #mashine_timer.wait_time = constants_n.STATE_MASHINE_TIMER
+    #mashine_timer.start()
 
 
 func set_default_state() -> void:
@@ -140,7 +144,7 @@ func _enter_tree() -> void:
 func _exit_tree() -> void:
     if Engine.is_editor_hint():
         return
-    prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]])
+    #prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]])
 
 
 func on_line_changed(unit_pribor: Object) -> void:
@@ -149,14 +153,15 @@ func on_line_changed(unit_pribor: Object) -> void:
 
 
 func on_mode_changed(in_tree: bool) -> void:
-    if not in_tree:
-        mashine_timer.stop()
-        signaller.emit_signal('interfer_off_all')
-        prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]])
-    else:
-        set_default_state()
-        control_prd_n.state = control_prd_n.STATE_MASHINE.INIT
-        mashine_timer.start()
+    print_debug('Выход из сцены')
+    #if not in_tree:
+        #mashine_timer.stop()
+        #signaller.emit_signal('interfer_off_all')
+        #prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]])
+    #else:
+        #set_default_state()
+        #control_prd_n.state = control_prd_n.STATE_MASHINE.INIT
+        #mashine_timer.start()
 
 
 func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:

scenes/pribor-prd-v/pribor-prd-v.gd

@@ -79,7 +79,10 @@ func on_state_mashine() -> void:
 func _ready() -> void:
     if Engine.is_editor_hint():
         return
+    print_debug('В сцене ПРД-В!')
 
+
+func start_control() -> void:
     initialize_connections()
     setup_timer()
     set_default_state()
@@ -142,7 +145,7 @@ func _enter_tree() -> void:
 func _exit_tree() -> void:
     if Engine.is_editor_hint():
         return
-    prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]])
+    #prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]])
 
 
 func on_line_changed(unit_pribor: Object) -> void:
@@ -151,14 +154,15 @@ func on_line_changed(unit_pribor: Object) -> void:
 
 
 func on_mode_changed(in_tree: bool) -> void:
-    if not in_tree:
-        mashine_timer.stop()
-        prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]])
-        signaller.emit_signal('interfer_off_all')
-    else:
-        set_default_state()
-        control_prd_v.state = control_prd_v.STATE_MASHINE.INIT
-        mashine_timer.start()
+    print_debug('Выход из сцены')
+    #if not in_tree:
+        #mashine_timer.stop()
+        #prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]])
+        #signaller.emit_signal('interfer_off_all')
+    #else:
+        #set_default_state()
+        #control_prd_v.state = control_prd_v.STATE_MASHINE.INIT
+        #mashine_timer.start()
 
 
 func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:

scenes/tabs-switch/tab-switch.tscn

@@ -5,8 +5,8 @@
 [ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль/контроль.tscn" id="3_txp0s"]
 [ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал/журнал.tscn" id="4_cu5k8"]
 [ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс/эмс.tscn" id="5_u71bh"]
+[ext_resource type="PackedScene" uid="uid://musb21x2u0xs" path="res://scenes/эмс2/эмс2.tscn" id="6_41d34"]
 [ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки/настройки.tscn" id="6_i8iv3"]
-[ext_resource type="PackedScene" uid="uid://musb21x2u0xs" path="res://scenes/эмс2/эмс2.tscn" id="6_rsg03"]
 [ext_resource type="Script" uid="uid://b5ykwyk5vpi6" path="res://scenes/tabs-switch/lbl_ready.gd" id="8_tidwt"]
 [ext_resource type="Script" uid="uid://roajn6c6wvc1" path="res://scenes/tabs-switch/тренаж_режим.gd" id="9_41d34"]
 
@@ -69,7 +69,7 @@ visible = false
 layout_mode = 2
 metadata/_tab_index = 3
 
-[node name="ЭМС ТГ" parent="tab_switch" instance=ExtResource("6_rsg03")]
+[node name="ЭМС ТГ" parent="tab_switch" instance=ExtResource("6_41d34")]
 visible = false
 layout_mode = 2
 metadata/_tab_index = 4
@@ -95,15 +95,13 @@ script = ExtResource("8_tidwt")
 metadata/_edit_lock_ = true
 
 [node name="remote_control" type="Label" parent="."]
-visible = false
 layout_mode = 2
-offset_left = 1358.0
-offset_right = 1501.0
+offset_left = 1244.0
+offset_right = 1401.0
 offset_bottom = 27.0
 tooltip_text = "Комплекс находится под внешним управлением"
 mouse_filter = 0
 theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_font_sizes/font_size = 14
 theme_override_styles/normal = SubResource("StyleBoxFlat_o1r22")
 text = "Внешнее управление"
 horizontal_alignment = 1

scenes/tilemap/tilemap.gd

@@ -368,12 +368,12 @@ func _process(delta) -> void:
         _queue.erase(tile.i)
         req.request_completed.connect(_response.bind(req, tile))
 
-        if req.request(tile.url) != OK:
-            tile.t = now
-            remove_child(req)
-            req.queue_free()
-            _req_count -= 1
-            push_error('запрос \"%s\" не отправлен' % tile.url)
+        #if req.request(tile.url) != OK:
+            #tile.t = now
+            #remove_child(req)
+            #req.queue_free()
+            #_req_count -= 1
+            # push_error('запрос \"%s\" не отправлен' % tile.url)  TODO: For Deugs 
         if _queue.is_empty():
             emit_signal('load_completed')
 

scenes/контроль/кнопка-прибора.gd

@@ -1,12 +1,16 @@
 @tool
 
 extends TextureButton
-
+@onready var tween: Tween
 @export var state_colors: Array
 
-func _on_toggled(toggled_on): $frame.visible = toggled_on
+func _on_toggled(toggled_on) -> void: $frame.visible = toggled_on
 func _enter_tree() -> void: $label.self_modulate = state_colors[state]
-
+func update_progress_bar(target_value) -> void:
+    if tween:
+        tween.kill()
+    tween = create_tween()
+    tween.tween_property($control_progress, "value", target_value, 0.3)
 
 @export var state: int:
     set(v):
@@ -14,3 +18,35 @@ func _enter_tree() -> void: $label.self_modulate = state_colors[state]
         state = v
         if is_inside_tree():
             $label.self_modulate = state_colors[v]
+
+
+@export var progress_value: float = 0.0:
+    set(v):
+        progress_value = v
+        
+        if is_inside_tree():
+            update_progress_bar(v)
+            var max_val = $control_progress.get('max_value')
+            var percentage = (v / max_val) * 100.0
+            $control_progress.tooltip_text = 'Процесс контроля %01d%%' % percentage
+
+
+@export var progress_visible: bool:
+    set(v):
+        progress_visible = v
+        if is_inside_tree():
+            $control_progress.visible = v
+
+
+@export var progress_max_value: int:
+    set(v):
+        progress_max_value = v
+        if is_inside_tree():
+            $control_progress.max_value = v
+
+
+@export var progress_min_value: int:
+    set(v):
+        progress_min_value = v
+        if is_inside_tree():
+            $control_progress.min_value = v

scenes/контроль/контроль.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=3 uid="uid://lwmw4egynmd1"]
+[gd_scene load_steps=20 format=3 uid="uid://lwmw4egynmd1"]
 
 [ext_resource type="Texture2D" uid="uid://bar8k5qef7kch" path="res://data/УФ.png" id="2_0nvm1"]
 [ext_resource type="Script" uid="uid://q3gmpsqspjfp" path="res://scenes/контроль/внешний.gd" id="2_8r80x"]
@@ -14,6 +14,8 @@
 [ext_resource type="Texture2D" uid="uid://dnreyfh3cd1k2" path="res://data/состояние-исправности-1.png" id="8_isjua"]
 [ext_resource type="Texture2D" uid="uid://b4isaggma6q3" path="res://data/Грани22.png" id="9_iqgf5"]
 [ext_resource type="Texture2D" uid="uid://c6booa8753u5t" path="res://data/состояние-исправности-2.png" id="9_ll0vs"]
+[ext_resource type="Texture2D" uid="uid://00871pb6moln" path="res://data/прогресс-фон-1.png" id="9_w6m6a"]
+[ext_resource type="Texture2D" uid="uid://c1k856fxhrjnh" path="res://data/прогресс-заполнение-1.png" id="10_lbx5w"]
 [ext_resource type="Script" uid="uid://bncy1x53jp73d" path="res://scenes/контроль/connect_pribor.gd" id="11_u7tym"]
 
 [sub_resource type="GDScript" id="GDScript_iqgf5"]
@@ -84,6 +86,8 @@ func _ready():
             if prd.prd_dict.has(item):
                 var prd_module = prd.prd_dict[item]
                 prd_module.connect('update_serviceability', Callable(self, 'on_serviceability_changed').bind(prd_module, pribor_node))
+                prd_module.unit_control.connect('update_progress', Callable(self, 'on_update_progress').bind(pribor_node))
+                prd_module.unit_control.connect('update_max_value_progress', Callable(self, 'on_update_max_value_progress').bind(pribor_node))
             if item == 'уарэп-эмс':
                 signaller.connect('update_uf_serviceability', Callable(self, 'on_update_uf_serviceability').bind(pribor_node))
     # Пиктограммы приборов, которые отображают состояние подключения только
@@ -143,8 +147,20 @@ func on_serviceability_changed(prd_module: Object, prd_pribor:Node)-> void:
 
 
 func on_update_uf_serviceability(uf_serviceaability: bool, uf_pribor: Node)-> void:
-
     uf_pribor.state = 1 if uf_serviceaability else 2
+
+
+func _on_control_prd_pressed() -> void:
+    signaller.emit_signal('start_contol_device')
+
+
+func on_update_progress(value_progress: float, pribor_node: Node) -> void:
+    pribor_node.progress_value = value_progress
+    pribor_node.progress_visible = value_progress > 0
+
+
+func on_update_max_value_progress(max_value_progress: int, pribor_node: Node) -> void:
+    pribor_node.progress_max_value = max_value_progress
 "
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_foasq"]
@@ -360,6 +376,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/online_proc = "on_line_changed"
 metadata/unit_name = ["уарэп-яу07-1н"]
 
@@ -396,6 +414,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_1"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_uf" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -412,6 +453,8 @@ stretch_mode = 0
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
 state = 1
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-эмс"]
 metadata/online_proc = "on_line_changed"
 
@@ -465,6 +508,8 @@ texture_normal = ExtResource("3_hhadv")
 stretch_mode = 0
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = [&"уарэп-бпо-1", &"уарэп-бпо-2"]
 metadata/online_proc = "online_change_arr"
 
@@ -528,6 +573,8 @@ texture_normal = ExtResource("9_iqgf5")
 stretch_mode = 0
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = [&"уарэп-афсп-левый"]
 metadata/online_proc = "on_line_changed"
 
@@ -595,6 +642,8 @@ stretch_mode = 0
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = [&"уарэп-афсп-правый"]
 metadata/online_proc = "on_line_changed"
 
@@ -659,6 +708,8 @@ texture_normal = ExtResource("5_kvnex")
 stretch_mode = 0
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-щ3", "уарэп-спт25-1", "уарэп-спт25-2"]
 metadata/online_proc = "online_change_arr"
 
@@ -711,6 +762,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-2в"]
 metadata/online_proc = "on_line_changed"
 
@@ -747,6 +800,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_2"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_n_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -763,6 +839,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-2н"]
 metadata/online_proc = "on_line_changed"
 
@@ -801,6 +879,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_2"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_k_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -817,6 +918,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-2к"]
 metadata/online_proc = "on_line_changed"
 
@@ -853,6 +956,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_2"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_v_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -869,6 +995,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-3в"]
 metadata/online_proc = "on_line_changed"
 
@@ -905,6 +1033,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_3"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_n_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -921,6 +1072,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-3н"]
 metadata/online_proc = "on_line_changed"
 
@@ -957,6 +1110,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_3"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_k_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -973,6 +1149,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-3к"]
 metadata/online_proc = "on_line_changed"
 
@@ -1009,6 +1187,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_3"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_v_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1025,6 +1226,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-1в"]
 metadata/online_proc = "on_line_changed"
 
@@ -1061,6 +1264,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_1"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_k_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1077,6 +1303,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-1к"]
 metadata/online_proc = "on_line_changed"
 
@@ -1113,6 +1341,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_1"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_v_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1128,6 +1379,8 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-4в"]
 metadata/online_proc = "on_line_changed"
 
@@ -1164,6 +1417,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_4"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_n_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1179,6 +1455,8 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-4н"]
 metadata/online_proc = "on_line_changed"
 
@@ -1215,6 +1493,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_4"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_k_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1230,6 +1531,8 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-4к"]
 metadata/online_proc = "on_line_changed"
 
@@ -1266,6 +1569,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_4"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="txr_legend0" type="TextureRect" parent="."]
 layout_mode = 0
 offset_left = 219.0
@@ -1387,6 +1713,15 @@ points = PackedVector2Array(-8, 0, 608, 0)
 width = 2.0
 default_color = Color(1, 1, 1, 0.352941)
 
+[node name="control_prd" type="Button" parent="."]
+layout_mode = 0
+offset_left = 1101.0
+offset_top = 64.0
+offset_right = 1326.0
+offset_bottom = 104.0
+focus_mode = 0
+text = "Запуск контроля"
+
 [connection signal="toggled" from="pribor_prd_n_1" to="pribor_prd_n_1" method="_on_toggled"]
 [connection signal="toggled" from="pribor_uf" to="pribor_uf" method="_on_toggled"]
 [connection signal="toggled" from="pribor_rtr" to="pribor_rtr" method="_on_toggled"]
@@ -1404,3 +1739,4 @@ default_color = Color(1, 1, 1, 0.352941)
 [connection signal="toggled" from="pribor_prd_v_4" to="pribor_prd_v_4" method="_on_toggled"]
 [connection signal="toggled" from="pribor_prd_n_4" to="pribor_prd_n_4" method="_on_toggled"]
 [connection signal="toggled" from="pribor_prd_k_4" to="pribor_prd_k_4" method="_on_toggled"]
+[connection signal="pressed" from="control_prd" to="." method="_on_control_prd_pressed"]

scenes/работа/работа.gd

@@ -177,8 +177,9 @@ func _ready():
     signaller.connect('map_user_panning',       Callable(self, 'on_user_panning'))
     signaller.connect('update_coordinates_map', Callable(self, 'on_update_coordinates_label'))
     signaller.connect('update_scale_map',       Callable(self, 'on_update_scale_label'))
-    signaller.connect('sector_klaster',        Callable(self, 'sector_klaster'))
+    signaller.connect('sector_klaster',         Callable(self, 'sector_klaster'))
     signaller.connect('clear_klaster',          Callable(self, 'clear_all_klaster'))
+    signaller.connect('th_aoa_update', Callable(self, 'on_th_aoa_update'))
     var unit_nav = network.get_unit_instance('навигация')
     unit_nav.connect('data_received', on_navi_data_received)
     on_btn_center_toggled(true)
@@ -595,6 +596,7 @@ func on_btn_close(btn):
     fs_closed.merge(fs_selected)
     signaller.emit_signal('update_fs_closed', fs_closed)
 
+
 func on_btn_work(btn):
     await get_tree().create_timer(0.2).timeout
     btn.pressed = false
@@ -604,6 +606,13 @@ func on_btn_work(btn):
         fs_closed[fs_index] = null
     signaller.emit_signal('update_fs_closed', fs_closed)
 
+
 func _on_btn_all_work_pressed() -> void:
     fs_closed.clear()
     signaller.emit_signal('update_fs_closed', fs_closed)
+
+
+func on_th_aoa_update(ths):
+    $count_all_pad/count_all.text = '%02d' % ths.size()
+    var c: int = ths.values().filter(func(th: threats.Threat): return th.proto != '').size()
+    $count_danger_pad/count_danger.text = '%02d' % c

scenes/эмс2/эмс_тг.gd

@@ -0,0 +1,37 @@
+extends Panel
+
+func _ready() -> void:
+    var unit_trassa = network.get_unit_instance('уарэп-трасса')
+    unit_trassa.connect('line_changed',  Callable(self, 'on_trassa_line_changed'))
+    signaller.connect('sector_klaster',  Callable(self, 'on_sector_klaster').bind(unit_trassa))
+
+
+func on_trassa_line_changed(unit_trassa):
+    if unit_trassa.online:
+        $"454/СостояниеРэс3".self_modulate = Color.WEB_GREEN
+        $"СкруглённыйПрямоугольникБелый/Label3".text = 'Трасса'
+        $"СкруглённыйПрямоугольникБелый/Label4".text = 'Трасса'
+        $"СкруглённыйПрямоугольникБелый/Label5".text = 'Активный'
+        $"СкруглённыйПрямоугольникБелый/Label6".text = str(unit_trassa.daa)
+        $"СкруглённыйПрямоугольникБелый/Label7".text = str(unit_trassa.dap)
+        $"СкруглённыйПрямоугольникБелый/Label8".text = '1'
+        $"СкруглённыйПрямоугольникБелый/Label9".text = str(unit_trassa.lfb)
+        $"СкруглённыйПрямоугольникБелый/Label10".text = str(unit_trassa.lfb)
+    else:
+        $"454/СостояниеРэс3".self_modulate = Color.WHITE
+        $"СкруглённыйПрямоугольникБелый/Label3".text = '-'
+        $"СкруглённыйПрямоугольникБелый/Label4".text = '-'
+        $"СкруглённыйПрямоугольникБелый/Label5".text = '-'
+        $"СкруглённыйПрямоугольникБелый/Label6".text = '-'
+        $"СкруглённыйПрямоугольникБелый/Label7".text = '-'
+        $"СкруглённыйПрямоугольникБелый/Label8".text = '-'
+        $"СкруглённыйПрямоугольникБелый/Label9".text = '-'
+        $"СкруглённыйПрямоугольникБелый/Label10".text = '-'
+
+
+func on_sector_klaster(_data, unit_trassa):
+    $"СкруглённыйПрямоугольникБелый/Label6".text = str(unit_trassa.dap)
+    $"СкруглённыйПрямоугольникБелый/Label7".text = str(unit_trassa.daa)
+    $"СкруглённыйПрямоугольникБелый/Label8".text = '1'
+    $"СкруглённыйПрямоугольникБелый/Label9".text = str(unit_trassa.lfb)
+    $"СкруглённыйПрямоугольникБелый/Label10".text = str(unit_trassa.hfb)

scenes/эмс2/эмс_тг.gd.uid

@@ -0,0 +1 @@
+uid://bvlqgv7aapebl

scripts/interfer.gd

@@ -351,8 +351,8 @@ func map_msvk_to_ecms(unit_instance: unit.Unit, ecms: Dictionary):
 
 
 ## Извлекает массив пространственно-частотных фильтров
-func map_mpchf_to_seczaps(unit_instance: unit.Unit, seczaps: Dictionary):
-    var json_dic: = unit_instance.json_dic as Dictionary
+func map_mpchf_to_seczaps(unit_instance: unit.Unit, _seczaps: Dictionary):
+    var json_dic = unit_instance.json_dic
     var mpchf = json_dic.get('mpchf', [])
     if mpchf is not Array: return
     for item in mpchf:

scripts/network.gd

@@ -22,18 +22,20 @@ class SocketSerial extends SerialPort:
         'O': SerialPort.PARITY_ODD }
     static var tick: int
     var unit_instance: unit.Unit
+    var failed: = {}
+
+    func _init():
+        connect('got_error', on_serial_got_error)
+
+    func on_serial_got_error(where: String, what: String):
+        if where not in failed:
+            push_error([where, what, unit_instance])
+            failed[where] = what
 
     func on_serial_data(data: PackedByteArray):
+        failed.clear()
         unit_instance.parse(data, tick)
 
-    func on_settings_changed():
-        try_close()
-        var rc = try_open()
-        if rc != Error.OK:
-            log.message(log.ERROR, 'невозможно открыть %s для \"%s\"' % [self, unit_instance.name])
-        else:
-            log.message(log.INFO, '%s для \"%s\"' % [self, unit_instance.name])
-
     func format_buffer(data: PackedByteArray):
         var buffer: PackedByteArray
         buffer.resize(64)
@@ -50,16 +52,16 @@ class SocketSerial extends SerialPort:
         buffer.resize(i)
         return buffer
 
-    func send_to(data: PackedByteArray):
+    func send_to(_data: PackedByteArray):
         if not is_open():
-            try_open()
+            call_deferred('try_open')
             return
         # var buffer = format_buffer(data)  # Не проверено, но должно работать
         # Эта последовательность для запроса состояния, получена от разработчиков СПТ-25
         const tx_tula: = [0x7e, 0x01, 0x04, 0xbb, 0x50, 0x7e]
         var sz = write_raw(tx_tula)
         if sz != tx_tula.size():
-            try_open()
+            call_deferred('try_close')
 
     func _to_string() -> String: return 'последовательный порт \"%s\" @ %d (%s)' % [self.port, self.baudrate, 'открыт' if is_open() else 'закрыт']
 
@@ -144,6 +146,15 @@ var send_sockets: Dictionary[StringName, SocketUDP]    ## Таблица <имя
 var addr_port_to_unit_name: Dictionary[StringName, StringName]  ## Преобразование адрес:порт в имя устройства
 
 
+func on_settings_changed(serial: SocketSerial):
+    serial.try_close()
+    var rc = serial.try_open()
+    if rc != Error.OK:
+        log.message(log.ERROR, 'невозможно открыть %s для \"%s\"' % [serial.port, serial.unit_instance.name])
+    else:
+        log.message(log.INFO, 'открыт %s для \"%s\"' % [serial.port, serial.unit_instance.name])
+
+
 ## [param unit_name] - Уникальное имя устройства[br]
 func create_socket_udp(unit_name: StringName) -> SocketUDP:
     var st = settings.UnitProfiles[unit_name][1]
@@ -202,13 +213,10 @@ func create_serial(unit_instance: unit.Unit) -> SocketSerial:
     serial.bytesize = st[4]
     serial.stopbits = st[5]
     serial.unit_instance = unit_instance
+    ProjectSettings.connect('settings_changed', func(): on_settings_changed(serial))
     return serial
 
 
-func on_serial_got_error(where: String, what: String, serial: SocketSerial, unit_instance: unit.Unit):
-    push_error([where, what, serial])
-
-
 ## [param unit_name] - Уникальное имя устройства[br]
 func create_modbus(unit_name: StringName) -> sch_3.Sch3:
     var unit_modbus: = sch_3.Sch3.new(unit_name)
@@ -286,8 +294,6 @@ func _ready() -> void:
         if proto in SERIAL_PROTO:
             var unit_instance = SERIAL_PROTO[proto].new(unit_name)
             var serial: = create_serial(unit_instance)
-            serial.connect('got_error', on_serial_got_error.bind(serial, unit_instance))
-            ProjectSettings.connect('settings_changed', serial.on_settings_changed)
             units_serial[unit_name] = unit_instance
             units[unit_name] = unit_instance
             serials[unit_name] = serial

scripts/prd.gd

@@ -153,6 +153,7 @@ class Fs:
 class PRD:
     var prd_name: String                                ## Имя прибора
     var unit_yau07                                      ## Юнит эмс
+    var unit_control: Object                            ## Класс проверки прибора ПРД
     var fs_dic: Dictionary                              ## Массив блоков ФС
     var yemsg_board: yemsboards.EmsBoard                ## Плата ЭМС-Г
     var state = PrdState.WORK
@@ -162,11 +163,13 @@ class PRD:
     var set_ug_state: bool = true                       ## Необходимо ли записать в УГ настройки
     signal update_serviceability()
 
-    func _init(u_name, u_yau07):
+    func _init(u_name, u_yau07, u_control: Object):
         prd_name = u_name
         unit_yau07 = u_yau07
+        unit_control = u_control
         init_ems_g()
 
+
     func init_ems_g():
         var in_tbl: Array = []
         var out_tbl: Array = []
@@ -281,7 +284,10 @@ func _ready() -> void:
     check_dir()
     for prd_name in PRD_NAMES:
         var unit_prd = network.get_unit_instance(prd_name)
-        var new_prd = PRD.new(prd_name, unit_prd)
+        var control_pribor_prd = preload('res://scripts/pribor-prd.gd')
+        var unit_control = control_pribor_prd.TestPRD.new({'unit_prd': unit_prd})
+        add_child(unit_control)
+        var new_prd = PRD.new(prd_name, unit_prd, unit_control)
         prd_dict[prd_name] = new_prd
     for key in FS_PRD.keys():
         var fs = Fs.new(key, FS_PRD[key][0])

scripts/pribor-prd.gd

@@ -1,4 +1,149 @@
 class TestPRD extends Node:
+    const DEVICE_CONSTANT: Dictionary = {
+        'PRD_N': {
+            CONSTANTS = {
+                'POWER_UKP_1': 31,
+                'POWER_UKP_2': 63,
+                'DKM_BIT_2': 1,
+                'DKM_BIT_3': 2,
+                'BASE_ADDR_EMS_G': 0x120,
+                'ADDR_UG_LITERA_1': 0x106,
+                'ADDR_UG_LITERA_2': 0x108,
+                'ADDR_UG_LITERA_3': 0x10A,
+                'TEMP_THRESHOLD': 70,
+                'POWER_THRESHOLD': 40,
+                'RAY_DOU_NUM': 0x3,
+                'ATT_UM_2': 0x2,
+                'ATT_UM_3': 0x3,
+                'POWER_UM': 100,
+                'TIMER_DELAY': 10.0,
+                'STATE_MASHINE_TIMER': 0.3,
+            },
+            PRIBOR_CONFIG = {
+                '1н': {'angle': 0.0, 'sectors': [4, 8]},
+                '2н': {'angle': 90.0, 'sectors': [7, 11]},
+                '3н': {'angle': 180.0, 'sectors': [6, 10]},
+                '4н': {'angle': 270.0, 'sectors': [5, 9]},
+            },
+            FS_PARAMS = {
+                2: {'freq': 932.0, 'width': 100.0},
+                3: {'freq': 1157.0, 'width': 100.0}
+            },
+            START_LITERA = 2
+        },
+        'PRD_V': {
+            CONSTANTS = {
+                'POWER_UKP_1': 31,
+                'POWER_UKP_2': 63,
+                'DKM_BIT_4': 3,
+                'DKM_BIT_5': 4,
+                'BASE_ADDR_EMS_G': 0x120,
+                'ADDR_UG_LITERA_1': 0x106,
+                'ADDR_UG_LITERA_2': 0x108,
+                'ADDR_UG_LITERA_3': 0x10A,
+                'TEMP_THRESHOLD': 70,
+                'POWER_THRESHOLD': 40,
+                'RAY_DOU_NUM': 0x3,
+                'ATT_UM_4': 0x2,
+                'ATT_UM_5': 0x3,
+                'POWER_UM': 100,
+                'TIMER_DELAY': 10.0,
+                'STATE_MASHINE_TIMER': 0.3,
+            },
+            PRIBOR_CONFIG = {
+                '1в': {'angle': 0.0, 'sectors': [12, 16]},
+                '2в': {'angle': 90.0, 'sectors': [15, 19]},
+                '3в': {'angle': 180.0, 'sectors': [14, 18]},
+                '4в': {'angle': 270.0, 'sectors': [13, 17]},
+            },
+            FS_PARAMS = {
+                4: {'freq': 1227.0, 'width': 100.0},
+                5: {'freq': 1575.0, 'width': 110.0},
+            },
+            START_LITERA = 4
+        },
+        'PRD_K': {
+            CONSTANTS = {
+                'POWER_UKP_1': 31,
+                'POWER_UKP_2': 63,
+                'DKM_BIT_1': 0,
+                'DKM_BIT_6': 5,
+                'DKM_BIT_7': 6,
+                'BASE_ADDR_EMS_G': 0x120,
+                'ADDR_UG_LITERA_1': 0x106,
+                'ADDR_UG_LITERA_2': 0x108,
+                'ADDR_UG_LITERA_3': 0x10A,
+                'TEMP_THRESHOLD': 40,
+                'POWER_THRESHOLD': 40,
+                'RAY_DOU_NUM': 0x3,
+                'ATT_UM_1': 0x0,
+                'ATT_UM_6': 0x3,
+                'ATT_UM_7': 0x2,
+                'POWER_UM': 100,
+                'TIMER_DELAY': 10.0,
+                'STATE_MASHINE_TIMER': 0.3,
+            },
+            PRIBOR_CONFIG = {           # Конфигурация параметров для каждого прибора
+                '1к': {'angle': 0.0, 'sectors': [0, 20, 24]},
+                '2к': {'angle': 90.0, 'sectors': [3, 23, 27]},
+                '3к': {'angle': 180.0, 'sectors': [2, 22, 26]},
+                '4к': {'angle': 270.0, 'sectors': [1, 21, 25]},
+            },
+            FS_PARAMS = {               # Конфигурация частот и ширин для каждого ФС
+                1: {'freq': 450.0, 'width': 80.0},
+                6: {'freq': 2450.0, 'width': 110.0},
+                7: {'freq': 4750.0, 'width': 110.0}
+            },
+            START_LITERA = 1
+        }
+    }
+
+    var block_ip_config_n:= {
+        'maa2000_1': [0, false],
+        'maa2000_2': [1, false],
+        'ip9_50_1':  [2, false],
+        'ip9_50_2':  [3, false],
+        'ip12_50_1': [4, false],
+        'ip5_25':    [7, false],
+    }
+    var block_kasseta_y5_prd_config_n: = {
+        'yau07': false,
+        'ems': false,
+        'ug': false,
+        'ukp1': false,
+        'ukp2': false,
+    }
+
+    # Результаты контроля
+    var control_results_n: Dictionary = {
+        'block_ip': false,     # Проверка касет П1 и ИП МА2000
+        'temperature': true,   # Проверка температур УМ
+        'dkm_2': false,
+        'dkm_3': false,
+        'dou_2': false,
+        'dou_3': false,
+        'fs_2': 2,
+        'fs_3': 2,
+    }
+####
+    var block_ip_config_v := {
+        'maa2000_1': [0, false],
+        'maa2000_2': [1, false],
+        'ip9_50_1':  [2, false],
+        'ip9_50_2':  [3, false],
+        'ip12_50_1': [4, false],
+        'ip5_25':    [7, false],
+    }
+    var block_kasseta_y5_prd_config_v: = {
+        'yau07': false,
+        'ems': false,
+        'ug': false,
+        'ukp1': false,
+        'ukp2': false,
+    }
+    
+    ####
+    
     const RAY_m5:= 'RAY_m5'
     const RAY_5:=  'RAY_5'
     const RAY_15:= 'RAY_15'
@@ -19,7 +164,7 @@ class TestPRD extends Node:
         TEMPERATURE_UKP_2 = 79,
         }
 
-    enum STATE_MASHINE {
+    enum STATE_MACHINE {
         INIT,
         FS_TURN_ON,
         FS_WORK,
@@ -72,7 +217,7 @@ class TestPRD extends Node:
     var block_kasseta_y5_config: Dictionary
     var control_results: Dictionary
     var self_name: String
-    var state: int = STATE_MASHINE.INIT
+    var state: int = STATE_MACHINE.INIT
     var current_litera: int
     var flag_write_isa: bool = false
     var flag_fs_status_ok: bool = false
@@ -81,31 +226,32 @@ class TestPRD extends Node:
     var unit_prd: Object
     var module_prd: Object
     var power_amplify: Array
-    var control_label: Label
+    #var control_label: Label
     var control_timer: Timer = Timer.new()
     var ems_6666_timer: Timer = Timer.new()
-    signal control_is_over(control_results, power_result)
+    var machine_timer: Timer = Timer.new()
+    signal control_is_over(control_results: Dictionary, power_result: Dictionary)
+    signal update_progress(progress_value: float)
+    signal update_max_value_progress(max_progress_value: int)
+    var cc: int = 0
+
+    var progress_value: float:
+        set(v):
+            if progress_value != v:
+                progress_value = v
+                call_deferred('emit_signal', 'update_progress', v)
 
 
     var ecms: Dictionary                                ##  Словарь помеховых воздействий
 
     ## Инициализация аргуметнов
     func _init(init_data: Dictionary) -> void:
-        control_label = init_data['control_label']
-        power_amplify = init_data['power_amplifiers']
         unit_prd = init_data['unit_prd']
-        module_prd = init_data['module_prd']
-        constants = init_data['constants']
-        pribor_config = init_data['prd_config']
-        fs_parameters = init_data['fs_params']
-        block_ip_config = init_data['block_ip_prd_config']
-        block_kasseta_y5_config = init_data['block_kasseta_y5_prd_config']
-        control_results = init_data['control_results']
-        current_litera = init_data['current_litera']
 
 
     func _ready() -> void:
         initialize_connections()
+        _determine_self_name()
         setup_timer()
 
 
@@ -157,112 +303,117 @@ class TestPRD extends Node:
         fs_result = on_fs_state(packet_type_7, fs_mapping, fs_result)
         control_results[fs_key] = fs_result[fs_key]
         flag_fs_status_ok = control_results[fs_key] == 1
-
-
+    
     ##
     func state_control_machine() -> void:
         match state:
-            STATE_MASHINE.INIT:
+            STATE_MACHINE.INIT:
                 _handle_init_state()
-            STATE_MASHINE.FS_TURN_ON:
+            STATE_MACHINE.FS_TURN_ON:
                 _handle_fs_turn_on_state()
-                state = STATE_MASHINE.FS_WORK
-            STATE_MASHINE.FS_WORK:
+                state = STATE_MACHINE.FS_WORK
+            STATE_MACHINE.FS_WORK:
+                for key in ecms.keys():
+                    pass
+                    #print([fs_parameters, current_litera])
+                    #print('ecms: %s %s' % [ecms[key].kni, ecms[key].params.freq])
                 if ecms.size() and flag_fs_status_ok:
                     ems_6666_timer.start()
                     _handle_fs_work_state()
-            STATE_MASHINE.CHEK_KASSETA_Y5:
+            STATE_MACHINE.CHEK_KASSETA_Y5:
                 if block_kasseta_y5_config['yau07']:
-                    state = STATE_MASHINE.WRITE_ISA
-            STATE_MASHINE.WRITE_ISA:
+                    state = STATE_MACHINE.WRITE_ISA
+            STATE_MACHINE.WRITE_ISA:
                 if not flag_write_isa:
                     _handle_ug_set_state(0x6)
-                    state = STATE_MASHINE.READ_ISA
-            STATE_MASHINE.READ_ISA:
+                    state = STATE_MACHINE.READ_ISA
+            STATE_MACHINE.READ_ISA:
                 if (unit_prd.cmd_state == unit_prd.CmdState.DONE) or (unit_prd.cmd_state == unit_prd.CmdState.FAIL):
                     _handle_read_isa(module_prd, unit_prd, [constants.ADDR_UG_LITERA_1, constants.ADDR_UG_LITERA_2, constants.ADDR_UG_LITERA_3])
                     flag_write_isa = false
-                    state = STATE_MASHINE.UG_SET_RAY
-            STATE_MASHINE.UG_SET_RAY:
+                    state = STATE_MACHINE.UG_SET_RAY
+            STATE_MACHINE.UG_SET_RAY:
                 var addr: int = constants.ADDR_UG_LITERA_1
                 if current_litera == 3 or current_litera == 5 or current_litera == 7:
                     addr = constants.ADDR_UG_LITERA_2
                 if unit_prd.isa_ports.has(addr) and (unit_prd.cmd_state == unit_prd.CmdState.DONE):
                     if unit_prd.isa_ports[addr] & 0x07 == 0:
-                        state = STATE_MASHINE.UG_SET_RAY_1
+                        state = STATE_MACHINE.UG_SET_RAY_1
                     elif unit_prd.isa_ports[addr] & 0x07 == 1:
-                        state = STATE_MASHINE.UG_SET_RAY_2
+                        state = STATE_MACHINE.UG_SET_RAY_2
                     elif unit_prd.isa_ports[addr] & 0x07 == 2:
-                        state = STATE_MASHINE.UG_SET_RAY_3
+                        state = STATE_MACHINE.UG_SET_RAY_3
                     elif unit_prd.isa_ports[addr] & 0x07 == 3:
-                        state = STATE_MASHINE.UG_SET_RAY_4
+                        state = STATE_MACHINE.UG_SET_RAY_4
                     elif unit_prd.isa_ports[addr] & 0x07 == 4:
-                        state = STATE_MASHINE.UG_SET_RAY_5
+                        state = STATE_MACHINE.UG_SET_RAY_5
                     elif unit_prd.isa_ports[addr] & 0x07 == 5:
                         if not current_litera == 1:
                             control_results = check_dou_result(control_results, power_result, self_name, current_litera, constants)
-                        state = STATE_MASHINE.IN_EMS_STOP
+                        state = STATE_MACHINE.IN_EMS_STOP
                     elif unit_prd.isa_ports[addr] & 0x07 == 6:
-                        state = STATE_MASHINE.UG_SET_RAY_0
+                        state = STATE_MACHINE.UG_SET_RAY_0
 
-            STATE_MASHINE.UG_SET_RAY_0:
+            STATE_MACHINE.UG_SET_RAY_0:
                 if flag_si_fs_input and not flag_write_isa:
                     control_timer.stop()
                     _handle_ug_set_state(0x0)
                     await get_tree().create_timer(0.5).timeout
-                    state = STATE_MASHINE.READ_ISA
-            STATE_MASHINE.UG_SET_RAY_1:
+                    state = STATE_MACHINE.READ_ISA
+            STATE_MACHINE.UG_SET_RAY_1:
                 if not flag_write_isa:
                     _handle_ug_set_state(0x1)
-                    state = STATE_MASHINE.READ_ISA
-            STATE_MASHINE.UG_SET_RAY_2:
+                    state = STATE_MACHINE.READ_ISA
+            STATE_MACHINE.UG_SET_RAY_2:
                 if not flag_write_isa:
                     _handle_ug_set_state(0x2)
-                    state = STATE_MASHINE.READ_ISA
-            STATE_MASHINE.UG_SET_RAY_3:
+                    state = STATE_MACHINE.READ_ISA
+            STATE_MACHINE.UG_SET_RAY_3:
                 if not flag_write_isa:
                     _handle_ug_set_state(0x3)
-                    state = STATE_MASHINE.READ_ISA
-            STATE_MASHINE.UG_SET_RAY_4:
+                    state = STATE_MACHINE.READ_ISA
+            STATE_MACHINE.UG_SET_RAY_4:
                 if not flag_write_isa:
                     _handle_ug_set_state(0x4)
-                    state = STATE_MASHINE.READ_ISA
-            STATE_MASHINE.UG_SET_RAY_5:
+                    state = STATE_MACHINE.READ_ISA
+            STATE_MACHINE.UG_SET_RAY_5:
                 if not flag_write_isa:
                     _handle_ug_set_state(0x5)
-                    state = STATE_MASHINE.READ_ISA
-            STATE_MASHINE.IN_EMS_STOP:
+                    state = STATE_MACHINE.READ_ISA
+            STATE_MACHINE.IN_EMS_STOP:
                 ems_6666_timer.stop()
-                state = STATE_MASHINE.FS_TURN_OFF
-            STATE_MASHINE.FS_TURN_OFF:
+                state = STATE_MACHINE.FS_TURN_OFF
+            STATE_MACHINE.FS_TURN_OFF:
                 ems_6666_timer.stop()
                 _handle_fs_turn_off_state()
-                state = STATE_MASHINE.STOP_CONTROL
-            STATE_MASHINE.STOP_CONTROL:
+                state = STATE_MACHINE.STOP_CONTROL
+            STATE_MACHINE.STOP_CONTROL:
                 _handle_stop_control_state()
+        ## В машине состояний вызов изменения состояния контроля
+        progressbar_status()
 
 
+    ## 'Выполняется инициализация ФС-%s' % current_litera
     func _handle_init_state() -> void:
-        control_label.text = 'Выполняется инициализация ФС-%s' % current_litera
         if current_litera in [1, 2, 3, 4, 5, 6, 7]:
             if not ecms.size():
-                state = STATE_MASHINE.FS_TURN_ON
+                state = STATE_MACHINE.FS_TURN_ON
         else:
             control_results = on_control_result(block_ip_config, control_results)
             var send_power_pack = prep_power(power_result, self_name)
             emit_signal('control_is_over', control_results, send_power_pack)
-            state = STATE_MASHINE.AWAIT
+            machine_timer.stop()
 
 
+    ##'Выполняется включение ФС-%s' % current_litera
     func _handle_fs_turn_on_state() -> void:
-        control_label.text = 'Выполняется включение ФС-%s' % current_litera
         manage_fs(true, self_name, pribor_config, fs_parameters, current_litera, constants.POWER_UM)
         control_timer.wait_time = constants.TIMER_DELAY
         control_timer.start()
 
 
+    ##'Выполняется проверка ФС-%s' % current_litera
     func _handle_fs_work_state() -> void:
-        control_label.text = 'Выполняется проверка ФС-%s' % current_litera
         if (current_litera == 2 and control_results.fs_2) or \
            (current_litera == 3 and control_results.fs_3) or \
            (current_litera == 4 and control_results.fs_4) or \
@@ -270,7 +421,7 @@ class TestPRD extends Node:
            (current_litera == 6 and control_results.fs_6) or \
            (current_litera == 7 and control_results.fs_7) or \
            (current_litera == 1 and control_results.fs_1):
-            state = STATE_MASHINE.CHEK_KASSETA_Y5
+            state = STATE_MACHINE.CHEK_KASSETA_Y5
 
 
     func _handle_ug_set_state(RAY_DOU_NUM: int) -> void:
@@ -293,28 +444,41 @@ class TestPRD extends Node:
             dic_att['ATT_UM_1'] = constants.ATT_UM_2
             dic_att['ATT_UM_2'] = constants.ATT_UM_3
 
-        var log_text = dic_att.ATT_UM_3 if current_litera == 1 else  dic_att.ATT_UM_1 if current_litera in [2, 4, 6] else dic_att.ATT_UM_2
-        control_label.text = 'Выполняется настройка угла (%s) и атт (0x0%s)' % [
-            dic_att.RAY_DOU_NUM,
-            log_text
-        ]
+        ##var log_text = dic_att.ATT_UM_3 if current_litera == 1 else  dic_att.ATT_UM_1 if current_litera in [2, 4, 6] else dic_att.ATT_UM_2
+        ## 'Выполняется настройка угла (%s) и атт (0x0%s)' % [dic_att.RAY_DOU_NUM, log_text]
         flag_write_isa = on_ug_setting(module_prd, unit_prd, dic_att)
 
 
+    ## Таймер отправки команды в ЭМС-Г для модуляции
     func _on_ems_6666_timer() -> void:
         module_prd.cmd_array.append([unit_prd.CmdCode.WRITE_ISA, [constants.BASE_ADDR_EMS_G, 6666]])
+    
+    
+    ## Таймер вызова машины состояний
+    func on_state_mashine():
+        state_control_machine()
+    
+    
+    func progressbar_status() -> void:
+        match state:
+            STATE_MACHINE.INIT:
+                cc += 10 if current_litera in [3, 5, 6, 7] else 0
+        if control_timer.get_time_left() > 0:
+            progress_value = cc + control_timer.get_wait_time() - control_timer.get_time_left()
+        if current_litera == 0:
+            progress_value = 0
 
 
+    ##'Выполняется отключение ФС-%s' % current_litera
     func _handle_fs_turn_off_state() -> void:
-        control_label.text = 'Выполняется отключение ФС-%s' % current_litera
         flag_fs_status_ok = false
         manage_fs(false, self_name, pribor_config, fs_parameters, current_litera, constants.POWER_UM)
 
 
+    ##'Выполняется завершение проверки ФС-%s' % current_litera
     func _handle_stop_control_state() -> void:
-        control_label.text = 'Выполняется завершение проверки ФС-%s' % current_litera
         _advance_to_next_fs()
-        state = STATE_MASHINE.INIT
+        state = STATE_MACHINE.INIT
 
 
     func _advance_to_next_fs() -> void:
@@ -330,33 +494,74 @@ class TestPRD extends Node:
 
     ######################################
     func initialize_connections() -> void:
-        _determine_self_name()
         var fs_mapping = _create_fs_mapping(self_name)
         signaller.conn(signaller.fs_update_state, Callable(self, 'on_fs_update_state').bind(fs_mapping))
+        signaller.conn(signaller.start_contol_device, Callable(self, '_on_start_contol_device'))
         interfer.connect('interfer_resized', Callable(self, 'on_interfer_resized'))
         unit_prd.connect('data_received', Callable(self, 'on_data_received'))
 
 
     func on_interfer_resized(ecms_dic: Dictionary) -> void:
         ecms = ecms_dic
+    
+    
+    func _on_start_contol_device()-> void:
+        _determine_self_name()
+        machine_timer.wait_time = constants.STATE_MASHINE_TIMER
+        machine_timer.start()
 
 
     func _determine_self_name() -> void:
+        cc = 0
+        state = STATE_MACHINE.INIT
         var current_unit = unit_prd.name
         var parts = current_unit.split('-')
         self_name = parts[-1]
+        if self_name == '1н' or self_name == '2н' or self_name == '3н' or self_name == '4н':
+            progress_value = 0
+            call_deferred('emit_signal', 'update_max_value_progress', 20)
+            constants = DEVICE_CONSTANT.PRD_N.CONSTANTS
+            pribor_config = DEVICE_CONSTANT.PRD_N.PRIBOR_CONFIG
+            fs_parameters = DEVICE_CONSTANT.PRD_N.FS_PARAMS
+            block_ip_config = block_ip_config_n
+            block_kasseta_y5_config = block_kasseta_y5_prd_config_n
+            control_results = control_results_n
+            current_litera = DEVICE_CONSTANT.PRD_N.START_LITERA
+        if self_name == '1в' or self_name == '2в' or self_name == '3в' or self_name == '4в':
+            progress_value = 0
+            call_deferred('emit_signal', 'update_max_value_progress', 20)
+            constants = DEVICE_CONSTANT.PRD_V.CONSTANTS
+            pribor_config = DEVICE_CONSTANT.PRD_V.PRIBOR_CONFIG
+            fs_parameters = DEVICE_CONSTANT.PRD_V.FS_PARAMS
+            block_ip_config = block_ip_config_n
+            block_kasseta_y5_config = block_kasseta_y5_prd_config_v
+            control_results = control_results_n
+            current_litera = DEVICE_CONSTANT.PRD_V.START_LITERA
+        if self_name == '1к' or self_name == '2к' or self_name == '3к' or self_name == '4к':
+            progress_value = 0
+            call_deferred('emit_signal', 'update_max_value_progress', 30)
+            constants = DEVICE_CONSTANT.PRD_K.CONSTANTS
+            pribor_config = DEVICE_CONSTANT.PRD_K.PRIBOR_CONFIG
+            fs_parameters = DEVICE_CONSTANT.PRD_K.FS_PARAMS
+            block_ip_config = block_ip_config_n
+            block_kasseta_y5_config = block_kasseta_y5_prd_config_n
+            control_results = control_results_n
+            current_litera = DEVICE_CONSTANT.PRD_K.START_LITERA
 
 
     func setup_timer() -> void:
         add_child(control_timer)
         control_timer.timeout.connect(on_stop_control)
         control_timer.one_shot = true
-        control_timer.wait_time = 15.0
-        control_timer.start()
+        control_timer.wait_time = constants.TIMER_DELAY
 
         add_child(ems_6666_timer)
         ems_6666_timer.timeout.connect(_on_ems_6666_timer)
         ems_6666_timer.wait_time = 1.0
+        
+        add_child(machine_timer)
+        machine_timer.connect('timeout', Callable(self, 'on_state_mashine'))
+        
 
 
     func _process_dkm_status(status: PackedByteArray) -> void:
@@ -405,18 +610,18 @@ class TestPRD extends Node:
 
     static func _get_ray_key(machine_state: int) -> String:
         match machine_state:
-            STATE_MASHINE.UG_SET_RAY_0: return RAY_m5
-            STATE_MASHINE.UG_SET_RAY_1: return RAY_5
-            STATE_MASHINE.UG_SET_RAY_2: return RAY_15
-            STATE_MASHINE.UG_SET_RAY_3: return RAY_25
-            STATE_MASHINE.UG_SET_RAY_4: return RAY_35
-            STATE_MASHINE.UG_SET_RAY_5: return RAY_45
+            STATE_MACHINE.UG_SET_RAY_0: return RAY_m5
+            STATE_MACHINE.UG_SET_RAY_1: return RAY_5
+            STATE_MACHINE.UG_SET_RAY_2: return RAY_15
+            STATE_MACHINE.UG_SET_RAY_3: return RAY_25
+            STATE_MACHINE.UG_SET_RAY_4: return RAY_35
+            STATE_MACHINE.UG_SET_RAY_5: return RAY_45
             _: return ''
 
 
     func on_stop_control() -> void:
         _handle_fs_turn_off_state()
-        state = STATE_MASHINE.FS_TURN_OFF
+        state = STATE_MACHINE.FS_TURN_OFF
 
 
     static func on_control_result(ip_config: Dictionary, ctrl_results: Dictionary) -> Dictionary:
@@ -536,6 +741,7 @@ class TestPRD extends Node:
                         all_temp_is_ok = false
         return all_temp_is_ok
 
+
     ## Проверка ДКМ
     static func check_dkm(status_prd: PackedByteArray, bit_dkm: int) -> bool:
         var dkm: int = 28

scripts/settings.gd

@@ -10,7 +10,7 @@ var UnitProfiles: Dictionary[StringName, Array] = { \
     'уарэп-яу07-частный': ['yau07rx', ['10.1.1.2', 50002, false, true], 'IP-адрес для приёма частных сообщений от ЯУ-07'],
     'уарэп-яу07-общий': ['yau07rx', ['*', 50000, true, true], 'IP-адрес для приёма широковещательных сообщений от ЯУ-07'],
     'уарэп-капсрпб': ['capsrpb', ['127.0.0.1', '127.0.0.1', 42023, 42022, false, true], 'IP-адрес для обмена сообщениями со службой \"МП550\" (СТЦ)'],
-    'уарэп-трасса': ['trassa', ['127.0.0.1', '127.0.0.1', 50200, 10004, false, true], 'IP-адрес для обмена сообщениями с \"Трассой\"'],
+    'уарэп-трасса': ['trassa', ['192.168.11.34', '192.168.11.105', 50200, 10004, false, true], 'IP-адрес для обмена сообщениями с \"Трассой\"'],
     'уарэп-эмс': ['yau07tx', ['10.1.1.52', 50052, false, false], 'IP-адрес прибора УФ'],
     'уарэп-яу07-2в': ['yau07tx', ['10.1.1.22', 50022, false, false], 'IP-адрес прибора ПРД-В2'],
     'уарэп-яу07-2н': ['yau07tx', ['10.1.1.21', 50021, false, false], 'IP-адрес прибора ПРД-Н2'],

scripts/signaller.gd

@@ -30,6 +30,8 @@ signal режим_журнал()
 ## Вызывается при переходе в режим [b]ЭМС[/b].
 signal режим_эмс()
 
+## Вызывается при переходе в режим [b]ЭМС ТГ[/b].
+signal режим_эмс2()
 
 ## Вызывается при переходе в режим [b]Настройка[/b].
 signal режим_настройки()
@@ -212,3 +214,7 @@ signal sector_klaster (new_sector_data)
 
 
 signal clear_klaster ()
+
+
+## Вызывается при нажатии на кнопку "Запуск контроля".[br]
+signal start_contol_device()

scripts/tcp5p28.gd

@@ -29,9 +29,9 @@ const MOD_TYPES: Array = [
 const CU_STATE: Dictionary = {
     0: 2,                     # Подготовка к выполнению
     1: 1,                     # Выполняется
-    2: 9,                     # Ошибка в команде
+    2: 3,                     # Ошибка в команде
     3: 7,                     # Занят выполнением другого ЦУ
-    4: 9,                     # Неисправность
+    4: 2,                     # Неисправность
     }
 
 class TCP5P28 extends unit.Unit:
@@ -135,7 +135,7 @@ class TCP5P28 extends unit.Unit:
                 continue
             var cu = ecms[id]
             cu_data.encode_u16(0, cu.ispp)
-            var state: int = CU_STATE[cu.svk] if CU_STATE.has(cu.svk) else 9
+            var state: int = CU_STATE[cu.svk] if CU_STATE.has(cu.svk) else 8
             cu_data.encode_u8(2, state)                    # Состояние выполнения команды
             cu_data.encode_u8(3, 0xFF)                     # Эффективность работы помехи
             data.append_array(cu_data)

scripts/trassa.gd

@@ -35,6 +35,10 @@ class Trassa extends unit.Unit:
         [2000, 6000, 500, 100],
         [3500, 6000, 524, 50],
         [390, 6000, 374, 50*7]]
+    var lfb = 0
+    var hfb = 0
+    var dap = 0
+    var daa = 0
 
     # Инициализация
     func _init(nm: StringName, buttons: Array = []) -> void:
@@ -84,7 +88,6 @@ class Trassa extends unit.Unit:
                 sector_draw(json_dic)
                 emit_signal('data_received', self)
             else:
-                var msg = json_conv.get_error_message()
                 emit_signal('parse_failed', self)
         else:
             emit_signal('parse_failed', self)
@@ -106,11 +109,10 @@ class Trassa extends unit.Unit:
             if txe == true or rxe == true:
                 sector_data["draw"] = true
                 if data.has("lfb") and data.has("hfb") and data.has("dap") and data.has("daa"):
-                    var lfb = int(data["lfb"])
-                    var hfb = int(data["hfb"])
-                    var dap = int(data["dap"])
-                    var daa = int(data["daa"])
-                    var key = str(lfb) + "_" + str(hfb)
+                    lfb = int(data["lfb"])
+                    hfb = int(data["hfb"])
+                    dap = int(data["dap"])
+                    daa = int(data["daa"])
                     for i in range(set_klaster.size()):
                         var mapping = set_klaster[i]
                         if lfb == mapping[0] and hfb == mapping[1]:

shaders/tools.gdshaderinc

@@ -3,10 +3,9 @@ const float DS = 0.004;                                 /* Относитель
 
 float random_timed(vec2 uv)
 {
-    return fract(sin(TIME * dot(uv.xy, vec2(12.9898, 78.233))) * 43758.5453123);
+   return fract(sin(dot(uv + TIME, vec2(12.9898, 78.233))) * 43758.5453);
 }
 
-
 float smooth_px(float r, float R, float ds)
 {
 	return 1.0 - smoothstep(R - ds, R + ds, r);