Merge remote-tracking branch 'origin/master-prd'

This commit is contained in:
sasha80
2025-12-15 15:37:04 +03:00
4 changed files with 14 additions and 16 deletions

View File

@@ -37,16 +37,16 @@ func on_data_received(yau: Object) -> void:
'''Обработка полученных данных от УФ'''
var new_ems_status = control_ems(yau.status)
var status_changed = false
# Обновляем только ключи КЭМС/ЭМС, сохраняя 'УФ-онлайн'
for key in ['КЭМС-Б1', 'ЭМС-Б1', 'ЭМС-Б2', 'ИП220-27Б']:
var old_value = uf_status.get(key, false)
var new_value = new_ems_status.get(key, false)
if old_value != new_value:
uf_status[key] = new_value
status_changed = true
if status_changed:
update_serviceability()
#endregion
@@ -64,7 +64,7 @@ func is_operational() -> bool:
func update_serviceability() -> void:
'''Обновление общего статуса сервисабельности'''
var new_serviceability: int = STATE_VAL.GOOD
# Проверяем онлайн-статус
if uf_status.get('УФ-онлайн', false) == false:
new_serviceability = STATE_VAL.NONE
@@ -84,7 +84,7 @@ static func control_ems(status: Array) -> Dictionary:
var status_dic: Dictionary = {}
if status.is_empty() or status.size() < 3:
return status_dic
status_dic['КЭМС-Б1'] = bool((status[StatusIndex.SOCKETS] >> 0) & 1) and bool((status[StatusIndex.SOCKETS] >> 3) & 1)
status_dic['ЭМС-Б1'] = bool((status[StatusIndex.SOCKETS] >> 1) & 1) and bool((status[StatusIndex.SOCKETS] >> 4) & 1)
status_dic['ЭМС-Б2'] = bool((status[StatusIndex.SOCKETS] >> 2) & 1) and bool((status[StatusIndex.SOCKETS] >> 5) & 1)

View File

@@ -31,7 +31,6 @@ class DeviceObserver:
func update_control_results(results: Dictionary) -> bool:
var changed := false
last_results = results.duplicate()
if results.get('is_over_control', false):
# Контроль завершен - проверяем все результаты
@@ -162,8 +161,7 @@ func _recalculate_overall_state() -> void:
func _update_display() -> void:
var config: Dictionary = STATUS_CONFIG[overall_prd_state].duplicate()
var config: Dictionary
text = config.text
modulate = config.color
add_theme_color_override("font_color", config.font_color)
@@ -258,7 +256,7 @@ func get_device_status(device_name: String) -> Dictionary:
"online": observer.status[DEVICE_STATUS.ONLINE],
"operational": observer.status[DEVICE_STATUS.STATUS],
"control_complete": observer.status[DEVICE_STATUS.CONTROL],
"last_results": observer.last_results.duplicate(),
"last_results": observer.last_results,
"status_uf": status_uf
}
return {}

View File

@@ -559,7 +559,7 @@ func set_fs_color(ecms):
func update_fs_colors():
var fs_colors = $canvas.fs_default_colors.duplicate()
var fs_colors = $canvas.fs_default_colors
for key in fs_active.keys():
fs_colors[key] = color_ecm
for key in fs_emit.keys():