diff --git a/scenes/настройки/настройки.tscn b/scenes/настройки/настройки.tscn index 98a1d8b..697af11 100644 --- a/scenes/настройки/настройки.tscn +++ b/scenes/настройки/настройки.tscn @@ -20,9 +20,9 @@ script = ExtResource("1_2l3rd") [node name="edt_mapaddr" type="LineEdit" parent="."] layout_mode = 0 offset_left = 410.0 -offset_top = 612.0 +offset_top = 637.0 offset_right = 778.0 -offset_bottom = 639.0 +offset_bottom = 664.0 theme_override_colors/font_color = Color(1, 0.596078, 0.4, 1) script = SubResource("GDScript_anjmx") @@ -38,9 +38,9 @@ vertical_alignment = 1 [node name="lbl_commit" type="Label" parent="."] layout_mode = 0 offset_left = 410.0 -offset_top = 582.0 +offset_top = 607.0 offset_right = 778.0 -offset_bottom = 607.0 +offset_bottom = 632.0 theme_override_colors/font_color = Color(1, 0.596078, 0.4, 1) vertical_alignment = 1 diff --git a/scripts/network.gd b/scripts/network.gd index 2053be9..f42c7d1 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -113,13 +113,12 @@ func create_serial(nm) -> Serial: func create_modbus(nm, mbc_unit) -> Modbus: var port = settings.UnitProfiles[nm][1] - var baud = settings.UnitProfiles[nm][2] - var params = settings.UnitProfiles[nm][3] + 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) - var _rc = mbc.open(port, params[0], baud[0], params[1], params[2], params[3]) + var _rc = mbc.open(port, params[1], params[0], params[2], params[3], params[4]) mbc.thread_run() return mbc diff --git a/scripts/settings.gd b/scripts/settings.gd index b2ea650..b53439f 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -30,7 +30,7 @@ var settings_program: Dictionary 'уарэп-5п28': [ '5p28', '192.168.3.109', [50000], 'IP-адрес комплекса 5П-28'], # Название: [ Протокол, Адрес, Скорость, ??, ??, Комментарий - 'уарэп-щ3': ['mbcs', '/home/sasha/dev/tty1', [19200], [3, 'N', 8, 1], 'Параметры клиента Modbus Serial'], + 'уарэп-щ3': ['mbcs', '/home/sasha/dev/tty1', [19200, 7, 'N', 8, 1], 'Параметры клиента Modbus Serial'], # Название: [ Протокол, Имя порта, Скорость, Чётность, ??, Комментарий 'уарэп-спт25-1': ['uart', '/home/sasha/dev/tty0', [19200, false, false], 'Адрес прибора СПТ-25 (G1)'],