diff --git a/scenes/pribor-prd-k/pribor-prd-k.gd b/scenes/pribor-prd-k/pribor-prd-k.gd index 5a49e32..74c6956 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.gd +++ b/scenes/pribor-prd-k/pribor-prd-k.gd @@ -158,6 +158,9 @@ func initialize_connections() -> void: signaller.conn(signaller.fs_update_state, Callable(self, 'on_fs_update_state')) var unit_name = get_meta('unit_name')[0] var unit_prd = network.get_unit_instance(unit_name) + var current_unit = unit_prd.name + var parts = current_unit.split('-') + pribor = parts[-1] unit_prd.connect('data_received', Callable(self, 'on_data_received')) unit_prd.connect('line_changed', Callable(self, 'on_line_changed')) diff --git a/scenes/pribor-prd-n/pribor-prd-n.gd b/scenes/pribor-prd-n/pribor-prd-n.gd index 3373e6d..46d83c5 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.gd +++ b/scenes/pribor-prd-n/pribor-prd-n.gd @@ -123,10 +123,10 @@ func on_state_mashine() -> void: func initialize_connections() -> void: signaller.conn(signaller.fs_update_state, Callable(self, 'on_fs_update_state')) - var unit_key = settings.get_unit_key(get_meta('unit_name')[0]) - var unit_prd = network.units[unit_key] - var currecnt_unit = unit_prd.name - var parts = currecnt_unit.split('-') + var unit_name = get_meta('unit_name')[0] + var unit_prd = network.get_unit_instance(unit_name) + var current_unit = unit_prd.name + var parts = current_unit.split('-') pribor = parts[-1] unit_prd.connect('data_received', Callable(self, 'on_data_received')) unit_prd.connect('line_changed', Callable(self, 'on_line_changed')) @@ -409,8 +409,9 @@ func on_fs_update_state(packet_type_7: Dictionary) -> void: func on_ug_setting() -> void: - var unit_key = settings.get_unit_key(get_meta('unit_name')[0]) - var unit_prd = network.units[unit_key] + var unit_name = get_meta('unit_name')[0] + var unit_prd = network.get_unit_instance(unit_name) + if unit_prd.isa_ports.has(Constants.ADDR_UG_LITERA_1): ug_work_2 = unit_prd.isa_ports[Constants.ADDR_UG_LITERA_1]