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

Merge remote-tracking branch 'sasha/master'

Browse Source
This commit is contained in:
MaD_CaT
2024-11-12 15:53:09 +03:00
parent d9bb79e261 4d709ed934
commit f1c2433b91
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/network.gd
View File

@@ -95,14 +95,22 @@ func create_serial(nm) -> Serial:
return sp return sp
func _ready() -> void: func init_sockets():
log.info('Модуль работы с сетью готов')
poll_sockets.append(create_socket('уарэп-яу07-частный')) poll_sockets.append(create_socket('уарэп-яу07-частный'))
poll_sockets.append(create_socket('уарэп-яу07-общий')) poll_sockets.append(create_socket('уарэп-яу07-общий'))
poll_sockets.append(create_socket('уарэп-капсрпб')) poll_sockets.append(create_socket('уарэп-капсрпб'))
poll_sockets.append(create_socket('уарэп-щ3')) poll_sockets.append(create_socket('уарэп-щ3'))
sock_unicast = poll_sockets[0] sock_unicast = poll_sockets[0]
sock_capsrpb = poll_sockets[2] sock_capsrpb = poll_sockets[2]
log.info('Модуль работы с сетью готов')
func _ready() -> void:
var tmr_wsa = Timer.new()
add_child(tmr_wsa)
tmr_wsa.one_shot = true
tmr_wsa.connect('timeout', init_sockets)
tmr_wsa.start(5.0)
for unit_name in settings.UnitProfiles: for unit_name in settings.UnitProfiles:
var st = settings.UnitProfiles[unit_name] var st = settings.UnitProfiles[unit_name]
@@ -215,8 +223,11 @@ func _process(_delta: float) -> void:
for addr in units_udp: for addr in units_udp:
var unit = units[addr] var unit = units[addr]
match unit.process(tick): match unit.process(tick):
Error.OK: sock_unicast.send_to([addr[0], dst_ports[addr]], unit.tx_data.slice(0, unit.tx_len)) Error.OK:
Error.FAILED: emit_signal('socket_error', 'ошибка: %s %s:%d' % [unit, addr[0], addr[1]]) if sock_unicast:
sock_unicast.send_to([addr[0], dst_ports[addr]], unit.tx_data.slice(0, unit.tx_len))
Error.FAILED:
emit_signal('socket_error', 'ошибка: %s %s:%d' % [unit, addr[0], addr[1]])
for key in units_serial: for key in units_serial:
var unit = units_serial[key] var unit = units_serial[key]
var serial = serials[key] var serial = serials[key]