diff --git a/scenes/эмс/эмс.gd b/scenes/эмс/эмс.gd index f05680d..ece1cdb 100644 --- a/scenes/эмс/эмс.gd +++ b/scenes/эмс/эмс.gd @@ -31,17 +31,19 @@ func _ready() -> void: func init_boards(): # Выставление позиций элементов ЭМС на экране $scrollin.set_position(Vector2(posx,posy)) - $scrollout.set_position(Vector2(posx+650,posy)) + $scrollout.set_position(Vector2(posx + 650,posy)) $scrl_in_set.set_position(Vector2(posx,posy + 700)) - $scrl_out_set.set_position(Vector2(posx+650,posy + 700)) - $lbl_online.set_position(Vector2(posx,posy-60)) + $scrl_out_set.set_position(Vector2(posx + 650,posy + 700)) + $lbl_online.set_position(Vector2(posx,posy - 60)) $btn_flash_read.set_position(Vector2(posx,posy + 900)) - $btn_flash_write.set_position(Vector2(posx,posy+ 935)) - $btn_connect.set_position(Vector2(posx+590,posy-25)) - $btn_disconnect.set_position(Vector2(posx+587,posy + 675)) + $btn_flash_write.set_position(Vector2(posx,posy + 935)) + $btn_connect.set_position(Vector2(posx + 590,posy - 25)) + $btn_disconnect.set_position(Vector2(posx + 587,posy + 675)) - g_boards['КЭМС'] = yemsboards.EmsBoard.new('КЭМС', 0x130, yemsconsts.INPUT_ROWS, yemsconsts.OUTPUT_ROWS) - g_boards['П5-28'] = yemsboards.EmsBoard.new('П5-28', 0x140, yemsconsts.INPUT_ROWS1, yemsconsts.OUTPUT_ROWS1) + g_boards['КЭМС-Б'] = yemsboards.EmsBoard.new(0, 0x130, yemsconsts.INPUT_KEMS, yemsconsts.OUTPUT_KEMS) + g_boards['ЭМС-Б1'] = yemsboards.EmsBoard.new(1, 0x110, yemsconsts.INPUT_EMS1, yemsconsts.OUTPUT_EMS1) + g_boards['ЭМС-Б2'] = yemsboards.EmsBoard.new(2, 0x120, yemsconsts.INPUT_EMS2, yemsconsts.OUTPUT_EMS2) + init_tbl_in() $scrollin/tbl_in.pin_header($scrollin, self) init_tbl_out() @@ -50,10 +52,15 @@ func init_boards(): $scrl_out_set/tbl_out_set.pin_header($scrl_out_set, self) 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] + 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')) $btn_flash_read.button_connect('pressed', Callable(self, 'on_btn_flash_read').bind($btn_flash_read)) $btn_flash_write.button_connect('pressed', Callable(self, 'on_btn_flash_write').bind($btn_flash_write)) + ## Обработчик нажатия кнопки disconnect. @@ -121,6 +128,7 @@ func init_tbl_in(): var params : Array = item[1] var in_dev: yemsdevs.InDev = yemsdevs.InDev.new(item[0], params, row_index) in_dev.board = board + in_dev.isa_addr = g_boards[board].base_addr_isa for i in range(len(row_type)): if i < len(params): var node = $scrollin/tbl_in.get_node2(i, row_index) @@ -203,6 +211,7 @@ func init_tbl_out(): var params : Array = item[1] var out_dev = yemsdevs.OutDev.new(item[0], params, row_index) out_dev.board = board + out_dev.isa_addr = g_boards[board].base_addr_isa for i in range(len(header_text)): var cell = $scrollout/tbl_out.get_node2(i, row_index) if i < len(params): @@ -362,3 +371,7 @@ func on_row_pressed(i_row: int, tbl): var is_row_selected = tbl.is_row_selected(i_row) tbl.set_row_selected(i_row, not is_row_selected) + +func on_data_ems_received(unit): + print_debug(unit.status) + diff --git a/scripts/repsettings.gd b/scripts/repsettings.gd index dced683..60f9f1e 100644 --- a/scripts/repsettings.gd +++ b/scripts/repsettings.gd @@ -7,7 +7,7 @@ class_name rep_settings extends Node 'уарэп-яу07-частный': ['yau07rx', '10.1.1.2', [50002], false, true, 'IP-адрес на котором принимают частные сообщения от ЯУ-07'], 'уарэп-яу07-общий': ['yau07rx', '10.1.1.255', [50000], true, true, 'IP-адрес на котором принимают широковещательные сообщения от ЯУ-07'], 'уарэп-капсрпб': ['json-capsrpb', '127.0.0.1', [42023, 42022], false, true, 'IP-адрес на котором принимают сообщения от КАПС РПБ'], - 'уарэп-эмс': ['yau07tx', '10.1.1.27', [50027], false, false, 'IP-адрес ЯУ-07 прибора УФ'], + 'уарэп-эмс': ['yau07tx', '10.1.1.52', [50027], 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/yems-boards.gd b/scripts/yems-boards.gd index 8e14f3d..5d585ac 100644 --- a/scripts/yems-boards.gd +++ b/scripts/yems-boards.gd @@ -1,15 +1,15 @@ class_name yems_boards extends Node class EmsBoard: - var id_board: String - var in_devs: Dictionary ## Словарь с входными устройствами. - var out_devs: Dictionary ## Словарь с выходными устройствами. - var base_addr_isa: int ## Базовый адрес ячейки isa. - var in_tbl: Array - var out_tbl: Array + var id_board: int ## id платы + var in_devs: Dictionary ## Словарь с входными устройствами. + var out_devs: Dictionary ## Словарь с выходными устройствами. + var base_addr_isa: int ## Базовый адрес ячейки isa. + var in_tbl: Array + var out_tbl: Array - 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 _init(id, base_addr, in_table, out_table): + id_board = id + in_tbl = in_table + out_tbl = out_table + base_addr_isa = base_addr diff --git a/scripts/yems-consts.gd b/scripts/yems-consts.gd index 0733c4d..9645ee8 100644 --- a/scripts/yems-consts.gd +++ b/scripts/yems-consts.gd @@ -1,144 +1,158 @@ class_name yerms_consts extends Node + ## Таблица с данными для входов, первое значение - индекс устройства в ячейке КЭМС. -const INPUT_ROWS1 = [ - [12,['283333 МР-231S, Строб ЭМС', 'X52', '0.00', '0.00']], - [13,['29НРЛС МР-231-3, УИЗП', 'X54', '0.00', '0.00']], - [14,['30НРЛС МР-231-3, Строб ЭМС', 'X55', '0.00', '0.00']], - [15,['31ЦИСВС-1010, УИЗП', 'X23', '0.00', '0.00']], - [21,['32НРЛС МР-231S, УИЗП', 'X21', '0.00', '0.00']], - [22,['33НРЛС МР-231S, Строб ЭМС', 'X22', '0.00', '0.00']], - [23,['34НРЛС МР-231-3, УИЗП', 'X24', '0.00', '0.00']], - [32,['352222 МР-231S, Строб ЭМС', 'X32', '0.00', '0.00']], - [33,['36НРЛС МР-231-3, УИЗП', 'X34', '0.00', '0.00']], - [34,['37НРЛС МР-231-3, Строб ЭМС', 'X35', '0.00', '0.00']], - [35,['38ЦИСВС-1010, УИЗП', 'X43', '0.00', '0.00']], - [38,['394302-01, 4302-04, УИЗП', 'X46', '0.00', '0.00']], - [31,['40НРЛС МР-231S, УИЗП', 'X51', '0.00', '0.00']]] +const INPUT_KEMS = [ + [1 ,['УИЗП №1', 'Х7', '0.00', '0.00']], + [9 ,['УИЗПФ №1','Х8', '0.00', '0.00']], + [2 ,['УИЗП №2', 'Х10', '0.00', '0.00']], + [10,['УИЗПФ №2','Х11', '0.00', '0.00']], + [3 ,['УИЗП №3', 'Х13', '0.00', '0.00']], + [11,['УИЗПФ №3','Х14', '0.00', '0.00']], + [4 ,['УИЗП №4', 'Х16', '0.00', '0.00']], + [12,['УИЗПФ №4','Х17', '0.00', '0.00']], + [5 ,['УИЗП №5', 'Х19', '0.00', '0.00']], + [13,['УИЗПФ №5','Х20', '0.00', '0.00']], + [6 ,['УИЗП №6', 'Х22', '0.00', '0.00']], + [14,['УИЗПФ №6','Х23', '0.00', '0.00']], + [7 ,['УИЗП №7', 'Х25', '0.00', '0.00']], + [15,['УИЗПФ №7','Х26', '0.00', '0.00']], + [17,['УИЗП_МП №1', 'X28 : 1', '0.00', '0.00']], + [18,['УИЗП_МП №2', 'X28 : 2', '0.00', '0.00']], + [19,['УИЗП_МП №3', 'X28 : 3', '0.00', '0.00']], + [20,['УИЗП_МП №4', 'X28 : 4', '0.00', '0.00']], + [21,['УИЗП_МП №5', 'X28 : 5', '0.00', '0.00']],] + ## Таблица с данными для выходов, первое значение - индекс устройства в ячейке КЭМС. -const OUTPUT_ROWS1 = [ - [41,['41НРЛС МР-231S, БИ', 'X61', '0.00', '0.00']], - [42,['42НРЛС МР-231S', 'X62', '0.00', '0.00']], - [43,['43НРЛС МР-231-3, БИ', 'X64', '0.00', '0.00']], - [44,['44НРЛС МР-231-3', 'X65', '0.00', '0.00']], - [45,['45ЦИСВС-1010, БИ', 'X63', '0.00', '0.00']], - [46,['464302-01, 4302-04, БИ', 'X66', '0.00', '0.00']], - [48,['47НРЛС 11111111', 'X69', '0.00', '0.00']], - [62,['48НРЛС МР-231S', 'X62', '0.00', '0.00']], - [63,['49НРЛС МР-231-3, БИ', 'X64', '0.00', '0.00']], - [64,['50НРЛС МР-231-3', 'X65', '0.00', '0.00']], - [65,['51ЦИСВС-1010, БИ', 'X63', '0.00', '0.00']], - [66,['524302-01, 4302-04, БИ', 'X66', '0.00', '0.00']], - [68,['53НРЛС 11111111', 'X69', '0.00', '0.00']]] +const OUTPUT_KEMS = [ + [47,['Бланк №1','Х6', '0.00', '0.00']], + [48,['Бланк №2','Х9', '0.00', '0.00']], + [49,['Бланк №3','Х12', '0.00', '0.00']], + [50,['Бланк №4','Х15', '0.00', '0.00']], + [51,['Бланк №5','Х18', '0.00', '0.00']], + [52,['Бланк №6','Х21', '0.00', '0.00']], + [53,['Бланк №7','Х24', '0.00', '0.00']], + [55,['Бланк_МП №1', 'X28 : 8', '0.00', '0.00']], + [56,['Бланк_МП №2', 'X28 : 9', '0.00', '0.00']], + [57,['Бланк_МП №3', 'X28 : 10', '0.00', '0.00']], + [58,['Бланк_МП №4', 'X28 : 11', '0.00', '0.00']], + [59,['Бланк_МП №5', 'X28 : 12', '0.00', '0.00']], ] + ## Таблица с данными для входов, первое значение - индекс устройства в ячейке КЭМС. -const INPUT_ROWS = [ - [1,['УИЗП №1', 'Х7', '0.00', '0.00']], - [2,['УИЗПФ №1', 'Х8', '0.00', '0.00']], - [3,['УИЗП №2', 'Х10', '0.00', '0.00']], - [4,['УИЗПФ №2', 'Х11', '0.00', '0.00']], - [5,['УИЗП №3', 'Х13', '0.00', '0.00']], - [6,['УИЗПФ №3', 'Х14', '0.00', '0.00']], - [7,['УИЗП №4', 'Х16', '0.00', '0.00']], - [8,['УИЗПФ №4', 'Х17', '0.00', '0.00']], - [9,['УИЗП №5', 'Х19', '0.00', '0.00']], - [10,['УИЗПФ №5', 'Х20', '0.00', '0.00']], - [11,['УИЗП №6', 'Х22', '0.00', '0.00']], - [12,['УИЗПФ №6','Х23', '0.00', '0.00']], - [13,['УИЗП №7','Х25', '0.00', '0.00']], - [14,['УИЗПФ №7','Х26', '0.00', '0.00']], - [15,['СИ1 Л1','X31 : 2', '0.00', '0.00']], - [16,['СИ1 Л6','X31 : 5', '0.00', '0.00']], - [17,['СИ1 Л7','X31 : 8', '0.00', '0.00']], - [18,['СИ2 Л1','X32 : 2', '0.00', '0.00']], - [19,['СИ2 Л6','X32 : 5', '0.00', '0.00']], +const INPUT_EMS1 = [ + [1 ,['БИ В Лб', 'Х49 : 37', '0.00', '0.00']], + [18,['БИ В ПрБ', 'Х49 : 31', '0.00', '0.00']], + [2 ,['БИ Г Лб', 'Х49 : 15', '0.00', '0.00']], + [19,['БИ Г ПрБ', 'Х49 : 8', '0.00', '0.00']], + [3 ,['БИ Д Лб', 'Х49 : 6', '0.00', '0.00']], + [20,['БИ Д ПрБ', 'Х49 : 10', '0.00', '0.00']], + [4 ,['БИ Е Лб', 'Х49 : 25', '0.00', '0.00']], + [21,['БИ Е ПрБ', 'Х49 : 40', '0.00', '0.00']], + [5 ,['СЗИ В Лб', 'Х49 : 42', '0.00', '0.00']], + [22,['СЗИ В ПрБ','Х49 : 44', '0.00', '0.00']], + [6 ,['СЗИ Г Лб', 'Х49 : 46', '0.00', '0.00']], + [24,['СЗИ Г ПрБ','Х49 : 32', '0.00', '0.00']], + [7 ,['СЗИ Д Лб', 'Х49 : 16', '0.00', '0.00']], + [25,['СЗИ Д ПрБ','Х49 : 47', '0.00', '0.00']], + [8 ,['СЗИ Е Лб', 'Х49 : 1', '0.00', '0.00']], + [26,['СЗИ Е ПрБ','Х49 : 50', '0.00', '0.00']], + [33,['Бланк_МП №1', 'X29 : 1', '0.00', '0.00']], + [34,['Бланк_МП №2', 'X29 : 2', '0.00', '0.00']], + [35,['Бланк_МП №3', 'X29 : 3', '0.00', '0.00']],] + + +## Таблица с данными для выходов, первое значение - индекс устройства в ячейке КЭМС. +const OUTPUT_EMS1 = [ + [1 ,['СЗИ1 Л1','X31 : 11', '0.00', '0.00']], + [18,['СЗИ1 Л6','X31 : 14', '0.00', '0.00']], + [2 ,['СЗИ1 Л7','X31 : 17', '0.00', '0.00']], + [19,['СЗИ2 Л1','X32 : 11', '0.00', '0.00']], + [3 ,['СЗИ2 Л6','X32 : 14', '0.00', '0.00']], + [20,['СЗИ2 Л7','X32 : 17', '0.00', '0.00']], + [4 ,['СЗИ3 Л1','X33 : 11', '0.00', '0.00']], + [21,['СЗИ3 Л6','X33 : 14', '0.00', '0.00']], + [5 ,['СЗИ3 Л7','X33 : 17', '0.00', '0.00']], + [22,['СЗИ4 Л1','X34 : 11', '0.00', '0.00']], + [6 ,['СЗИ4 Л6','X34 : 14', '0.00', '0.00']], + [23,['СЗИ4 Л7','X34 : 17', '0.00', '0.00']], + [7 ,['СЗИ1 Л2','X38 : 11', '0.00', '0.00']], + [24,['СЗИ1 Л3','X38 : 14', '0.00', '0.00']], + [8 ,['СЗИ2 Л2','X39 : 11', '0.00', '0.00']], + [25,['СЗИ2 Л3','X39 : 14', '0.00', '0.00']], + [9 ,['СЗИ3 Л2','X40 : 11', '0.00', '0.00']], + [26,['СЗИ3 Л3','X40 : 14', '0.00', '0.00']], + [10,['СЗИ4 Л2','X41 : 11', '0.00', '0.00']], + [27,['СЗИ4 Л3','X41 : 14', '0.00', '0.00']], + [11,['СЗИ1 Л4','X42 : 11', '0.00', '0.00']], + [28,['СЗИ1 Л5','X42 : 14', '0.00', '0.00']], + [12,['СЗИ2 Л4','X43 : 11', '0.00', '0.00']], + [29,['СЗИ2 Л5','X43 : 14', '0.00', '0.00']], + [13,['СЗИ3 Л4','X44 : 11', '0.00', '0.00']], + [30,['СЗИ3 Л5','X44 : 14', '0.00', '0.00']], + [14,['СЗИ4 Л4','X45 : 11', '0.00', '0.00']], + [31,['СЗИ4 Л5','X45 : 14', '0.00', '0.00']], + [33,['УИЗП_МП №1', 'X29 : 8', '0.00', '0.00']], + [34,['УИЗП_МП №2', 'X29 : 9', '0.00', '0.00']], + [35,['Выход 35', 'X29 : 10', '0.00', '0.00']], + [36,['Выход 36', 'X29 : 11', '0.00', '0.00']], + [37,['Выход 37', 'X29 : 12', '0.00', '0.00']], + [38,['Выход 38', 'X29 : 13', '0.00', '0.00']],] + + +## Таблица с данными для входов, первое значение - индекс устройства в ячейке КЭМС. +const INPUT_EMS2 = [ + [1 ,['СИ1 Л1','X31 : 2', '0.00', '0.00']], + [18,['СИ1 Л6','X31 : 5', '0.00', '0.00']], + [2 ,['СИ1 Л7','X31 : 8', '0.00', '0.00']], + [19,['СИ2 Л1','X32 : 2', '0.00', '0.00']], + [3 ,['СИ2 Л6','X32 : 5', '0.00', '0.00']], [20,['СИ2 Л7','X32 : 8', '0.00', '0.00']], - [21,['СИ3 Л1','X33 : 2', '0.00', '0.00']], - [22,['СИ3 Л6','X33 : 5', '0.00', '0.00']], - [23,['СИ3 Л7','X33 : 8', '0.00', '0.00']], - [24,['СИ4 Л1','X34 : 2', '0.00', '0.00']], - [25,['СИ4 Л6','X34 : 5', '0.00', '0.00']], - [26,['СИ4 Л7','X34 : 8', '0.00', '0.00']], - [27,['СИ1 Л2','X38 : 2', '0.00', '0.00']], - [28,['СИ1 Л3','X38 : 5', '0.00', '0.00']], - [29,['СИ2 Л2','X39 : 2', '0.00', '0.00']], - [30,['СИ2 Л3','X39 : 5', '0.00', '0.00']], - [31,['СИ3 Л2','X40 : 2', '0.00', '0.00']], - [32,['СИ3 Л3','X40 : 5', '0.00', '0.00']], - [33,['СИ4 Л2','X41 : 2', '0.00', '0.00']], - [34,['СИ4 Л3','X41 : 5', '0.00', '0.00']], - [35,['СИ1 Л4','X42 : 2', '0.00', '0.00']], - [36,['СИ1 Л5','X42 : 5', '0.00', '0.00']], - [37,['СИ2 Л4','X43 : 2', '0.00', '0.00']], - [38,['СИ2 Л5','X43 : 5', '0.00', '0.00']], - [39,['СИ3 Л4','X44 : 2', '0.00', '0.00']], - [40,['СИ3 Л5','X44 : 5', '0.00', '0.00']], - [41,['СИ4 Л4','X45 : 2', '0.00', '0.00']], - [42,['СИ4 Л5','X45 : 5', '0.00', '0.00']], - [43,['БИ В Лб','Х49 : 37', '0.00', '0.00']], - [44,['БИ В ПрБ','Х49 : 31', '0.00', '0.00']], - [45,['БИ Г Лб','Х49 : 15', '0.00', '0.00']], - [46,['БИ Г ПрБ','Х49 : 8', '0.00', '0.00']], - [47,['БИ Д Лб','Х49 : 6', '0.00', '0.00']], - [48,['БИ Д ПрБ','Х49 : 10', '0.00', '0.00']], - [49,['БИ Е Лб','Х49 : 25', '0.00', '0.00']], - [50,['БИ Е ПрБ','Х49 : 40', '0.00', '0.00']], - [51,['СЗИ В Лб','Х49 : 42', '0.00', '0.00']], - [52,['СЗИ В ПрБ','Х49 : 32', '0.00', '0.00']], - [53,['СЗИ Г Лб','Х49 : 46', '0.00', '0.00']], - [54,['СЗИ Г ПрБ','Х49 : 32', '0.00', '0.00']], - [55,['СЗИ Д Лб','Х49 : 16', '0.00', '0.00']], - [56,['СЗИ Д ПрБ','Х49 : 47', '0.00', '0.00']], - [57,['СЗИ Е Лб','Х49 : 1', '0.00', '0.00']], - [58,['СЗИ Е ПрБ','Х49 : 50', '0.00', '0.00']]] + [4 ,['СИ3 Л1','X33 : 2', '0.00', '0.00']], + [21,['СИ3 Л6','X33 : 5', '0.00', '0.00']], + [5 ,['СИ3 Л7','X33 : 8', '0.00', '0.00']], + [22,['СИ4 Л1','X34 : 2', '0.00', '0.00']], + [6 ,['СИ4 Л6','X34 : 5', '0.00', '0.00']], + [23,['СИ4 Л7','X34 : 8', '0.00', '0.00']], + [7 ,['СИ1 Л2','X38 : 2', '0.00', '0.00']], + [24,['СИ1 Л3','X38 : 5', '0.00', '0.00']], + [8 ,['СИ2 Л2','X39 : 2', '0.00', '0.00']], + [25,['СИ2 Л3','X39 : 5', '0.00', '0.00']], + [9 ,['СИ3 Л2','X40 : 2', '0.00', '0.00']], + [26,['СИ3 Л3','X40 : 5', '0.00', '0.00']], + [10,['СИ4 Л2','X41 : 2', '0.00', '0.00']], + [27,['СИ4 Л3','X41 : 5', '0.00', '0.00']], + [11,['СИ1 Л4','X42 : 2', '0.00', '0.00']], + [28,['СИ1 Л5','X42 : 5', '0.00', '0.00']], + [12,['СИ2 Л4','X43 : 2', '0.00', '0.00']], + [29,['СИ2 Л5','X43 : 5', '0.00', '0.00']], + [13,['СИ3 Л4','X44 : 2', '0.00', '0.00']], + [30,['СИ3 Л5','X44 : 5', '0.00', '0.00']], + [14,['СИ4 Л4','X45 : 2', '0.00', '0.00']], + [31,['СИ4 Л5','X45 : 5', '0.00', '0.00']], + [58,['Бланк_МП №4', 'X30 : 1', '0.00', '0.00']], + [59,['Бланк_МП №5', 'X30 : 2', '0.00', '0.00']], + [35,['Вход 35', 'X29 : 10', '0.00', '0.00']], + [36,['Вход 36', 'X29 : 11', '0.00', '0.00']], + [37,['Вход 37', 'X29 : 12', '0.00', '0.00']], + [38,['Вход 38', 'X29 : 13', '0.00', '0.00']],] + ## Таблица с данными для выходов, первое значение - индекс устройства в ячейке КЭМС. -const OUTPUT_ROWS = [ - [11,['Бланк №1','Х6', '0.00', '0.00']], - [12,['Бланк №2','Х9', '0.00', '0.00']], - [13,['Бланк №3','Х12', '0.00', '0.00']], - [14,['Бланк №4','Х15', '0.00', '0.00']], - [15,['Бланк №5','Х18', '0.00', '0.00']], - [16,['Бланк №6','Х21', '0.00', '0.00']], - [17,['Бланк №7','Х24', '0.00', '0.00']], - [18,['СЗИ1 Л1','X31 : 11', '0.00', '0.00']], - [19,['СЗИ1 Л6','X31 :14', '0.00', '0.00']], - [20,['СЗИ1 Л7','X31 : 17', '0.00', '0.00']], - [21,['СЗИ2 Л1','X32 : 11', '0.00', '0.00']], - [22,['СЗИ2 Л6','X32 : 14', '0.00', '0.00']], - [23,['СЗИ2 Л7','X32: 17', '0.00', '0.00']], - [24,['СЗИ3 Л1','X33 : 11', '0.00', '0.00']], - [25,['СЗИ3 Л6','X33 :14', '0.00', '0.00']], - [26,['СЗИ3 Л7','X33: 17', '0.00', '0.00']], - [27,['СЗИ4 Л1','X34 : 11', '0.00', '0.00']], - [28,['СЗИ4 Л6','X34 :14', '0.00', '0.00']], - [29,['СЗИ4 Л7','X34: 17', '0.00', '0.00']], - [30,['СЗИ1 Л2','X38 : 11', '0.00', '0.00']], - [31,['СЗИ1 Л3','X38 : 14', '0.00', '0.00']], - [32,['СЗИ2 Л2','X39 : 11', '0.00', '0.00']], - [33,['СЗИ2 Л3','X39 : 14', '0.00', '0.00']], - [34,['СЗИ3 Л2','X40 : 11', '0.00', '0.00']], - [35,['СЗИ3 Л3','X40 : 14', '0.00', '0.00']], - [36,['СЗИ4 Л2','X41 : 11', '0.00', '0.00']], - [37,['СЗИ4 Л3','X41 :14', '0.00', '0.00']], - [38,['СЗИ1 Л4','X42 : 11', '0.00', '0.00']], - [39,['СЗИ1 Л5','X42 :14', '0.00', '0.00']], - [40,['СЗИ2 Л4','X43 : 11', '0.00', '0.00']], - [41,['СЗИ2 Л5','X43 : 14', '0.00', '0.00']], - [42,['СЗИ3 Л4','X44 : 11', '0.00', '0.00']], - [43,['СЗИ3 Л5','X44 :14', '0.00', '0.00']], - [44,['СЗИ4 Л4','X45 : 11', '0.00', '0.00']], - [45,['СЗИ4 Л5','X45 : 14', '0.00', '0.00']], - [46,['БИ РТР №1','X47 : 2', '0.00', '0.00']], - [47,['БИ РТР №2','X47 : 5', '0.00', '0.00']], - [48,['БИ РТР №3','X47 : 8', '0.00', '0.00']], - [49,['БИ РТР №4','X47 : 11', '0.00', '0.00']], - [50,['СИ В Лб','Х49 : 21', '0.00', '0.00']], - [51,['СИ В ПрБ','Х49 : 19', '0.00', '0.00']], - [52,['СИ Г Лб','Х49 : 28', '0.00', '0.00']], - [53,['СИ Г ПрБ','Х49 : 30', '0.00', '0.00']], - [54,['СИ Д Лб','Х49 : 13', '0.00', '0.00']], - [55,['СИ Д ПрБ','Х49 : 11', '0.00', '0.00']], - [56,['СИ Е Лб','Х49 : 26', '0.00', '0.00']], - [57,['СИ Е ПрБ','Х49 : 35', '0.00', '0.00']]] +const OUTPUT_EMS2 = [ + [1,['БИ РТР №1','X47 : 2', '0.00', '0.00']], + [19,['БИ РТР №2','X47 : 5', '0.00', '0.00']], + [2,['БИ РТР №3','X47 : 8', '0.00', '0.00']], + [19,['БИ РТР №4','X47 : 11', '0.00', '0.00']], + [3,['СИ В Лб', 'Х49 : 21', '0.00', '0.00']], + [20,['СИ В ПрБ', 'Х49 : 19', '0.00', '0.00']], + [4,['СИ Г Лб', 'Х49 : 28', '0.00', '0.00']], + [21,['СИ Г ПрБ', 'Х49 : 30', '0.00', '0.00']], + [5,['СИ Д Лб', 'Х49 : 13', '0.00', '0.00']], + [22,['СИ Д ПрБ', 'Х49 : 11', '0.00', '0.00']], + [6,['СИ Е Лб', 'Х49 : 26', '0.00', '0.00']], + [23,['СИ Е ПрБ', 'Х49 : 35', '0.00', '0.00']], + [33,['УИЗП_МП №3', 'X30 : 8', '0.00', '0.00']], + [34,['УИЗП_МП №4', 'X30 : 9', '0.00', '0.00']], + [35,['УИЗП_МП №5', 'X30 : 10', '0.00', '0.00']],] diff --git a/scripts/yems-devs.gd b/scripts/yems-devs.gd index c97f201..8c35feb 100644 --- a/scripts/yems-devs.gd +++ b/scripts/yems-devs.gd @@ -14,6 +14,7 @@ class InDev: var out_dots: Array ## Список выходных устройств в порядке, как в таблице и точки матрицы. var connect_devs: Dictionary ## Список присоединённых устройств. var board: String ## Плата в которой находится устройство. + var isa_addr: int ## Адрес устройства на шине isa func _init(dev_id : int, params : Array, row_id : int): id = dev_id