Merge remote-tracking branch 'origin/master' into master-afsp

# Conflicts:
#	scenes/tabs-switch/lbl-ready.gd
#	scripts/pribor-prd.gd

scripts/pribor-prd.gd

@@ -1288,7 +1288,7 @@ static func check_dou_result(control_dic: Dictionary, power_dic: Dictionary, pri
 
     var ray_dic: Dictionary = power_dic[litera]
     # Проверка наличия данных
-    if ray_dic[RAY_m5].size() == 0  or \
+    if  ray_dic[RAY_m5].size() == 0  or \
         ray_dic[RAY_5 ].size() == 0 or \
         ray_dic[RAY_15].size() == 0 or \
         ray_dic[RAY_25].size() == 0 or \
@@ -1301,7 +1301,7 @@ static func check_dou_result(control_dic: Dictionary, power_dic: Dictionary, pri
     var low_power_by_position: Array = [0, 0, 0, 0, 0, 0]  # Счетчики для 6 позиций
     for ray_key in [RAY_m5, RAY_5, RAY_15, RAY_25, RAY_35, RAY_45]:
         var power_array: Array = ray_dic[ray_key]
-        for i in range(power_array.size()):
+        for i in power_array.size():
             if power_array[i] < cnst.POWER_THRESHOLD:
                 low_power_by_position[i] += 1
 
@@ -1358,6 +1358,7 @@ func restore_default_states() -> void:
 
     _set_status('Состояния сброшены к значениям по умолчанию')
 
+
 ## Получение текущих состояний для отладки
 func get_current_states() -> Dictionary:
     return {

scripts/threats.gd

@@ -152,7 +152,7 @@ func on_data_capsrpb_received(unit: capsrpb.CapsRpb, threats: Dictionary):
     if not unit.json_dic.has('sa'):  return
 
     var mis = unit.json_dic['mis']
-    bpo_mode_rx = int(unit.json_dic['sa'])
+    bpo_mode_rx = int(unit.json_dic['sa']) as AFSP_BPO_MODE
     var sz: = threats.size()
     for dic_th in mis:
         if dic_th is not Dictionary: