From 09cf24a3590deeb245635b06df4aa841f0c3b215 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Mon, 1 Dec 2025 12:28:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=9F=D0=A0?= =?UTF-8?q?=D0=94-=D0=9A=20=D0=BF=D1=80=D0=B8=D0=B1=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/pribor-prd.gd | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index 656b5d84..d7e6f1e7 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -999,12 +999,13 @@ static func on_ug_setting(prd_unit: Object, settings_ug: Dictionary, prd_cmd_arr var result: int if cur_litera in [2, 4, 6]: result = ((settings_ug.ATT_UM_1 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) - prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_1, result]]) + prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_1, result]]) elif cur_litera in [3, 5, 7]: result = ((settings_ug.ATT_UM_2 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_2, result]]) elif cur_litera == 1: - result = ((settings_ug.ATT_UM_2 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) + result = ((settings_ug.ATT_UM_1 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) + prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_1, result]]) prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_3, settings_ug.ATT_UM_3]]) return true @@ -1152,7 +1153,7 @@ static func on_fs_state(packet_type_7: Dictionary, fs_mapping: Dictionary, fs_re ## Вспомогательная функция для проверки применения правила static func _should_apply_rule(fs_num: int, rule: Dictionary, results: Dictionary) -> bool: - return bool(fs_num >= rule.min and fs_num < rule.max) and results.has(rule.key) + return bool(fs_num >= rule.min and fs_num <= rule.max) and results.has(rule.key) ## Получение мощности при выполнении контроля