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

scripts/pribor-prd.gd

@@ -125,7 +125,7 @@ class TestPRD extends Node:
         'fs_2': 2,
         'fs_3': 2,
     }
-####
+    ####
     var block_ip_config_v := {
         'maa2000_1': [0, false],
         'maa2000_2': [1, false],
@@ -141,7 +141,46 @@ class TestPRD extends Node:
         'ukp1': false,
         'ukp2': false,
     }
-    
+    var control_results_v: Dictionary = {
+        'block_ip': false,     # Проверка касет П1 и ИП МА2000
+        'temperature': true,   # Проверка температур УМ
+        'dkm_4': false,
+        'dkm_5': false,
+        'dou_4': false,
+        'dou_5': false,
+        'fs_4': 2,
+        'fs_5': 2,
+    }
+    ####
+    var block_kasseta_y5_prd_config_k: = {
+        'yau07': false,
+        'ems': false,
+        'ug': false,
+        'ukp1': false,
+        'ukp2': false,
+    }
+    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 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],
+    }
     ####
     
     const RAY_m5:= 'RAY_m5'
@@ -201,14 +240,14 @@ class TestPRD extends Node:
         'TEMPERATURE_UKP_2': 79,
     }
 
-    var power_result: Dictionary = {
-        1: {RAY_m5: [], RAY_5: [], RAY_15: [], RAY_25: [], RAY_35: [], RAY_45: [],},
-        2: {RAY_m5: [], RAY_5: [], RAY_15: [], RAY_25: [], RAY_35: [], RAY_45: [],},
-        3: {RAY_m5: [], RAY_5: [], RAY_15: [], RAY_25: [], RAY_35: [], RAY_45: [],},
-        4: {RAY_m5: [], RAY_5: [], RAY_15: [], RAY_25: [], RAY_35: [], RAY_45: [],},
-        5: {RAY_m5: [], RAY_5: [], RAY_15: [], RAY_25: [], RAY_35: [], RAY_45: [],},
-        6: {RAY_m5: [], RAY_5: [], RAY_15: [], RAY_25: [], RAY_35: [], RAY_45: [],},
-        7: {RAY_m5: [], RAY_5: [], RAY_15: [], RAY_25: [], RAY_35: [], RAY_45: [],},
+    var power_for_litera: Dictionary = {
+        1: {RAY_m5: [560, 400, 330, 560, 400, 330], RAY_5: [560, 400, 330, 560, 400, 330,], RAY_15: [560, 400, 330, 560, 400, 330,], RAY_25: [560, 400, 330, 560, 400, 330,], RAY_35: [560, 400, 330, 560, 400, 330,], RAY_45: [560, 400, 330, 560, 400, 330,],},
+        2: {RAY_m5: [560, 400, 330, 560, 400, 330,], RAY_5: [560, 400, 330, 560, 400, 330,], RAY_15: [560, 400, 330, 560, 400, 330,], RAY_25: [560, 400, 330, 560, 400, 330,], RAY_35: [560, 400, 330, 560, 400, 330,], RAY_45: [560, 400, 330, 560, 400, 330,],},
+        3: {RAY_m5: [560, 400, 330, 560, 400, 330,], RAY_5: [560, 400, 330, 560, 400, 330,], RAY_15: [560, 400, 330, 560, 400, 330,], RAY_25: [560, 400, 330, 560, 400, 330,], RAY_35: [560, 400, 330, 560, 400, 330,], RAY_45: [560, 400, 330, 560, 400, 330,],},
+        4: {RAY_m5: [560, 400, 330, 560, 400, 330,], RAY_5: [560, 400, 330, 560, 400, 330,], RAY_15: [560, 400, 330, 560, 400, 330,], RAY_25: [560, 400, 330, 560, 400, 330,], RAY_35: [560, 400, 330, 560, 400, 330,], RAY_45: [560, 400, 330, 560, 400, 330,],},
+        5: {RAY_m5: [560, 400, 330, 560, 400, 330,], RAY_5: [560, 400, 330, 560, 400, 330,], RAY_15: [560, 400, 330, 560, 400, 330,], RAY_25: [560, 400, 330, 560, 400, 330,], RAY_35: [560, 400, 330, 560, 400, 330,], RAY_45: [560, 400, 330, 560, 400, 330,],},
+        6: {RAY_m5: [560, 400, 330, 560, 400, 330,], RAY_5: [560, 400, 330, 560, 400, 330,], RAY_15: [560, 400, 330, 560, 400, 330,], RAY_25: [560, 400, 330, 560, 400, 330,], RAY_35: [560, 400, 330, 560, 400, 330,], RAY_45: [560, 400, 330, 560, 400, 330,],},
+        7: {RAY_m5: [560, 400, 330, 560, 400, 330,], RAY_5: [560, 400, 330, 560, 400, 330,], RAY_15: [560, 400, 330, 560, 400, 330,], RAY_25: [560, 400, 330, 560, 400, 330,], RAY_35: [560, 400, 330, 560, 400, 330,], RAY_45: [560, 400, 330, 560, 400, 330,],},
         }
     var constants: Dictionary
     var pribor_config: Dictionary
@@ -226,11 +265,12 @@ class TestPRD extends Node:
     var unit_prd: Object
     var module_prd: Object
     var power_amplify: Array
+    var power_result: Dictionary
     #var control_label: Label
     var control_timer: Timer = Timer.new()
     var ems_6666_timer: Timer = Timer.new()
     var machine_timer: Timer = Timer.new()
-    signal control_is_over(control_results: Dictionary, power_result: Dictionary)
+    signal control_is_over()
     signal update_progress(progress_value: float)
     signal update_max_value_progress(max_progress_value: int)
     var cc: int = 0
@@ -271,11 +311,11 @@ class TestPRD extends Node:
         socket_status_ems_g(status)
         _process_dkm_status(status)
         if current_litera != 0:
-            var tek_litera: Dictionary = power_result[current_litera]
+            var tek_litera: Dictionary = power_for_litera[current_litera]
             var interes = _get_ray_key(state)
             if interes != '':
                 tek_litera[_get_ray_key(state)] = power_um_ukp(status, current_litera, tek_litera[_get_ray_key(state)])
-                power_result[current_litera] = tek_litera
+                power_for_litera[current_litera] = tek_litera
 
 
     func socket_status_ems_g(packet_form_yau_07: PackedByteArray) -> void:
@@ -349,7 +389,7 @@ class TestPRD extends Node:
                         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)
+                            control_results = check_dou_result(control_results, power_for_litera, self_name, current_litera, constants)
                         state = STATE_MACHINE.IN_EMS_STOP
                     elif unit_prd.isa_ports[addr] & 0x07 == 6:
                         state = STATE_MACHINE.UG_SET_RAY_0
@@ -400,8 +440,8 @@ class TestPRD extends Node:
                 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)
+            power_result = prep_power(power_for_litera, self_name)
+            emit_signal('control_is_over')
             machine_timer.stop()
 
 
@@ -538,9 +578,9 @@ class TestPRD extends Node:
             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_ip_config = block_ip_config_v
             block_kasseta_y5_config = block_kasseta_y5_prd_config_v
-            control_results = control_results_n
+            control_results = control_results_v
             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
@@ -548,9 +588,9 @@ class TestPRD extends Node:
             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_ip_config = block_ip_config_k
             block_kasseta_y5_config = block_kasseta_y5_prd_config_n
-            control_results = control_results_n
+            control_results = control_results_k
             current_litera = DEVICE_CONSTANT.PRD_K.START_LITERA