Merge remote-tracking branch 'origin/master' into master-prd
This commit is contained in:
@@ -242,9 +242,14 @@ class PRD:
|
||||
var json_data = json_conv.get_data()
|
||||
yemsg_board.need_write = true
|
||||
yemsg_board.ems_load = yemsg_board.LoadState.IN_PROCESS
|
||||
yemsg_board.btn_load(json_data)
|
||||
yemsg_board.state_board = yemsg_board.WRITE
|
||||
yemsg_board.start_rw_kems(false)
|
||||
var read_ok = yemsg_board.btn_load(json_data)
|
||||
if read_ok:
|
||||
yemsg_board.state_board = yemsg_board.WRITE
|
||||
yemsg_board.start_rw_kems(false)
|
||||
else:
|
||||
yemsg_board.ems_load = yemsg_board.LoadState.FAIL
|
||||
yemsg_board.set_wait()
|
||||
log.error('Не удалось прочитать файл настроек ячейки ЭМС-Г %s' %abs_dir)
|
||||
else:
|
||||
yemsg_board.ems_load = yemsg_board.LoadState.FAIL
|
||||
yemsg_board.set_wait()
|
||||
@@ -290,18 +295,23 @@ func get_fs_param(index: int) -> Array:
|
||||
|
||||
## Функция возвращает массив с индексами модулей ФС для выбранной помехи
|
||||
func get_fs_index(ecm, fs_index_arr):
|
||||
var angle: float = ecm.kni + 45.0
|
||||
if ecm.params.has('freq'):
|
||||
find_fs_index(angle, ecm.params['freq'], fs_index_arr)
|
||||
|
||||
|
||||
func find_fs_index(aoa: float, freq: int, fs_index_arr: Array):
|
||||
var sector: int
|
||||
var band: Array
|
||||
var angle: float = ecm.kni + 45.0
|
||||
var angle = aoa
|
||||
if angle > 360.0:
|
||||
angle -= 360.0
|
||||
for sec in FS_SECTORS.values():
|
||||
if float(angle) >= sec[0] and float(angle) <= sec[1]:
|
||||
sector = FS_SECTORS.find_key(sec)
|
||||
for diap in FS_FREQ.values():
|
||||
if ecm.params.has('freq'):
|
||||
if ecm.params['freq'] >= diap[0] and ecm.params['freq'] <= diap[1]:
|
||||
band.append(FS_FREQ.find_key(diap))
|
||||
if freq >= diap[0] and freq <= diap[1]:
|
||||
band.append(FS_FREQ.find_key(diap))
|
||||
for item in band:
|
||||
fs_index_arr.append(item * 4 + sector)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user