From ff73887eb7eee75df722b199d78fe666befb3616 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Tue, 29 Oct 2024 11:05:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=9F=D1=80=D0=BE=D0=B4=D0=BE=D0=BB=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=AD=D0=9C=D0=A1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/эмс/эмс.gd | 7 ++++++- scripts/network.gd | 4 ++-- scripts/settings.gd | 4 ++-- scripts/tcp5p28.gd | 9 +++++---- scripts/yau07.gd | 3 ++- scripts/yems-boards.gd | 40 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 57 insertions(+), 10 deletions(-) diff --git a/scenes/эмс/эмс.gd b/scenes/эмс/эмс.gd index ece1cdbe..b2a7bc45 100644 --- a/scenes/эмс/эмс.gd +++ b/scenes/эмс/эмс.gd @@ -373,5 +373,10 @@ func on_row_pressed(i_row: int, tbl): func on_data_ems_received(unit): - print_debug(unit.status) + for board in g_boards.values(): + board.set_status(unit.status) + for i_row in range($scrollin/tbl_in.get_rows_count()): + var state_pic = ($tbl_input.get_node2(4, i_row)).get_sprite() + var dev = $tbl_input.get_node_user_data(4, i_row)[0] + print_debug(dev) diff --git a/scripts/network.gd b/scripts/network.gd index a5143aee..ca2ac0e2 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -152,10 +152,10 @@ func poll_receive(sock: Socket, tick: int) -> bool: var port: = sock.get_packet_port() var addr_port: = [addr, port] if addr_port in units: - units[addr_port].parse(data, tick) + units[addr_port].parse(data) return false if port in unit_keys: - units[unit_keys[port]].parse(data, tick) + units[unit_keys[port]].parse(data) return false diff --git a/scripts/settings.gd b/scripts/settings.gd index 3fc72773..f92c6d5b 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -6,9 +6,9 @@ class_name rep_settings extends Node @export var UnitProfiles: = { \ # Название | Протокол | Адрес | Порт | Широковещательное | Привязывать к адресу | Комментарий 'уарэп-яу07-частный': ['yau07rx', '10.1.1.2', [50002], false, true, 'IP-адрес на котором принимают частные сообщения от ЯУ-07'], - 'уарэп-яу07-общий': ['yau07rx', '10.1.1.255', [50000], true, true, 'IP-адрес на котором принимают широковещательные сообщения от ЯУ-07'], + 'уарэп-яу07-общий': ['yau07rx', '*', [50000], true, true, 'IP-адрес на котором принимают широковещательные сообщения от ЯУ-07'], 'уарэп-капсрпб': ['json-capsrpb', '127.0.0.1', [42023, 42022], false, true, 'IP-адрес на котором принимают сообщения от КАПС РПБ'], - 'уарэп-эмс': ['yau07tx', '10.1.1.52', [50027], false, false, 'IP-адрес ЯУ-07 прибора УФ'], + 'уарэп-эмс': ['yau07tx', '10.1.1.52', [50052], false, false, 'IP-адрес ЯУ-07 прибора УФ'], 'уарэп-яу07-2в': ['yau07tx', '10.1.1.34', [50034], false, false, 'IP-адрес ЯУ-07 прибора ПРД-В'], 'уарэп-яу07-2н': ['yau07tx', '10.1.1.33', [50033], false, false, 'IP-адрес ЯУ-07 прибора ПРД-Н'], 'уарэп-яу07-2к': ['yau07tx', '10.1.1.35', [50035], false, false, 'IP-адрес ЯУ-07 прибора ПРД-К'], diff --git a/scripts/tcp5p28.gd b/scripts/tcp5p28.gd index 9da29d39..a7b8fb63 100644 --- a/scripts/tcp5p28.gd +++ b/scripts/tcp5p28.gd @@ -49,8 +49,8 @@ class TCP5P28 extends unit.Unit: func _to_string() -> String: return String('капсрпб: "%s" %s ' % [self.name, ['отключен', 'на связи'][int(online)]]) - func parse(data: PackedByteArray, now_tick: int): - rx_tick = now_tick + func parse(data: PackedByteArray): + rx_tick = tick if not online: online = true emit_signal('line_changed', self) @@ -65,8 +65,9 @@ class TCP5P28 extends unit.Unit: if cmd_type == CMD_TYPE_IN and external_cu: set_interfer(data) - func process(now_tick: int): - if online and ((now_tick - rx_tick) > ONLINE_TIMEOUT): + func process(delta: int): + tick += delta + if online and ((tick - rx_tick) > ONLINE_TIMEOUT): online = false emit_signal('line_changed', self) if len(tx_stack): diff --git a/scripts/yau07.gd b/scripts/yau07.gd index 470fbfe3..99cc1f99 100644 --- a/scripts/yau07.gd +++ b/scripts/yau07.gd @@ -208,7 +208,8 @@ class YaU07 extends unit.Unit: if byte_i < len_rx_data: status[i] = rx_data[byte_i] # Массив байтовый "состояние прибора" i += 1 - + emit_signal('data_received', self) + if rx_data_len == (status_len + 6): return true # Нет поля "ответ на команду", разбор пакета завершить diff --git a/scripts/yems-boards.gd b/scripts/yems-boards.gd index 5d585ac2..d67f29af 100644 --- a/scripts/yems-boards.gd +++ b/scripts/yems-boards.gd @@ -7,9 +7,49 @@ class EmsBoard: var base_addr_isa: int ## Базовый адрес ячейки isa. var in_tbl: Array var out_tbl: Array + var online: bool + var ems_load: bool func _init(id, base_addr, in_table, out_table): id_board = id in_tbl = in_table out_tbl = out_table base_addr_isa = base_addr + + func set_status(status): + var offset = 0 + if id_board == 1: offset = 26 + elif id_board == 2: offset = 52 + var bit_online = 0 + id_board + var bit_load = 3 + id_board + online = (status[0] >> bit_online) & 1 + ems_load = (status[0] >> bit_load) & 1 + var in_blank = int(status[1 + offset] | (status[2 + offset] << 8) | (status[3 + offset] << 16) | \ + (status[4 + offset] << 24) | (status[5 + offset] << 32)) + var in_imp = int(status[7 + offset] | (status[8 + offset] << 8) | (status[9 + offset] << 16) | \ + (status[10 + offset] << 24) | (status[11 + offset] << 32)) + var out_blank = int(status[13 + offset] | (status[14 + offset] << 8) | (status[15 + offset] << 16) | \ + (status[16 + offset] << 24) | (status[17 + offset] << 32)) + var out_imp = int(status[19 + offset] | (status[20 + offset] << 8) | (status[21 + offset] << 16)| \ + (status[22 + offset] << 24) | (status[23 + offset] << 32)) + var out_kz = int(status[25 + offset] | (status[26 + offset] << 8)) + if id_board > 0: + out_kz = 0 + + for in_dev in in_devs.values(): + if (in_blank >> (in_dev.id - 1)) & 1: + in_dev.state = 1 + elif (in_imp >> (in_dev.id - 1)) & 1: + in_dev.state = 2 + else: + in_dev.state = 0 + + for out_dev in out_devs.values(): + if (out_kz >> (out_dev.id - 1)) & 1: + out_dev.state = 3 + elif (out_blank >> (out_dev.id - 1)) & 1: + out_dev.state = 1 + elif (out_imp >> (out_dev.id - 1)) & 1: + out_dev.state = 2 + else: + out_dev.state = 0