Merge remote-tracking branch 'origin/dev_danil' into dev_danil

# Conflicts:
#	scripts/control_panel.gd
This commit is contained in:
danil_tim
2025-02-14 12:01:18 +03:00

View File

@@ -193,6 +193,10 @@ func _draw_control_panel_prd(pribor):
$soc_P1/MAA_2.rname = 'А23'
# Кассета П-2
$soc_P2.visible = false
# ДКМ
$soc_DKM/DKM_1.visible = false
$soc_DKM/DKM_2.fname = 'ДКМ4'
$soc_DKM/DKM_2.fname = 'ДКМ5'
elif pribor == Constants.MODE.PRD_K:
# Кассета У5
@@ -226,6 +230,10 @@ func _draw_control_panel_prd(pribor):
$soc_P1/MAA_2.rname = 'А28'
# Кассета П-2
$soc_P2.visible = true
# ДКМ
$soc_DKM/DKM_1.visible = true
$soc_DKM/DKM_2.fname = 'ДКМ6'
$soc_DKM/DKM_2.fname = 'ДКМ7'
func _on_fs_status_1(_name_port, status_fs_1):