From f121000299ce438f7dae8e7dd1f789f3afe74b35 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 19 Mar 2025 09:31:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/настройки/настройки.gd | 3 +-- scripts/network.gd | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index 6d64921a..482c1a38 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -193,8 +193,7 @@ func _on_btn_save_settings_pressed(): json_data[parameter].append(child.is_pressed()) var file = FileAccess.open(settings.settings_file, FileAccess.WRITE) if file: - var json_conv = JSON.new() - var json_string = json_conv.stringify(json_data) + var json_string = JSON.stringify(json_data) file.store_string(json_string) file.close() log.info('Настройки сохранены в файл %s' % settings.settings_file) diff --git a/scripts/network.gd b/scripts/network.gd index c23ab480..d8adc3ca 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -69,6 +69,7 @@ class Modbus extends ModbusClientRtu: push_error('%s:%s %s' % [unit_name, port, params]) return false set_response_timeout(params[5]) + set_indication_timeout(params[5]) thread_run() return true @@ -127,15 +128,12 @@ func create_serial(nm) -> Serial: func create_modbus(nm, mbc_unit) -> Modbus: - var port = settings.UnitProfiles[nm][1] - var params = settings.UnitProfiles[nm][2] var mbc: = Modbus.new() mbc.connect('read', mbc_unit.on_read) mbc.connect('read_input', mbc_unit.on_read_input) mbc.connect('write', mbc_unit.on_write) mbc.unit_name = nm mbc.try_reconnect() - mbc.set_indication_timeout(params[5]) mbc.thread_run() return mbc