From f3d47ae3835f6beaee68b656a0a5568316ae3ef6 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 28 Oct 2024 13:29:11 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/эмс/эмс.gd | 8 ++++---- scripts/tools.gd | 6 ------ scripts/unit.gd | 1 - 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/scenes/эмс/эмс.gd b/scenes/эмс/эмс.gd index ece1cdb..650d777 100644 --- a/scenes/эмс/эмс.gd +++ b/scenes/эмс/эмс.gd @@ -43,7 +43,7 @@ func init_boards(): g_boards['КЭМС-Б'] = yemsboards.EmsBoard.new(0, 0x130, yemsconsts.INPUT_KEMS, yemsconsts.OUTPUT_KEMS) g_boards['ЭМС-Б1'] = yemsboards.EmsBoard.new(1, 0x110, yemsconsts.INPUT_EMS1, yemsconsts.OUTPUT_EMS1) g_boards['ЭМС-Б2'] = yemsboards.EmsBoard.new(2, 0x120, yemsconsts.INPUT_EMS2, yemsconsts.OUTPUT_EMS2) - + init_tbl_in() $scrollin/tbl_in.pin_header($scrollin, self) init_tbl_out() @@ -52,7 +52,7 @@ func init_boards(): $scrl_out_set/tbl_out_set.pin_header($scrl_out_set, self) init_tbl_files() $scrl_files/tbl_files.pin_header($scrl_files, self) - + var unit_key = repsettings.get_unit_key('уарэп-эмс') var unit = repnetwork.units[unit_key] unit.connect('data_received', Callable(self, 'on_data_ems_received')) @@ -60,7 +60,7 @@ func init_boards(): $btn_disconnect.connect('pressed', Callable(self, 'on_btn_disconnect')) $btn_flash_read.button_connect('pressed', Callable(self, 'on_btn_flash_read').bind($btn_flash_read)) $btn_flash_write.button_connect('pressed', Callable(self, 'on_btn_flash_write').bind($btn_flash_write)) - + ## Обработчик нажатия кнопки disconnect. @@ -374,4 +374,4 @@ func on_row_pressed(i_row: int, tbl): func on_data_ems_received(unit): print_debug(unit.status) - + diff --git a/scripts/tools.gd b/scripts/tools.gd index beeee06..7a3b336 100644 --- a/scripts/tools.gd +++ b/scripts/tools.gd @@ -74,7 +74,6 @@ func get_string_slice(s_in: String, s_out: Array, i0: int, i1: int): func pos_calc(freq: float, aoa: float, pos0: Vector2, r0: float, r1: float, f0: float, f1: float): var r = remap(freq, f0, f1, r0, r1) var aoa_rad = radians(aoa) - PI / 2.0 - return Vector2(cos(aoa_rad), sin(aoa_rad)) * r + pos0 @@ -112,11 +111,6 @@ func map_dec_to_rad(pos0: Vector2, pos: Vector2) -> Vector2: return Vector2(ang + 360.0 * float(ang < 0.0), hypot(x1, y1)) -## Переводит значение val из диапазона a0...a1 в диапазон b0...b1. -func map_range(val: float, a0: float, a1: float, b0: float, b1: float) -> float: - return (((val - a0) * (b1 - b0)) / (a1 - a0)) + b0 - - ## Возвращает [b]true[/b], если точка внутри заданного полигона.[br] ## [param pos] - Проверяемая точка.[br] ## [param p] - Координаты вершин полигона.[br] diff --git a/scripts/unit.gd b/scripts/unit.gd index 3e46652..099722c 100644 --- a/scripts/unit.gd +++ b/scripts/unit.gd @@ -1,7 +1,6 @@ class_name base_unit extends Node ## Базовый класс для управления подключаемыми устройствами - class Unit: signal line_changed(unit) ## Вызывается при изменение состояния связи signal command_done(unit) ## Вызывается после выполнения команды. From b6b9336fcb5c400a50d3bd20f4ffc0368f9a8d01 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 29 Oct 2024 08:40:35 +0300 Subject: [PATCH 2/7] =?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=D0=B5.=20=D0=9E=D0=B1=D1=80=D0=B0=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=20=D1=81=D0=B5=D1=82=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/network.gd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/network.gd b/scripts/network.gd index a5143ae..f0f3690 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -205,6 +205,8 @@ func get_tcp_data(sock: SocketTCP, peer, len_rx): func _process(_delta: float) -> void: + if Engine.is_editor_hint(): + return var tick = Time.get_ticks_msec() for addr in units_udp: var unit = units[addr] From c67d8d237b747cd10197c23db6517e6534064c94 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 29 Oct 2024 08:43:14 +0300 Subject: [PATCH 3/7] =?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=D0=B5.=20=D0=A0=D0=B0=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D1=80=20=D1=80=D0=B0=D0=BC=D0=BA=D0=B8=20=D0=BD=D0=B5=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2=D1=83?= =?UTF-8?q?=D0=B5=D1=82=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D0=BC=D1=83=20=D0=B2=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/контроль/элемент-я.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/контроль/элемент-я.gd b/scenes/контроль/элемент-я.gd index 6062db6..f73a1fa 100644 --- a/scenes/контроль/элемент-я.gd +++ b/scenes/контроль/элемент-я.gd @@ -26,7 +26,7 @@ func _on_button_pressed(): $margin/vbox.alignment = v -func _enter_tree() -> void: _on_resized() +func _enter_tree() -> void: call_deferred('_on_resized') func _on_resized() -> void: $rect.size = size From 3ca72b8d64bec18d066b3f487b16b0739124b4b8 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 29 Oct 2024 08:44:02 +0300 Subject: [PATCH 4/7] =?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=92=D0=B5=D1=80=D0=BD=D1=83=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B4=D0=BB=D0=B8=D0=BD=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/network.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/network.gd b/scripts/network.gd index f0f3690..0275b90 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -9,7 +9,7 @@ const SERIAL_PROTO: = {'uart': spt25.SPT25 } class Serial extends SerialPort: func send_to(data: PackedByteArray): - write_raw(data) + return write_raw(data) func try_open(parsing_proc: Callable): if not is_open(): open(port) From ab7d704a35cad9eebc06849c7cac5b90606d3c73 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 29 Oct 2024 08:44:48 +0300 Subject: [PATCH 5/7] =?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=D0=B5.=20=D0=92=D1=80=D0=B5=D0=BC=D1=8F=20?= =?UTF-8?q?=D0=B2=20=D1=81=D0=B5=D0=BA=D1=83=D0=BD=D0=B4=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/spt25.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spt25.gd b/scripts/spt25.gd index b515288..cde3c4a 100644 --- a/scripts/spt25.gd +++ b/scripts/spt25.gd @@ -4,7 +4,7 @@ class_name spt25_unit extends Node class SPT25 extends unit.Unit: var tx_tick: int = 0 - var req_period = 3000 + var req_period = 3.0 func _to_string() -> String: return String('СПТ-25: %s %s' % [self.name, ['отключен', 'на связи'][int(online)]]) func _init(nm) -> void: From ae87945c6b25e1a93866839ab45528e2f213915d Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 29 Oct 2024 08:45:43 +0300 Subject: [PATCH 6/7] =?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=92=D1=80=D0=B5=D0=BC=D1=8F=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/spt25.gd | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/spt25.gd b/scripts/spt25.gd index cde3c4a..f9c492b 100644 --- a/scripts/spt25.gd +++ b/scripts/spt25.gd @@ -28,5 +28,6 @@ class SPT25 extends unit.Unit: func process(delta: float): tick += delta if (tick - tx_tick) > req_period: + tx_tick = tick return Error.OK return Error.ERR_BUSY From 947abdfcc2759bf47cca1f1ca1807b3550ffdf3a Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 29 Oct 2024 08:46:09 +0300 Subject: [PATCH 7/7] Godot --- data/document-new-0.png.import | 2 +- data/ofont.ru_Franklin Gothic Book.ttf.import | 2 +- data/кнопка-квадрат-1.png.import | 2 +- data/мп550-работа-эскиз.png.import | 2 +- data/отметка-самолёт.png.import | 2 +- data/прицел-табличка.png.import | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/document-new-0.png.import b/data/document-new-0.png.import index d9ed0d2..7abe794 100644 --- a/data/document-new-0.png.import +++ b/data/document-new-0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dd60btbqnpiqw" +uid="uid://nm7cpjw6rs51" path="res://.godot/imported/document-new-0.png-4076926ba4469926b76b7d685aad96aa.ctex" metadata={ "vram_texture": false diff --git a/data/ofont.ru_Franklin Gothic Book.ttf.import b/data/ofont.ru_Franklin Gothic Book.ttf.import index be3abc0..c2d2d97 100644 --- a/data/ofont.ru_Franklin Gothic Book.ttf.import +++ b/data/ofont.ru_Franklin Gothic Book.ttf.import @@ -2,7 +2,7 @@ importer="font_data_dynamic" type="FontFile" -uid="uid://b8xqbrj2ontxe" +uid="uid://dvf4iwl08c1lt" path="res://.godot/imported/ofont.ru_Franklin Gothic Book.ttf-52f1dac05bf20c0c7af86c6e9cfad8fc.fontdata" [deps] diff --git a/data/кнопка-квадрат-1.png.import b/data/кнопка-квадрат-1.png.import index 2fa36e9..8458337 100644 --- a/data/кнопка-квадрат-1.png.import +++ b/data/кнопка-квадрат-1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b6p0ndxcng02k" +uid="uid://cl8h2vaibabyi" path="res://.godot/imported/кнопка-квадрат-1.png-3e8f354c4e789ff37e9c072bb90aa353.ctex" metadata={ "vram_texture": false diff --git a/data/мп550-работа-эскиз.png.import b/data/мп550-работа-эскиз.png.import index f89954d..9b448fa 100644 --- a/data/мп550-работа-эскиз.png.import +++ b/data/мп550-работа-эскиз.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bq67yytxgoopq" +uid="uid://b4oau2xgcka77" path="res://.godot/imported/мп550-работа-эскиз.png-7af57230feae7557e482f8923843a550.ctex" metadata={ "vram_texture": false diff --git a/data/отметка-самолёт.png.import b/data/отметка-самолёт.png.import index 2fd5cb6..8f78fd9 100644 --- a/data/отметка-самолёт.png.import +++ b/data/отметка-самолёт.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://83m8t7nj4a60" +uid="uid://gkbvsypul1qg" path="res://.godot/imported/отметка-самолёт.png-bb46afb23fe946fe2230cd3d30c66dca.ctex" metadata={ "vram_texture": false diff --git a/data/прицел-табличка.png.import b/data/прицел-табличка.png.import index e637fdc..d8ee757 100644 --- a/data/прицел-табличка.png.import +++ b/data/прицел-табличка.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cqu18m05sdl5w" +uid="uid://bq6biyc0nxjv4" path="res://.godot/imported/прицел-табличка.png-45ba36412555fb1cbc42d6445071f6cd.ctex" metadata={ "vram_texture": false