From 913cddaa58009b90d5998173dd05d1a22a3d620e Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Tue, 12 Nov 2024 13:43:42 +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=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=84=D0=BB=D0=B5?= =?UTF-8?q?=D1=88.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.godot | 10 +++++----- scenes/bip/bip.gd | 1 - scenes/frame-ecm-list/scroll-ecm-list.gd | 1 - scenes/frame-threats/scroll-threats.gd | 1 - scenes/tabs-switch/tab-switch.tscn | 7 +++++++ scenes/эмс/эмс.gd | 6 +++--- scripts/yems-boards.gd | 4 ++-- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/project.godot b/project.godot index 2cf8809..dd5c662 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="uarep-ctl" run/main_scene="res://scenes/tabs-switch/tab-switch.tscn" -config/features=PackedStringArray("4.2") +config/features=PackedStringArray("4.3") run/flush_stdout_on_print=true run/low_processor_mode=true run/delta_smoothing=false @@ -155,22 +155,22 @@ common/drop_mouse_on_gui_input_disabled=true up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) ] } down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) ] } left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) ] } right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) ] } diff --git a/scenes/bip/bip.gd b/scenes/bip/bip.gd index 49fbbf8..1d8d487 100644 --- a/scenes/bip/bip.gd +++ b/scenes/bip/bip.gd @@ -26,4 +26,3 @@ func _on_bip_gui_input(event): func update(): $bip.material.set('shader_parameter/tick_update', float(Time.get_ticks_msec()/1000)) - diff --git a/scenes/frame-ecm-list/scroll-ecm-list.gd b/scenes/frame-ecm-list/scroll-ecm-list.gd index 9237a1d..f9f55e8 100644 --- a/scenes/frame-ecm-list/scroll-ecm-list.gd +++ b/scenes/frame-ecm-list/scroll-ecm-list.gd @@ -150,4 +150,3 @@ func map_th_to_row(ecm) -> Array: if INTERFER_STATE.has(ecm.svk): row[COLUMN_STATE] = '%s' % INTERFER_STATE[ecm.svk] return row - diff --git a/scenes/frame-threats/scroll-threats.gd b/scenes/frame-threats/scroll-threats.gd index 2440bb3..f054b02 100644 --- a/scenes/frame-threats/scroll-threats.gd +++ b/scenes/frame-threats/scroll-threats.gd @@ -101,4 +101,3 @@ func on_rto_threat_sel(th_id, tbl): ## Снимает выделение цели. func on_rto_threat_unsel(_th_id): $table.clear_rows_selected() - diff --git a/scenes/tabs-switch/tab-switch.tscn b/scenes/tabs-switch/tab-switch.tscn index 605eb0a..4b6e48b 100644 --- a/scenes/tabs-switch/tab-switch.tscn +++ b/scenes/tabs-switch/tab-switch.tscn @@ -23,30 +23,37 @@ layout_mode = 0 offset_right = 1600.0 offset_bottom = 1200.0 tooltip_text = "Переключает режимы работы программы" +current_tab = 0 script = ExtResource("1_fg0vd") [node name="Работа" parent="tab_switch" instance=ExtResource("2_u7p16")] layout_mode = 2 +metadata/_tab_index = 0 [node name="Контроль" parent="tab_switch" instance=ExtResource("3_txp0s")] visible = false layout_mode = 2 +metadata/_tab_index = 1 [node name="Журнал" parent="tab_switch" instance=ExtResource("4_cu5k8")] visible = false layout_mode = 2 +metadata/_tab_index = 2 [node name="ЭМС" parent="tab_switch" instance=ExtResource("5_u71bh")] visible = false layout_mode = 2 +metadata/_tab_index = 3 [node name="ЭМС2" parent="tab_switch" instance=ExtResource("6_rsg03")] visible = false layout_mode = 2 +metadata/_tab_index = 4 [node name="Настройки" parent="tab_switch" instance=ExtResource("6_i8iv3")] visible = false layout_mode = 2 +metadata/_tab_index = 5 [node name="lbl_ready" type="Label" parent="."] layout_mode = 0 diff --git a/scenes/эмс/эмс.gd b/scenes/эмс/эмс.gd index fce9b63..4ffc356 100644 --- a/scenes/эмс/эмс.gd +++ b/scenes/эмс/эмс.gd @@ -455,14 +455,14 @@ func on_data_ems_received(unit_ems): for board in g_boards.values(): board.set_status(unit_ems.status) if active_board.state_board == active_board.WAIT and active_board.state_cmd == active_board.WAIT: - if board.online and not board.read_done and board.ems_load: + if board.online and not board.read_done: active_board = board active_board.state_board = active_board.READ active_board.start_rw_kems(true) - elif board.online and board.read_done and board.ems_load and board.need_flash_rd: + elif board.online and board.read_done and board.need_flash_rd: active_board = board active_board.state_board = active_board.READ_FLASH - #active_board.start_rw_kems(true) + active_board.read_flash() for i_row in range($scrollin/tbl_in.get_rows_count()): var state_pic = ($scrollin/tbl_in.get_node2(4, i_row)) var dev = $scrollin/tbl_in.get_node_user_data(4, i_row)[0] diff --git a/scripts/yems-boards.gd b/scripts/yems-boards.gd index 9f32d6e..41c4cf9 100644 --- a/scripts/yems-boards.gd +++ b/scripts/yems-boards.gd @@ -211,6 +211,6 @@ LOAD_KEMS, WRITE_FLASH_END} state_cmd = WR_DEV_NUM_R on_wr_device(cur_dev_num) - func on_btn_flash_read(): - unit_ems.send_flash(unit_ems.CmdCode.READ_FLASH,[], yemsconsts.NUM_BYTE_FROM_FLASH, id_board) + func read_flash(): + unit_ems.send_flash(unit_ems.CmdCode.READ_FLASH, [], yemsconsts.NUM_BYTE_FROM_FLASH, id_board) state_cmd = READ_FLASH