From 09fe3285d6bdb3d8d638d3b78644fa75791d2c49 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Thu, 27 Mar 2025 15:50:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=83=D0=B3=D0=BE=D0=BB=20=D0=BC=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B0=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D1=85=D0=B8,=20=D0=B0=20=D1=82=D0=B0?= =?UTF-8?q?=D0=BA=20=D0=B6=D0=B5=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B5=D0=B3=D0=BE=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/frame-ecm-params/scroll-ecm-params.gd | 5 +++-- scripts/interfer.gd | 9 ++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scenes/frame-ecm-params/scroll-ecm-params.gd b/scenes/frame-ecm-params/scroll-ecm-params.gd index 0245a76..932993f 100644 --- a/scenes/frame-ecm-params/scroll-ecm-params.gd +++ b/scenes/frame-ecm-params/scroll-ecm-params.gd @@ -18,9 +18,10 @@ const TABLE_PARAMS = { 'freq': [2, 'Частота, МГц', true, 400.0, 6000.0], 'width': [3, 'Занимая полоса частот, МГц', true, 0.0, 120.0], 'dur': [4, 'Длительность импульса, мкс', true, 0.0, 1000000.0], - 'period': [5, 'Период повтора, мкс', true, 0.0, 1000000.0] } + 'period': [5, 'Период повтора, мкс', true, 0.0, 1000000.0], + 'um': [6, 'Угол места, гр.', true, -5.0, 55.0] } -const MOD_ROW_INDEX = 6 ## Индекс строки с модуляцией +const MOD_ROW_INDEX = 7 ## Индекс строки с модуляцией func init_table(): for i in TABLE_PARAMS.size(): $table.add_row(TABLE_ROW) diff --git a/scripts/interfer.gd b/scripts/interfer.gd index b6814fd..2a2a96c 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -214,9 +214,13 @@ func on_interfer_rcv(interfer_params: Array, unit, ecms): var mode = interfer_params[0] var id = interfer_params[1] var aoa = interfer_params[2] + var um = interfer_params[3] if (aoa < 0) and (aoa > 360): err = true var param: Dictionary = {} + if (um < -5) and (um > 55): + err = true + param['um'] = um param['freq'] = interfer_params[4] if (param['freq'] < FREQ_MIN) and (param['freq'] > FREQ_MAX): err = true @@ -267,7 +271,10 @@ func interfer_create(interfer_name, ecms, param, kni, id, dict, source_interfer) ecm.powp = 100.0 ecm.source_interfer = source_interfer ecm.modulation = emit_enable - ecm.um = 15.0 # Значение по умолчанию + if param.has('um'): + ecm.um = param['um'] + else: + ecm.um = 15.0 # Значение по умолчанию signaller.emit_signal('interfer_new', ecm) if interfer_name == 'off': signaller.emit_signal('interfer_off', ecm, ecms, thrs)