From 7677fe43329a1efe7310da22acdb1f8a36be8892 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 8 Oct 2025 14:50:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5.=20=D0=9A=D0=BE=D0=BD=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=20=D0=94=D0=9A=D0=9C=20=D0=BF=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=20=D0=BD=D0=B5=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/pribor-prd-k.gd | 2 +- scripts/pribor-prd.gd | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/scenes/pribor-prd-k/pribor-prd-k.gd b/scenes/pribor-prd-k/pribor-prd-k.gd index 5557b0e..3c7b47f 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.gd +++ b/scenes/pribor-prd-k/pribor-prd-k.gd @@ -17,7 +17,7 @@ const constants_k: Dictionary = { 'ATT_UM_1': 0x0, 'ATT_UM_6': 0x3, 'ATT_UM_7': 0x2, - 'POWER_UM': 90, + 'POWER_UM': 100, 'TIMER_DELAY': 5.0, 'STATE_MASHINE_TIMER': 0.3, } diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index c5e23b8..6031b73 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -171,7 +171,7 @@ class TestPRD extends Node: STATE_MASHINE.UG_SET_RAY_0: _handle_ug_set_state(0x0) - await get_tree().create_timer(1.0).timeout + await get_tree().create_timer(1.2).timeout state = STATE_MASHINE.READ_ISA STATE_MASHINE.UG_SET_RAY_1: _handle_ug_set_state(0x1) @@ -248,11 +248,11 @@ class TestPRD extends Node: elif self_name == '1н' or self_name == '2н' or self_name == '3н' or self_name == '4н': dic_att['ATT_UM_1'] = constants.ATT_UM_2 dic_att['ATT_UM_2'] = constants.ATT_UM_3 - control_label.text = 'Выполняется настройка угла (%s) и атт (%s, %s, %s)' % [ + + var log_text = dic_att.ATT_UM_3 if current_litera == 1 else dic_att.ATT_UM_1 if current_litera in [2, 4, 6] else dic_att.ATT_UM_2 + control_label.text = 'Выполняется настройка угла (%s) и атт (0x0%s)' % [ dic_att.RAY_DOU_NUM, - dic_att.ATT_UM_1, - dic_att.ATT_UM_2, - dic_att.ATT_UM_3, + log_text ] on_ug_setting(module_prd, unit_prd, dic_att) @@ -321,7 +321,15 @@ class TestPRD extends Node: var dkm_bit = _get_dkm_bit_for_current_fs(current_litera, constants) if dkm_bit == 0: control_results['dkm_1'] = check_dkm(status, dkm_bit) - elif dkm_bit == 1: + + var addr: int = constants.ADDR_UG_LITERA_1 + if current_litera == 3 or current_litera == 5 or current_litera == 7: + addr = constants.ADDR_UG_LITERA_2 + if not unit_prd.isa_ports.has(addr) or not (unit_prd.cmd_state == unit_prd.CmdState.DONE): + return + if not unit_prd.isa_ports[addr] & 0x07 == 6: return + + if dkm_bit == 1: control_results['dkm_2'] = check_dkm(status, dkm_bit) elif dkm_bit == 2: control_results['dkm_3'] = check_dkm(status, dkm_bit)