Merge remote-tracking branch 'MaD_CaT/master'

# Conflicts:
#	shaders/bip.gdshader

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

@@ -48,7 +48,7 @@ func _ready():
 func on_line_changed(u, conn_node, _pribor_meta): conn_node.set_val(u.online)
 
 
-func online_change_arr(u, conn_node, pribor_meta):
+func online_change_arr(_u, conn_node, pribor_meta):
     var state_online = true
     for i in pribor_meta.size():
         var unit_key = settings.get_unit_key(pribor_meta[i])

scripts/interfer.gd

@@ -5,7 +5,6 @@ class_name Iterfer extends Node
 ## Режимы помехи.
 const ITERFER_MODE = {
     'off': ['Откл', ['freq', 'width'], 0],
-    'auto': ['АВТО', ['freq', 'width'], 1000],
     'srni1': ['СРН-И1', ['freq', 'width'], 1],
     'srnm2': ['СРН-М2', ['freq', 'width'], 2],
     'srngps': ['СРН-GPS', ['freq', 'width'], 3],
@@ -205,6 +204,10 @@ func on_interfer_create(interfer_name, sel_threats, fs_arr, _unit, ecms):
         var id = item[3]
         param['freq'] = item[1]
         param['width'] = item[2]
+        if (param['width'] < WIDTH_MIN):
+            param['width'] = WIDTH_MIN
+        elif (param['width'] > WIDTH_MAX):
+            param['width'] = WIDTH_MAX
         interfer_create(interfer_name, ecms, param, kni, id, fs, SOURCE_INTERFER[1])