velelepie/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-prd

Browse Source 
# Conflicts:
#	scenes/pribor-prd-k/pribor-prd-k.gd
This commit is contained in:
Maxim
2025-08-01 01:30:25 +03:00
parent 58070353bb 61ac2ce9d1
commit 03880bc923
39 changed files with 149 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scenes/pribor-prd-v/pribor-prd-v.gd
View File

@@ -50,8 +50,8 @@ func _ready() -> 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 unit_name = get_meta('unit_name')[0]
var unit_prd = network.get_unit_instance(unit_name)
currecnt_unit = unit_prd.name
unit_prd.connect('data_received', Callable(self, 'on_data_received'))
unit_prd.connect('line_changed', Callable(self, 'on_line_changed'))
@@ -74,10 +74,9 @@ func _enter_tree() -> void:
func _exit_tree() -> 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)
var prd_module = prd.prd_dict[unit_prd.name]
prd_module.cmd_array.append([unit_prd.CmdCode.WRITE_ISA, [Constants.ADDR_UG_LITERA_1, ug_work_1, Constants.ADDR_UG_LITERA_2, ug_work_2]])
@@ -329,8 +328,8 @@ 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.units[unit_name]
if unit_prd.isa_ports.has(Constants.ADDR_UG_LITERA_1):
ug_work_1 = unit_prd.isa_ports[Constants.ADDR_UG_LITERA_1]