From ed4bbd09bd51f8eed8bb05f80b2eacc24752c220 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Fri, 6 Nov 2026 09:38:28 +0100 Subject: [PATCH] ManualControlWindow: Small fixes --- .../Windows/ManualControlWindow.xaml | 2 +- .../Windows/ManualControlWindow.xaml.cs | 33 ++++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/PamhagenSysCtrl/Windows/ManualControlWindow.xaml b/PamhagenSysCtrl/Windows/ManualControlWindow.xaml index 75631ad..28f9525 100644 --- a/PamhagenSysCtrl/Windows/ManualControlWindow.xaml +++ b/PamhagenSysCtrl/Windows/ManualControlWindow.xaml @@ -12,7 +12,7 @@ + Margin="350,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"/> diff --git a/PamhagenSysCtrl/Windows/ManualControlWindow.xaml.cs b/PamhagenSysCtrl/Windows/ManualControlWindow.xaml.cs index 8f55bf9..d15d2ab 100644 --- a/PamhagenSysCtrl/Windows/ManualControlWindow.xaml.cs +++ b/PamhagenSysCtrl/Windows/ManualControlWindow.xaml.cs @@ -138,22 +138,23 @@ namespace PamhagenSysCtrl { P6Button.Background = plant.State.P6_State == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose; Status.Text = $""" - Presse Querschnecke: {plant.State.PressCrossAuger_State} - Füllstände: - Maischewanne 1: {plant.State.MW2_FillLevel} (ausgewählt: {plant.State.MW1_WantSelected}, Status: {plant.State.MW1_IsSelected}) - Maischewanne 2: {plant.State.MW2_FillLevel} (ausgewählt: {plant.State.MW2_WantSelected}, Status: {plant.State.MW2_IsSelected}) - Presse 1: {plant.State.Press1_HasClearance} - Presse 2: {plant.State.Press2_HasClearance} - Tank 1: {plant.State.T1_FillLevel} - Tank 2: {plant.State.T2_FillLevel} - Tank 3: {plant.State.T3_FillLevel} - Tank 4: {plant.State.T4_FillLevel} - Tank 5: {plant.State.T5_FillLevel} - Tank 6: {plant.State.T6_FillLevel} - Tank 7: {plant.State.T7_FillLevel} - Tank 8: {plant.State.T8_FillLevel} - Tank 9: {plant.State.T9_FillLevel} - """; + Presse Querschnecke: {plant.State.PressCrossAuger_State} + Freigaben: + Presse 1: {plant.State.Press1_HasClearance} + Presse 2: {plant.State.Press2_HasClearance} + Füllstände: + Maischewanne 1: {plant.State.MW1_FillLevel} (ausgewählt-soll: {plant.State.MW1_WantSelected}, ausgewählt-ist: {plant.State.MW1_IsSelected}) + Maischewanne 2: {plant.State.MW2_FillLevel} (ausgewählt-soll: {plant.State.MW2_WantSelected}, ausgewählt-ist: {plant.State.MW2_IsSelected}) + Tank 1: {plant.State.T1_FillLevel} + Tank 2: {plant.State.T2_FillLevel} + Tank 3: {plant.State.T3_FillLevel} + Tank 4: {plant.State.T4_FillLevel} + Tank 5: {plant.State.T5_FillLevel} + Tank 6: {plant.State.T6_FillLevel} + Tank 7: {plant.State.T7_FillLevel} + Tank 8: {plant.State.T8_FillLevel} + Tank 9: {plant.State.T9_FillLevel} + """; } private void TroughAugerButton_Click(object? sender, RoutedEventArgs? evt) {