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

Merge remote-tracking branch 'origin/sasha' into prd-control

Browse Source 
# Conflicts:
#	scenes/контроль/контроль.tscn
This commit is contained in:
MaD_CaT
2025-12-09 10:35:01 +03:00
parent bd78e1010d 12fbb1fd55
commit 6dc31afa15
32 changed files with 359 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/interfer.gd
View File

@@ -111,6 +111,12 @@ var gos_nmfs: Array ## Список номеров
var fs_closed: Dictionary ## Словарь секторов запрета
## Режимы работы АФСП и БПО (Протокол ТНИИС-СТЦ, пункт 2.5.10)
enum AFSP_BPO_MODE {
run = 1,
test = 2 }
## Сеанс помехи.
class Interfer:
var ispp: int = 0 ## Индекс сеанса.
@@ -127,6 +133,7 @@ class Interfer:
var um: float ## Угол места для помехи.
var nmfs: int = 0 ## Номер модуля ФС в нумерации СТЦ
var priority: int = 0 ## Приоритет помехи
static var afsp_bpo_mode: = AFSP_BPO_MODE.run ## Режим работы АФСП и БПО
func _to_string() -> String:
return 'номер: %d название: %s частота: %0.1f МГц пеленг: %0.1f гр.' % [ispp, ITERFER_MODE[krp][0], params['freq'], kni]
@@ -138,6 +145,7 @@ class Interfer:
data_to_json['ispp'] = ispp
data_to_json['krp'] = ITERFER_MODE[krp][0]
data_to_json['nmfs'] = nmfs
data_to_json['sa'] = afsp_bpo_mode
if krp != INTERFER_OFF:
data_to_json['kni'] = kni
data_to_json['powp'] = powp
@@ -211,6 +219,8 @@ func _ready() -> void:
signaller.connect('interfer_prinuditelno', Callable(self, 'on_interfer_prinuditelno'))
signaller.connect('emit_changed', Callable(self, 'on_emit_changed').bind(ecms))
signaller.connect('режим_тренаж', on_trenazh_mode)
signaller.connect('режим_контроль', on_kontrol_mode)
signaller.connect('режим_работа', on_rabota_mode)
signaller.connect('update_fs_closed', Callable(self, 'on_update_fs_closed'))
threats.connect('threat_lost', Callable(self, 'on_threats_lost').bind(ecms, unit_caps))
threats.connect('threats_resized', Callable(self, 'on_threats_resized'))
@@ -222,6 +232,8 @@ func _ready() -> void:
func on_trenazh_mode(val: bool): trenazh_mode = val
func on_kontrol_mode(): Interfer.afsp_bpo_mode = AFSP_BPO_MODE.test
func on_rabota_mode(): Interfer.afsp_bpo_mode = AFSP_BPO_MODE.run
func on_nav_data_received(coords: Dictionary, unit_caps):

34
scripts/yau07.gd
View File

@@ -304,24 +304,24 @@ class YaU07 extends unit.Unit:
if cmd_result != 1: # Команда не выполнена
return false
var cmd_code: CmdCode = rx_data[cmd_code_pos] as CmdCode # "код команды"
var rc: = true
if (cmd_code == CmdCode.READ_ISA) or (cmd_code == CmdCode.WRITE_ISA):
rc = parse_isa(rx_data, status_len)
var cmd_code: int = rx_data[cmd_code_pos] # Код команды
elif (cmd_code == CmdCode.READ_BLOCK) or (cmd_code == CmdCode.WRITE_BLOCK):
rc = parse_block(rx_data, status_len)
if (cmd_state == CmdState.WAIT) and (cmd_num_rx == cmd_num_tx) and (cmd_code == cmd_code_tx):
cmd_code_rx = cmd_code
cmd_state = CmdState.DONE
var rc: = true
if (cmd_code == CmdCode.READ_ISA) or (cmd_code == CmdCode.WRITE_ISA):
rc = parse_isa(rx_data, status_len)
elif (cmd_code == CmdCode.READ_BLOCK) or (cmd_code == CmdCode.WRITE_BLOCK):
rc = parse_block(rx_data, status_len)
elif (cmd_code == CmdCode.ERASE_FLASH) or (cmd_code == CmdCode.WRITE_FLASH) \
or (cmd_code == CmdCode.READ_FLASH_MP550) or (cmd_code == CmdCode.WRITE_FLASH_MP550) \
or (cmd_code == CmdCode.READ_FLASH) or (cmd_code == CmdCode.LOAD_FLASH):
rc = parse_flash(rx_data, status_len, cmd_code)
elif (cmd_code == CmdCode.ERASE_FLASH) or (cmd_code == CmdCode.WRITE_FLASH) \
or (cmd_code == CmdCode.READ_FLASH_MP550) or (cmd_code == CmdCode.WRITE_FLASH_MP550) \
or (cmd_code == CmdCode.READ_FLASH) or (cmd_code == CmdCode.LOAD_FLASH):
rc = parse_flash(rx_data, status_len, cmd_code)
if rc:
if (cmd_state == CmdState.WAIT) and (cmd_num_rx == cmd_num_tx):
cmd_state = CmdState.DONE
cmd_code_rx = cmd_code
if rc:
emit_signal('command_done', self)
else:
emit_signal('parse_failed', self)
else:
emit_signal('parse_failed', self)
return true