состояние, где нужна отладка темепературы, мощности, модулей ФС

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

@@ -1,81 +1,10 @@
 @tool
 extends 'res://scenes/контроль/прибор.gd'
 
-const constants_k: Dictionary = {
-    '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,
-}
-# Конфигурация параметров для каждого прибора
-const 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]},
-}
-# Конфигурация частот и ширин для каждого ФС
-const FS_PARAMS := {
-    1: {'freq': 450.0, 'width': 80.0},
-    6: {'freq': 2450.0, 'width': 110.0},
-    7: {'freq': 4750.0, 'width': 110.0}
-}
 enum STATE_VAL { NONE = 0, GOOD = 1, ERROR = 2 }
 
-var block_ip_config_k := {
-    'maa2000_1': [0, false],
-    'maa2000_2': [1, false],
-    'ip9_50_1':  [2, false],
-    'ip9_50_2':  [3, false],
-    'ip12_50_1': [4, false],
-    'ip9_50_3':  [5, false],
-    'ip12_50_2': [6, false],
-    'ip5_25':    [7, false],
-}
-var block_kasseta_y5_prd_config_k: = {
-    'yau07': false,
-    'ems': false,
-    'ug': false,
-    'ukp1': false,
-    'ukp2': false,
-}
 # Основные переменные
-var start_litera: int = 1
-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 unit_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 ctrl_pos = 30
 
 
@@ -90,48 +19,10 @@ func _ready() -> void:
 
 
 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 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:
-    add_child(mashine_timer)
-    mashine_timer.connect('timeout', Callable(self, 'on_state_mashine'))
-    mashine_timer.wait_time = constants_k.STATE_MASHINE_TIMER
-    mashine_timer.start()
-
-
 func set_default_state() -> void:
     for group in get_tree().get_nodes_in_group('default_reset'):
         group.state = STATE_VAL.NONE
@@ -143,7 +34,7 @@ func set_default_state() -> void:
 func _enter_tree() -> void:
     if Engine.is_editor_hint():
         return
-    $control_result.text = 'Выполняется ...'
+    $control_result.text = 'Ожидается запуск контроля ...' # TODO: Необходимо сделать пулл сообщений
     $control_result.add_theme_color_override('font_color', Color.ALICE_BLUE)
     signaller.connect('режим_работа', Callable(self, 'on_mode_changed').bind(false))
     signaller.connect('режим_журнал', Callable(self, 'on_mode_changed').bind(false))
@@ -176,10 +67,10 @@ func on_mode_changed(in_tree: bool) -> void:
         #mashine_timer.start()
 
 
-func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:
+static func power_fill(pow_dic: Dictionary, fs_result: Dictionary, power_amplifier: Array, unit_prd: Object) -> void:
     #if not control_prd_k.block_kasseta_y5_config.yau07 or not control_prd_k.block_kasseta_y5_config.ukp1 or not control_prd_k.block_kasseta_y5_config.ukp2:
         #return
-    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
@@ -194,14 +85,13 @@ func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:
                 if powamp_meta in ['um_8', 'um_9', 'um_10', 'um_11', 'um_12', 'um_13'] and not fs_result.fs_7: return
                 i_powapm.value0 = pow_dic[powamp_meta]
                 for i_p in pow_dic[powamp_meta]:
-                    if i_p < constants_k.POWER_THRESHOLD:
+                    if i_p < unit_prd.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 = unit_prd_k.block_kasseta_y5_config
+    var block_kasseta_y5_prd_config_k: Dictionary = 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')
@@ -211,7 +101,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 = unit_prd_k.block_ip_config
+    var block_ip_config_k: Dictionary = 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,8 +130,9 @@ func on_control_result(result_dic: Dictionary, power_dic: Dictionary) -> void:
         $dou7_A8.state = STATE_VAL.GOOD if result_dic.dou_7 else STATE_VAL.ERROR
     else:
         result_dic.fs_7 = false
-
-    power_fill(power_dic, result_dic)
+    
+    var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier')
+    power_fill(power_dic, result_dic, power_amplifier, unit_prd_k)
 
     var result = true
     for device in result_dic.values():