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

Исправление. Сообщения для ЯУ-07 отправляются из неправильной подсети

Browse Source
This commit is contained in:
sasha80
2025-02-12 13:20:29 +03:00
parent c54c9820db
commit 7676966c9c
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/network.gd
View File

@@ -82,6 +82,7 @@ var unit_keys: Dictionary
var sock_unicast: Socket
var sock_capsrpb: Socket
var logger_page: Node
var send_sockets: Dictionary # Таблица <имяустройста>: <сокет> для отправки сообщений
func on_serial_data(data, unit): unit.parse(data, tick)
@@ -140,6 +141,23 @@ func _ready() -> void:
sock_unicast = poll_sockets[0]
sock_capsrpb = poll_sockets[2]
send_sockets['уарэп-яу07-частный'] = sock_unicast
send_sockets['уарэп-яу07-общий'] = poll_sockets[1]
send_sockets['уарэп-капсрпб'] = sock_capsrpb
send_sockets['уарэп-эмс'] = sock_unicast
send_sockets['уарэп-яу07-2в'] = sock_unicast
send_sockets['уарэп-яу07-2н'] = sock_unicast
send_sockets['уарэп-яу07-2к'] = sock_unicast
send_sockets['уарэп-яу07-4в'] = sock_unicast
send_sockets['уарэп-яу07-4н'] = sock_unicast
send_sockets['уарэп-яу07-4к'] = sock_unicast
send_sockets['уарэп-яу07-1в'] = sock_unicast
send_sockets['уарэп-яу07-1н'] = sock_unicast
send_sockets['уарэп-яу07-1к'] = sock_unicast
send_sockets['уарэп-яу07-3в'] = sock_unicast
send_sockets['уарэп-яу07-3н'] = sock_unicast
send_sockets['уарэп-яу07-3к'] = sock_unicast
for unit_name in settings.UnitProfiles:
var st = settings.UnitProfiles[unit_name]
var proto = st[0]
@@ -266,8 +284,11 @@ func _process(_delta: float) -> void:
for addr in units_udp:
var unit = units[addr]
match unit.process(tick):
Error.OK: sock_unicast.send_to([addr[0], dst_ports[addr]], unit.tx_data.slice(0, unit.tx_len))
Error.FAILED: emit_signal('socket_error', [unit, sock_unicast])
Error.OK:
var sock = send_sockets[unit.name]
sock.send_to([addr[0], dst_ports[addr]], unit.tx_data.slice(0, unit.tx_len))
Error.FAILED:
emit_signal('socket_error', [unit, sock_unicast])
for key in units_serial:
var unit_serial = units_serial[key]
var serial = serials[key]