From 1d001f9a0a6b7740c35edc6558b613943dee850d Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 24 Feb 2025 21:15:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/PRD.gd | 20 +++++++++++----- scripts/control_panel.gd | 51 +++++++++++++++++++++++++++++++--------- scripts/network.gd | 18 +++++++++----- 3 files changed, 66 insertions(+), 23 deletions(-) diff --git a/scripts/PRD.gd b/scripts/PRD.gd index 9289f2f..d242b79 100644 --- a/scripts/PRD.gd +++ b/scripts/PRD.gd @@ -263,10 +263,14 @@ func _on_read_isa(unit_isa_ports: Dictionary) -> void: if Constants.BASE_PORTS.EMS_G+8 in data_dict: var select = data_dict[Constants.BASE_PORTS.EMS_G+8] >> 13 if data_dict[Constants.BASE_PORTS.EMS_G+8] >> 13 < 3 else 3 $TabContainer/PRD/body_grid/litera_3_5_7/yau07b_control.get_node2(1,2).select(select) + if tmp_device_mode == Constants.META.FGOZ_4: + var data_dict = Constants.EMS_G_PORT_DATA_HOLDER[index][1] + if Constants.BASE_PORTS.EMS_G+8 in data_dict: + $TabContainer/PRD/body_grid/litera_2_4_6/yau07b_control.get_node2(1,5).get_child(1).button_pressed = data_dict[Constants.BASE_PORTS.EMS_G+8] >> 15 if tmp_device_mode == Constants.META.FGOZ_3: var data_dict = Constants.EMS_G_PORT_DATA_HOLDER[index][1] if Constants.BASE_PORTS.EMS_G+8 in data_dict: - $TabContainer/PRD/body_grid/litera_3_5_7/yau07b_control.get_node2(1,5).get_child(1).button_pressed = data_dict[Constants.BASE_PORTS.EMS_G+8] >> 13 + $TabContainer/PRD/body_grid/litera_3_5_7/yau07b_control.get_node2(1,5).get_child(1).button_pressed = data_dict[Constants.BASE_PORTS.EMS_G+8] >> 15 func _on_data_fs_1(fs_1_data): @@ -363,7 +367,7 @@ func _process(_delta: float) -> void: node_freq_fs_2_mod.text = 'Частота' node_freq_fs_2 = node_select_fs_2.get_node2(1, 3) node_freq_fs_2_mod = node_select_fs_2.get_node2(0, 3) - if int(node_freq_fs_2.get_text()) != freq_fs_2 and node_freq_fs_2.get_text() != '': + if int(node_freq_fs_2.get_text()) != att_fs_2 and node_freq_fs_2.get_text() != '': node_freq_fs_2_mod.modulate = Color.AQUAMARINE node_freq_fs_2_mod.text = 'Аттенюатор*' else: @@ -406,6 +410,8 @@ func set_frame(node: Node, val: int): node.set_frame(val) func _on_prd_select() -> void: emit_signal('read_ems_g_start') set_tab_and_buttons(0, 'select_prd') + Network.get_gen_state_1() + Network.get_gen_state_2() func _on_control_button() -> void: @@ -590,7 +596,7 @@ func _on_modul_um_3(item_from_ray_1: int): func _on_fgos_1(toggled_on: bool): var meta = Constants.META.FGOZ_4 Network.write_port_isa(Constants.BASE_PORTS.EMS_G+2, meta) - var modul_um = 0x2000 if toggled_on else 0x0 + var modul_um = 0x8000 if toggled_on else 0x0 Network.write_port_isa(Constants.BASE_PORTS.EMS_G+8, modul_um) @@ -598,7 +604,7 @@ func _on_fgos_1(toggled_on: bool): func _on_fgos_2(toggled_on: bool): var meta = Constants.META.FGOZ_3 Network.write_port_isa(Constants.BASE_PORTS.EMS_G+2, meta) - var modul_um = 0x2000 if toggled_on else 0x0 + var modul_um = 0x8000 if toggled_on else 0x0 Network.write_port_isa(Constants.BASE_PORTS.EMS_G+8, modul_um) @@ -673,7 +679,8 @@ func _on_modul_fs_1(modulation_select_1) -> void: func _on_get_status_1(toggled_btn): var inverted_state = not toggled_btn - Network.get_fs_gen_status(inverted_state) + Network.set_fs_gen_status(inverted_state) + #Network.get_gen_state_1() func _on_set_ferq_1(freq: String): @@ -718,7 +725,8 @@ func _on_start_fs_2(): func _on_get_status_2(toggled_btn): var inverted_state = not toggled_btn - Network.get_fs_gen_status_2(inverted_state) + Network.set_fs_gen_status_2(inverted_state) + #Network.get_gen_state_2() func _on_set_ferq_2(freq: String): diff --git a/scripts/control_panel.gd b/scripts/control_panel.gd index c30d1f7..75bd8e0 100644 --- a/scripts/control_panel.gd +++ b/scripts/control_panel.gd @@ -89,7 +89,12 @@ func _ready() -> void: $Kasseta_FS/ref_A2, $Kasseta_FS/ref_A4, $Kasseta_FS/Block_FS_PRD_K, - $Kasseta_FS/FS_PRD_K] + $Kasseta_FS/FS_PRD_K, + + $soc_DKM/DKM_1, + $soc_DKM/DKM_2, + $soc_DKM/DKM_3, + ] count_cell = len(node_cell_ind) _draw_control_panel_prd(Constants.CURRENT_MODE) @@ -286,25 +291,35 @@ func _on_fs_status_2(_name_port, status_fs_2): func fs_1_setup(freq): - Network.get_fs_gen_status(true) ## отключен пока что (поменять на false) - await get_tree().create_timer(0.5).timeout + await get_tree().create_timer(0.4).timeout + Network.set_fs_gen_status(true) ## отключен на false + await get_tree().create_timer(0.4).timeout + Network.get_gen_state_1() Network.status_can_macro_1(false) Network.set_fs_ferq_carrier(freq * 1_000_000) Network.set_fs_attenuation(float(19)) Network.set_can_macro(freq) Network.status_can_macro_1(true) - Network.get_fs_gen_status(false) + await get_tree().create_timer(0.4).timeout + Network.set_fs_gen_status(false) + await get_tree().create_timer(0.4).timeout + Network.get_gen_state_1() func fs_2_setup(freq): - Network.get_fs_gen_status_2(true) - await get_tree().create_timer(0.5).timeout + await get_tree().create_timer(1.8).timeout + Network.set_fs_gen_status_2(true) + await get_tree().create_timer(0.8).timeout + Network.get_gen_state_2() Network.status_can_macro_2(false) Network.set_fs_ferq_carrier_2(freq * 1_000_000) Network.set_fs_attenuation_2(float(19)) Network.set_can_macro_2(freq) Network.status_can_macro_2(true) - Network.get_fs_gen_status_2(false) ## отключен пока что (поменять на false) + await get_tree().create_timer(0.8).timeout + Network.set_fs_gen_status_2(false) ## отключен = false + await get_tree().create_timer(0.8).timeout + Network.get_gen_state_2() func yau_07b_setup(): @@ -344,6 +359,8 @@ func _on_data_fs(fs_data:PackedByteArray, fs_name: String): func _on_start_super_control(): logger = Logger.new(get_node('log_array')) + for i in count_cell: + node_cell_ind[i].state = Constants.STATE_VAL.NONE #timer.start(5) if (past_pribor != Constants.CURRENT_MODE): @@ -433,15 +450,28 @@ func _on_fs_status(META:int): $soc_DKM/DKM_2.state = (dkm >> 1) & 0x1 $soc_DKM/DKM_3.state = (dkm >> 2) & 0x1 $Kasseta_FS/ref_A3.state = $soc_DKM/DKM_2.state - logger.info('%s: %s ❌' % [$Kasseta_FS/ref_A3.fname, $soc_DKM/DKM_2.state]) $Kasseta_FS/ref_A4.state = $soc_DKM/DKM_3.state + if (dkm >> 1) & 0x1 == 1: + logger.info('%s: %s ✅' % [$Kasseta_FS/ref_A3.fname, 'Включено']) + else: + logger.info('%s: %s ❌' % [$Kasseta_FS/ref_A3.fname, 'Нет связи']) + if (dkm >> 2) & 0x1 == 1: + logger.info('%s: %s ✅' % [$Kasseta_FS/ref_A4.fname, 'Включено']) + else: + logger.info('%s: %s ❌' % [$Kasseta_FS/ref_A4.fname, 'Нет связи']) elif Constants.CURRENT_MODE == Constants.MODE.PRD_B: $soc_DKM/DKM_2.state = (dkm >> 3) & 0x1 $soc_DKM/DKM_3.state = (dkm >> 4) & 0x1 $Kasseta_FS/ref_A3.state = $soc_DKM/DKM_2.state - logger.info('%s: %s ❌' % [$Kasseta_FS/ref_A3.fname, $soc_DKM/DKM_2.state]) $Kasseta_FS/ref_A4.state = $soc_DKM/DKM_3.state - logger.info('%s: %s ❌' % [$Kasseta_FS/ref_A4.fname, $soc_DKM/DKM_3.state]) + if (dkm >> 3) & 0x1 == 1: + logger.info('%s: %s ✅' % [$Kasseta_FS/ref_A3.fname, 'Включено']) + else: + logger.info('%s: %s ❌' % [$Kasseta_FS/ref_A3.fname, 'Нет связи']) + if (dkm >> 4) & 0x1 == 1: + logger.info('%s: %s ✅' % [$Kasseta_FS/ref_A4.fname, 'Включено']) + else: + logger.info('%s: %s ❌' % [$Kasseta_FS/ref_A4.fname, 'Нет связи']) elif Constants.CURRENT_MODE == Constants.MODE.PRD_K: $soc_DKM/DKM_1.state = (dkm >> 0) & 0x1 $soc_DKM/DKM_2.state = (dkm >> 5) & 0x1 @@ -450,5 +480,4 @@ func _on_fs_status(META:int): $Kasseta_FS/ref_A3.state = $soc_DKM/DKM_2.state $Kasseta_FS/ref_A4.state = $soc_DKM/DKM_3.state emit_signal('signal_on_start_timer_03') - print('Флаг ФС: ', [flag_fs_1_ready, flag_fs_2_ready]) diff --git a/scripts/network.gd b/scripts/network.gd index 51da666..7fe9be8 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -261,13 +261,16 @@ func start_work_fs(): counter_fs_1 += 1 -func get_fs_gen_status(state_gen): +func set_fs_gen_status(state_gen): unit_fs.set_gen_state(state_gen, counter_fs_1, client_fs_1) counter_fs_1 += 1 - unit_fs.get_base_current_temp(counter_fs_1, client_fs_1) - counter_fs_1 += 1 + + +func get_gen_state_1(): unit_fs.get_gen_state(counter_fs_1, client_fs_1) counter_fs_1 += 1 + #unit_fs.get_base_current_temp(counter_fs_1, client_fs_1) + #counter_fs_1 += 1 func set_fs_ferq_carrier(freq: int): @@ -352,13 +355,16 @@ func start_work_fs_2(): counter_fs_2 += 1 -func get_fs_gen_status_2(state_gen: bool): +func set_fs_gen_status_2(state_gen: bool): unit_fs.set_gen_state(state_gen, counter_fs_2, client_fs_2) counter_fs_2 += 1 + + +func get_gen_state_2(): unit_fs.get_gen_state(counter_fs_2, client_fs_2) counter_fs_2 += 1 - unit_fs.get_base_current_temp(counter_fs_2, client_fs_2) - counter_fs_2 += 1 + #unit_fs.get_base_current_temp(counter_fs_2, client_fs_2) + #counter_fs_2 += 1 func set_fs_ferq_carrier_2(freq: int):