maxim/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Объединение исправления Александра

Browse Source
This commit is contained in:
TotMaxim
2025-12-07 21:05:41 +03:00
parent b69eaa29d9
commit 426da5ff04
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scenes/pribor-uf/pribor-uf.gd
View File

@@ -13,7 +13,7 @@ func _ready() -> void:
if Engine.is_editor_hint(): return if Engine.is_editor_hint(): return
#control_vk() #control_vk()
uf_control = get_parent().uf_control uf_control = get_parent().uf_control
uf_control.connect('update_uf_serviceability', on_update_uf_serviceability) signaller.connect('update_uf_serviceability', on_update_uf_serviceability)
var uf_status = uf_control.get_current_status() var uf_status = uf_control.get_current_status()
control_ems(uf_status) control_ems(uf_status)
find_labels(self) find_labels(self)

6
scenes/pribor-uf/uf-ctl.gd
View File

@@ -10,7 +10,7 @@ var uf_status: Dictionary = {'УФ-онлайн': false, 'КЭМС-Б1': false,
var _self_name: String var _self_name: String
var _serviceability: int = STATE_VAL.NONE var _serviceability: int = STATE_VAL.NONE
var serviceability: int: var serviceability_uf: int:
get: get:
return _serviceability return _serviceability
set(value): set(value):
@@ -58,7 +58,7 @@ func get_current_status() -> Dictionary:
func is_operational() -> bool: func is_operational() -> bool:
'''Проверка, все ли системы работают нормально''' '''Проверка, все ли системы работают нормально'''
return serviceability and uf_status.get('УФ-онлайн', false) return serviceability_uf and uf_status.get('УФ-онлайн', false)
func update_serviceability() -> void: func update_serviceability() -> void:
@@ -75,7 +75,7 @@ func update_serviceability() -> void:
new_serviceability = STATE_VAL.ERROR new_serviceability = STATE_VAL.ERROR
break break
# Новое значение через setter # Новое значение через setter
self.serviceability = new_serviceability self.serviceability_uf = new_serviceability
#endregion #endregion
#region Вспомогательные методы #region Вспомогательные методы

6
scenes/контроль/контроль.tscn
View File

@@ -566,7 +566,6 @@ metadata/unit_name = ["уарэп-эмс"]
metadata/online_proc = "on_line_changed" metadata/online_proc = "on_line_changed"
[node name="label" type="Label" parent="pribor_uf"] [node name="label" type="Label" parent="pribor_uf"]
self_modulate = Color(0, 1, 0, 1)
layout_mode = 0 layout_mode = 0
offset_left = 15.0 offset_left = 15.0
offset_top = -44.0 offset_top = -44.0
@@ -1937,6 +1936,7 @@ offset_top = 15.0
offset_right = 1408.0 offset_right = 1408.0
offset_bottom = 49.0 offset_bottom = 49.0
theme_override_font_sizes/font_size = 22 theme_override_font_sizes/font_size = 22
disabled = true
text = "Показать функциональную схему Э2" text = "Показать функциональную схему Э2"
flat = true flat = true
@@ -1996,9 +1996,9 @@ default_color = Color(1, 1, 1, 0.352941)
[node name="control_prd_button" type="Button" parent="."] [node name="control_prd_button" type="Button" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 1043.0 offset_left = 1040.0
offset_top = 64.0 offset_top = 64.0
offset_right = 1390.0 offset_right = 1416.0
offset_bottom = 104.0 offset_bottom = 104.0
focus_mode = 0 focus_mode = 0
theme_override_colors/font_hover_color = Color(1, 1, 1, 1) theme_override_colors/font_hover_color = Color(1, 1, 1, 1)

14
scripts/pribor-prd.gd
View File

@@ -390,7 +390,6 @@ func _handle_init_state() -> void:
if _get_current_ecm(): return if _get_current_ecm(): return
state = STATE_MACHINE.CHEK_KASSETA_Y5 state = STATE_MACHINE.CHEK_KASSETA_Y5
else: else:
if _get_current_ecm(): return
# Завершение контроля если литеры закончились # Завершение контроля если литеры закончились
flags.control_is_over = true flags.control_is_over = true
power_result = prep_power(power_for_litera, self_name) power_result = prep_power(power_for_litera, self_name)
@@ -996,18 +995,17 @@ static func on_y5_control_result(block_kasseta: Dictionary) -> bool:
## Установка угла и аттенюации для УМ ## Установка угла и аттенюации для УМ
static func on_ug_setting(prd_unit: Object, settings_ug: Dictionary, prd_cmd_array: Array, cur_litera: int) -> bool: static func on_ug_setting(prd_unit: Object, settings_ug: Dictionary, prd_cmd_array: Array, cur_litera: int) -> bool:
var result_1: int var result_1: int
var result_2: int
if cur_litera == 1: if cur_litera == 1:
result_1 = ((settings_ug.ATT_UM_1 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) result_1 = ((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_1]]) prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_1, result_1]])
prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_3, settings_ug.ATT_UM_3]]) prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_3, settings_ug.ATT_UM_3]])
else: else:
#if cur_litera in [2, 4, 6]: if cur_litera in [2, 4, 6]:
result_1 = ((settings_ug.ATT_UM_1 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) result_1 = ((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_1]]) prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_1, result_1]])
#elif cur_litera in [3, 5, 7]: elif cur_litera in [3, 5, 7]:
result_2 = ((settings_ug.ATT_UM_2 & 0x07) << 3) | (settings_ug.RAY_DOU_NUM & 0x07) result_1 = ((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_2]]) prd_cmd_array.append([prd_unit.CmdCode.WRITE_ISA, [settings_ug.ADDR_UG_LITERA_2, result_1]])
return true return true