From b08cd6cc2eb704b645a372e1750b19adca65994b Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Tue, 13 May 2025 14:29:05 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F.=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D1=85=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=AD=D0=9C=D0=A1-=D0=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/эмс/yems-boards.gd | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scenes/эмс/yems-boards.gd b/scenes/эмс/yems-boards.gd index ba1b2d92..4b818f47 100644 --- a/scenes/эмс/yems-boards.gd +++ b/scenes/эмс/yems-boards.gd @@ -69,9 +69,8 @@ class EmsBoard: var bit_load = 4 if online: if (ems_load != LoadState.IN_PROCESS) and (ems_load != LoadState.FAIL): - ems_load = LoadState.DONE if ((status[0] >> bit_load) & 1) else LoadState.NOT_LOAD - elif ((status[0] >> bit_load) & 1): - ems_load = LoadState.DONE + if (ems_load == LoadState.NOT_DEFINED) or not (((status[0] >> bit_load) & 1)): + ems_load = LoadState.NOT_LOAD else: ems_load = LoadState.NOT_DEFINED set_wait() @@ -180,6 +179,9 @@ class EmsBoard: elif (state_cmd == WRITE_FLASH) and (unit_ems.cmd_code_rx == unit_ems.CmdCode.WRITE_FLASH_MP550): set_wait() elif state_board == LOADING: + var bit_load = 4 + if ((unit_ems.status[0] >> bit_load) & 1): + ems_load = LoadState.DONE set_wait() ## Выбор текущего устройства и проверка правильности его номера From dadcf0f793b045f744dde51f89612d65dfd0fb62 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Mon, 19 May 2025 08:28:35 +0300 Subject: [PATCH 2/2] =?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=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA=D0=B0=20=D1=81=20=D0=BA=D1=83?= =?UTF-8?q?=D1=80=D1=81=D0=BE=D0=B2=D1=8B=D0=BC=20=D1=83=D0=B3=D0=BB=D0=BE?= =?UTF-8?q?=D0=BC=20=D0=B8=D0=B7=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86?= =?UTF-8?q?=D1=8B=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=D0=BC=D0=B5=D1=85.=20=D0=A3=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=81=20=D1=87=D0=B0=D1=81=D1=82=D0=BE=D1=82=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D1=85.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/frame-ecm-list/scroll-ecm-list.gd | 14 ++++++-------- scenes/frame-ecm-params/scroll-ecm-params.gd | 15 +++++++-------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/scenes/frame-ecm-list/scroll-ecm-list.gd b/scenes/frame-ecm-list/scroll-ecm-list.gd index fa96d3b9..e4374173 100644 --- a/scenes/frame-ecm-list/scroll-ecm-list.gd +++ b/scenes/frame-ecm-list/scroll-ecm-list.gd @@ -5,10 +5,10 @@ extends ScrollContainer const CellLineEdit = preload('res://table/ячейка-2.tscn') ## Ячейка таблицы. const TableHeader = preload('res://table/header.tscn') ## Ячейка заголовок таблицы. -const TABLE_HEADER = [ TableHeader, TableHeader, TableHeader, TableHeader , TableHeader ] ## Описание ряда заголовка. -const TABLE_ROW = [ CellLineEdit, CellLineEdit, CellLineEdit, CellLineEdit , CellLineEdit ] ## Описание ряда. -const TABLE_HEADERS_TEXT = ['Номер', 'Название', 'Частота, МГц', 'Пеленг', 'Состояние' ] ## Заголовки таблицы. -const TABLE_COLUMN_SIZE = [ 65, 80, 120, 70, 100 ] ## Ширины колонок. +const TABLE_HEADER = [ TableHeader, TableHeader, TableHeader , TableHeader ] ## Описание ряда заголовка. +const TABLE_ROW = [ CellLineEdit, CellLineEdit, CellLineEdit , CellLineEdit ] ## Описание ряда. +const TABLE_HEADERS_TEXT = ['Номер', 'Название', 'Пеленг', 'Состояние' ] ## Заголовки таблицы. +const TABLE_COLUMN_SIZE = [ 75, 100, 90, 170 ] ## Ширины колонок. ## Состояние выполнения сеанса помехи const INTERFER_STATE = { @@ -42,9 +42,8 @@ const INTERFER_NAMES = { ## Индексы колонок const COLUMN_NUMBER = 0 const COLUMN_NAME = 1 -const COLUMN_FREQ = 2 -const COLUMN_AOA = 3 -const COLUMN_STATE = 4 +const COLUMN_AOA = 2 +const COLUMN_STATE = 3 func on_rto_threat_unsel(_th_id): $table.clear_rows_selected() @@ -152,7 +151,6 @@ func map_th_to_row(ecm) -> Array: row[COLUMN_NAME] = '' if INTERFER_NAMES.has(ecm.krp): row[COLUMN_NAME] = '%s' % INTERFER_NAMES[ecm.krp] - row[COLUMN_FREQ] = '%s' % ecm.params['freq'] row[COLUMN_AOA] = '%s' % ecm.kni row[COLUMN_STATE] = '' if INTERFER_STATE.has(ecm.svk): diff --git a/scenes/frame-ecm-params/scroll-ecm-params.gd b/scenes/frame-ecm-params/scroll-ecm-params.gd index 5fa0c1ea..3fc2c3a0 100644 --- a/scenes/frame-ecm-params/scroll-ecm-params.gd +++ b/scenes/frame-ecm-params/scroll-ecm-params.gd @@ -13,15 +13,14 @@ const TABLE_HEADERS_TEXT = ['Параметр', 'Значение' ] ## const TABLE_COLUMN_SIZE = [ 370, 85 ] ## Ширины колонок. const TABLE_PARAMS = { - 'kni': [0, 'Курсовой угол, гр.', false, 0.0, 360.0], - 'powp': [1, 'Мощность, %', true, 0.0, 100.0], - 'freq': [2, 'Частота, МГц', true, settings.FREQ_MIN, settings.FREQ_MAX], - 'width': [3, 'Занимая полоса частот, МГц', true, 0.0, settings.WIDTH_MAX], - 'dur': [4, 'Длительность импульса, мкс', true, 0.0, settings.DUR_MAX], - 'period': [5, 'Период повтора, мкс', true, 0.0, settings.PERIOD_MAX], - 'um': [6, 'Угол места, гр.', true, settings.UM_MIN, settings.UM_MAX] } + 'powp': [0, 'Мощность, %', true, 0.0, 100.0], + 'freq': [1, 'Частота, МГц', true, settings.FREQ_MIN, settings.FREQ_MAX], + 'width': [2, 'Занимая полоса частот, МГц', true, 0.0, settings.WIDTH_MAX], + 'dur': [3, 'Длительность импульса, мкс', true, 0.0, settings.DUR_MAX], + 'period': [4, 'Период повтора, мкс', true, 0.0, settings.PERIOD_MAX], + 'um': [5, 'Угол места, гр.', true, settings.UM_MIN, settings.UM_MAX] } -const MOD_ROW_INDEX = 7 ## Индекс строки с модуляцией +const MOD_ROW_INDEX = 6 ## Индекс строки с модуляцией func init_table(): for i in TABLE_PARAMS.size(): $table.add_row(TABLE_ROW)