From 22df0beb4f63b0d45715d570dbe51a07dc54c225 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 13 Aug 2025 15:43:10 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A0=D0=B5=D0=B3=D1=80=D0=B5=D1=81=D1=81?= =?UTF-8?q?=D0=B8=D1=8F.=20not=20enough=20arguments=20for=20format=20strin?= =?UTF-8?q?g=20in=20operator=20'%'.?= 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 46b206c1..16ff54da 100644 --- a/scenes/журнал/журнал.gd +++ b/scenes/журнал/журнал.gd @@ -2,7 +2,7 @@ extends Panel func on_line_changed(unit_inst): log.message(Logger.INFO, '\"%s\" изменение состояния: %s' % [unit_inst.name, 'на связи' if unit_inst.online else 'отключен']) -func on_command_fail(unit_inst): log.message(Logger.ERROR, '\"%s\" %s команда не выполнена' % unit_inst.name) +func on_command_fail(unit_inst): log.message(Logger.ERROR, '\"%s\" команда не выполнена' % unit_inst.name) func on_threats_changed(th: Object, msg: String): log.message(Logger.INFO, '%s: %s' % [msg, th.to_string()]) func on_parse_error(unit_inst, msg: String): log.message(Logger.ERROR, '%s: %s' % [unit.name, msg]) func on_interfer_off(ecm, _ecms, _thrs,msg: String): log.message(Logger.INFO, '%s: %s' % [msg, ecm.to_string()]) From 89b38d15146e4d6be11da07aad995b07e192d104 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 13 Aug 2025 15:45:46 +0300 Subject: [PATCH 2/4] =?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=A1=D1=82=D0=B0=D1=82=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D1=81=D0=BA=D0=B8=D0=B9=20=D1=82=D0=B8=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-bpo.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/pribor-afsp/pribor-bpo.gd b/scenes/pribor-afsp/pribor-bpo.gd index 3d0db983..95310365 100644 --- a/scenes/pribor-afsp/pribor-bpo.gd +++ b/scenes/pribor-afsp/pribor-bpo.gd @@ -28,7 +28,7 @@ func _on_request_completed(result, _response_code, headers, body: PackedByteArra push_error('разбор json прерван - \"%s\" (%s)' % [err, headers]) return - var pp = [] + var pp: = [] tools.map_solid_to_array(prefix_path, pp) var ret_val = [null, false, 0] var pp_copy = pp.duplicate(true) From cd9c15ae35309925482f9841a7c053fe3cd4b7ea Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 13 Aug 2025 15:47:11 +0300 Subject: [PATCH 3/4] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index 4e07d7e8..29564b25 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -165,7 +165,7 @@ func setting_tab(): var tootip_text = tbl_row[3] name_to_line_index[param_name] = i $scroll_set/table.add_row([node_label, node_value]) - var label_instance = $scroll_set/table.get_node2(0, i) + var label_instance = $scroll_set/table.get_node2(0, i) label_instance.text = param_name label_instance.tooltip_text = tootip_text $scroll_set/table.set_node_editable(0, i, false) From 851ce21ce7a26bc951684c8656e32521926ff7c7 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 13 Aug 2025 15:50:36 +0300 Subject: [PATCH 4/4] =?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=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20-?= =?UTF-8?q?=20url-=D0=B0=D0=B4=D1=80=D0=B5=D1=81=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=91=D0=9F=D0=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.godot | 8 ++++---- scenes/pribor-afsp/pribor-afsp-1.tscn | 4 ++-- scenes/pribor-afsp/pribor-afsp-2.tscn | 2 ++ scenes/pribor-afsp/pribor-bpo.tscn | 4 ++-- scenes/pribor-afsp/request.gd | 16 +++++++++++----- scenes/настройки/настройки.gd | 7 ++++++- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/project.godot b/project.godot index e8ea6335..9952c0a5 100644 --- a/project.godot +++ b/project.godot @@ -29,12 +29,8 @@ interfer/default_color0=Vector3(0.38, 0.47, 0.51) interfer/default_color1=Vector3(0.39, 0.44, 0.5) interfer/select_color=Vector3(1, 1, 1) interfer/interfer_color=Vector3(0.58, 0.47, 0.51) -config/mod_bus_driver_port="48000" -config/mod_bus_driver_address="localhost" interfer/resend_timeout=1000.0 config/external_cu=false -config/unit_afsp_left_bort="http://127.0.0.1:8000/selftest_left.json" -config/unit_afsp_right_bort="http://127.0.0.1:8000/selftest_right.json" config/unit_rr_request_period=5.0 config/kems_files_path="user://kems/" config/emsg_files_path="user://emsg/" @@ -184,6 +180,10 @@ right={ buffering/agile_event_flushing=true +[internationalization] + +locale/locale_filter_mode=0 + [logging] file_logging/enable_file_logging=true diff --git a/scenes/pribor-afsp/pribor-afsp-1.tscn b/scenes/pribor-afsp/pribor-afsp-1.tscn index 33f74753..7d7f4fc2 100644 --- a/scenes/pribor-afsp/pribor-afsp-1.tscn +++ b/scenes/pribor-afsp/pribor-afsp-1.tscn @@ -24,8 +24,8 @@ metadata/DeviceName = &"Устройство РР левого борта" [node name="request" type="HTTPRequest" parent="."] use_threads = true script = ExtResource("2_4vyhj") -addr_left = "http://192.168.56.2:8001/selftest" -addr_right = "http://192.168.56.2:8002/selftest" +projsettings_path_left = "application/config/Адрес АФСП левого борта" +projsettings_path_right = "application/config/Адрес АФСП правого борта" [node name="timer" type="Timer" parent="request"] autostart = true diff --git a/scenes/pribor-afsp/pribor-afsp-2.tscn b/scenes/pribor-afsp/pribor-afsp-2.tscn index 5cdc9194..a0320ae4 100644 --- a/scenes/pribor-afsp/pribor-afsp-2.tscn +++ b/scenes/pribor-afsp/pribor-afsp-2.tscn @@ -24,6 +24,8 @@ metadata/DeviceName = &"Устройство РР правого борта" [node name="request" type="HTTPRequest" parent="."] use_threads = true script = ExtResource("2_miwrd") +projsettings_path_left = "application/config/Адрес АФСП левого борта" +projsettings_path_right = "application/config/Адрес АФСП правого борта" [node name="timer" type="Timer" parent="request"] autostart = true diff --git a/scenes/pribor-afsp/pribor-bpo.tscn b/scenes/pribor-afsp/pribor-bpo.tscn index e2945542..0f70e45f 100644 --- a/scenes/pribor-afsp/pribor-bpo.tscn +++ b/scenes/pribor-afsp/pribor-bpo.tscn @@ -186,8 +186,8 @@ fname = "Яч. связи" [node name="request" type="HTTPRequest" parent="."] use_threads = true script = ExtResource("4_crej3") -addr_left = "http://192.168.56.2:8001/selftest" -addr_right = "http://192.168.56.2:8002/selftest" +projsettings_path_left = "application/config/Адрес БПО левого борта" +projsettings_path_right = "application/config/Адрес БПО правого борта" [node name="timer" type="Timer" parent="request"] autostart = true diff --git a/scenes/pribor-afsp/request.gd b/scenes/pribor-afsp/request.gd index b69562e0..e52d0a47 100644 --- a/scenes/pribor-afsp/request.gd +++ b/scenes/pribor-afsp/request.gd @@ -19,11 +19,17 @@ const RESULT_STRINGS = { RESULT_TIMEOUT: 'Время истекло' } -@export var addr_left: String -@export var addr_right: String - +@export var projsettings_path_left: String = '' +@export var projsettings_path_right: String = '' var i_bort: int = 0 +var addr_left: String +var addr_right: String + + +func on_settings_changed(): + addr_left = ProjectSettings.get_setting(projsettings_path_left) + addr_right = ProjectSettings.get_setting(projsettings_path_right) func get_result_string(result: Result): @@ -31,8 +37,8 @@ func get_result_string(result: Result): func _ready(): - addr_left = ProjectSettings.get_setting('application/config/unit_afsp_left_bort') - addr_right = ProjectSettings.get_setting('application/config/unit_afsp_right_bort') + ProjectSettings.connect('settings_changed', on_settings_changed) + on_settings_changed() func _on_request_timer(): diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index 29564b25..dce02031 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -50,7 +50,12 @@ const SETTING_TABLE = [ ['уарэп-щ3', TableEdit, TableEdit, 'Путь к UART-устройству для связи с прибором Щ3'], ['уарэп-спт25-1', TableEdit, TableEdit, 'Путь к UART-устройству для связи с прибором СПТ-25 1'], ['уарэп-спт25-2', TableEdit, TableEdit, 'Путь к UART-устройству для связи с прибором СПТ-25 2'], - ['Шаблон адреса сервера карт', TableEdit, TableEdit, 'URL-адрес сервера карт, должен содержать поля \"{x}\", \"{y}\", \"{z}\" для подстановки индекса плитки'] ] + ['Шаблон адреса сервера карт', TableEdit, TableEdit, 'Шаблон URL-адреса сервера карт, должен содержать поля \"{x}\", \"{y}\", \"{z}\" для подстановки индекса плитки'], + ['Адрес АФСП левого борта', TableEdit, TableEdit, 'http-адрес для запроса состояния прибора АФСП'], + ['Адрес АФСП правого борта', TableEdit, TableEdit, 'http-адрес для запроса состояния прибора АФСП'], + ['Адрес БПО левого борта', TableEdit, TableEdit, 'http-адрес для запроса состояния прибора БПО'], + ['Адрес БПО правого борта', TableEdit, TableEdit, 'http-адрес для запроса состояния прибора БПО'] ] + const EXTERNAL_CU = 16 ## Внешнее целееуказание const SUPPRESS = 17 ## Строка - Подавление const KEYBOARD = 18 ## Строка - Виртуальная клавиатура