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

Рефакторинг. Табуляцию в пробелы

Browse Source
This commit is contained in:
sasha80
2023-08-10 15:37:14 +03:00
parent 58b98be426
commit 628ed9e8d9
6 changed files with 112 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
scripts/repnetwork.gd
View File

@@ -15,46 +15,46 @@ var logger_page: Node
func create_socket(nm) -> Socket:
var addr = REPSettings.UnitProfiles[nm][1]
var port = REPSettings.UnitProfiles[nm][2]
var broad = REPSettings.UnitProfiles[nm][3]
var bind = REPSettings.UnitProfiles[nm][4]
var sock: = Socket.new()
sock.set_broadcast_enabled(broad)
var rc = Error.OK if not bind else sock.bind(port, addr)
var errlevel = Log.INFO if rc == Error.OK else Log.ERROR
Log.message(errlevel, '%s: сокет:%s:%d привязанный:%s %s' % [nm, addr, port, ['нет', 'да'][int(bind)], error_string(rc)])
return sock
var addr = REPSettings.UnitProfiles[nm][1]
var port = REPSettings.UnitProfiles[nm][2]
var broad = REPSettings.UnitProfiles[nm][3]
var bind = REPSettings.UnitProfiles[nm][4]
var sock: = Socket.new()
sock.set_broadcast_enabled(broad)
var rc = Error.OK if not bind else sock.bind(port, addr)
var errlevel = Log.INFO if rc == Error.OK else Log.ERROR
Log.message(errlevel, '%s: сокет:%s:%d привязанный:%s %s' % [nm, addr, port, ['нет', 'да'][int(bind)], error_string(rc)])
return sock
func _ready() -> void:
Log.info('Сетевой модуль готов')
Log.info('Сетевой модуль готов')
poll_sockets.append(create_socket('уарэп-яу07-частный'))
poll_sockets.append(create_socket('уарэп-яу07-общий'))
poll_sockets.append(create_socket('уарэп-капсрпб-пол'))
poll_sockets.append(create_socket('уарэп-яу07-общий'))
poll_sockets.append(create_socket('уарэп-капсрпб-пол'))
sock_unicast = poll_sockets[0]
for unit_name in REPSettings.UnitProfiles:
var setting = REPSettings.UnitProfiles[unit_name]
var proto = setting[0]
if proto in PROTOCOL_TYPES:
var unit = PROTOCOL_TYPES[proto].new(unit_name)
var unit_key = REPSettings.get_unit_key(unit_name)
units[unit_key] = unit
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))
var setting = REPSettings.UnitProfiles[unit_name]
var proto = setting[0]
if proto in PROTOCOL_TYPES:
var unit = PROTOCOL_TYPES[proto].new(unit_name)
var unit_key = REPSettings.get_unit_key(unit_name)
units[unit_key] = unit
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))
for key in units: Log.info('%s %s:%d' % [units[key].name, key[0], key[1]])
func poll_receive(sock: Socket) -> bool:
while sock.get_available_packet_count() > 0:
var data: = sock.get_packet()
var addr: = sock.get_packet_ip()
var port: = sock.get_packet_port()
var addr_port: = [addr, port]
if addr_port in units: units[addr_port].parse(data)
while sock.get_available_packet_count() > 0:
var data: = sock.get_packet()
var addr: = sock.get_packet_ip()
var port: = sock.get_packet_port()
var addr_port: = [addr, port]
if addr_port in units: units[addr_port].parse(data)
return false

12
scripts/threats.gd
View File

@@ -27,10 +27,10 @@ class Threat:
var width: float ## Ширина занимаемого диапазона частот, МГц.
var id: int ## Идентификатор цели.
func _init(): Tools.get_members_names(self).any(func(vn): fflags[vn] = false)
func _init(): Tools.get_members_names(self).any(func(vn): fflags[vn] = false)
func _to_string() -> String: return 'номер:%d пеленг:%0.1f частота:%0.1f МГц' % [id, aoa, freq]
func set_from_dic(dic_vals: Dictionary):
func set_from_dic(dic_vals: Dictionary):
var items: = fflags.keys().filter(func(vn): return vn in dic_vals)
items.any(func(vn): set(vn, dic_vals[vn]); fflags[vn] = true; return false)
@@ -43,12 +43,12 @@ var threats = {} ## Список целей. Индекс - <источник
func _ready() -> void:
Log.info('Модуль обработки целей готов')
#var unit_key = REPSettings.get_unit_key('уарэп-капсрпб-отп')
Log.info('Модуль обработки целей готов')
var unit_key = REPSettings.get_unit_key('уарэп-капсрпб-отп')
var unit = REPNetwork.units[unit_key]
var timer_check_lost: = Timer.new()
add_child(timer_check_lost)
#unit.connect('data_received', Callable(self, 'on_data_capsrpb_received'))
#unit.connect('data_received', Callable(self, 'on_data_capsrpb_received'))
timer_check_lost.connect('timeout', Callable(self, 'on_timer_check_lost').bind(unit, REPSettings.ThreatParams.time_lost[0]))
timer_check_lost.start(REPSettings.ThreatParams.time_lost[0] / 2.0)
@@ -63,7 +63,7 @@ func on_timer_check_lost(unit, time_lost: int):
## Приём целей
func on_data_capsrpb_received(unit: capsrpb.CapsRpb):
if 'mis' not in unit.json_dic:
if 'mis' not in unit.json_dic:
return
var mis = unit.json_dic['mis']
for dic_th in mis:

12
scripts/yems_devs.gd
View File

@@ -11,10 +11,10 @@ class InDev:
var freq: int # Предполагаемая частота на которой работает комплекс
var ports_data: Dictionary # Словарь состояния портов устройства
var tbl_row_id: int # Индекс устройства в таблице выходов
var out_dots: Array # Список выходных устройств в порядке, как в таблице и точки матрицы
var out_dots: Array # Список выходных устройств в порядке, как в таблице и точки матрицы
var connect_devs: Dictionary # Список присоединённых устройств
var board: String # Плата в которой находится устройство
func _init(dev_id : int, params : Array, row_id : int):
id = dev_id
dev_name = String(params[0])
@@ -22,16 +22,16 @@ class InDev:
delay = float(params[2])
offset = float(params[3])
tbl_row_id = row_id
class OutDev extends InDev:
var mode: String # Режим работы выхода
func _init(dev_id : int, params : Array, row_id : int):
id = dev_id
dev_name = String(params[0])
connector = String(params[1])
delay = float(params[2])
offset = float(params[3])
tbl_row_id = row_id
tbl_row_id = row_id
mode = 'Работа'

4
scripts/yemsboards.gd
View File

@@ -7,8 +7,8 @@ class EmsBoard:
var base_addr_isa: int # Базовый адрес ячейки isa
var in_tbl: Array
var out_tbl: Array
func _init(id, base_addr, in_table, out_table):
func _init(id, base_addr, in_table, out_table):
id_board = id
in_tbl = in_table
out_tbl = out_table