diff --git a/config/setting_prd_control.json b/config/setting_prd_control.json index 78a08e67..c1534d4a 100644 --- a/config/setting_prd_control.json +++ b/config/setting_prd_control.json @@ -17,8 +17,8 @@ "ATT_UM_2": 2, "ATT_UM_3": 3, "POWER_UM": 100, - "TIMER_DELAY": 10.0, - "STATE_MASHINE_TIMER": 0.3 + "TIMER_DELAY": 15.0, + "STATE_MASHINE_TIMER": 0.2 }, "pribor_config": { "1н": {"angle": 0.0, "sectors": [4, 8]}, @@ -48,8 +48,8 @@ "ATT_UM_4": 2, "ATT_UM_5": 3, "POWER_UM": 100, - "TIMER_DELAY": 10.0, - "STATE_MASHINE_TIMER": 0.3 + "TIMER_DELAY": 15.0, + "STATE_MASHINE_TIMER": 0.2 }, "pribor_config": { "1в": {"angle": 0.0, "sectors": [12, 16]}, @@ -81,8 +81,8 @@ "ATT_UM_6": 3, "ATT_UM_7": 2, "POWER_UM": 100, - "TIMER_DELAY": 10.0, - "STATE_MASHINE_TIMER": 0.3 + "TIMER_DELAY": 15.0, + "STATE_MASHINE_TIMER": 0.2 }, "pribor_config": { "1к": {"angle": 0.0, "sectors": [0, 20, 24]}, @@ -218,6 +218,6 @@ {"key": "fs_4", "min": 12, "max": 16}, {"key": "fs_5", "min": 16, "max": 20}, {"key": "fs_6", "min": 20, "max": 24}, - {"key": "fs_7", "min": 24, "max": 27} + {"key": "fs_7", "min": 24, "max": 28} ] } diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index 6df25d18..792d41eb 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -252,8 +252,8 @@ animations = [{ [sub_resource type="ShaderMaterial" id="ShaderMaterial_71ec4"] shader = ExtResource("9_71ec4") -shader_parameter/grey = Vector3(0.14, 0.13, 0.13) -shader_parameter/orange = Vector3(0.95, 0.55, 0.05) +shader_parameter/white = Vector3(0.14, 0.13, 0.13) +shader_parameter/black = Vector3(0.95, 0.55, 0.05) shader_parameter/gamma = 2.0 [node name="Контроль" type="Panel"] diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index d7e6f1e7..daa73825 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -1153,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) ## Получение мощности при выполнении контроля