velelepie/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'MaD_CaT/master' into master-gd4.4

Browse Source
This commit is contained in:
sasha80
2025-03-28 16:30:51 +03:00
parent 3e02ce0689 fc1765511d
commit ebe6f666f5
3 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/interfer.gd
View File

@@ -10,7 +10,7 @@ const ITERFER_MODE = {
'srnm2': ['СРН-М2', ['freq', 'width'], 2],
'srngps': ['СРН-GPS', ['freq', 'width'], 3],
'lchm1': ['ЛЧМ-1', ['freq', 'width'], 10],
'lchm2': ['ЛЧМ-2', ['freq', 'width'], 4],
'lchm2': ['ЛЧМ-2', ['freq', 'width'], 16],
'mchm1': ['МЧМ-1', ['freq', 'width'], 11],
'pdm2': ['ПД-М2', ['freq', 'width'], 12],
'pdm4': ['ПД-М4', ['freq', 'width'], 13],
@@ -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)

11
scripts/tcp5p28.gd
View File

@@ -45,6 +45,11 @@ class TCP5P28 extends unit.Unit:
signal get_interfers(unit: TCP5P28) ## Запрос состояния выполнения целеуказания.
var tx_stack: Array ## Массив пакетов для отправки.
var ext_cu = false
func _init(nm) -> void:
super._init(nm)
ext_cu = ProjectSettings.get_setting('application/config/external_cu', false)
ProjectSettings.connect('settings_changed', on_setting_changed)
func _to_string() -> String: return String('5П-28: "%s" %s ' % [self.name, ['отключен', 'на связи'][int(online)]])
@@ -60,8 +65,7 @@ class TCP5P28 extends unit.Unit:
emit_signal('get_threats')
if cmd_type == CMD_TYPE_STATE:
emit_signal('get_interfers')
var external_cu = ProjectSettings.get_setting('application/config/external_cu', false)
if cmd_type == CMD_TYPE_IN and external_cu:
if cmd_type == CMD_TYPE_IN and ext_cu:
set_interfer(data)
func process(tick: int):
@@ -181,3 +185,6 @@ class TCP5P28 extends unit.Unit:
var data_to_send: PackedByteArray = create_header(data_len)
data_to_send.append_array(data_tx)
tx_stack.append(data_to_send)
func on_setting_changed():
ext_cu = ProjectSettings.get_setting('application/config/external_cu', false)