From 388b92836cf94f4f26093e271cd5821aae824bfe Mon Sep 17 00:00:00 2001 From: TotMaxim Date: Fri, 28 Nov 2025 21:31:09 +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=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B2=20270=20?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D0=B4=D1=83=D1=81=D0=BE=D0=B2=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80?= =?UTF-8?q?=D0=B8=D1=81=D1=83=D0=BD=D0=BA=D0=B0=20=D0=BA=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BB=D1=8F.=20=D0=92=D1=8B=D1=81=D1=82=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB=D1=83=D1=87=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8C=20=D0=B2=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B5=20"=D0=A0=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0".=20=D0=A7=D1=82=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=D0=B0=20=D0=B1=D0=B0=D0=B9=D1=82?= =?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BE=D1=82=20=D0=A1=D0=9F=D0=A225.=20=D0=98=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BB=D0=B5=D0=BA=D1=81?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4?= =?UTF-8?q?=D0=BA=D0=B5=20=D0=AD=D0=9C=D0=A1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-uyep/spt25-view.gd | 22 +++++++++++----------- scenes/tilemap/tilemap.gd | 2 +- scenes/эмс/yems-consts.gd | 20 ++++++++++---------- scripts/prd.gd | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/scenes/pribor-uyep/spt25-view.gd b/scenes/pribor-uyep/spt25-view.gd index 02938f55..ac1974fd 100644 --- a/scenes/pribor-uyep/spt25-view.gd +++ b/scenes/pribor-uyep/spt25-view.gd @@ -32,29 +32,29 @@ func disable_all(): func on_data_received(data: PackedByteArray): # Сеть 1. Использование - $block_input1.state = STATE_VAL.GOOD if data[4] & (1 << 5) else STATE_VAL.ERROR + $block_input1.state = STATE_VAL.GOOD if data[3] & (1 << 5) else STATE_VAL.ERROR # Сеть 1. Вход - $block_input1.state0 = STATE_VAL.GOOD if ((data[4] & (1 << 1)) == 0) and ((data[4] & (1 << 3)) == 0) else STATE_VAL.ERROR + $block_input1.state0 = STATE_VAL.GOOD if ((data[3] & (1 << 1)) == 0) and ((data[3] & (1 << 3)) == 0) else STATE_VAL.ERROR # Сеть 1. Неисправность блока инвертора 1 канала - $block_input1.state1 = STATE_VAL.GOOD if (data[6] & (1 << 2)) == 0 else STATE_VAL.ERROR + $block_input1.state1 = STATE_VAL.GOOD if (data[5] & (1 << 2)) == 0 else STATE_VAL.ERROR # Сеть 1. Перегрев 1 канала - $block_input1.state2 = STATE_VAL.GOOD if (data[5] & (1 << 3)) == 0 else STATE_VAL.ERROR + $block_input1.state2 = STATE_VAL.GOOD if (data[4] & (1 << 3)) == 0 else STATE_VAL.ERROR # Сеть 2. Использование - $block_input2.state = STATE_VAL.GOOD if data[4] & (1 << 6) else STATE_VAL.ERROR + $block_input2.state = STATE_VAL.GOOD if data[3] & (1 << 6) else STATE_VAL.ERROR # Сеть 2. Вход - $block_input2.state0 = STATE_VAL.GOOD if ((data[4] & (1 << 2)) == 0) and ((data[4] & (1 << 4)) == 0) else STATE_VAL.ERROR + $block_input2.state0 = STATE_VAL.GOOD if ((data[3] & (1 << 2)) == 0) and ((data[3] & (1 << 4)) == 0) else STATE_VAL.ERROR # Сеть 2. Неисправность блока инвертора 2 канала - $block_input2.state1 = STATE_VAL.GOOD if (data[6] & (1 << 3)) == 0 else STATE_VAL.ERROR + $block_input2.state1 = STATE_VAL.GOOD if (data[5] & (1 << 3)) == 0 else STATE_VAL.ERROR # Сеть 2. Перегрев 2 канала - $block_input2.state2 = STATE_VAL.GOOD if (data[5] & (1 << 4)) == 0 else STATE_VAL.ERROR + $block_input2.state2 = STATE_VAL.GOOD if (data[4] & (1 << 4)) == 0 else STATE_VAL.ERROR # Неисправность, напряжение меньше номинального, напряжение выше номинального - $block_output.state0 = STATE_VAL.GOOD if ((data[4] & (1 << 0)) == 0) and ((data[4] & (1 << 7)) == 0) and ((data[5] & (1 << 2)) == 0) else STATE_VAL.ERROR + $block_output.state0 = STATE_VAL.GOOD if ((data[3] & (1 << 0)) == 0) and ((data[3] & (1 << 7)) == 0) and ((data[4] & (1 << 2)) == 0) else STATE_VAL.ERROR # Перегрузка и короткое замыкание по выходу - $block_output.state1 = STATE_VAL.GOOD if ((data[5] & (1 << 0)) == 0) and ((data[5] & (1 << 1)) == 0) else STATE_VAL.ERROR + $block_output.state1 = STATE_VAL.GOOD if ((data[4] & (1 << 0)) == 0) and ((data[4] & (1 << 1)) == 0) else STATE_VAL.ERROR # Критическая температура - $block_output.state2 = STATE_VAL.GOOD if ((data[5] & (1 << 5)) == 0) else STATE_VAL.ERROR + $block_output.state2 = STATE_VAL.GOOD if ((data[4] & (1 << 5)) == 0) else STATE_VAL.ERROR # Обобщённое состояние state = STATE_VAL.GOOD \ diff --git a/scenes/tilemap/tilemap.gd b/scenes/tilemap/tilemap.gd index 30868755..39b0e0d3 100644 --- a/scenes/tilemap/tilemap.gd +++ b/scenes/tilemap/tilemap.gd @@ -717,7 +717,7 @@ func set_coordinates(lon: float, lat: float, course: float) -> void: add_mark_from_lon_lat(ship_id, lon, lat, ship_instance, 0.0) else: _marks[ship_id].position = lonlat_to_world(lon, lat) - ship_instance.rotation_degrees = fmod(270.0 + course, 360.0) + ship_instance.rotation_degrees = fmod(course, 360.0) queue_redraw() diff --git a/scenes/эмс/yems-consts.gd b/scenes/эмс/yems-consts.gd index dd27c0e5..fe9be29f 100644 --- a/scenes/эмс/yems-consts.gd +++ b/scenes/эмс/yems-consts.gd @@ -54,15 +54,15 @@ const EMS_G_BOARDS = { ## Таблица с данными для входов, первое значение - индекс устройства в ячейке КЭМС. const INPUT_KEMS = [ - [1 ,['УИЗП №1', 'Х7', '0.00', '0.00']], + [1 ,['5П-26М', 'Х7', '0.00', '0.00']], [2 ,['УИЗПФ №1','Х8', '0.00', '0.00']], - [3 ,['УИЗП №2', 'Х10', '0.00', '0.00']], + [3 ,['НРЛС МР-231', 'Х10', '0.00', '0.00']], [4 ,['УИЗПФ №2','Х11', '0.00', '0.00']], - [5 ,['УИЗП №3', 'Х13', '0.00', '0.00']], + [5 ,['НРЛС-231-3', 'Х13', '0.00', '0.00']], [6 ,['УИЗПФ №3','Х14', '0.00', '0.00']], - [7 ,['УИЗП №4', 'Х16', '0.00', '0.00']], + [7 ,['3Р87-1Ф', 'Х16', '0.00', '0.00']], [8 ,['УИЗПФ №4','Х17', '0.00', '0.00']], - [9 ,['УИЗП №5', 'Х19', '0.00', '0.00']], + [9 ,['ПРЛ ИСБУ-23900', 'Х19', '0.00', '0.00']], [10,['УИЗПФ №5','Х20', '0.00', '0.00']], [11,['УИЗП №6', 'Х22', '0.00', '0.00']], [12,['УИЗПФ №6','Х23', '0.00', '0.00']], @@ -77,11 +77,11 @@ const INPUT_KEMS = [ ## Таблица с данными для выходов, первое значение - индекс устройства в ячейке КЭМС. const OUTPUT_KEMS = [ - [47,['Бланк №1','Х6', '0.00', '0.00']], - [48,['Бланк №2','Х9', '0.00', '0.00']], - [49,['Бланк №3','Х12', '0.00', '0.00']], - [50,['Бланк №4','Х15', '0.00', '0.00']], - [51,['Бланк №5','Х18', '0.00', '0.00']], + [47,['5П-26М','Х6', '0.00', '0.00']], + [48,['НРЛС МР-231','Х9', '0.00', '0.00']], + [49,['НРЛС-231-3','Х12', '0.00', '0.00']], + [50,['3Р87-1Ф','Х15', '0.00', '0.00']], + [51,['ПРЛ ИСБУ-23900','Х18', '0.00', '0.00']], [52,['Бланк №6','Х21', '0.00', '0.00']], [53,['Бланк №7','Х24', '0.00', '0.00']], [55,['Бланк_МП №1', 'X28 : 8', '0.00', '0.00']], diff --git a/scripts/prd.gd b/scripts/prd.gd index 2612f33e..cfe9e872 100644 --- a/scripts/prd.gd +++ b/scripts/prd.gd @@ -105,8 +105,8 @@ class Fs: [10, 20], [20, 30], [30, 40], - [40, 50], - [50, 55]] + [40, 90], + [90, 100]] var index ## Индекс блока усилителей var modulation: bool ## Состояние модуляции