From b39d5654fb585af60974c34f2bc4327a8f498044 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Thu, 31 Oct 2024 08:48:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.godot | 4 ++-- scenes/pribor-uyep/spt25-view.gd | 8 +++---- scenes/tabs-switch/tab-switch.gd | 2 +- scenes/эмс/эмс.gd | 4 ++-- scripts/interfer.gd | 8 +++---- scripts/network.gd | 38 ++++++++++++++++---------------- scripts/sch3.gd | 4 ++-- scripts/threats.gd | 12 +++++----- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/project.godot b/project.godot index 1abc6296..b5a1a24f 100644 --- a/project.godot +++ b/project.godot @@ -48,8 +48,8 @@ log="*res://addons/godot-logger/scripts/logger.gd" unit="*res://scripts/unit.gd" tools="*res://scripts/tools.gd" signaller="*res://scripts/signaller.gd" -repsettings="*res://scripts/settings.gd" -repnetwork="*res://scripts/network.gd" +settings="*res://scripts/settings.gd" +network="*res://scripts/network.gd" yau07="*res://scripts/yau07.gd" capsrpb="*res://scripts/capsrpb.gd" table="*res://table/table.gd" diff --git a/scenes/pribor-uyep/spt25-view.gd b/scenes/pribor-uyep/spt25-view.gd index f4730ea4..052493bc 100644 --- a/scenes/pribor-uyep/spt25-view.gd +++ b/scenes/pribor-uyep/spt25-view.gd @@ -12,8 +12,8 @@ enum STATE_VAL { func _enter_tree() -> void: if Engine.is_editor_hint(): return - var unit_key = repsettings.get_unit_key(unit_name) - var unit = repnetwork.units[unit_key] + var unit_key = settings.get_unit_key(unit_name) + var unit = network.units[unit_key] unit.connect('data_received', on_data_received) unit.connect('line_changed', on_line_changed) @@ -34,8 +34,8 @@ func on_line_changed(unit): func _exit_tree() -> void: if Engine.is_editor_hint(): return - var unit_key = repsettings.get_unit_key(unit_name) - var unit = repnetwork.units[unit_key] + var unit_key = settings.get_unit_key(unit_name) + var unit = network.units[unit_key] unit.disconnect('data_received', on_data_received) diff --git a/scenes/tabs-switch/tab-switch.gd b/scenes/tabs-switch/tab-switch.gd index 31a8f966..864fecc2 100644 --- a/scenes/tabs-switch/tab-switch.gd +++ b/scenes/tabs-switch/tab-switch.gd @@ -4,7 +4,7 @@ const TAB_TOSIGNAL_NAME = {0: 'режим_работа', 1: 'режим_конт func _enter_tree() -> void: - repnetwork.logger_page = $Журнал + network.logger_page = $Журнал func _on_tab_changed(tab) -> void: diff --git a/scenes/эмс/эмс.gd b/scenes/эмс/эмс.gd index c78d884e..eed94aac 100644 --- a/scenes/эмс/эмс.gd +++ b/scenes/эмс/эмс.gd @@ -53,8 +53,8 @@ func init_boards(): init_tbl_files() $scrl_files/tbl_files.pin_header($scrl_files, self) - var unit_key = repsettings.get_unit_key('уарэп-эмс') - var unit = repnetwork.units[unit_key] + var unit_key = settings.get_unit_key('уарэп-эмс') + var unit = network.units[unit_key] unit.connect('data_received', Callable(self, 'on_data_ems_received')) $btn_connect.connect('pressed', Callable(self, 'on_btn_connect')) $btn_disconnect.connect('pressed', Callable(self, 'on_btn_disconnect')) diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 834d47ce..93c69832 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -97,10 +97,10 @@ func _ready(): var ecms: Dictionary = {} ## Словарь помех. for i in range(ID_INTERFERS_LEN): # Заполняет массив ID целей id_array.append(i + 1) - var unit_key = repsettings.get_unit_key('уарэп-капсрпб') - var unit = repnetwork.units[unit_key] - var unit_5p28_key = repsettings.get_unit_key('уарэп-5п28') - var unit_5p28 = repnetwork.units_tcp[unit_5p28_key] + var unit_key = settings.get_unit_key('уарэп-капсрпб') + var unit = network.units[unit_key] + var unit_5p28_key = settings.get_unit_key('уарэп-5п28') + var unit_5p28 = network.units_tcp[unit_5p28_key] var timer_check_state: = Timer.new() add_child(timer_check_state) var resend_timeout = ProjectSettings.get_setting('application/interfer/resend_timeout', 1000.0) diff --git a/scripts/network.gd b/scripts/network.gd index 22eff7d4..1179492e 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -63,10 +63,10 @@ func on_serial_data(data, unit): unit.parse(data, tick) func create_socket(nm) -> Socket: - var addr = repsettings.UnitProfiles[nm][1] - var port = repsettings.UnitProfiles[nm][2][0] - var broad = repsettings.UnitProfiles[nm][3] - var bind = repsettings.UnitProfiles[nm][4] + var addr = settings.UnitProfiles[nm][1] + var port = settings.UnitProfiles[nm][2][0] + var broad = settings.UnitProfiles[nm][3] + var bind = settings.UnitProfiles[nm][4] var sock: = Socket.new() sock.set_broadcast_enabled(broad) var rc = Error.OK if not bind else sock.bind(port, addr) @@ -76,18 +76,18 @@ func create_socket(nm) -> Socket: func create_tcpsocket(nm) -> SocketTCP: - var addr = repsettings.UnitProfiles[nm][1] - var port = repsettings.UnitProfiles[nm][2][0] + var addr = settings.UnitProfiles[nm][1] + var port = settings.UnitProfiles[nm][2][0] var sock = SocketTCP.new() - sock.unit_key = repsettings.get_unit_key(nm) + sock.unit_key = settings.get_unit_key(nm) sock.listen(port, addr) log.message(log.INFO, '%s: сокет:%s:%d привязанный:' % [nm, addr, port]) return sock func create_serial(nm) -> Serial: - var port = repsettings.UnitProfiles[nm][1] - var baud = repsettings.UnitProfiles[nm][2][0] + var port = settings.UnitProfiles[nm][1] + var baud = settings.UnitProfiles[nm][2][0] var sp: = Serial.new() sp.port = port sp.baudrate = baud @@ -104,25 +104,25 @@ func _ready() -> void: sock_unicast = poll_sockets[0] sock_capsrpb = poll_sockets[2] - for unit_name in repsettings.UnitProfiles: - var settings = repsettings.UnitProfiles[unit_name] - var proto = settings[0] + for unit_name in settings.UnitProfiles: + var st = settings.UnitProfiles[unit_name] + var proto = st[0] if proto in PROTOCOL_TYPES: var unit = PROTOCOL_TYPES[proto].new(unit_name) - var unit_key = repsettings.get_unit_key(unit_name) + var unit_key = settings.get_unit_key(unit_name) units[unit_key] = unit units_udp[unit_key] = unit if logger_page: unit.connect('line_changed', Callable(logger_page, 'on_line_changed').bind(unit_key)) unit.connect('command_fail', Callable(logger_page, 'on_command_fail').bind(unit_key)) - if len(settings[2]) > 1: - dst_ports[unit_key] = settings[2][1] + if len(st[2]) > 1: + dst_ports[unit_key] = st[2][1] else: - dst_ports[unit_key] = settings[2][0] + dst_ports[unit_key] = st[2][0] if proto in TCP_PROTO: var unit = TCP_PROTO[proto].new(unit_name) - var unit_key = repsettings.get_unit_key(unit_name) + var unit_key = settings.get_unit_key(unit_name) units_tcp[unit_key] = unit if logger_page: unit.connect('line_changed', Callable(logger_page, 'on_line_changed').bind(unit_key)) @@ -130,7 +130,7 @@ func _ready() -> void: if proto in SERIAL_PROTO: var unit = SERIAL_PROTO[proto].new(unit_name) - var unit_key = repsettings.get_unit_key(unit_name) + var unit_key = settings.get_unit_key(unit_name) if logger_page: unit.connect('line_changed', Callable(logger_page, 'on_line_changed').bind(unit_key)) unit.connect('command_fail', Callable(logger_page, 'on_command_fail').bind(unit_key)) @@ -144,7 +144,7 @@ func _ready() -> void: else: log.message(log.INFO, '%s для \"%s\"' % [serial, unit_name]) - tcp_sockets.append([create_tcpsocket('уарэп-5п28'), units_tcp[repsettings.get_unit_key('уарэп-5п28')]]) + tcp_sockets.append([create_tcpsocket('уарэп-5п28'), units_tcp[settings.get_unit_key('уарэп-5п28')]]) for key in units: log.info('%s %s:%d' % [units[key].name, key[0], key[1]]) for key in units_tcp: log.info('%s %s:%d' % [units_tcp[key].name, key[0], key[1]]) diff --git a/scripts/sch3.gd b/scripts/sch3.gd index 425e5e3c..55469832 100644 --- a/scripts/sch3.gd +++ b/scripts/sch3.gd @@ -4,8 +4,8 @@ var cnt: int = 0 var rw: bool = true func _ready(): - var unit_key = repsettings.get_unit_key('уарэп-щ3') - var unit = repnetwork.units[unit_key] + var unit_key = settings.get_unit_key('уарэп-щ3') + var unit = network.units[unit_key] var timer = Timer.new() add_child(timer) unit.connect('command_fail', Callable(self, 'on_command_fail')) diff --git a/scripts/threats.gd b/scripts/threats.gd index 6ee893f2..65884c1e 100644 --- a/scripts/threats.gd +++ b/scripts/threats.gd @@ -46,18 +46,18 @@ signal threats_resized(th: Dictionary) func _ready() -> void: log.info('Модуль обработки целей готов') var threats = {} ## Список целей. Индекс - <номер цели> - var unit_key = repsettings.get_unit_key('уарэп-капсрпб') - var unit = repnetwork.units[unit_key] - var unit_5p28_key = repsettings.get_unit_key('уарэп-5п28') - var unit_5p28 = repnetwork.units_tcp[unit_5p28_key] + var unit_key = settings.get_unit_key('уарэп-капсрпб') + var unit = network.units[unit_key] + var unit_5p28_key = settings.get_unit_key('уарэп-5п28') + var unit_5p28 = network.units_tcp[unit_5p28_key] var timer_check_lost: = Timer.new() var timer_aoa_update: = Timer.new() add_child(timer_check_lost) add_child(timer_aoa_update) unit.connect('data_received', Callable(self, 'on_data_capsrpb_received').bind(threats)) unit_5p28.connect('get_threats', Callable(self, 'on_get_threats').bind(unit_5p28, threats)) - timer_check_lost.connect('timeout', Callable(self, 'on_timer_check_lost').bind(repsettings.ThreatParams.time_lost, threats)) - timer_check_lost.start(repsettings.ThreatParams.time_lost / 1000.0) + timer_check_lost.connect('timeout', Callable(self, 'on_timer_check_lost').bind(settings.ThreatParams.time_lost, threats)) + timer_check_lost.start(settings.ThreatParams.time_lost / 1000.0) timer_aoa_update.connect('timeout', Callable(self, 'on_timer_aoa_update').bind(threats)) timer_aoa_update.start(0.25) signaller.connect('rto_threat_sel', Callable(self, 'on_rto_threat_sel').bind(threats))