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

Merge remote-tracking branch 'MaD_CaT/master'

Browse Source 
# Conflicts:
#	project.godot
This commit is contained in:
sasha80
2025-08-27 13:47:11 +03:00
parent 50230beace fa0a2f4b24
commit 0c9ca5e10d
7 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scenes/эмс/yems-boards.gd
View File

@@ -297,15 +297,17 @@ class EmsBoard:
if not check_dev_number(): continue
if ports.has('%d'%(base_addr_isa + 4)):
cur_dev.ports_data[base_addr_isa + 4] = int(ports['%d'%(base_addr_isa + 4)])
else: continue
else: return false
if ports.has('%d'%(base_addr_isa + 6)):
cur_dev.ports_data[base_addr_isa + 6] = int(ports['%d'%(base_addr_isa + 6)])
else: continue
cur_dev.ports_data[base_addr_isa + 6] = int(ports['%d'%(base_addr_isa + 6)])
else: return false
if ports.has('%d'%(base_addr_isa + 8)):
cur_dev.ports_data[base_addr_isa + 8] = int(ports['%d'%(base_addr_isa + 8)])
else: continue
cur_dev.ports_data[base_addr_isa + 8] = int(ports['%d'%(base_addr_isa + 8)])
else: return false
if ports.has('%d'%(base_addr_isa + 10)):
cur_dev.ports_data[base_addr_isa + 10] = int(ports['%d'%(base_addr_isa + 10)])
cur_dev.ports_data[base_addr_isa + 10] = int(ports['%d'%(base_addr_isa + 10)])
else: return false
return true
func set_load_done():
state_board = LOADING

9
scenes/эмс/эмс.gd
View File

@@ -654,6 +654,9 @@ func _on_btn_load_pressed() -> void:
if not json_data.has(str(board.id_board)):
return
var data = json_data[str(board.id_board)]
board.btn_load(data)
board.need_write = true
log.message(log.INFO, 'Произведено чтение настроек ЭМС из файла: %s' %fl_name)
var read_ok = board.btn_load(data)
if read_ok:
board.need_write = true
log.message(log.INFO, 'Произведено чтение настроек ЭМС из файла: %s, для платы %s' %[fl_name, board.id_board])
else:
log.message(log.ERROR, 'Ошибка чтение настроек ЭМС из файла: %s' %fl_name)