Enhance Installer

Add msi installer
Graph: Forbid paths trough already locked valves
2026-08-05 16:31:32 +02:00 · 2026-08-05 15:39:00 +02:00 · 2026-08-05 14:31:54 +02:00 · 2026-08-05 14:16:01 +02:00 · 2026-08-04 23:56:32 +02:00 · 2026-08-04 19:14:58 +02:00
47 changed files with 2345 additions and 566 deletions
@@ -0,0 +1,56 @@
+name: Deploy
+on:
+  push:
+    tags: ["v[0-9]+.[0-9]+.[0-9]+"]
+jobs:
+  deploy:
+    name: Build and Deploy
+    runs-on: windows-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Set APP_VERSION variable from tag
+        shell: powershell
+        run: |
+          $APP_VERSION = $env:GITHUB_REF -replace '^refs/tags/v', ''
+          Add-Content -Path $env:GITHUB_ENV -Value "APP_VERSION=$APP_VERSION"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Check version in project
+        shell: powershell
+        run: |
+          Select-String PamhagenSysCtrl/PamhagenSysCtrl.csproj -Pattern "<Version>"
+          $res = Select-String PamhagenSysCtrl/PamhagenSysCtrl.csproj -Pattern "<Version>${{ env.APP_VERSION }}</Version>"
+          if ($res -eq $null) {
+            exit 1
+          }
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.1
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v1
+      - name: Restore NuGet packages
+        shell: powershell
+        run: $(& nuget restore PamhagenSysCtrl.sln; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Installer
+        shell: powershell
+        run: $(& msbuild -verbosity:quiet Installer/Installer.wixproj -property:Configuration=Release -property:Platform=x64; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Rename artifact
+        shell: powershell
+        run: Move-Item Installer/bin/x64/Release/PamhagenSysCtrl.msi Installer/bin/x64/Release/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi
+      - name: Create release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          name: Anlagensteuerung Pamhagen ${{ env.APP_VERSION }}
+          body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**"
+          files: |-
+            Installer/bin/x64/Release/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi
+      - name: Upload to website
+        shell: powershell
+        run: |
+          $content = [System.IO.File]::ReadAllBytes("Installer/bin/x64/Release/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi")
+          Invoke-WebRequest `
+            -Uri "https://elwig.at/files/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi" `
+            -Method PUT `
+            -Body $content `
+            -Headers @{ Authorization = "${{ secrets.API_AUTHORIZATION }}" } `
+            -ContentType "application/octet-stream"
@@ -0,0 +1,25 @@
+name: Test
+on:
+  push:
+    branches: ["**"]
+    paths: ["PamhagenSysCtrl/**", ".gitea/workflows/test.yaml"]
+jobs:
+  test:
+    name: Run tests
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Check for Byte order marks
+        shell: powershell
+        run: |
+          $pattern = [char]::ConvertFromUtf32(0xFEFF)
+          $files = git grep -IEl "^$pattern"
+          if ( $lastexitcode -ne 1 ) {
+            echo "Files with BOM found:"
+            echo $files
+            exit 1
+          } else {
+            echo "No files with BOM found"
+            exit 0
+          }
@@ -4,3 +4,4 @@ bin/
 .vs
 .idea
 *.exe
+*.zip
@@ -0,0 +1,14 @@
+
+Pamhagen
+========
+
+Source code
+C:\Program Files\Anlagensteuerung Pamhagen\src\pamhagen-sysctrl.zip
+https://git.necronda.net/winzer/pamhagen-sysctrl
+
+Installation folder
+C:\Program Files\Anlagensteuerung Pamhagen\
+
+Data and configuration folder
+C:\ProgramData\Anlagensteuerung Pamhagen\
+- config.ini       : main configuration file
@@ -0,0 +1,3 @@
+
+[plc]
+port = COM1
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <!-- C:\Program Files (x86)\Anlagensteuerung Pamhagen or C:\Program Files\Anlagensteuerung Pamhagen -->
+    <StandardDirectory Id="ProgramFiles64Folder">
+      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
+        <Directory Id="SourceFolder" Name="src" />
+      </Directory>
+    </StandardDirectory>
+
+    <!-- C:\ProgramData\Anlagensteuerung Pamhagen -->
+    <StandardDirectory Id="CommonAppDataFolder">
+      <Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)" />
+    </StandardDirectory>
+
+    <!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
+    <StandardDirectory Id="ProgramMenuFolder">
+      <Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
+    </StandardDirectory>
+
+    <!-- C:\Users\{USERNAME}\Desktop -->
+    <StandardDirectory Id="DesktopFolder" />
+  </Fragment>
+</Wix>
@@ -0,0 +1,43 @@
+<Project Sdk="WixToolset.Sdk/7.0.0">
+  <PropertyGroup>
+    <InstallerPlatform>x64</InstallerPlatform>
+    <OutputName>PamhagenSysCtrl</OutputName>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <Cultures>de-AT</Cultures>
+    <AcceptEula>wix7</AcceptEula>
+    <SuppressValidation>false</SuppressValidation>
+    <PublishDirectory>$(MSBuildProjectDirectory)\..\PamhagenSysCtrl\bin\Publish</PublishDirectory>
+  </PropertyGroup>
+  <UsingTask TaskName="GetFileVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <AssemblyPath ParameterType="System.String" Required="true" />
+      <Version ParameterType="System.String" Output="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System.Diagnostics" />
+      <Code Type="Fragment" Language="cs"><![CDATA[
+        Version = FileVersionInfo.GetVersionInfo(AssemblyPath).ProductVersion.Split('+')[0];
+      ]]></Code>
+    </Task>
+  </UsingTask>
+  <Target Name="PublishApplication" BeforeTargets="BeforeBuild">
+    <RemoveDir Directories="$(PublishDirectory)" Condition="Exists('$(PublishDirectory)')" />
+    <Exec Command="dotnet publish &quot;$(MSBuildProjectDirectory)\..\PamhagenSysCtrl\PamhagenSysCtrl.csproj&quot; --configuration &quot;$(Configuration)&quot; --runtime win-x64 --self-contained true --output &quot;$(PublishDirectory)&quot; --nologo" />
+    <GetFileVersion AssemblyPath="$(PublishDirectory)\PamhagenSysCtrl.exe">
+      <Output TaskParameter="Version" PropertyName="ProductVersion" />
+    </GetFileVersion>
+    <PropertyGroup>
+      <DefineConstants>ProductVersion=$(ProductVersion);BuildPath=$(PublishDirectory)</DefineConstants>
+    </PropertyGroup>
+  </Target>
+  <Target Name="CreateSourceArchive" BeforeTargets="BeforeBuild">
+    <Exec Command="git -C &quot;$(MSBuildProjectDirectory)\..&quot; archive --format=zip --output &quot;$(MSBuildProjectDirectory)\Files\pamhagen-sysctrl.zip&quot; HEAD" />
+  </Target>
+  <ItemGroup>
+    <ProjectReference Include="..\PamhagenSysCtrl\PamhagenSysCtrl.csproj" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Files\config.ini" />
+    <None Include="Files\README.txt" />
+  </ItemGroup>
+</Project>
@@ -0,0 +1,22 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <ComponentGroup Id="MainComponents">
+      <Component Directory="InstallFolder">
+        <File Source="$(var.BuildPath)\PamhagenSysCtrl.exe" Id="PamhagenSysCtrl.exe"/>
+      </Component>
+      <Files Directory="InstallFolder" Include="$(var.BuildPath)\**">
+        <Exclude Files="$(var.BuildPath)\PamhagenSysCtrl.exe"/>
+        <Exclude Files="$(var.BuildPath)\**.pdb"/>
+      </Files>
+      <Component Directory="SourceFolder">
+        <File Source="$(ProjectDir)\Files\pamhagen-sysctrl.zip" Id="pamhagen_sysctrl.zip"/>
+      </Component>
+      <Component Directory="ConfigFolder" Permanent="true" NeverOverwrite="true">
+        <File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"/>
+      </Component>
+      <Component Directory="ConfigFolder">
+        <File Source="$(ProjectDir)\Files\README.txt" Id="README.txt"/>
+	  </Component>
+	</ComponentGroup>
+  </Fragment>
+</Wix>
@@ -0,0 +1,5 @@
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl"
+                 Culture="de-AT">
+  <String Id="DowngradeError"
+          Value="Eine neuere Version von [ProductName] ist bereits installiert." />
+</WixLocalization>
@@ -0,0 +1,17 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="Anlagensteuerung Pamhagen"
+           Manufacturer="Anlagensteuerung Pamhagen"
+           Version="$(var.ProductVersion)"
+           Language="3079"
+           UpgradeCode="f214bfc6-1cd0-4971-807e-a4830e3b82a3"
+           Scope="perMachine"
+           Compressed="true">
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no"/>
+    <MediaTemplate EmbedCab="true" CompressionLevel="high"/>
+
+    <Feature Id="Main" Title="Anlagensteuerung Pamhagen" Level="1">
+      <ComponentGroupRef Id="MainComponents"/>
+      <ComponentGroupRef Id="ShortcutComponents"/>
+    </Feature>
+  </Package>
+</Wix>
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <ComponentGroup Id="ShortcutComponents">
+      <Component Id="StartMenuFolderShortcut"
+                 Directory="StartMenuProgramsFolder"
+                 Guid="6101b33f-9bc8-4d44-aad0-0f3eddc840c6">
+        <Shortcut Id="ApplicationStartMenuShortcut"
+                  Name="!(bind.Property.ProductName)"
+                  Description="!(bind.Property.ProductName)"
+                  Target="[InstallFolder]PamhagenSysCtrl.exe"
+                  WorkingDirectory="InstallFolder" />
+        <RemoveFolder Id="StartMenuProgramsFolder" On="uninstall" />
+        <RegistryValue Root="HKCU"
+                       Key="Software\!(bind.Property.Manufacturer)\!(bind.Property.ProductName)"
+                       Name="start_menu_installed"
+                       Type="integer"
+                       Value="1"
+                       KeyPath="yes" />
+      </Component>
+
+      <Component Id="DesktopFolderShortcut"
+                 Directory="DesktopFolder"
+                 Guid="58b61147-4e5c-4581-8593-fc7bcb591048">
+        <Shortcut Id="DesktopShortcut"
+                  Name="!(bind.Property.ProductName)"
+                  Description="!(bind.Property.ProductName)"
+                  Target="[InstallFolder]PamhagenSysCtrl.exe"
+                  WorkingDirectory="InstallFolder" />
+        <RegistryValue Root="HKCU"
+                       Key="Software\!(bind.Property.Manufacturer)\!(bind.Property.ProductName)"
+                       Name="desktop_installed"
+                       Type="integer"
+                       Value="1"
+                       KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
@@ -1,3 +1,10 @@
 <Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+  </Configurations>
+  <Project Path="Installer/Installer.wixproj">
+    <Platform Solution="*|Any CPU" Project="x64" />
+    <Build Solution="*|Any CPU" Project="true" />
+  </Project>
  <Project Path="PamhagenSysCtrl/PamhagenSysCtrl.csproj" />
 </Solution>
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />
+    </dependentAssembly>
+  </dependency>
+</assembly>
@@ -2,7 +2,7 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:local="clr-namespace:PamhagenSysCtrl"
-             StartupUri="Windows/MainWindow.xaml"
+             StartupUri="Windows/PlantSchemeWindow.xaml"
             Exit="Application_Exit">
    <Application.Resources>
    </Application.Resources>
@@ -1,4 +1,6 @@
 using PamhagenSysCtrl.Helpers;
+using System.IO;
+using System.Reflection;
 using System.Windows;
 using System.Windows.Threading;

@@ -6,14 +8,42 @@ namespace PamhagenSysCtrl {
    public partial class App : Application {

        public static PamhagenPlant? Plant;
-        public static Dispatcher MainDispatcher;
+        public static Dispatcher? MainDispatcher;
+
+        public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Anlagensteuerung Pamhagen");
+        public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
+        public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Anlagensteuerung Pamhagen");
+        public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Anlagensteuerung Pamhagen");
+
+        public static Config Config { get; private set; } = new(ConfigPath);
+        public static Version Version { get; private set; } = new();

        public App() :
            base() {
+            Directory.CreateDirectory(TempPath);
+            Directory.CreateDirectory(DataPath);
            MainDispatcher = Dispatcher;
+
+            var args = Environment.GetCommandLineArgs();
+            if (args.Length >= 2) {
+                Config = new(Path.GetFullPath(args[1]));
+            }
        }

        protected override async void OnStartup(StartupEventArgs evt) {
+            Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0");
+
+            try {
+                Plant = new(Config.PlcPort);
+                await Plant.StartThread();
+            } catch (Exception exc) {
+                Plant?.Dispose();
+                Plant = null;
+                var str = $"Beim Aufbauen einer Verbindung zur SPS ist ein Fehler aufgetreten:\n\n{exc.GetType().Name}: {exc.Message}";
+                if (exc.InnerException != null) str += $"\n\n{exc.InnerException.GetType().Name}: {exc.InnerException.Message}";
+                MessageBox.Show(str, "SPS-Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
            base.OnStartup(evt);
        }

@@ -0,0 +1,28 @@
+using Microsoft.Extensions.Configuration;
+using System.Windows;
+
+namespace PamhagenSysCtrl.Helpers {
+    public class Config {
+
+        private static readonly string[] TrueValues = ["1", "true", "yes", "on"];
+
+        private readonly string FileName;
+
+        public string PlcPort = "COM1";
+
+        public Config(string filename) {
+            FileName = filename;
+            Read();
+        }
+
+        public void Read() {
+            try {
+                var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
+                PlcPort = config["plc:port"] ?? "COM1";
+            } catch (Exception exc) {
+                MessageBox.Show($"Die Konfigurationsdatei konnte nicht gelesen werden:\n\n{exc.Message}", "Konfigurationsdatei lesen", MessageBoxButton.OK, MessageBoxImage.Error);
+                App.Current.Shutdown();
+            }
+        }
+    }
+}
@@ -0,0 +1,4 @@
+namespace PamhagenSysCtrl.Helpers {
+    public class NoClearanceException(string msg) : Exception(msg) {
+    }
+}
@@ -0,0 +1,43 @@
+using System.Windows.Media;
+
+namespace PamhagenSysCtrl.Helpers {
+    public class PamhagenBrushes {
+
+        public const double TRANSITION = 1.0 / 4096;
+
+        public static readonly SolidColorBrush Green = new SolidColorBrush(Color.FromRgb(0x20, 0xE0, 0x20));
+        public static readonly SolidColorBrush DimOrange = new SolidColorBrush(Color.FromRgb(0xFF, 0xC0, 0x80));
+        public static readonly SolidColorBrush Yellow = new SolidColorBrush(Color.FromRgb(0xFF, 0xE0, 0x10));
+        public static readonly SolidColorBrush Red = new SolidColorBrush(Color.FromRgb(0xFF, 0x20, 0x20));
+
+        public static Brush ForFillState(FillState state, Color background) {
+            return state switch {
+                FillState.Empty => GetEmpty(background),
+                FillState.Filled => GetFilled(background),
+                FillState.Half => GetHalf(background),
+                FillState.Full => GetFull(background),
+                _ => GetEmpty(background),
+            };
+        }
+
+        public static Brush ForFillState(FillState state, SolidColorBrush background) {
+            return ForFillState(state, background.Color);
+        }
+
+        public static Brush GetEmpty(Color background) {
+            return new SolidColorBrush(background);
+        }
+
+        public static Brush GetFilled(Color background) {
+            return new LinearGradientBrush(background, Green.Color, new(0.5, 0.875 - TRANSITION), new(0.5, 0.875 + TRANSITION));
+        }
+
+        public static Brush GetHalf(Color background) {
+            return new LinearGradientBrush(background, Green.Color, new(0.5, 0.5 - TRANSITION), new(0.5, 0.5 + TRANSITION));
+        }
+
+        public static Brush GetFull(Color background) {
+            return new LinearGradientBrush(background, Red.Color, new(0.5, 0.0625 - TRANSITION), new(0.5, 0.0625 + TRANSITION));
+        }
+    }
+}
@@ -9,19 +9,31 @@ namespace PamhagenSysCtrl.Helpers {

        public readonly Trough MW1;
        public readonly Trough MW2;
+        public readonly Pump MP1;
+        public readonly Pump MP2;
+        public readonly Pump P12;
+        public readonly Pump P3;
+        public readonly Pump P4;
+        public readonly Pump P5;
+        public readonly Pump P6;
+        public readonly EncasedAuger Auger1;
+        public readonly EncasedAuger Auger2;

        public PamhagenGraph() {
-            double mw2X = 100;
-            double mw1X = 250;
-            double mpY = 280;
-            double ltg1Y = 410;
+            double mw2X = 180;
+            double mw1X = 300;
+            double mpY = 380;
+            double ltg1Y = 510;
            double ltg2Y = ltg1Y + 30;
            double ltg1X = 600;
            double ltg2X = ltg1X + 30;
-            double ltg6Y = 60;
+            double ltg6Y = 160;
            double ltg7Y = ltg6Y - 30;
-            double tanksY = 180;
+            double tanksY = 280;
            double tValveY = ((tanksY - 50) + ltg6Y) / 2 + 5;
+            double wtX = ltg1X - 180;
+            double wt2Y = 225;
+            double wt1Y = wt2Y + 135;
            double t1X = 735;
            double t2X = t1X + 80;
            double t3X = t2X + 80;
@@ -31,18 +43,37 @@ namespace PamhagenSysCtrl.Helpers {
            double t7X = t6X + 80;
            double t8X = t7X + 80;
            double t9X = t8X + 80;
+            var prY = 780;
+            var pr1X = 750;
+            var pr2X = 900;

-            MW1 = new Trough("MW1", mw1X, mpY - 70, () => App.Plant?.FillLevelA1 != FillState.Empty);
-            MW2 = new Trough("MW2", mw2X, mpY - 70, () => App.Plant?.FillLevelA1 != FillState.Empty);
-            var mp1 = new Pump("MP1", mw1X, mpY);
-            var mp2 = new Pump("MP2", mw2X, mpY);
+            var trough = new EntryTrough("Auffangwanne", mw1X + 70, 100, () => App.Plant?.IsTroughAugerActive ?? false);
+            Nodes.Add(trough);
+
+            Auger1 = new EncasedAuger("", (mw1X + mw2X) / 2 - 100, 200, () => App.Plant?.IsAuger1Active ?? false);
+            var auger3 = new EncasedAuger("Pressen-\nQuerschnecke", 40, 200, () => App.Plant?.IsPresseQuerSchneckeActive ?? false, 180, clickable: false);
+            Auger2 = new EncasedAuger("", 120, 80, () => App.Plant?.IsAuger2Active ?? false, 135);
+            var belt = new ConveyorBelt("", 90, 160, () => App.Plant?.IsBeltActive ?? false);
+            Nodes.Add(belt);
+            Nodes.Add(Auger1);
+            Nodes.Add(auger3);
+            Nodes.Add(Auger2);
+            var rebler = new Rebler("Rebler", (mw1X + mw2X) / 2, 200, () => App.Plant?.IsReblerActive ?? false);
+            Nodes.Add(rebler);
+            var switcher = new Switcher("", (mw1X + mw2X) / 2, 260, () => App.Plant?.TroughSelector ?? 0, () => App.Plant == null ? 0 : App.Plant.WantMW1Selected ? 1 : 2);
+            Nodes.Add(switcher);
+
+            MW1 = new Trough("MW1", mw1X, mpY - 70, () => App.Plant?.FillLevelMW1 ?? FillState.Unknown);
+            MW2 = new Trough("MW2", mw2X, mpY - 70, () => App.Plant?.FillLevelMW2 ?? FillState.Unknown);
+            MP1 = new Pump("MP1", mw1X, mpY, () => App.Plant?.IsMP1Active ?? false, () => App.Plant?.MP1HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
+            MP2 = new Pump("MP2", mw2X, mpY, () => App.Plant?.IsMP2Active ?? false, () => App.Plant?.MP2HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
            var x1 = new PipeJoin(mw1X, mpY + 40);
            var x2 = new PipeJoin(mw2X, mpY + 40);

-            CreateOutlet(MW1, mp1);
-            CreateOutlet(MW2, mp2);
-            CreatePipe(mp1, x1);
-            CreatePipe(mp2, x2);
+            CreateOutlet(MW1, MP1);
+            CreateOutlet(MW2, MP2);
+            CreatePipe(MP1, x1);
+            CreatePipe(MP2, x2);

            var v1 = CreateValve(1, mw1X, mpY + 70);
            var v2 = CreateValve(2, mw2X, mpY + 70);
@@ -70,7 +101,7 @@ namespace PamhagenSysCtrl.Helpers {
            var v6 = CreateValve(6, mw1X, ltg2Y + 40);
            var v7 = CreateValve(7, (mw2X + mw1X) / 2, ltg2Y);
            var v8 = CreateValve(8, mw2X, ltg2Y + 40);
-            var v9 = CreateValve(9, ltg2X, 400);
+            var v9 = CreateValve(9, ltg2X, 500);

            CreatePipe(x4, v5);
            CreatePipe(x4, v6);
@@ -78,54 +109,54 @@ namespace PamhagenSysCtrl.Helpers {
            CreatePipe(x6, v8);
            CreatePipe(v7, v9);

-            var xv15 = new PipeJoin(ltg1X, 300);
-            var xv11 = new PipeJoin(ltg2X, 330);
-            var x7 = new PipeJoin(ltg2X, 360);
+            var xv15 = new PipeJoin(ltg1X, wt1Y + 40);
+            var xv11 = new PipeJoin(ltg2X, wt1Y + 70);
+            var x7 = new PipeJoin(ltg2X, 460);

            CreatePipe(v5, xv15);
            CreatePipe(v9, x7);
            CreatePipe(x7, xv11);

-            var v10 = CreateValve(10, ltg2X + 40, 360);
-            var v11 = CreateValve(11, ltg1X - 30, 330);
-            var v12 = CreateValve(12, ltg1X, 260);
-            var v13 = CreateValve(13, ltg2X, 260);
-            var v14 = CreateValve(14, ltg1X - 30, 220);
-            var v15 = CreateValve(15, ltg1X - 30, 300);
-            var v16 = CreateValve(16, ltg1X - 30, 190);
+            var v10 = CreateValve(10, ltg2X + 40, 460);
+            var v11 = CreateValve(11, ltg1X - 30, wt1Y + 70);
+            var v12 = CreateValve(12, ltg1X, wt1Y);
+            var v13 = CreateValve(13, ltg2X, wt1Y);
+            var v14 = CreateValve(14, ltg1X - 30, wt1Y - 40);
+            var v15 = CreateValve(15, ltg1X - 30, wt1Y + 40);
+            var v16 = CreateValve(16, ltg1X - 30, wt1Y - 70);
            CreatePipe(v10, x7);
            CreatePipe(xv11, v11);
            CreatePipe(xv15, v15);
            CreatePipe(xv15, v12);
            CreatePipe(xv11, v13);

-            var xv16 = new PipeJoin(ltg1X, 190);
-            var xv14 = new PipeJoin(ltg2X, 220);
+            var xv16 = new PipeJoin(ltg1X, wt1Y - 70);
+            var xv14 = new PipeJoin(ltg2X, wt1Y - 40);
            CreatePipe(v12, xv16);
            CreatePipe(v13, xv14);
            CreatePipe(v16, xv16);
            CreatePipe(v14, xv14);

-            var v20 = CreateValve(20, ltg1X - 30, 60);
-            var v21 = CreateValve(21, ltg1X - 30, 90);
-            var xv20 = new PipeJoin(ltg1X, 60);
-            var xv21 = new PipeJoin(ltg2X, 90);
+            var v20 = CreateValve(20, ltg1X - 30, wt2Y - 70);
+            var v21 = CreateValve(21, ltg1X - 30, wt2Y - 40);
+            var xv20 = new PipeJoin(ltg1X, wt2Y - 70);
+            var xv21 = new PipeJoin(ltg2X, wt2Y - 40);
            CreatePipe(xv16, xv20);
            CreatePipe(xv14, xv21);
            CreatePipe(v20, xv20);
            CreatePipe(v21, xv21);

-            var wt1 = new HeatExchanger("WT Most", ltg1X - 180, 260);
-            var wt2 = new HeatExchanger("WT Warmwasser", ltg1X - 180, 125);
-            var v17 = CreateValve(17, ltg1X - 110, 260);
-            var v18 = CreateValve(18, ltg1X - 140, 300);
-            var v19 = CreateValve(19, ltg1X - 140, 190);
-            var xwt1 = new PipeJoin(ltg1X - 60, 300);
-            var xwt2 = new PipeJoin(ltg1X - 110, 300);
-            var xwt3 = new PipeJoin(ltg1X - 140, 220);
-            var xwt4 = new PipeJoin(ltg1X - 60, 220);
-            var xwt5 = new PipeJoin(ltg1X - 140, 160);
-            var xwt6 = new PipeJoin(ltg1X - 60, 90);
+            var wt1 = new HeatExchanger("WT Most", wtX, wt1Y);
+            var wt2 = new HeatExchanger("WT Warmwasser", wtX, wt2Y);
+            var v17 = CreateValve(17, wtX + 70, wt1Y);
+            var v18 = CreateValve(18, wtX + 40, wt1Y + 40);
+            var v19 = CreateValve(19, wtX + 40, (wt1Y + wt2Y) / 2);
+            var xwt1 = new PipeJoin(wtX + 120, wt1Y + 40);
+            var xwt2 = new PipeJoin(wtX + 70, wt1Y + 40);
+            var xwt3 = new PipeJoin(wtX + 40, wt1Y - 40);
+            var xwt4 = new PipeJoin(wtX + 120, wt1Y - 40);
+            var xwt5 = new PipeJoin(wtX + 40, wt2Y + 40);
+            var xwt6 = new PipeJoin(wtX + 120, wt2Y - 40);
            CreatePipe(v11, xwt1);
            CreatePipe(v15, xwt1);
            CreatePipe(xwt1, xwt2);
@@ -259,17 +290,17 @@ namespace PamhagenSysCtrl.Helpers {
            CreateInlet(v43, t9);

            var xp12 = new PipeJoin((t1X + t2X) / 2, tanksY + 80);
-            var p12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 110);
+            P12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 110, () => App.Plant?.IsP12Active ?? false, () => App.Plant?.P12HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
            CreateOutlet(t1, xp12);
            CreateOutlet(t2, xp12);
-            CreatePipe(xp12, p12);
+            CreatePipe(xp12, P12);

-            var p3 = new Pump("P3", t3X, tanksY + 110);
-            var p4 = new Pump("P4", t4X, tanksY + 110);
-            var p5 = new Pump("P5", t5X, tanksY + 110);
-            CreateOutlet(t3, p3);
-            CreateOutlet(t4, p4);
-            CreateOutlet(t5, p5);
+            P3 = new Pump("P3", t3X, tanksY + 110, () => App.Plant?.IsP3Active ?? false, () => App.Plant?.P3HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
+            P4 = new Pump("P4", t4X, tanksY + 110, () => App.Plant?.IsP4Active ?? false, () => App.Plant?.P4HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
+            P5 = new Pump("P5", t5X, tanksY + 110, () => App.Plant?.IsP5Active ?? false, () => App.Plant?.P5HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
+            CreateOutlet(t3, P3);
+            CreateOutlet(t4, P4);
+            CreateOutlet(t5, P5);

            var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 150);
            var v45 = CreateValve(45, t3X, tanksY + 150);
@@ -279,10 +310,10 @@ namespace PamhagenSysCtrl.Helpers {
            var xv44 = new PipeJoin((t1X + t2X) / 2, tanksY + 180);
            var xv45 = new PipeJoin(t3X, tanksY + 180);
            var xv47 = new PipeJoin(t4X, tanksY + 180);
-            CreatePipe(p12, v44);
-            CreatePipe(p3, v45);
-            CreatePipe(p4, v47);
-            CreatePipe(p5, v48);
+            CreatePipe(P12, v44);
+            CreatePipe(P3, v45);
+            CreatePipe(P4, v47);
+            CreatePipe(P5, v48);
            CreatePipe(v44, xv44);
            CreatePipe(v45, xv45);
            CreatePipe(v47, xv47);
@@ -296,23 +327,20 @@ namespace PamhagenSysCtrl.Helpers {
            var xt6 = new PipeJoin(t6X, tanksY + 110);
            var xt7 = new PipeJoin(t7X, tanksY + 110);
            var xt8 = new PipeJoin(t8X, tanksY + 110);
-            var p6 = new Pump("P6", t6X, tanksY + 150);
+            P6 = new Pump("P6", t6X, tanksY + 150, () => App.Plant?.IsP6Active ?? false, () => App.Plant?.P6HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
            CreateOutlet(t6, xt6);
            CreateOutlet(t7, xt7);
            CreateOutlet(t8, xt8);
            CreateOutlet(t9, xt8);
            CreatePipe(xt8, xt7);
            CreatePipe(xt7, xt6);
-            CreatePipe(xt6, p6);
+            CreatePipe(xt6, P6);

            var v49 = CreateValve(49, t4X, tanksY + 220);
            CreatePipe(xv47, v49);

-            var prY = 680;
-            var pr1X = 750;
-            var pr2X = 900;
-            var press1 = new Press("Presse 1", pr1X, prY, 200000, () => App.Plant?.FillLevelPress1 == FillState.Full);
-            var press2 = new Press("Presse 2", pr2X, prY, 150000, () => App.Plant?.FillLevelPress1 == FillState.Full);
+            var press1 = new Press("Presse 1", pr1X, prY, 200000, () => App.Plant?.FillLevelPress1 ?? FillState.Unknown);
+            var press2 = new Press("Presse 2", pr2X, prY, 150000, () => App.Plant?.FillLevelPress2 ?? FillState.Unknown);
            var v50 = CreateValve(50, pr1X - 45, prY - 100);
            var v51 = CreateValve(51, pr1X - 15, prY - 100);
            var v52 = CreateValve(52, pr1X + 15, prY - 100);
@@ -321,15 +349,15 @@ namespace PamhagenSysCtrl.Helpers {
            var v55 = CreateValve(55, pr2X - 15, prY - 100);
            var v56 = CreateValve(56, pr2X + 15, prY - 100);
            var v57 = CreateValve(57, pr2X + 45, prY - 100);
-            var xp1 = new PipeJoin(pr1X - 15, 510);
-            var xp2 = new PipeJoin(pr1X + 15, 540);
-            var xp3 = new PipeJoin(pr2X - 45, 450);
-            var xp4 = new PipeJoin(pr2X + 45, 480);
+            var xp1 = new PipeJoin(pr1X - 15, 610);
+            var xp2 = new PipeJoin(pr1X + 15, 640);
+            var xp3 = new PipeJoin(pr2X - 45, 550);
+            var xp4 = new PipeJoin(pr2X + 45, 580);

            CreatePipe(v6, xp1, true);
            CreatePipe(v8, xp2, true);
            CreatePipe(v49, xp3, true);
-            CreatePipe(p6, xp4, true);
+            CreatePipe(P6, xp4, true);
            CreatePipe(xp1, v51);
            CreatePipe(xp1, v55);
            CreatePipe(xp2, v52);
@@ -350,11 +378,11 @@ namespace PamhagenSysCtrl.Helpers {
        }

        protected static Valve CreateValve(int n, double x, double y) {
-            return new(n, x, y, () => App.Plant?.IsValveOpen(4) ?? false, () => App.Plant?.WantValveOpen(4) ?? false);
+            return new(n, x, y, () => App.Plant?.IsValveOpen(n) ?? false, () => App.Plant?.WantValveOpen(n) ?? false);
        }

        protected static Tank CreateTank(int n, double x, double y, int capacity) {
-            return new($"Tank {n}", x, y, capacity, () => App.Plant?.TankFillLevels[n - 1] != FillState.Empty, () => App.Plant?.TankFillLevels[n - 1] != FillState.Full);
+            return new($"Tank {n}", x, y, capacity, () => App.Plant?.TankFillLevels[n - 1] ?? FillState.Unknown);
        }

        public void TraverseSubgraph(INode start, HashSet<IEdge>? visited = null, Action<IEdge>? edgeAction = null, Action<Valve>? valveAction = null) {
@@ -383,14 +411,13 @@ namespace PamhagenSysCtrl.Helpers {

        public void AddPath(Path path) {
            _selectedPaths.Add(path);
-            UpdateValvesAdjacientToPath(path, true);
+            UpdateValvesAdjacientToPath(path, true, false);
            if (App.Plant is PamhagenPlant plant) {
-                foreach (var (edge, _) in path.Hops) {
-                    if (edge is Valve v) {
+                foreach (var (_, node) in path.Hops) {
+                    if (node is Valve v) {
                        plant.OpenV(v.Nr);
                    }
                }
-                plant.CommitChanges();
            }
        }

@@ -399,26 +426,37 @@ namespace PamhagenSysCtrl.Helpers {
            UpdateValvesAdjacientToPath(path, false);
            foreach (var p in _selectedPaths) UpdateValvesAdjacientToPath(p, true);
            if (App.Plant is PamhagenPlant plant) {
-                foreach (var (edge, _) in path.Hops) {
-                    if (edge is Valve v) {
+                foreach (var (_, node) in path.Hops) {
+                    if (node is Valve v) {
                        plant.CloseV(v.Nr);
                    }
                }
-                plant.CommitChanges();
            }
        }

-        private void UpdateValvesAdjacientToPath(Path path, bool locked) {
+        private void UpdateValvesAdjacientToPath(Path path, bool locked, bool? wantOpen = null) {
            foreach (var (edge, node) in path.Hops) {
-                TraverseSubgraph(node, valveAction: (v) => v.IsLocked = locked);
+                TraverseSubgraph(node, valveAction: (v) => {
+                    v.IsLocked = locked;
+                    if (wantOpen.HasValue) {
+                        if (wantOpen.Value) {
+                            App.Plant?.OpenV(v.Nr);
+                        } else {
+                            App.Plant?.CloseV(v.Nr);
+                        }
+                    }
+                });
            }
        }

-        public void ColorPipesAdjacientToPath(Path path, Brush? color1, Brush? color2) {
+        public void ColorPipesAdjacientToPath(Path path, Brush? color1, bool flowArrows, Brush? color2) {
            var color = color1;
+            var flowPathOffset = 0.0;
            HashSet<IEdge> visited = [];
            foreach (var (edge, node) in path.Hops) {
                edge.Highlight = color1;
+                edge.Flow = flowArrows ? (edge.End == node, flowPathOffset) : null;
+                if (edge.Flow != null) flowPathOffset += edge.FlowLength;
                visited.Add(edge);
                if (node is Pump) color = color2;
                TraverseSubgraph(node, visited, edgeAction: (e) => e.Highlight = color);
@@ -13,17 +13,23 @@ namespace PamhagenSysCtrl.Helpers {

        protected bool ActuatorsChanged = false;
        protected PamhagenPlc.ActuatorStates Actuators;
-        protected PamhagenPlc.SensorStates Sensors;
+        protected PamhagenPlc.SensorStates Sensors = new(default, default, default, default, [
+            FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown
+            ], default);

        public bool IsValveOpen(int n) => !IsValveClosed(n);
        public bool IsValveClosed(int n) => Sensors.GetDS(n);
        public bool WantValveClosed(int n) => !WantValveOpen(n);
        public bool WantValveOpen(int n) => Actuators.GetV(n);

-        public bool IsA1Selected => Sensors.TroughSelector == 1;
-        public bool IsA2Selected => Sensors.TroughSelector == 2;
-        public FillState FillLevelA1 => Sensors.FillingLevels.A1;
-        public FillState FillLevelA2 => Sensors.FillingLevels.A2;
+        public bool AreValvesOpen(params int[] ns) => ns.All(IsValveOpen) && ns.All(WantValveOpen);
+        public bool AreValvesClosed(params int[] ns) => ns.All(IsValveClosed) && ns.All(WantValveClosed);
+
+        public int TroughSelector => Sensors.TroughSelector;
+        public bool IsMWSelected => Sensors.TroughSelector == 1;
+        public bool IsMW2Selected => Sensors.TroughSelector == 2;
+        public FillState FillLevelMW1 => Sensors.FillingLevels.MW1;
+        public FillState FillLevelMW2 => Sensors.FillingLevels.MW2;
        public FillState FillLevelPress1 => Sensors.FillingLevels.Press1;
        public FillState FillLevelPress2 => Sensors.FillingLevels.Press2;
        public FillState FillLevelT1 => Sensors.FillingLevelTanks[0];
@@ -38,26 +44,53 @@ namespace PamhagenSysCtrl.Helpers {
        public FillState[] TankFillLevels => Sensors.FillingLevelTanks;
        public double GradationOe => Sensors.GradationOe;
        public MotorState PresseQuerSchnecke => Sensors.PresseQuerSchnecke;
+        public bool IsPresseQuerSchneckeActive => PresseQuerSchnecke == MotorState.Forward;

-        public bool WantA1Selected => Actuators.GetV(58);
-        public bool WantA2Selected => !Actuators.GetV(58);
+        public bool WantMW1Selected => Actuators.GetV(58);
+        public bool WantMW2Selected => !Actuators.GetV(58);

        public bool IsTroughAugerActive => Actuators.TroughAuger;
        public bool IsReblerActive => Actuators.Rebler;
-        public bool IsStirrerA1Active => Actuators.StirrerA1;
-        public bool IsStirrerA2Active => Actuators.StirrerA2;
+        public bool IsStirrerMW1Active => Actuators.StirrerMW1;
+        public bool IsStirrerMW2Active => Actuators.StirrerMW2;
        public bool IsBeltActive => Actuators.Belt;
        public bool IsAuger1Active => Actuators.Auger1;
        public bool IsAuger2Active => Actuators.Auger2;
        public bool IsWasteDisposalActive => IsBeltActive || IsAuger1Active || IsAuger2Active;
        public bool IsGradationPumpActive => Actuators.GradationPump;

+        public bool IsMP1Active => Actuators.MP1 == MotorState.Forward || Actuators.MP1 == MotorState.Backward;
+        public bool IsMP2Active => Actuators.MP2 == MotorState.Forward || Actuators.MP2 == MotorState.Backward;
+        public bool IsP12Active => Actuators.P12 == MotorState.Forward;
+        public bool IsP3Active => Actuators.P3 == MotorState.Forward;
+        public bool IsP4Active => Actuators.P4 == MotorState.Forward;
+        public bool IsP5Active => Actuators.P5 == MotorState.Forward;
+        public bool IsP6Active => Actuators.P6 == MotorState.Forward;
+
        public PamhagenPlant(string portName) {
            Plc = new(portName);
+            Update += OnUpdate;
        }

        protected virtual void RaiseUpdateEvent(PlantEventArgs evt) {
-            App.MainDispatcher.BeginInvoke(() => Update?.Invoke(this, evt));
+            App.MainDispatcher?.BeginInvoke(() => Update?.Invoke(this, evt));
+        }
+
+        protected static void OnUpdate(object? sender, PlantEventArgs evt) {
+            if (sender is not PamhagenPlant p) return;
+            if (p.IsPresseQuerSchneckeActive && !p.IsBeltActive) p.StartBelt();
+            if (p.IsReblerActive && !p.IsAuger1Active) p.StartAuger1();
+            if (p.IsAuger1Active && !p.IsBeltActive) p.StartBelt();
+            if (p.IsBeltActive && !p.IsAuger2Active) p.StartAuger2();
+            if (p.IsTroughAugerActive && (!p.IsReblerActive || (p.IsMWSelected && p.FillLevelMW1 == FillState.Full) || (p.IsMW2Selected && p.FillLevelMW2 == FillState.Full)))
+                p.StopTroughAuger();
+            if (p.IsMP1Active && !p.MP1HasClearance) p.StopMP1();
+            if (p.IsMP2Active && !p.MP2HasClearance) p.StopMP2();
+            if (p.IsP12Active && !p.P12HasClearance) p.StopP12();
+            if (p.IsP3Active && !p.P3HasClearance) p.StopP3();
+            if (p.IsP4Active && !p.P4HasClearance) p.StopP4();
+            if (p.IsP5Active && !p.P5HasClearance) p.StopP5();
+            if (p.IsP6Active && !p.P6HasClearance) p.StopP6();
        }

        public async Task StartThread() {
@@ -107,40 +140,222 @@ namespace PamhagenSysCtrl.Helpers {
            }
        }

-        public void CommitChanges() {
-            ActuatorsChanged = true;
-        }
+        protected bool HasWTClearanceAA =>
+            (AreValvesOpen(12) && AreValvesClosed(15, 16, 20)) ||  // bypass
+            (AreValvesOpen(15, 18, 16) && AreValvesClosed(11, 12, 14, 17, 19, 20)) ||  // WT1
+            (AreValvesOpen(15, 17, 20) && AreValvesClosed(11, 12, 18, 19, 21)) ||  // WT2
+            (AreValvesOpen(15, 18, 19, 20) && AreValvesClosed(11, 12, 14, 16, 17, 21)) ||  // WT1+WT2
+            false;
+        protected bool HasWTClearanceAB =>
+            (AreValvesOpen(15, 18, 14) && AreValvesClosed(11, 12, 13, 16, 17, 19, 21)) ||  // WT1
+            (AreValvesOpen(15, 17, 21) && AreValvesClosed(11, 12, 13, 18, 19, 20)) ||  // WT2
+            (AreValvesOpen(15, 18, 19, 21) && AreValvesClosed(11, 12, 13, 14, 16, 17, 20)) ||  // WT1+WT2
+            false;
+        protected bool HasWTClearanceBA =>
+            (AreValvesOpen(11, 18, 16) && AreValvesClosed(15, 12, 13, 14, 17, 19, 20)) ||  // WT1
+            (AreValvesOpen(11, 17, 20) && AreValvesClosed(15, 12, 13, 18, 19, 21)) ||  // WT2
+            (AreValvesOpen(11, 18, 19, 20) && AreValvesClosed(15, 12, 13, 14, 16, 17, 21)) ||  // WT1+WT2
+            false;
+        protected bool HasWTClearanceBB =>
+            (AreValvesOpen(13) && AreValvesClosed(11, 14, 21)) ||  // bypass
+            (AreValvesOpen(11, 18, 14) && AreValvesClosed(15, 13, 16, 17, 19, 21)) ||  // WT1
+            (AreValvesOpen(11, 17, 21) && AreValvesClosed(15, 13, 18, 19, 20)) ||  // WT2
+            (AreValvesOpen(11, 18, 19, 21) && AreValvesClosed(15, 13, 14, 16, 17, 20)) ||  // WT1+WT2
+            false;
+
+        protected bool HasT1ClearanceA => AreValvesOpen(22) && AreValvesClosed(24, 26, 28);
+        protected bool HasT1ClearanceB => AreValvesOpen(23) && AreValvesClosed(25, 27, 29);
+        protected bool HasT2ClearanceA => AreValvesOpen(24) && AreValvesClosed(22, 26, 28);
+        protected bool HasT2ClearanceB => AreValvesOpen(25) && AreValvesClosed(23, 27, 29);
+        protected bool HasT3ClearanceA => AreValvesOpen(26) && AreValvesClosed(22, 24, 28);
+        protected bool HasT3ClearanceB => AreValvesOpen(27) && AreValvesClosed(23, 25, 29);
+        protected bool HasT4ClearanceA => AreValvesOpen(28, 30) && AreValvesClosed(22, 24, 26, 32, 34);
+        protected bool HasT4ClearanceB => AreValvesOpen(29, 31) && AreValvesClosed(23, 25, 27, 33, 35);
+        protected bool HasT5ClearanceA => AreValvesOpen(28, 32) && AreValvesClosed(22, 24, 26, 30, 34);
+        protected bool HasT5ClearanceB => AreValvesOpen(29, 33) && AreValvesClosed(23, 25, 27, 31, 35);
+        protected bool HasT6ClearanceA => AreValvesOpen(28, 34, 37) && AreValvesClosed(22, 24, 26, 30, 32, 39, 41, 43);
+        protected bool HasT6ClearanceB => AreValvesOpen(29, 35, 36) && AreValvesClosed(23, 25, 27, 31, 33, 38, 40, 42);
+        protected bool HasT7ClearanceA => AreValvesOpen(28, 34, 39) && AreValvesClosed(22, 24, 26, 30, 32, 37, 41, 43);
+        protected bool HasT7ClearanceB => AreValvesOpen(29, 35, 38) && AreValvesClosed(23, 25, 27, 31, 33, 36, 40, 42);
+        protected bool HasT8ClearanceA => AreValvesOpen(28, 34, 41) && AreValvesClosed(22, 24, 26, 30, 32, 37, 39, 43);
+        protected bool HasT8ClearanceB => AreValvesOpen(29, 35, 40) && AreValvesClosed(23, 25, 27, 31, 33, 36, 38, 42);
+        protected bool HasT9ClearanceA => AreValvesOpen(28, 34, 43) && AreValvesClosed(22, 24, 26, 30, 32, 37, 39, 41);
+        protected bool HasT9ClearanceB => AreValvesOpen(29, 35, 42) && AreValvesClosed(23, 25, 27, 31, 33, 36, 38, 40);
+
+        protected bool HasClearanceTank1(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT1ClearanceA) || (HasWTClearanceAB && HasT1ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT1ClearanceA) || (HasWTClearanceBB && HasT1ClearanceB)));
+        protected bool HasClearanceTank2(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT2ClearanceA) || (HasWTClearanceAB && HasT2ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT2ClearanceA) || (HasWTClearanceBB && HasT2ClearanceB)));
+        protected bool HasClearanceTank3(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT3ClearanceA) || (HasWTClearanceAB && HasT3ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT3ClearanceA) || (HasWTClearanceBB && HasT3ClearanceB)));
+        protected bool HasClearanceTank4(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT4ClearanceA) || (HasWTClearanceAB && HasT4ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT4ClearanceA) || (HasWTClearanceBB && HasT4ClearanceB)));
+        protected bool HasClearanceTank5(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT5ClearanceA) || (HasWTClearanceAB && HasT5ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT5ClearanceA) || (HasWTClearanceBB && HasT5ClearanceB)));
+        protected bool HasClearanceTank6(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT6ClearanceA) || (HasWTClearanceAB && HasT6ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT6ClearanceA) || (HasWTClearanceBB && HasT6ClearanceB)));
+        protected bool HasClearanceTank7(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT7ClearanceA) || (HasWTClearanceAB && HasT7ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT7ClearanceA) || (HasWTClearanceBB && HasT7ClearanceB)));
+        protected bool HasClearanceTank8(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT8ClearanceA) || (HasWTClearanceAB && HasT8ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT8ClearanceA) || (HasWTClearanceBB && HasT8ClearanceB)));
+        protected bool HasClearanceTank9(bool a, bool b) =>
+            (a && ((HasWTClearanceAA && HasT9ClearanceA) || (HasWTClearanceAB && HasT9ClearanceB))) ||
+            (b && ((HasWTClearanceBA && HasT9ClearanceA) || (HasWTClearanceBB && HasT9ClearanceB)));
+
+        public bool MP1HasClearance => FillLevelMW1 != FillState.Empty && (
+            (MP1HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+            (MP1HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+            (HasClearanceTank1(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
+            (HasClearanceTank2(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
+            (HasClearanceTank3(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
+            (HasClearanceTank4(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
+            (HasClearanceTank5(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
+            (HasClearanceTank6(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
+            (HasClearanceTank7(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
+            (HasClearanceTank8(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
+            (HasClearanceTank9(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
+            false);
+        protected bool MP1HasClearancePress1 =>
+            (AreValvesOpen(1, 6, 51) && AreValvesClosed(3, 4, 5, 55)) ||
+            (AreValvesOpen(4, 8, 52) && AreValvesClosed(1, 2, 7, 56));
+        protected bool MP1HasClearancePress2 =>
+            (AreValvesOpen(1, 6, 55) && AreValvesClosed(3, 4, 5, 51)) ||
+            (AreValvesOpen(4, 8, 56) && AreValvesClosed(1, 2, 7, 52));
+        protected bool MP1HasClearanceTanksA => AreValvesOpen(1, 5) && AreValvesClosed(3, 4, 6);
+        protected bool MP1HasClearanceTanksB => AreValvesOpen(4, 7, 9) && AreValvesClosed(1, 2, 8, 10);

        public MotorState MP1 {
            get => Actuators.MP1;
            set => Actuators.MP1 = (value != MotorState.Halt && value != MotorState.Forward && value != MotorState.Backward) ? throw new ArgumentException("Invalid state for MP1") : value;
        }

+        public bool MP2HasClearance => FillLevelMW2 != FillState.Empty && (
+              (MP2HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              (MP2HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (HasClearanceTank1(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
+              (HasClearanceTank2(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
+              (HasClearanceTank3(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
+              (HasClearanceTank4(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
+              (HasClearanceTank5(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
+              (HasClearanceTank6(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
+              (HasClearanceTank7(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
+              (HasClearanceTank8(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
+              (HasClearanceTank9(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
+              false);
+        protected bool MP2HasClearancePress1 =>
+            (AreValvesOpen(2, 8, 52) && AreValvesClosed(3, 4, 7, 56)) ||
+            (AreValvesOpen(3, 6, 51) && AreValvesClosed(1, 2, 5, 55));
+        protected bool MP2HasClearancePress2 =>
+            (AreValvesOpen(2, 8, 56) && AreValvesClosed(3, 4, 7, 52)) ||
+            (AreValvesOpen(3, 6, 55) && AreValvesClosed(2, 1, 5, 51));
+        protected bool MP2HasClearanceTanksA => AreValvesOpen(3, 5) && AreValvesClosed(1, 2, 6);
+        protected bool MP2HasClearanceTanksB => AreValvesOpen(2, 7, 9) && AreValvesClosed(3, 4, 8, 10);
+
        public MotorState MP2 {
            get => Actuators.MP2;
            set => Actuators.MP2 = (value != MotorState.Halt && value != MotorState.Forward && value != MotorState.Backward) ? throw new ArgumentException("Invalid state for MP2") : value;
        }

+        public bool P12HasClearance => (FillLevelT1 != FillState.Empty || FillLevelT2 != FillState.Empty) && (
+              (P12HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              (P12HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (HasClearanceTank1(false, P12HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
+              (HasClearanceTank2(false, P12HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
+              (HasClearanceTank3(false, P12HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
+              (HasClearanceTank4(false, P12HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
+              (HasClearanceTank5(false, P12HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
+              (HasClearanceTank6(false, P12HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
+              (HasClearanceTank7(false, P12HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
+              (HasClearanceTank8(false, P12HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
+              (HasClearanceTank9(false, P12HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
+              false);
+        protected bool P12HasClearancePress1 => AreValvesOpen(44, 46, 49, 50) && AreValvesClosed(10, 45, 47, 48, 54);
+        protected bool P12HasClearancePress2 => AreValvesOpen(44, 46, 49, 54) && AreValvesClosed(10, 45, 47, 48, 50);
+        protected bool P12HasClearanceTanksB => AreValvesOpen(44, 10) && AreValvesClosed(9, 45, 46);
+
        public MotorState P12 {
            get => Actuators.P12;
            set => Actuators.P12 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P12") : value;
        }

+        public bool P3HasClearance => FillLevelT3 != FillState.Empty && (
+              (P3HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              (P3HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (HasClearanceTank1(false, P3HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
+              (HasClearanceTank2(false, P3HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
+              (HasClearanceTank3(false, P3HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
+              (HasClearanceTank4(false, P3HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
+              (HasClearanceTank5(false, P3HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
+              (HasClearanceTank6(false, P3HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
+              (HasClearanceTank7(false, P3HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
+              (HasClearanceTank8(false, P3HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
+              (HasClearanceTank9(false, P3HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
+              false);
+        protected bool P3HasClearancePress1 => AreValvesOpen(45, 46, 49, 50) && AreValvesClosed(10, 44, 47, 48, 54);
+        protected bool P3HasClearancePress2 => AreValvesOpen(45, 46, 49, 54) && AreValvesClosed(10, 44, 47, 48, 50);
+        protected bool P3HasClearanceTanksB => AreValvesOpen(45, 10) && AreValvesClosed(9, 44, 46);
+
        public MotorState P3 {
            get => Actuators.P3;
            set => Actuators.P3 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P3") : value;
        }

+        public bool P4HasClearance => FillLevelT4 != FillState.Empty && (
+              (P4HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              (P4HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (HasClearanceTank1(false, P4HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
+              (HasClearanceTank2(false, P4HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
+              (HasClearanceTank3(false, P4HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
+              (HasClearanceTank4(false, P4HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
+              (HasClearanceTank5(false, P4HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
+              (HasClearanceTank6(false, P4HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
+              (HasClearanceTank7(false, P4HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
+              (HasClearanceTank8(false, P4HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
+              (HasClearanceTank9(false, P4HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
+              false);
+        protected bool P4HasClearancePress1 => AreValvesOpen(47, 49, 50) && AreValvesClosed(46, 48, 54);
+        protected bool P4HasClearancePress2 => AreValvesOpen(47, 49, 54) && AreValvesClosed(46, 48, 50);
+        protected bool P4HasClearanceTanksB => AreValvesOpen(47, 46, 10) && AreValvesClosed(9, 44, 45, 48, 49);
+
        public MotorState P4 {
            get => Actuators.P4;
            set => Actuators.P4 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P4") : value;
        }

+        public bool P5HasClearance => FillLevelT5 != FillState.Empty && (
+              (P5HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
+              (P5HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
+              (HasClearanceTank1(false, P5HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
+              (HasClearanceTank2(false, P5HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
+              (HasClearanceTank3(false, P5HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
+              (HasClearanceTank4(false, P5HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
+              (HasClearanceTank5(false, P5HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
+              (HasClearanceTank6(false, P5HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
+              (HasClearanceTank7(false, P5HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
+              (HasClearanceTank8(false, P5HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
+              (HasClearanceTank9(false, P5HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
+              false);
+        protected bool P5HasClearancePress1 => AreValvesOpen(48, 49, 50) && AreValvesClosed(46, 47, 54);
+        protected bool P5HasClearancePress2 => AreValvesOpen(48, 49, 54) && AreValvesClosed(46, 47, 50);
+        protected bool P5HasClearanceTanksB => AreValvesOpen(48, 46, 10) && AreValvesClosed(9, 44, 45, 47, 49);
+
        public MotorState P5 {
            get => Actuators.P5;
            set => Actuators.P5 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P5") : value;
        }

+        public bool P6HasClearance =>
+            (IsValveOpen(53) && IsValveClosed(57) && FillLevelPress1 != FillState.Full) ||
+            (IsValveOpen(57) && IsValveClosed(53) && FillLevelPress2 != FillState.Full);
+
        public MotorState P6 {
            get => Actuators.P6;
            set => Actuators.P6 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P6") : value;
@@ -153,157 +368,198 @@ namespace PamhagenSysCtrl.Helpers {
        protected void SetV(int n, bool val) {
            if (n < 1 || n > 57) throw new ArgumentException("Invalid value for n: 1 <= #V <= 57");
            Actuators.SetV(n, val);
-
+            ActuatorsChanged = true;
        }

-        public void SelectA1() {
+        public void SelectMW1() {
            Actuators.SetV(58, true);
-            //if (IsReblerActive) Actuators.StirrerA1 = true;
+            //if (IsReblerActive) Actuators.StirrerMW1 = true;
+            ActuatorsChanged = true;
        }

-        public void SelectA2() {
+        public void SelectMW2() {
            Actuators.SetV(58, false);
-            //if (IsReblerActive) Actuators.StirrerA2 = true;
+            //if (IsReblerActive) Actuators.StirrerMW2 = true;
+            ActuatorsChanged = true;
        }

        public void StartTroughAuger() {
+            if (!IsReblerActive || (IsMWSelected && FillLevelMW1 == FillState.Full) || (IsMW2Selected && FillLevelMW2 == FillState.Full))
+                throw new NoClearanceException("Schnecke Auffangwanne hat keine Freigabe");
            Actuators.TroughAuger = true;
+            ActuatorsChanged = true;
        }

        public void StopTroughAuger() {
            Actuators.TroughAuger = false;
+            ActuatorsChanged = true;
        }

        public void StartRebler() {
            Actuators.Rebler = true;
+            StartAuger1();
+            ActuatorsChanged = true;
        }

        public void StopRebler() {
+            StopTroughAuger();
            Actuators.Rebler = false;
+            ActuatorsChanged = true;
        }

-        public void StartStirrerA1() {
-            Actuators.StirrerA1 = true;
+        public void StartStirrerMW1() {
+            Actuators.StirrerMW1 = true;
+            ActuatorsChanged = true;
        }

-        public void StopStirrerA1() {
-            Actuators.StirrerA1 = false;
+        public void StopStirrerMW1() {
+            Actuators.StirrerMW1 = false;
+            ActuatorsChanged = true;
        }

-        public void StartStirrerA2() {
-            Actuators.StirrerA2 = true;
+        public void StartStirrerMW2() {
+            Actuators.StirrerMW2 = true;
+            ActuatorsChanged = true;
        }

-        public void StopStirrerA2() {
-            Actuators.StirrerA2 = false;
+        public void StopStirrerMW2() {
+            Actuators.StirrerMW2 = false;
+            ActuatorsChanged = true;
        }

        public void StartBelt() {
            Actuators.Belt = true;
+            StartAuger2();
+            ActuatorsChanged = true;
        }

        public void StopBelt() {
+            if (IsPresseQuerSchneckeActive) throw new NoClearanceException("Presse-Querschnecke aktiv");
+            if (IsAuger1Active) throw new NoClearanceException("Förderschnecke 1 aktiv");
            Actuators.Belt = false;
+            ActuatorsChanged = true;
        }

        public void StartAuger1() {
            Actuators.Auger1 = true;
+            StartBelt();
+            ActuatorsChanged = true;
        }

        public void StopAuger1() {
+            if (IsReblerActive) throw new NoClearanceException("Rebler aktiv");
            Actuators.Auger1 = false;
+            ActuatorsChanged = true;
        }

        public void StartAuger2() {
            Actuators.Auger2 = true;
+            ActuatorsChanged = true;
        }

        public void StopAuger2() {
+            if (IsBeltActive) throw new NoClearanceException("Förderband aktiv");
            Actuators.Auger2 = false;
-        }
-
-        public void StartWasteDisposal() {
-            StartBelt();
-            StartAuger1();
-            StartAuger2();
-        }
-
-        public void StopWasteDisposal() {
-            StopBelt();
-            StopAuger1();
-            StopAuger2();
+            ActuatorsChanged = true;
        }

        public void StartGradationPump() {
            Actuators.GradationPump = true;
+            ActuatorsChanged = true;
        }

        public void StopGradationPump() {
            Actuators.GradationPump = false;
+            ActuatorsChanged = true;
        }

        public void StartMP1Forward() {
+            if (!MP1HasClearance) throw new NoClearanceException("MP1 hat keine Freigabe");
            Actuators.MP1 = MotorState.Forward;
+            ActuatorsChanged = true;
        }

        public void StartMP1Backward() {
+            if (!MP1HasClearance) throw new NoClearanceException("MP1 hat keine Freigabe");
            Actuators.MP1 = MotorState.Backward;
+            ActuatorsChanged = true;
        }

        public void StopMP1() {
            Actuators.MP1 = MotorState.Halt;
+            ActuatorsChanged = true;
        }

        public void StartMP2Forward() {
+            if (!MP2HasClearance) throw new NoClearanceException("MP2 hat keine Freigabe");
            Actuators.MP2 = MotorState.Forward;
+            ActuatorsChanged = true;
        }

        public void StartMP2Backward() {
+            if (!MP2HasClearance) throw new NoClearanceException("MP2 hat keine Freigabe");
            Actuators.MP2 = MotorState.Backward;
+            ActuatorsChanged = true;
        }

        public void StopMP2() {
            Actuators.MP2 = MotorState.Halt;
+            ActuatorsChanged = true;
        }

        public void StartP12() {
+            if (!P12HasClearance) throw new NoClearanceException("P1/2 hat keine Freigabe");
            Actuators.P12 = MotorState.Forward;
+            ActuatorsChanged = true;
        }

        public void StopP12() {
            Actuators.P12 = MotorState.Halt;
+            ActuatorsChanged = true;
        }

        public void StartP3() {
+            if (!P3HasClearance) throw new NoClearanceException("P3 hat keine Freigabe");
            Actuators.P3 = MotorState.Forward;
+            ActuatorsChanged = true;
        }

        public void StopP3() {
            Actuators.P3 = MotorState.Halt;
+            ActuatorsChanged = true;
        }

        public void StartP4() {
+            if (!P4HasClearance) throw new NoClearanceException("P4 hat keine Freigabe");
            Actuators.P4 = MotorState.Forward;
+            ActuatorsChanged = true;
        }

        public void StopP4() {
            Actuators.P4 = MotorState.Halt;
+            ActuatorsChanged = true;
        }

        public void StartP5() {
+            if (!P5HasClearance) throw new NoClearanceException("P5 hat keine Freigabe");
            Actuators.P5 = MotorState.Forward;
+            ActuatorsChanged = true;
        }

        public void StopP5() {
            Actuators.P5 = MotorState.Halt;
+            ActuatorsChanged = true;
        }

        public void StartP6() {
+            if (!P6HasClearance) throw new NoClearanceException("P6 hat keine Freigabe");
            Actuators.P6 = MotorState.Forward;
+            ActuatorsChanged = true;
        }

        public void StopP6() {
            Actuators.P6 = MotorState.Halt;
+            ActuatorsChanged = true;
        }
    }
 }
@@ -5,7 +5,7 @@ namespace PamhagenSysCtrl.Helpers {

        public record struct SensorStates(
            long PressureSensors,
-            (FillState A1, FillState A2, FillState Press1, FillState Press2) FillingLevels,
+            (FillState MW1, FillState MW2, FillState Press1, FillState Press2) FillingLevels,
            int TroughSelector,
            double GradationOe,
            FillState[] FillingLevelTanks,
@@ -17,7 +17,7 @@ namespace PamhagenSysCtrl.Helpers {
        public record struct ActuatorStates(
            long Valves,
            MotorState MP1, MotorState MP2, MotorState P12, MotorState P3, MotorState P4, MotorState P5, MotorState P6,
-            bool TroughAuger, bool Rebler, bool StirrerA1, bool StirrerA2, bool Belt, bool Auger1, bool Auger2, bool GradationPump
+            bool TroughAuger, bool Rebler, bool StirrerMW1, bool StirrerMW2, bool Belt, bool Auger1, bool Auger2, bool GradationPump
        ) {
            public readonly bool GetV(int n) => (Valves & (1L << (n - 1))) != 0;
            public void SetV(int n, bool val) {
@@ -107,11 +107,11 @@ namespace PamhagenSysCtrl.Helpers {
            long pressure = (long)r1 | ((long)r2 << 16) | ((long)r3 << 32) | ((long)r4 << 48);
            pressure = (pressure & 0x01FFFFFFFFFFFFFF) | ((pressure & 0x0600000000000000) << 1);

-            var a1 = Int3ToFillState((f1      ) & 0x7);  // 111 011 001 000
-            var a2 = Int3ToFillState((f1 >>  3) & 0x7);  // 111 011 001 000
-            var p1 = Int1ToFillState((f1 >>  6) & 0x1);  // 1 0
-            var p2 = Int1ToFillState((f1 >>  7) & 0x1);  // 1 0
-            var wp =                ((f1 >>  8) & 0x3);  // 10 01
+            var mw1 = Int3ToFillState((f1      ) & 0x7);  // 111 011 001 000
+            var mw2 = Int3ToFillState((f1 >>  3) & 0x7);  // 111 011 001 000
+            var p1  = Int1ToFillState((f1 >>  6) & 0x1);  // 1 0
+            var p2  = Int1ToFillState((f1 >>  7) & 0x1);  // 1 0
+            var wp  =                ((f1 >>  8) & 0x3);  // 10 01

            // Masseligerät :    4mA => 50 Oe
            //                   20mA => 150 Oe
@@ -137,7 +137,7 @@ namespace PamhagenSysCtrl.Helpers {
            var t9 = Int1ToFillState((f2 >> 13) & 0x1);  // 1 0
            var q1 = Int1ToPumpState((f2 >> 15) & 0x1);  // 1 0

-            return new SensorStates(pressure, (a1, a2, p1, p2), wp == 3 ? -1 : wp == 1 ? 2 : wp == 2 ? 1 : 0, oe, [t1, t2, t3, t4, t5, t6, t7, t8, t9], q1);
+            return new SensorStates(pressure, (mw1, mw2, p1, p2), wp == 3 ? -1 : wp == 1 ? 2 : wp == 2 ? 1 : 0, oe, [t1, t2, t3, t4, t5, t6, t7, t8, t9], q1);
        }

        protected async Task<(ushort RW000, ushort RW001, ushort RW002, ushort RW003, ushort RW004, ushort RW005, ushort RW006)> ReadOutputRegisters() {
@@ -210,8 +210,8 @@ namespace PamhagenSysCtrl.Helpers {
                (state.TroughAuger    ? 0x01 : 0x00) |
                (state.Rebler         ? 0x02 : 0x00) |
                (state.GetV(58)       ? 0x04 : 0x00) |
-                (state.StirrerA1      ? 0x08 : 0x00) |
-                (state.StirrerA2      ? 0x10 : 0x00) |
+                (state.StirrerMW1     ? 0x08 : 0x00) |
+                (state.StirrerMW2     ? 0x10 : 0x00) |
                (state.Belt           ? 0x20 : 0x00) |
                (state.Auger1         ? 0x40 : 0x00) |
                (state.Auger2         ? 0x80 : 0x00);
@@ -0,0 +1,75 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class Auger {
+
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public double Width { get; set; }
+        public double Height { get; set; }
+        public double Angle { get; set; }
+
+        public bool IsAnimationActive {
+            set {
+                if (value) {
+                    _storyboard?.Resume();
+                } else {
+                    _storyboard?.Pause();
+                }
+            }
+        }
+
+        private Polyline? _polyline;
+        private Storyboard? _storyboard;
+
+        public Auger(double x, double y, double width, double height, double angle = 0) {
+            CenterX = x;
+            CenterY = y;
+            Width = width;
+            Height = height;
+            Angle = angle;
+        }
+
+        public void Draw(Canvas canvas) {
+            var d = Height / 4;
+            int n = (int)(Width / d / 4) + 2;
+            _polyline = new Polyline() {
+                Points = [.. Enumerable.Range(0, n).SelectMany(i => new List<Point>() {
+                    new(i * 4 * d, Height / 2), new((i * 4 + 1) * d, 0),
+                    new((i * 4 + 2) * d, Height / 2), new((i * 4 + 3) * d, Height)
+                }), new(n * 4 * d, Height / 2), new(0, Height / 2)],
+                Fill = Brushes.Transparent,
+                Stroke = Brushes.Black,
+                StrokeThickness = 2,
+            };
+            _polyline.SetValue(Canvas.LeftProperty, 0.0);
+
+            var slideLeft = new DoubleAnimation {
+                From = 0,
+                To = -d * 4,
+                Duration = new Duration(TimeSpan.FromSeconds(1)),
+                RepeatBehavior = RepeatBehavior.Forever,
+            };
+            _storyboard = new Storyboard();
+            _storyboard.Children.Add(slideLeft);
+            Storyboard.SetTarget(slideLeft, _polyline);
+            Storyboard.SetTargetProperty(slideLeft, new PropertyPath(Canvas.LeftProperty));
+            var clipCanvas = new Canvas() {
+                Width = Width,
+                Height = Height,
+                ClipToBounds = true,
+                RenderTransform = new RotateTransform(Angle, Width / 2, Height / 2),
+            };
+            clipCanvas.SetValue(Canvas.TopProperty, CenterY - Height / 2);
+            clipCanvas.SetValue(Canvas.LeftProperty, CenterX - Width / 2);
+            clipCanvas.Children.Add(_polyline);
+            canvas.Children.Add(clipCanvas);
+            _storyboard.Begin();
+            _storyboard.Pause();
+        }
+    }
+}
@@ -0,0 +1,113 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class ConveyorBelt : INode {
+
+        public const double WIDTH = 30;
+        public const double HEIGHT = 120;
+
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public string Label { get; set; }
+        public ISet<IEdge> Inputs { get; init; }
+        public ISet<IEdge> Outputs { get; init; }
+
+        public bool IsActive => CallbackActive();
+        public bool IsAnimationActive {
+            get => _animationActive;
+            set {
+                _animationActive = value;
+                if (value) {
+                    _storyboard?.Resume();
+                } else {
+                    _storyboard?.Pause();
+                }
+            }
+        }
+
+        protected Func<bool> CallbackActive;
+
+        private bool _animationActive;
+        private Shape? _rect;
+        private Polyline? _polyline;
+        private Storyboard? _storyboard;
+
+        public ConveyorBelt(string label, double x, double y, Func<bool> cbActive) {
+            CenterX = x;
+            CenterY = y;
+            Label = label;
+            CallbackActive = cbActive;
+            Inputs = new HashSet<IEdge>();
+            Outputs = new HashSet<IEdge>();
+        }
+
+        public void Draw(Canvas canvas) {
+            _rect = new Rectangle() {
+                Width = WIDTH,
+                Height = HEIGHT,
+                Stroke = Brushes.Black,
+                StrokeThickness = 2,
+                Fill = Brushes.WhiteSmoke,
+                StrokeLineJoin = PenLineJoin.Round,
+            };
+            _rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
+            _rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
+
+            var d = 15;
+            int n = (int)(HEIGHT / d) + 2;
+            _polyline = new Polyline() {
+                Points = [.. Enumerable.Range(0, n).SelectMany(i => new List<Point>() {
+                    new(-WIDTH, i * d), new(WIDTH, i * d), new(-WIDTH, i * d)
+                })],
+                Fill = Brushes.Transparent,
+                Stroke = Brushes.Black,
+                StrokeThickness = 2,
+            };
+            _polyline.SetValue(Canvas.TopProperty, 0.0);
+
+            var slideUp = new DoubleAnimation {
+                From = 0,
+                To = -d,
+                Duration = new Duration(TimeSpan.FromSeconds(1)),
+                RepeatBehavior = RepeatBehavior.Forever,
+            };
+            _storyboard = new Storyboard();
+            _storyboard.Children.Add(slideUp);
+            Storyboard.SetTarget(slideUp, _polyline);
+            Storyboard.SetTargetProperty(slideUp, new PropertyPath(Canvas.TopProperty));
+            var clipCanvas = new Canvas() {
+                Width = WIDTH - 15,
+                Height = HEIGHT - 8,
+                ClipToBounds = true,
+            };
+            clipCanvas.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2 + 4);
+            clipCanvas.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2 + 7.5);
+            clipCanvas.Children.Add(_polyline);
+
+            canvas.Children.Add(_rect);
+            canvas.Children.Add(clipCanvas);
+            _storyboard.Begin();
+            _storyboard.Pause();
+
+        }
+
+        public bool IsInside(double x, double y) {
+            return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            IsAnimationActive = IsActive;
+            _rect?.Fill =
+                IsAnimationActive && isHovering && isPressed ? PamhagenBrushes.Red :
+                IsAnimationActive && isHovering ? PamhagenBrushes.Red :
+                !IsAnimationActive && isHovering && isPressed ? PamhagenBrushes.Green :
+                !IsAnimationActive && isHovering ? PamhagenBrushes.Green :
+                IsAnimationActive ? PamhagenBrushes.Green :
+                Brushes.WhiteSmoke;
+        }
+    }
+}
@@ -0,0 +1,100 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class EncasedAuger : INode {
+
+        public const double WIDTH = 80;
+        public const double HEIGHT = 20;
+
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public double Angle { get; set; }
+        public string Label { get; set; }
+        public ISet<IEdge> Inputs { get; init; }
+        public ISet<IEdge> Outputs { get; init; }
+
+        public bool IsClickable { get; private set; }
+        public bool IsActive => CallbackActive();
+        public bool IsAnimationActive {
+            get => _animationActive;
+            set {
+                _animationActive = value;
+                _auger?.IsAnimationActive = value;
+            }
+        }
+
+        protected Func<bool> CallbackActive;
+
+        private bool _animationActive;
+        private Shape? _inner;
+        private Shape? _outer;
+        private Auger? _auger;
+        private TextBlock? _text;
+
+        public EncasedAuger(string label, double x, double y, Func<bool> cbActive, double angle = 0, bool clickable = true) {
+            CenterX = x;
+            CenterY = y;
+            Label = label;
+            Angle = angle;
+            CallbackActive = cbActive;
+            IsClickable = clickable;
+            Inputs = new HashSet<IEdge>();
+            Outputs = new HashSet<IEdge>();
+        }
+
+        public void Draw(Canvas canvas) {
+            var c = new Canvas() {
+                RenderTransform = new RotateTransform(Angle, WIDTH / 2, HEIGHT / 2),
+            };
+            _outer = new Rectangle() {
+                Width = WIDTH,
+                Height = HEIGHT,
+                Fill = Brushes.Black,
+            };
+            _inner = new Rectangle() {
+                Width = WIDTH,
+                Height = HEIGHT - 4,
+                Fill = Brushes.WhiteSmoke,
+            };
+            c.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
+            c.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
+            _inner.SetValue(Canvas.TopProperty, 2.0);
+            c.Children.Add(_outer);
+            c.Children.Add(_inner);
+            canvas.Children.Add(c);
+
+            _text = new() {
+                Text = Label,
+                Width = WIDTH,
+                FontSize = 12,
+                TextAlignment = TextAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            _text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
+            _text.SetValue(Canvas.TopProperty, CenterY + HEIGHT / 2);
+            canvas.Children.Add(_text);
+
+            _auger = new Auger(CenterX, CenterY, WIDTH, 12, Angle);
+            _auger.Draw(canvas);
+        }
+
+        public bool IsInside(double x, double y) {
+            return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= WIDTH / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            isHovering = isHovering && IsClickable;
+            IsAnimationActive = IsActive;
+            _inner?.Fill =
+                IsAnimationActive && isHovering && isPressed ? PamhagenBrushes.Red :
+                IsAnimationActive && isHovering ? PamhagenBrushes.Red :
+                !IsAnimationActive && isHovering && isPressed ? PamhagenBrushes.Green :
+                !IsAnimationActive && isHovering ? PamhagenBrushes.Green :
+                IsAnimationActive ? PamhagenBrushes.Green :
+                Brushes.WhiteSmoke;
+        }
+    }
+}
@@ -0,0 +1,116 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    class EntryTrough : INode {
+
+        public const double WIDTH = 150;
+        public const double HEIGHT = 60;
+
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public string Label { get; set; }
+        public ISet<IEdge> Inputs { get; init; }
+        public ISet<IEdge> Outputs { get; init; }
+
+        public bool IsActive => CallbackActive();
+        public bool IsAnimationActive {
+            get => _animationActive;
+            set {
+                _animationActive = value;
+                _auger?.IsAnimationActive = value;
+                if (value) {
+                    _doorTransform?.BeginAnimation(
+                        RotateTransform.AngleProperty,
+                        new DoubleAnimation {
+                            From = _doorTransform.Angle,
+                            To = 60,
+                            Duration = TimeSpan.FromSeconds(Math.Abs(_doorTransform.Angle - 60) / 60.0)
+                        });
+                } else {
+                    _doorTransform?.BeginAnimation(
+                        RotateTransform.AngleProperty,
+                        new DoubleAnimation {
+                            From = _doorTransform.Angle,
+                            To = 0,
+                            Duration = TimeSpan.FromSeconds(Math.Abs(_doorTransform.Angle - 0) / 60.0)
+                        });
+                }
+            }
+        }
+
+        protected Func<bool> CallbackActive;
+
+        private bool _animationActive;
+        private Shape? _inner;
+        private Shape? _outer;
+        private TextBlock? _text;
+        private Auger? _auger;
+        private Shape? _door;
+        private RotateTransform? _doorTransform;
+
+        public EntryTrough(string label, double x, double y, Func<bool> cbActive) {
+            CenterX = x;
+            CenterY = y;
+            Label = label;
+            CallbackActive = cbActive;
+            Inputs = new HashSet<IEdge>();
+            Outputs = new HashSet<IEdge>();
+        }
+
+        public void Draw(Canvas canvas) {
+            var top = CenterY - HEIGHT / 2;
+            var right = CenterX + WIDTH / 2;
+            var bottom = CenterY + HEIGHT / 2;
+            var left = CenterX - WIDTH / 2;
+            _outer = new Polygon() {
+                Points = [new(left, top), new(right, top), new(right - 20, bottom), new(left, bottom), new(left, bottom - 20), new(left + 12.5, bottom - 20)],
+                Fill = Brushes.Black,
+            };
+            _inner = new Polygon() {
+                Points = [new(left + 2, top), new(right - 2, top), new(right - 20 - 2, bottom - 2), new(left, bottom - 2), new(left, bottom - 18), new(left + 15.5, bottom - 18)],
+                Fill = Brushes.WhiteSmoke,
+            };
+            _doorTransform = new RotateTransform(0, left, bottom - 24);
+            _door = new Line() {
+                X1 = left, Y1 = bottom - 24, X2 = left, Y2 = bottom + 4,
+                Stroke = Brushes.Black,
+                StrokeThickness = 4,
+                RenderTransform = _doorTransform,
+            };
+            _text = new() {
+                Text = Label,
+                FontSize = 12,
+                Width = WIDTH,
+                TextAlignment = TextAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            _text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
+            _text.SetValue(Canvas.TopProperty, CenterY - 7.5 - 8);
+            canvas.Children.Add(_outer);
+            canvas.Children.Add(_inner);
+            canvas.Children.Add(_text);
+            canvas.Children.Add(_door);
+            _auger = new(CenterX - 11, CenterY + HEIGHT / 2 - 9, WIDTH - 25, 12);
+            _auger.Draw(canvas);
+        }
+
+        public bool IsInside(double x, double y) {
+            return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            IsAnimationActive = IsActive;
+            _inner?.Fill =
+                IsAnimationActive && isHovering && isPressed ? PamhagenBrushes.Red :
+                IsAnimationActive && isHovering ? PamhagenBrushes.Red :
+                !IsAnimationActive && isHovering && isPressed ? PamhagenBrushes.Green :
+                !IsAnimationActive && isHovering ? PamhagenBrushes.Green :
+                IsAnimationActive ? PamhagenBrushes.Green :
+                Brushes.WhiteSmoke;
+        }
+    }
+}
@@ -0,0 +1,173 @@
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    internal sealed class FlowArrows {
+
+        public const double SPEED = 20;
+        public const double SPACING = 15;
+        public const double LENGTH = 7;
+        public const double WIDTH = 7;
+
+        private static readonly Stopwatch Clock = Stopwatch.StartNew();
+
+        private readonly Canvas _layer;
+        private readonly Point[] _path;
+        private Point[] _points = [];
+        private double _length;
+        private double _pathOffset;
+        private bool _isActive;
+
+        public double Length => GetLength(_path[0], _path[1]) + GetLength(_path[1], _path[2]);
+
+        private FlowArrows(Canvas canvas, Point[] path) {
+            _path = path;
+            _layer = new Canvas() {
+                IsHitTestVisible = false,
+                Visibility = Visibility.Collapsed,
+            };
+            _layer.Unloaded += (_, _) => Stop();
+            canvas.Children.Add(_layer);
+        }
+
+        public static FlowArrows Create(Canvas canvas, Line first, Line second) {
+            return new FlowArrows(canvas, [
+                new Point(first.X1, first.Y1),
+                new Point(first.X2, first.Y2),
+                new Point(second.X2, second.Y2),
+            ]);
+        }
+
+        public static FlowArrows Create(Canvas canvas, Polyline path) {
+            return new FlowArrows(canvas, [.. path.Points]);
+        }
+
+        public void Update((bool TowardEnd, double PathOffset)? flow) {
+            if (flow == null) {
+                Stop();
+                return;
+            }
+
+            _points = flow.Value.TowardEnd ? _path : [.. _path.Reverse()];
+            _length = GetLength(_points[0], _points[1]) + GetLength(_points[1], _points[2]);
+            _pathOffset = flow.Value.PathOffset;
+            if (!_isActive) {
+                CompositionTarget.Rendering += OnRendering;
+                _isActive = true;
+            }
+            _layer.Visibility = Visibility.Visible;
+            Render();
+        }
+
+        private void OnRendering(object? sender, EventArgs args) {
+            Render();
+        }
+
+        private void Render() {
+            var distance = ((Clock.Elapsed.TotalSeconds * SPEED - _pathOffset) % SPACING + SPACING) % SPACING;
+            var arrowIndex = 0;
+            while (distance <= _length) {
+                var arrow = GetArrow(arrowIndex++);
+                SetPosition(arrow, distance);
+                arrow.Visibility = Visibility.Visible;
+                distance += SPACING;
+            }
+            while (arrowIndex < _layer.Children.Count) {
+                _layer.Children[arrowIndex++].Visibility = Visibility.Collapsed;
+            }
+        }
+
+        private Polygon GetArrow(int index) {
+            if (index < _layer.Children.Count) {
+                return (Polygon)_layer.Children[index];
+            }
+
+            var arrow = new Polygon() {
+                Fill = new SolidColorBrush(Color.FromArgb(0x60, 0, 0, 0)),
+                IsHitTestVisible = false,
+                Points = [
+                    new(-LENGTH / 2, -WIDTH / 2),
+                    new(0, -WIDTH / 2),
+                    new(LENGTH / 2, 0),
+                    new(0, WIDTH / 2),
+                    new(-LENGTH / 2, WIDTH / 2),
+                    new(0, 0),
+                ],
+                RenderTransform = new MatrixTransform(Matrix.Identity),
+            };
+            _layer.Children.Add(arrow);
+            return arrow;
+        }
+
+        private void SetPosition(Polygon arrow, double distance) {
+            const double blendDistance = WIDTH / 2;
+            double firstLength = GetLength(_points[0], _points[1]);
+            double blendStartDistance = firstLength - blendDistance;
+            double blendEndDistance = firstLength + blendDistance;
+
+            Vector v1 = Normalize(_points[0], _points[1]);
+            Vector v2 = Normalize(_points[1], _points[2]);
+            Point blendStart = _points[1] - v1 * blendDistance;
+            Point blendEnd = _points[1] + v2 * blendDistance;
+
+            Point position;
+            Vector direction;
+            if (distance < blendStartDistance) {
+                position = _points[0] + v1 * distance;
+                direction = v1;
+            } else if (distance <= blendEndDistance) {
+                double t = (distance - blendStartDistance) / (blendEndDistance - blendStartDistance);
+                double u = 1.0 - t;
+
+                position = new Point(
+                    u * u * blendStart.X +
+                    2 * u * t * _points[1].X +
+                    t * t * blendEnd.X,
+
+                    u * u * blendStart.Y +
+                    2 * u * t * _points[1].Y +
+                    t * t * blendEnd.Y);
+
+                direction = new Vector(
+                    2 * u * (_points[1].X - blendStart.X) +
+                    2 * t * (blendEnd.X - _points[1].X),
+
+                    2 * u * (_points[1].Y - blendStart.Y) +
+                    2 * t * (blendEnd.Y - _points[1].Y));
+
+                direction.Normalize();
+            } else {
+                double d = distance - firstLength;
+                position = _points[1] + v2 * d;
+                direction = v2;
+            }
+
+            double ux = direction.X;
+            double uy = direction.Y;
+            (arrow.RenderTransform as MatrixTransform)?.Matrix = new Matrix(ux, uy, -uy, ux, position.X, position.Y);
+        }
+
+        private void Stop() {
+            if (_isActive) {
+                CompositionTarget.Rendering -= OnRendering;
+                _isActive = false;
+            }
+            _layer.Visibility = Visibility.Collapsed;
+        }
+
+        private static double GetLength(Point start, Point end) {
+            var dx = end.X - start.X;
+            var dy = end.Y - start.Y;
+            return Math.Sqrt(dx * dx + dy * dy);
+        }
+
+        private static Vector Normalize(Point p1, Point p2) {
+            Vector v = p2 - p1;
+            if (v.Length > 0) v.Normalize();
+            return v;
+        }
+    }
+}
@@ -55,14 +55,18 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        }

        public Path? GetPath(IEnumerable<INode> points, Func<INode, bool>? valid = null) {
-            if (points.Count() < 2) throw new ArgumentException("Path is too short");
+            if (points.Count() < 2) return null;
            var start = points.First();
            var path = new Path(start, []);
            foreach (var end in points.Skip(1)) {
-                if (GetPath(start, end, valid, visited: [..path.Hops.Select(h => h.Node)]) is not Path p)
+                if (valid != null && !valid(start)) {
                    return null;
-                path.Hops = [..path.Hops, ..p.Hops];
-                start = end;
+                } else if (GetPath(start, end, valid, visited: [.. path.Hops.Select(h => h.Node)]) is not Path p) {
+                    return null;
+                } else {
+                    path.Hops = [.. path.Hops, .. p.Hops];
+                    start = end;
+                }
            }
            return path;
        }
@@ -106,17 +110,17 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
            }
        }

-        public ISet<INode> Update(double x, double y, bool down) {
-            HashSet<INode> hover = new();
+        public ISet<INode> GetHover(double x, double y) {
+            return Nodes.Where(n => n.IsInside(x, y)).ToHashSet();
+        }
+
+        public void Update(ISet<INode> hovering, bool isPressed) {
            foreach (var e in Edges) {
                e.Update();
            }
            foreach (var n in Nodes) {
-                if (n.Update(x, y, down)) {
-                    hover.Add(n);
-                }
+                n.Update(hovering.Contains(n), isPressed);
            }
-            return hover;
        }
    }
 }
@@ -50,10 +50,15 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
            canvas.Children.Add(_text);
        }

-        public bool Update(double x, double y, bool down) {
-            var hover = Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
-            _rect?.Fill = hover ? Brushes.LightGray : Brushes.WhiteSmoke;
-            return hover;
+        public bool IsInside(double x, double y) {
+            return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            _rect?.Fill =
+                isHovering && isPressed ? Brushes.DarkGray :
+                isHovering ? Brushes.LightGray :
+                Brushes.WhiteSmoke;
        }
    }
 }
@@ -9,6 +9,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public bool IsTwoWay { get; }
        public bool Orientation { get; }
        public Brush? Highlight { get; set; }
+        public (bool TowardEnd, double PathOffset)? Flow { get; set; }
+        public double FlowLength { get; }

        public void Draw(Canvas canvas);
        public void Update();
@@ -10,7 +10,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public ISet<IEdge> Outputs { get; }

        public void Draw(Canvas canvas);
-        public bool Update(double x, double y, bool down);
+        public void Update(bool isHovering, bool isPressed);
+        public bool IsInside(double x, double y);

    }
 }
@@ -11,11 +11,14 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public bool IsTwoWay => false;
        public bool Orientation { get; set; }
        public Brush? Highlight { get; set; }
+        public (bool TowardEnd, double PathOffset)? Flow { get; set; }
+        public double FlowLength => _flowArrows?.Length ?? 0;

        private Line? _outer1;
        private Line? _outer2;
        private Line? _inner1;
        private Line? _inner2;
+        private FlowArrows? _flowArrows;

        public Inlet(INode start, ISink end, bool orientation = false) {
            Start = start;
@@ -74,11 +77,13 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
            canvas.Children.Add(_outer2);
            canvas.Children.Add(_inner1);
            canvas.Children.Add(_inner2);
+            _flowArrows = FlowArrows.Create(canvas, _inner1!, _inner2!);
        }

        public void Update() {
            _inner1?.Stroke = Highlight ?? Brushes.DarkGray;
            _inner2?.Stroke = Highlight ?? Brushes.DarkGray;
+            _flowArrows?.Update(Flow);
        }
    }
 }
@@ -13,8 +13,11 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public bool IsTwoWay => false;
        public bool Orientation { get; set; }
        public Brush? Highlight { get; set; }
+        public (bool TowardEnd, double PathOffset)? Flow { get; set; }
+        public double FlowLength => _flowArrows?.Length ?? 0;

        private Polygon? _hopper;
+        private FlowArrows? _flowArrows;
        private Line? _outer1;
        private Line? _outer2;
        private Line? _inner1;
@@ -46,7 +49,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                Y2 = y2,
                StrokeThickness = 10,
                Stroke = Brushes.Black,
-                StrokeStartLineCap = PenLineCap.Flat,
+                StrokeStartLineCap = PenLineCap.Round,
                StrokeEndLineCap = PenLineCap.Round,
            };
            _inner1 = new Line() {
@@ -56,7 +59,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                Y2 = y2,
                StrokeThickness = 6,
                Stroke = Brushes.DarkGray,
-                StrokeStartLineCap = PenLineCap.Flat,
+                StrokeStartLineCap = PenLineCap.Round,
                StrokeEndLineCap = PenLineCap.Round,
            };
            _outer2 = new Line() {
@@ -76,20 +79,22 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                Y2 = y3,
                StrokeThickness = 6,
                Stroke = Brushes.DarkGray,
-                StrokeStartLineCap = PenLineCap.Square,
-                StrokeEndLineCap = PenLineCap.Square,
+                StrokeStartLineCap = PenLineCap.Round,
+                StrokeEndLineCap = PenLineCap.Round,
            };
            canvas.Children.Add(_outer1);
            canvas.Children.Add(_outer2);
            canvas.Children.Add(_hopper);
            canvas.Children.Add(_inner1);
            canvas.Children.Add(_inner2);
+            _flowArrows = FlowArrows.Create(canvas, _inner1!, _inner2!);
        }

        public void Update() {
            _inner1?.Stroke = Highlight ?? Brushes.DarkGray;
            _inner2?.Stroke = Highlight ?? Brushes.DarkGray;
            _hopper?.Fill = Highlight ?? Brushes.DarkGray;
+            _flowArrows?.Update(Flow);
        }
    }
 }
@@ -1,5 +1,4 @@
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Shapes;

@@ -11,11 +10,12 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public bool IsTwoWay { get; set; }
        public bool Orientation { get; set; }
        public Brush? Highlight { get; set; }
+        public (bool TowardEnd, double PathOffset)? Flow { get; set; }
+        public double FlowLength => _flowArrows?.Length ?? 0;

-        private Line? _outer1;
-        private Line? _outer2;
-        private Line? _inner1;
-        private Line? _inner2;
+        private Polyline? _outer;
+        private Polyline? _inner;
+        private FlowArrows? _flowArrows;

        public Pipe(INode start, INode end, bool orientation = false, bool twoWay = false) {
            Start = start;
@@ -31,43 +31,30 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
            var y2 = Orientation ? End.CenterY : Start.CenterY;
            var x3 = End.CenterX;
            var y3 = End.CenterY;
-            _outer1 = new Line() {
-                X1 = x1, Y1 = y1, X2 = x2, Y2 = y2,
+            _outer = new Polyline() {
+                Points = [new(x1, y1), new(x2, y2), new(x3, y3)],
                StrokeThickness = 10,
                Stroke = Brushes.Black,
                StrokeStartLineCap = PenLineCap.Round,
                StrokeEndLineCap = PenLineCap.Round,
+                StrokeLineJoin = PenLineJoin.Round,
            };
-            _inner1 = new Line() {
-                X1 = x1, Y1 = y1, X2 = x2, Y2 = y2,
+            _inner = new Polyline() {
+                Points = [new(x1, y1), new(x2, y2), new(x3, y3)],
                StrokeThickness = 6,
                Stroke = Brushes.DarkGray,
                StrokeStartLineCap = PenLineCap.Round,
                StrokeEndLineCap = PenLineCap.Round,
+                StrokeLineJoin = PenLineJoin.Round,
            };
-            _outer2 = new Line() {
-                X1 = x2, Y1 = y2, X2 = x3, Y2 = y3,
-                StrokeThickness = 10,
-                Stroke = Brushes.Black,
-                StrokeStartLineCap = PenLineCap.Round,
-                StrokeEndLineCap = PenLineCap.Round,
-            };
-            _inner2 = new Line() {
-                X1 = x2, Y1 = y2, X2 = x3, Y2 = y3,
-                StrokeThickness = 6,
-                Stroke = Brushes.DarkGray,
-                StrokeStartLineCap = PenLineCap.Round,
-                StrokeEndLineCap = PenLineCap.Round,
-            };
-            canvas.Children.Add(_outer1);
-            canvas.Children.Add(_outer2);
-            canvas.Children.Add(_inner1);
-            canvas.Children.Add(_inner2);
+            canvas.Children.Add(_outer);
+            canvas.Children.Add(_inner);
+            _flowArrows = FlowArrows.Create(canvas, _inner);
        }

        public void Update() {
-            _inner1?.Stroke = Highlight ?? Brushes.DarkGray;
-            _inner2?.Stroke = Highlight ?? Brushes.DarkGray;
+            _inner?.Stroke = Highlight ?? Brushes.DarkGray;
+            _flowArrows?.Update(Flow);
        }
    }
 }
@@ -11,7 +11,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {

        public double CenterX { get; set; }
        public double CenterY { get; set; }
-        public string Label { get; } = "";
+        public string Label => "";

        public ISet<IEdge> Inputs { get; init; }
        public ISet<IEdge> Outputs { get; init; }
@@ -81,10 +81,12 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
            canvas.Children.Add(_rect);
        }

-        public bool Update(double x, double y, bool down) {
-            var hover = Math.Abs(x - CenterX) <= SIZE / 2 && Math.Abs(y - CenterY) <= SIZE / 2;
-            _rect?.Stroke = hover ? Brushes.Black : Brushes.Black;
-            return hover;
+        public bool IsInside(double x, double y) {
+            return Math.Abs(x - CenterX) <= SIZE / 2 && Math.Abs(y - CenterY) <= SIZE / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            _rect?.Stroke = isHovering ? Brushes.Black : Brushes.Black;
        }
    }
 }
@@ -1,6 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Media.Media3D;
 using System.Windows.Shapes;

 namespace PamhagenSysCtrl.Helpers.Pipeline {
@@ -15,23 +16,24 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public ISet<IEdge> Inputs { get; set; }
        public ISet<IEdge> Outputs { get; set; }

-        protected Func<bool> CallbackIsFull;
-
        public double TopY => CenterY - DIAMETER / 2;
-        public bool IsFull => CallbackIsFull();
+        public FillState FillState => CallbackFillState();
+        public bool IsFull => FillState == FillState.Full;

        public int? CapacityLiters { get; set; }

+        protected Func<FillState> CallbackFillState;
+
+        private Shape? _frame;
        private Shape? _circle;
        private TextBlock? _text;

-
-        public Press(string label, double x, double y, int capacityLiters, Func<bool> cbFull) {
+        public Press(string label, double x, double y, int capacityLiters, Func<FillState> cbFillState) {
            CenterX = x;
            CenterY = y;
            Label = label;
            CapacityLiters = capacityLiters;
-            CallbackIsFull = cbFull;
+            CallbackFillState = cbFillState;
            Inputs = new HashSet<IEdge>();
            Outputs = new HashSet<IEdge>();
        }
@@ -44,6 +46,17 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                StrokeThickness = 2,
                Fill = Brushes.WhiteSmoke,
            };
+            _frame = new Polygon() {
+                Points = [
+                    new(CenterX - DIAMETER / 2 - 10, CenterY), new(CenterX + DIAMETER / 2 + 10, CenterY),
+                    new(CenterX + DIAMETER / 2 + 10, CenterY + DIAMETER / 2 + 30), new(CenterX + DIAMETER / 2 - 20, CenterY + DIAMETER / 2 + 30),
+                    new(CenterX + DIAMETER / 2 - 20, CenterY + DIAMETER / 2 + 10), new(CenterX - DIAMETER / 2 + 20, CenterY + DIAMETER / 2 + 10),
+                    new(CenterX - DIAMETER / 2 + 20, CenterY + DIAMETER / 2 + 30), new(CenterX - DIAMETER / 2 - 10, CenterY + DIAMETER / 2 + 30)
+                ],
+                Stroke = Brushes.Black,
+                StrokeThickness = 2,
+                Fill = Brushes.WhiteSmoke,
+            };
            _text = new() {
                Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}"  : Label,
                FontSize = 14,
@@ -55,14 +68,22 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
            _circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
            _text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
            _text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 20 : 10));
+            canvas.Children.Add(_frame);
            canvas.Children.Add(_circle);
            canvas.Children.Add(_text);
        }

-        public bool Update(double x, double y, bool down) {
-            var hover = Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
-            _circle?.Fill = hover ? Brushes.LightGray : Brushes.WhiteSmoke;
-            return hover;
+        public bool IsInside(double x, double y) {
+            return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2 || (Math.Abs(x - CenterX) <= DIAMETER / 2 + 10 && y >= CenterY && y <= CenterY + DIAMETER / 2 + 30);
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            var color =
+                isHovering && isPressed ? Brushes.DarkGray :
+                isHovering ? Brushes.LightGray :
+                Brushes.WhiteSmoke;
+            _circle?.Fill = PamhagenBrushes.ForFillState(FillState, color);
+            _frame?.Fill = color;
        }
    }
 }
@@ -15,14 +15,26 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public ISet<IEdge> Inputs { get; init; }
        public ISet<IEdge> Outputs { get; init; }

+        public Brush? Highlight { get; set; }
+        public bool IsActive => CallbackActive();
+        public bool HasClearance => CallbackClearance();
+        public bool IsSelected => CallbackSelected(this);
+
+        protected Func<bool> CallbackActive;
+        protected Func<bool> CallbackClearance;
+        protected Func<Pump, bool> CallbackSelected;
+
        private Shape? _circle;
        private Shape? _triangle;
        private TextBlock? _text;

-        public Pump(string label, double x, double y) {
+        public Pump(string label, double x, double y, Func<bool> cbActive, Func<bool> cbClearance, Func<Pump, bool> cbSelected) {
            CenterX = x;
            CenterY = y;
            Label = label;
+            CallbackActive = cbActive;
+            CallbackClearance = cbClearance;
+            CallbackSelected = cbSelected;
            Inputs = new HashSet<IEdge>();
            Outputs = new HashSet<IEdge>();
        }
@@ -58,10 +70,18 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
            canvas.Children.Add(_text);
        }

-        public bool Update(double x, double y, bool down) {
-            var hover = Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
-            _circle?.Fill = hover ? Brushes.LightGray : Brushes.WhiteSmoke;
-            return hover;
+        public bool IsInside(double x, double y) {
+            return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
+        }
+
+        public void Update(bool isHovering, bool isPresed) {
+            _circle?.Fill = Highlight ?? (
+                IsActive && isHovering ? PamhagenBrushes.Red :
+                IsActive ? PamhagenBrushes.Green :
+                HasClearance && IsSelected && isHovering ? PamhagenBrushes.Green :
+                HasClearance && IsSelected ? PamhagenBrushes.Yellow :
+                IsSelected ? PamhagenBrushes.Red :
+                isHovering ? Brushes.LightGray : Brushes.WhiteSmoke);
        }
    }
 }
@@ -0,0 +1,105 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class Rebler : INode {
+
+        public const double WIDTH = 120;
+        public const double HEIGHT = 60;
+
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public string Label { get; set; }
+        public ISet<IEdge> Inputs { get; init; }
+        public ISet<IEdge> Outputs { get; init; }
+
+        public bool IsActive => CallbackActive();
+
+        protected Func<bool> CallbackActive;
+
+        private TextBlock? _text;
+        private Shape? _rect;
+        private Shape? _hopperOuter;
+        private Shape? _hopperInner;
+        private Shape? _bottomInner;
+        private Shape? _bottomOuter;
+
+        public Rebler(string label, double x, double y, Func<bool> cbActive) {
+            CenterX = x;
+            CenterY = y;
+            Label = label;
+            CallbackActive = cbActive;
+            Inputs = new HashSet<IEdge>();
+            Outputs = new HashSet<IEdge>();
+        }
+
+        public void Draw(Canvas canvas) {
+            _rect = new Rectangle() {
+                Width = WIDTH,
+                Height = HEIGHT,
+                Fill = Brushes.WhiteSmoke,
+                Stroke = Brushes.Black,
+                StrokeThickness = 2,
+            };
+            var left = CenterX - WIDTH / 2;
+            var right = CenterX + WIDTH / 2;
+            var top = CenterY - HEIGHT / 2;
+            var bottom = CenterY + HEIGHT / 2;
+            var hx = right - 20;
+            var h = 15;
+            var w = 25;
+            _hopperOuter = new Polygon() {
+                Points = [new(hx - w, top - h), new(hx - w + 5, top + 2), new(hx + w - 5, top + 2), new(hx + w, top - h)],
+                Fill = Brushes.Black,
+            };
+            _hopperInner = new Polygon() {
+                Points = [new(hx - w + 2, top - h), new(hx - w + 5 + 2, top + 2), new(hx + w - 5 - 2, top + 2), new(hx + w - 2, top - h)],
+                Fill = Brushes.WhiteSmoke,
+            };
+            _bottomOuter = new Polygon() {
+                Points = [new(left + 20, bottom), new(right - 20, bottom), new(right - 15, bottom + 10), new(left + 15, bottom + 10)],
+                Fill = Brushes.Black,
+            };
+            _bottomInner = new Polygon() {
+                Points = [new(left + 20 + 2, bottom), new(right - 20 - 2, bottom), new(right - 15 - 2, bottom + 10), new(left + 15 + 2, bottom + 10)],
+                Fill = Brushes.WhiteSmoke,
+            };
+            _text = new() {
+                Text = Label,
+                FontSize = 12,
+                Width = WIDTH,
+                TextAlignment = TextAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            _rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
+            _rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
+            _text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
+            _text.SetValue(Canvas.TopProperty, CenterY - 8);
+            canvas.Children.Add(_hopperOuter);
+            canvas.Children.Add(_bottomOuter);
+            canvas.Children.Add(_rect);
+            canvas.Children.Add(_hopperInner);
+            canvas.Children.Add(_bottomInner);
+            canvas.Children.Add(_text);
+        }
+
+        public bool IsInside(double x, double y) {
+            return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            var color =
+                IsActive && isHovering && isPressed ? PamhagenBrushes.Red :
+                IsActive && isHovering ? PamhagenBrushes.Red :
+                !IsActive && isHovering && isPressed ? PamhagenBrushes.Green :
+                !IsActive && isHovering ? PamhagenBrushes.Green :
+                IsActive ? PamhagenBrushes.Green :
+                Brushes.WhiteSmoke;
+            _rect?.Fill = color;
+            _hopperInner?.Fill = color;
+            _bottomInner?.Fill = color;
+        }
+    }
+}
@@ -0,0 +1,87 @@
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class Switcher : INode {
+
+        public const double WIDTH = 100;
+        public const double HEIGHT = 50;
+
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public string Label { get; set; }
+        public ISet<IEdge> Inputs { get; init; }
+        public ISet<IEdge> Outputs { get; init; }
+
+        private Line? _main;
+        private Line? _shadow;
+        private RotateTransform? _mainTransform;
+        private RotateTransform? _shadowTransform;
+
+        protected Func<int> CallbackIsPosition;
+        protected Func<int> CallbackWantPosition;
+
+        public Switcher(string label, double x, double y, Func<int> cbIsPosition, Func<int> cbWantPosition) {
+            CenterX = x;
+            CenterY = y;
+            Label = label;
+            CallbackIsPosition = cbIsPosition;
+            CallbackWantPosition = cbWantPosition;
+            Inputs = new HashSet<IEdge>();
+            Outputs = new HashSet<IEdge>();
+        }
+
+        public void Draw(Canvas canvas) {
+            _mainTransform = new RotateTransform(0, CenterX, CenterY);
+            _shadowTransform = new RotateTransform(0, CenterX, CenterY);
+            _main = new Line() {
+                X1 = CenterX - WIDTH / 2, Y1 = CenterY,
+                X2 = CenterX + WIDTH / 2, Y2 = CenterY,
+                StrokeThickness = 5,
+                Stroke = Brushes.Black,
+                StrokeStartLineCap = PenLineCap.Square,
+                StrokeEndLineCap = PenLineCap.Square,
+                RenderTransform = _mainTransform,
+            };
+            _shadow = new Line() {
+                X1 = CenterX - WIDTH / 2, Y1 = CenterY,
+                X2 = CenterX + WIDTH / 2, Y2 = CenterY,
+                StrokeThickness = 5,
+                Stroke = Brushes.DarkGray,
+                StrokeStartLineCap = PenLineCap.Square,
+                StrokeEndLineCap = PenLineCap.Square,
+                RenderTransform = _shadowTransform,
+            };
+            canvas.Children.Add(_shadow);
+            canvas.Children.Add(_main);
+        }
+
+        public bool IsInside(double x, double y) {
+            return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            var isPos = CallbackIsPosition();
+            var wantPos = CallbackWantPosition();
+            if (isHovering && wantPos == isPos) wantPos = wantPos == 1 ? 2 : 1;
+            var target1 = isPos == 0 ? 0 : isPos == 1 ? 15 : -15;
+            var target2 = wantPos == 0 ? 0 : wantPos == 1 ? 15 : -15;
+            _mainTransform?.BeginAnimation(
+                RotateTransform.AngleProperty,
+                new DoubleAnimation {
+                    From = _mainTransform.Angle,
+                    To = target1,
+                    Duration = TimeSpan.FromSeconds(Math.Abs(_mainTransform.Angle - target1) / 120.0)
+                });
+            _shadowTransform?.BeginAnimation(
+                RotateTransform.AngleProperty,
+                new DoubleAnimation {
+                    From = _shadowTransform.Angle,
+                    To = target2,
+                    Duration = TimeSpan.FromSeconds(Math.Abs(_shadowTransform.Angle - target2) / 120.0)
+                });
+        }
+    }
+}
@@ -14,27 +14,26 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public double TopY => CenterY - HEIGHT / 2;
        public double BottomY => CenterY + HEIGHT / 2;
        public string Label { get; set; }
-        public bool IsFull => CallbackIsFull();
-        public bool IsFilled => CallbackIsFilled();
+        public FillState FillState => CallbackFillState();
+        public bool IsFull => FillState == FillState.Full;
+        public bool IsFilled => FillState != FillState.Empty;

        public ISet<IEdge> Inputs { get; init; }
        public ISet<IEdge> Outputs { get; init; }

        public int? CapacityLiters { get; set; }

-        protected Func<bool> CallbackIsFilled;
-        protected Func<bool> CallbackIsFull;
+        protected Func<FillState> CallbackFillState;

        private Shape? _rect;
        private TextBlock? _text;

-        public Tank(string label, double x, double y, int capacityLiters, Func<bool> cbFilled, Func<bool> cbFull) {
+        public Tank(string label, double x, double y, int capacityLiters, Func<FillState> cbFillState) {
            CenterX = x;
            CenterY = y;
            Label = label;
            CapacityLiters = capacityLiters;
-            CallbackIsFilled = cbFilled;
-            CallbackIsFull = cbFull;
+            CallbackFillState = cbFillState;
            Inputs = new HashSet<IEdge>();
            Outputs = new HashSet<IEdge>();
        }
@@ -62,10 +61,16 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
            canvas.Children.Add(_text);
        }

-        public bool Update(double x, double y, bool down) {
-            var hover = Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
-            _rect?.Fill = hover ? Brushes.LightGray : Brushes.WhiteSmoke;
-            return hover;
+        public bool IsInside(double x, double y) {
+            return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            _rect?.Fill = PamhagenBrushes.ForFillState(FillState,
+                isHovering && isPressed ? Brushes.DarkGray :
+                isHovering ? Brushes.LightGray :
+                Brushes.WhiteSmoke
+            );
        }
    }
 }
@@ -13,51 +13,65 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
        public double CenterY { get; set; }
        public double BottomY => CenterY + HEIGHT / 2;
        public string Label { get; set; }
-        public bool IsFilled => CallbackIsFilled();
+        public FillState FillState => CallbackFillState();
+        public bool IsFilled => FillState != FillState.Empty;
        public ISet<IEdge> Inputs { get; init; }
        public ISet<IEdge> Outputs { get; init; }

-        protected Func<bool> CallbackIsFilled;
+        protected Func<FillState> CallbackFillState;

-        private Shape? _rect;
+        private Shape? _inner;
+        private Shape? _outer;
        private TextBlock? _text;

-        public Trough(string label, double x, double y, Func<bool> cbFilled) {
+        public Trough(string label, double x, double y, Func<FillState> cbFillState) {
            CenterX = x;
            CenterY = y;
            Label = label;
-            CallbackIsFilled = cbFilled;
+            CallbackFillState = cbFillState;
            Inputs = new HashSet<IEdge>();
            Outputs = new HashSet<IEdge>();
        }

        public void Draw(Canvas canvas) {
-            _rect = new Rectangle() {
+            _outer = new Rectangle() {
                Width = WIDTH,
                Height = HEIGHT,
-                Stroke = Brushes.Black,
-                StrokeThickness = 2,
+                Fill = Brushes.Black,
+            };
+            _inner = new Rectangle() {
+                Width = WIDTH - 4,
+                Height = HEIGHT - 2,
                Fill = Brushes.WhiteSmoke,
            };
            _text = new() {
                Text = Label,
-                FontSize = 12,
+                FontSize = 14,
                Width = WIDTH,
                TextAlignment = TextAlignment.Center,
                VerticalAlignment = VerticalAlignment.Center,
            };
-            _rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
-            _rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
+            _outer.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
+            _outer.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
+            _inner.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2 + 2);
+            _inner.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
            _text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
-            _text.SetValue(Canvas.TopProperty, CenterY - 8);
-            canvas.Children.Add(_rect);
+            _text.SetValue(Canvas.TopProperty, CenterY - 10);
+            canvas.Children.Add(_outer);
+            canvas.Children.Add(_inner);
            canvas.Children.Add(_text);
        }

-        public bool Update(double x, double y, bool down) {
-            var hover = Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
-            _rect?.Fill = hover ? Brushes.LightGray : Brushes.WhiteSmoke;
-            return hover;
+        public bool IsInside(double x, double y) {
+            return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
+            _inner?.Fill = PamhagenBrushes.ForFillState(FillState,
+                isHovering && isPressed ? Brushes.DarkGray :
+                isHovering ? Brushes.LightGray :
+                Brushes.WhiteSmoke
+            );
        }
    }
 }
@@ -55,20 +55,22 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                VerticalAlignment = VerticalAlignment.Center,
            };
            _text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
-            _text.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2 + 5);
+            _text.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2 + 5.5);
            canvas.Children.Add(_circle);
            canvas.Children.Add(_text);
        }

-        public bool Update(double x, double y, bool down) {
-            var hover = Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
+        public bool IsInside(double x, double y) {
+            return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
+        }
+
+        public void Update(bool isHovering, bool isPressed) {
            _circle?.Fill =
-                IsLocked && !WantOpen && !IsOpen ? Brushes.Orange :
-                IsLocked && !WantOpen &&  IsOpen ? Brushes.Red :
-                IsLocked &&  WantOpen && !IsOpen ? Brushes.Yellow :
-                IsLocked &&  WantOpen &&  IsOpen ? Brushes.Green :
-                Highlight ?? (hover ? Brushes.LightGray : Brushes.DarkGray);
-            return hover;
+              IsLocked && !WantOpen && !IsOpen ? PamhagenBrushes.DimOrange :
+              IsLocked && !WantOpen && IsOpen ? PamhagenBrushes.Red :
+              IsLocked && WantOpen && !IsOpen ? PamhagenBrushes.Yellow :
+              IsLocked && WantOpen && IsOpen ? PamhagenBrushes.Green :
+              Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
        }
    }
 }
@@ -3,14 +3,19 @@
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
    <TargetFramework>net10.0-windows</TargetFramework>
+    <Version>0.0.1</Version>
+    <Product>Anlagensteuerung Pamhagen</Product>
+    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <UseWPF>true</UseWPF>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ApplicationManifest>App.manifest</ApplicationManifest>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="System.IO.Ports" Version="10.0.9" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.10" />
+	  <PackageReference Include="System.IO.Ports" Version="10.0.10" />
  </ItemGroup>

 </Project>
@@ -1,278 +0,0 @@
-using PamhagenSysCtrl.Helpers;
-using PamhagenSysCtrl.Windows;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace PamhagenSysCtrl {
-    public partial class MainWindow : Window {
-
-        public MainWindow() {
-            InitializeComponent();
-
-            for (int i = 1; i <= 60; i++) {
-                var b = new Button() {
-                    Content = $"V{i}",
-                    Margin = new(10 + ((i - 1) / 10) * 50, 10 + ((i - 1) % 10) * 40, 10, 10),
-                    BorderThickness = new(2),
-                    FontWeight = FontWeights.Bold,
-                    VerticalAlignment = VerticalAlignment.Top,
-                    HorizontalAlignment = HorizontalAlignment.Left,
-                    Height = 30,
-                    Width = 40,
-                    FontSize = 14,
-                };
-                var borderStyle = new Style(typeof(Border));
-                borderStyle.Setters.Add(new Setter(Border.CornerRadiusProperty, new CornerRadius(5)));
-                b.Resources.Add(typeof(Border), borderStyle);
-                b.Click += (sender, evt) => {
-                    if (App.Plant == null || sender is not Button b) return;
-                    var i = int.Parse($"{b.Content}"[1..]);
-                    if (i > 57) {
-                        return;
-                    } else if (App.Plant.WantValveOpen(i)) {
-                        App.Plant.CloseV(i);
-                    } else {
-                        App.Plant.OpenV(i);
-                    }
-                    App.Plant.CommitChanges();
-                };
-                ValvePanel.Children.Add(b);
-            }
-
-            var w = new PlantSchemeWindow();
-            w.Show();
-        }
-
-        public async void ConnectButton_Click(object? sender, RoutedEventArgs evt) {
-            try {
-                App.Plant = new(PortInput.Text);
-                App.Plant.Update += OnUpdate;
-                await App.Plant.StartThread();
-            } catch (Exception exc) {
-                App.Plant?.Dispose();
-                App.Plant = null;
-                var str = $"Beim Aufbauen einer Verbindung zur SPS ist ein Fehler aufgetreten:\n\n{exc.GetType().Name}: {exc.Message}";
-                if (exc.InnerException != null) str += $"\n\n{exc.InnerException.GetType().Name}: {exc.InnerException.Message}";
-                MessageBox.Show(str, "SPS-Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-        }
-
-        public void OnUpdate(object? sender, PlantEventArgs evt) {
-            if (sender is not PamhagenPlant plant) return;
-
-            for (int i = 1; i <= 60; i++) {
-                var target = plant.WantValveClosed(i);
-                var actual = plant.IsValveClosed(i);
-                if (ValvePanel.Children[i - 1] is not Button b)
-                    continue;
-                b.BorderBrush = target ? Brushes.DarkRed : Brushes.SlateGray;
-                b.Foreground = target ? Brushes.DarkRed : Brushes.Black;
-                b.Background = actual ? Brushes.MistyRose : Brushes.WhiteSmoke;
-            }
-
-            ReblerButton.BorderBrush = plant.IsReblerActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            ReblerButton.Foreground = plant.IsReblerActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            ReblerButton.Background = plant.IsReblerActive ? Brushes.MintCream: Brushes.MistyRose;
-
-            TroughAugerButton.BorderBrush = plant.IsTroughAugerActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            TroughAugerButton.Foreground = plant.IsTroughAugerActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            TroughAugerButton.Background = plant.IsTroughAugerActive ? Brushes.MintCream : Brushes.MistyRose;
-
-            StirrerA1Button.BorderBrush = plant.IsStirrerA1Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            StirrerA1Button.Foreground = plant.IsStirrerA1Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            StirrerA1Button.Background = plant.IsStirrerA1Active ? Brushes.MintCream : Brushes.MistyRose;
-
-            StirrerA2Button.BorderBrush = plant.IsStirrerA2Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            StirrerA2Button.Foreground = plant.IsStirrerA2Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            StirrerA2Button.Background = plant.IsStirrerA2Active ? Brushes.MintCream : Brushes.MistyRose;
-
-            BeltButton.BorderBrush = plant.IsBeltActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            BeltButton.Foreground = plant.IsBeltActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            BeltButton.Background = plant.IsBeltActive ? Brushes.MintCream : Brushes.MistyRose;
-
-            Auger1Button.BorderBrush = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger1Button.Foreground = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger1Button.Background = plant.IsAuger1Active ? Brushes.MintCream : Brushes.MistyRose;
-
-            Auger2Button.BorderBrush = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger2Button.Foreground = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger2Button.Background = plant.IsAuger2Active ? Brushes.MintCream : Brushes.MistyRose;
-
-            GradationPumpButton.BorderBrush = plant.IsGradationPumpActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            GradationPumpButton.Foreground = plant.IsGradationPumpActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            GradationPumpButton.Background = plant.IsGradationPumpActive ? Brushes.MintCream : Brushes.MistyRose;
-
-            MP1BackwardButton.BorderBrush = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP1BackwardButton.Foreground = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP1BackwardButton.Background = plant.MP1 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
-            MP1HaltButton.BorderBrush = plant.MP1 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
-            MP1HaltButton.Foreground = plant.MP1 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
-            MP1HaltButton.Background = plant.MP1 == MotorState.Halt ? Brushes.MistyRose : Brushes.WhiteSmoke;
-            MP1ForwardButton.BorderBrush = plant.MP1 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP1ForwardButton.Foreground = plant.MP1 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP1ForwardButton.Background = plant.MP1 == MotorState.Forward ? Brushes.MintCream: Brushes.WhiteSmoke;
-
-            MP2BackwardButton.BorderBrush = plant.MP2 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP2BackwardButton.Foreground = plant.MP2 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP2BackwardButton.Background = plant.MP2 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
-            MP2HaltButton.BorderBrush = plant.MP2 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
-            MP2HaltButton.Foreground = plant.MP2 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
-            MP2HaltButton.Background = plant.MP2 == MotorState.Halt ? Brushes.MistyRose : Brushes.WhiteSmoke;
-            MP2ForwardButton.BorderBrush = plant.MP2 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP2ForwardButton.Foreground = plant.MP2 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP2ForwardButton.Background = plant.MP2 == MotorState.Forward ? Brushes.MintCream : Brushes.WhiteSmoke;
-
-            P12Button.BorderBrush = plant.P12 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P12Button.Foreground = plant.P12 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P12Button.Background = plant.P12 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
-
-            Status.Text = $"""
-            Gradation °Oe: {plant.GradationOe:N2}
-            Presse Querschnecke: {plant.PresseQuerSchnecke}
-            Füllstände:
-              Wanne A1: {plant.FillLevelA1} (ausgewählt: {plant.WantA1Selected}, Status: {plant.IsA1Selected})
-              Wanne A2: {plant.FillLevelA2} (ausgewählt: {plant.WantA2Selected}, Status: {plant.IsA2Selected})
-              Presse 1: {plant.FillLevelPress1}
-              Presse 2: {plant.FillLevelPress2}
-              Tank 1: {plant.FillLevelT1}
-              Tank 2: {plant.FillLevelT2}
-              Tank 3: {plant.FillLevelT3}
-              Tank 4: {plant.FillLevelT4}
-              Tank 5: {plant.FillLevelT5}
-              Tank 6: {plant.FillLevelT6}
-              Tank 7: {plant.FillLevelT7}
-              Tank 8: {plant.FillLevelT8}
-              Tank 9: {plant.FillLevelT9}
-            """;
-        }
-
-        private void TroughAugerButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.IsTroughAugerActive) {
-                App.Plant.StopTroughAuger();
-            } else {
-                App.Plant.StartTroughAuger();
-            }
-            App.Plant.CommitChanges();
-        }
-
-        private void ReblerButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.IsReblerActive) {
-                App.Plant.StopRebler();
-            } else {
-                App.Plant.StartRebler();
-            }
-            App.Plant.CommitChanges();
-        }
-
-        private void StirrerA1Button_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.IsStirrerA1Active) {
-                App.Plant.StopStirrerA1();
-            } else {
-                App.Plant.StartStirrerA1();
-            }
-            App.Plant.CommitChanges();
-        }
-
-        private void StirrerA2Button_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.IsStirrerA2Active) {
-                App.Plant.StopStirrerA2();
-            } else {
-                App.Plant.StartStirrerA2();
-            }
-            App.Plant.CommitChanges();
-        }
-
-        private void BeltButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.IsBeltActive) {
-                App.Plant.StopBelt();
-            } else {
-                App.Plant.StartBelt();
-            }
-            App.Plant.CommitChanges();
-        }
-
-        private void Auger1Button_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.IsAuger1Active) {
-                App.Plant.StopAuger1();
-            } else {
-                App.Plant.StartAuger1();
-            }
-            App.Plant.CommitChanges();
-        }
-
-        private void Auger2Button_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.IsAuger2Active) {
-                App.Plant.StopAuger2();
-            } else {
-                App.Plant.StartAuger2();
-            }
-            App.Plant.CommitChanges();
-        }
-
-        private void GradationPumpButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.IsGradationPumpActive) {
-                App.Plant.StopGradationPump();
-            } else {
-                App.Plant.StartGradationPump();
-            }
-            App.Plant.CommitChanges();
-        }
-
-        private void MP1BackwardButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            App.Plant.StartMP1Backward();
-            App.Plant.CommitChanges();
-        }
-
-        private void MP1HaltButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            App.Plant.StopMP1();
-            App.Plant.CommitChanges();
-        }
-
-        private void MP1ForwardButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            App.Plant.StartMP1Forward();
-            App.Plant.CommitChanges();
-        }
-
-
-        private void MP2BackwardButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            App.Plant.StartMP2Backward();
-            App.Plant.CommitChanges();
-        }
-
-        private void MP2HaltButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            App.Plant.StopMP2();
-            App.Plant.CommitChanges();
-        }
-
-        private void MP2ForwardButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            App.Plant.StartMP2Forward();
-            App.Plant.CommitChanges();
-        }
-
-        private void P12Button_Click(object? sender, RoutedEventArgs? evt) {
-            if (App.Plant == null) return;
-            if (App.Plant.P12 == MotorState.Forward) {
-                App.Plant.StopP12();
-            } else {
-                App.Plant.StartP12();
-            }
-            App.Plant.CommitChanges();
-        }
-    }
-}
@@ -1,19 +1,13 @@
-<Window x:Class="PamhagenSysCtrl.MainWindow"
+<Window x:Class="PamhagenSysCtrl.ManualControlWindow"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:PamhagenSysCtrl"
        mc:Ignorable="d"
-        Title="MainWindow" Height="550" Width="860">
+        Title="Manuelle Steuerung - Anlagensteuerung Pamhagen" Height="550" Width="860">
    <Grid>
-        <TextBox x:Name="PortInput" Text="COM1"
-                 Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left" Height="25" Width="80" FontSize="14" Padding="2,2,2,2"/>
-        <Button x:Name="ConnectButton" Content="Verbinden"
-                Margin="100,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left" Height="25" Width="80" FontSize="14"
-                Click="ConnectButton_Click"/>
-
-        <Grid x:Name="ValvePanel" Margin="5,50,5,5">
+        <Grid x:Name="ValvePanel" Margin="5,5,5,5">
        </Grid>

        <TextBlock x:Name="Status" FontSize="14"
@@ -31,66 +25,75 @@
                    Margin="10,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                    Click="ReblerButton_Click"/>

-            <Button x:Name="StirrerA1Button" Content="Rührer A1" Padding="2" Height="30" Width="120"
+            <Button x:Name="StirrerMW1Button" Content="Rührer MW1" Padding="2" Height="30" Width="120"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="10,80,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="StirrerA1Button_Click"/>
+                    Click="StirrerMW1Button_Click"/>

-            <Button x:Name="StirrerA2Button" Content="Rührer A2" Padding="2" Height="30" Width="120"
+            <Button x:Name="StirrerMW2Button" Content="Rührer MW2" Padding="2" Height="30" Width="120"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="10,115,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="StirrerA2Button_Click"/>
-
-            <Button x:Name="BeltButton" Content="Förderband" Padding="2" Height="30" Width="150"
-                    FontSize="14" BorderThickness="2" FontWeight="Bold"
-                    Margin="135,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="BeltButton_Click"/>
+                    Click="StirrerMW2Button_Click"/>

            <Button x:Name="Auger1Button" Content="Förderschnecke 1" Padding="2" Height="30" Width="150"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
-                    Margin="135,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                    Margin="135,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                    Click="Auger1Button_Click"/>
-
+            <Button x:Name="BeltButton" Content="Förderband" Padding="2" Height="30" Width="150"
+                    FontSize="14" BorderThickness="2" FontWeight="Bold"
+                    Margin="135,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                    Click="BeltButton_Click"/>
            <Button x:Name="Auger2Button" Content="Förderschnecke 2" Padding="2" Height="30" Width="150"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="135,80,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                    Click="Auger2Button_Click"/>

-            <Button x:Name="GradationPumpButton" Content="Gradationspumpe" Padding="2" Height="30" Width="150"
+            <Button x:Name="P6Button" Content="Pumpe 6" Padding="2" Height="30" Width="150"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="135,115,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="GradationPumpButton_Click"/>
-
-            <Button x:Name="MP1ForwardButton" Content="Zurück" Padding="2" Height="30" Width="60"
+                    Click="P6Button_Click"/>
+            <Button x:Name="MP1BackwardButton" Content="Zurück" Padding="2" Height="30" Width="60"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="290,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="MP1ForwardButton_Click"/>
+                    Click="MP1BackwardButton_Click"/>
            <Button x:Name="MP1HaltButton" Content="MP1" Padding="2" Height="30" Width="60"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="350,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                    Click="MP1HaltButton_Click"/>
-            <Button x:Name="MP1BackwardButton" Content="Vor" Padding="2" Height="30" Width="60"
+            <Button x:Name="MP1ForwardButton" Content="Vor" Padding="2" Height="30" Width="60"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="410,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="MP1BackwardButton_Click"/>
+                    Click="MP1ForwardButton_Click"/>

-            <Button x:Name="MP2ForwardButton" Content="Zurück" Padding="2" Height="30" Width="60"
+            <Button x:Name="MP2BackwardButton" Content="Zurück" Padding="2" Height="30" Width="60"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="290,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="MP2ForwardButton_Click"/>
+                    Click="MP2BackwardButton_Click"/>
            <Button x:Name="MP2HaltButton" Content="MP2" Padding="2" Height="30" Width="60"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="350,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                    Click="MP2HaltButton_Click"/>
-            <Button x:Name="MP2BackwardButton" Content="Vor" Padding="2" Height="30" Width="60"
+            <Button x:Name="MP2ForwardButton" Content="Vor" Padding="2" Height="30" Width="60"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="410,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                    Click="MP2BackwardButton_Click"/>
+                    Click="MP2ForwardButton_Click"/>

-            <Button x:Name="P12Button" Content="Pumpe 1/2" Padding="2" Height="30" Width="180"
+            <Button x:Name="P12Button" Content="Pumpe 1/2" Padding="2" Height="30" Width="87.5"
                    FontSize="14" BorderThickness="2" FontWeight="Bold"
                    Margin="290,80,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                    Click="P12Button_Click"/>
+            <Button x:Name="P3Button" Content="Pumpe 3" Padding="2" Height="30" Width="87.5"
+                    FontSize="14" BorderThickness="2" FontWeight="Bold"
+                    Margin="382.5,80,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                    Click="P3Button_Click"/>
+            <Button x:Name="P4Button" Content="Pumpe 4" Padding="2" Height="30" Width="87.5"
+                    FontSize="14" BorderThickness="2" FontWeight="Bold"
+                    Margin="290,115,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                    Click="P4Button_Click"/>
+            <Button x:Name="P5Button" Content="Pumpe 5" Padding="2" Height="30" Width="87.5"
+                    FontSize="14" BorderThickness="2" FontWeight="Bold"
+                    Margin="382.5,115,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                    Click="P5Button_Click"/>
        </Grid>
    </Grid>
 </Window>
@@ -0,0 +1,362 @@
+using PamhagenSysCtrl.Helpers;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace PamhagenSysCtrl {
+    public partial class ManualControlWindow : Window {
+
+        public ManualControlWindow() {
+            InitializeComponent();
+
+            for (int i = 1; i <= 58; i++) {
+                var b = new Button() {
+                    Content = $"V{i}",
+                    Margin = new(10 + ((i - 1) / 10) * 50, 10 + ((i - 1) % 10) * 40, 10, 10),
+                    BorderThickness = new(2),
+                    FontWeight = FontWeights.Bold,
+                    VerticalAlignment = VerticalAlignment.Top,
+                    HorizontalAlignment = HorizontalAlignment.Left,
+                    Height = 30,
+                    Width = 40,
+                    FontSize = 14,
+                };
+                var borderStyle = new Style(typeof(Border));
+                borderStyle.Setters.Add(new Setter(Border.CornerRadiusProperty, new CornerRadius(5)));
+                b.Resources.Add(typeof(Border), borderStyle);
+                b.Click += (sender, evt) => {
+                    if (App.Plant == null || sender is not Button b) return;
+                    var i = int.Parse($"{b.Content}"[1..]);
+                    if (i == 58) {
+                        if (App.Plant.WantMW1Selected) {
+                            App.Plant.SelectMW2();
+                        } else {
+                            App.Plant.SelectMW1();
+                        }
+                    } else if (i > 57) {
+                        return;
+                    } else if (App.Plant.WantValveOpen(i)) {
+                        App.Plant.CloseV(i);
+                    } else {
+                        App.Plant.OpenV(i);
+                    }
+                };
+                ValvePanel.Children.Add(b);
+            }
+
+            App.Plant?.Update += OnUpdate;
+        }
+
+        public void OnUpdate(object? sender, PlantEventArgs evt) {
+            if (sender is not PamhagenPlant plant) return;
+
+            for (int i = 1; i <= 58; i++) {
+                var target = plant.WantValveClosed(i);
+                var actual = plant.IsValveClosed(i);
+                if (ValvePanel.Children[i - 1] is not Button b)
+                    continue;
+                b.BorderBrush = target ? Brushes.DarkRed : Brushes.DarkGreen;
+                b.Foreground = target ? Brushes.DarkRed : Brushes.DarkGreen;
+                b.Background = actual ? Brushes.MistyRose : Brushes.MintCream;
+            }
+
+            ReblerButton.BorderBrush = plant.IsReblerActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            ReblerButton.Foreground = plant.IsReblerActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            ReblerButton.Background = plant.IsReblerActive ? Brushes.MintCream: Brushes.MistyRose;
+
+            TroughAugerButton.BorderBrush = plant.IsTroughAugerActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            TroughAugerButton.Foreground = plant.IsTroughAugerActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            TroughAugerButton.Background = plant.IsTroughAugerActive ? Brushes.MintCream : Brushes.MistyRose;
+
+            StirrerMW1Button.BorderBrush = plant.IsStirrerMW1Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            StirrerMW1Button.Foreground = plant.IsStirrerMW1Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            StirrerMW1Button.Background = plant.IsStirrerMW1Active ? Brushes.MintCream : Brushes.MistyRose;
+
+            StirrerMW2Button.BorderBrush = plant.IsStirrerMW2Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            StirrerMW2Button.Foreground = plant.IsStirrerMW2Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            StirrerMW2Button.Background = plant.IsStirrerMW2Active ? Brushes.MintCream : Brushes.MistyRose;
+
+            BeltButton.BorderBrush = plant.IsBeltActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            BeltButton.Foreground = plant.IsBeltActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            BeltButton.Background = plant.IsBeltActive ? Brushes.MintCream : Brushes.MistyRose;
+
+            Auger1Button.BorderBrush = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger1Button.Foreground = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger1Button.Background = plant.IsAuger1Active ? Brushes.MintCream : Brushes.MistyRose;
+
+            Auger2Button.BorderBrush = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger2Button.Foreground = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger2Button.Background = plant.IsAuger2Active ? Brushes.MintCream : Brushes.MistyRose;
+
+            MP1BackwardButton.BorderBrush = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP1BackwardButton.Foreground = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP1BackwardButton.Background = plant.MP1 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
+            MP1HaltButton.BorderBrush = plant.MP1 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
+            MP1HaltButton.Foreground = plant.MP1 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
+            MP1HaltButton.Background = plant.MP1 == MotorState.Halt ? Brushes.MistyRose : Brushes.WhiteSmoke;
+            MP1ForwardButton.BorderBrush = plant.MP1 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP1ForwardButton.Foreground = plant.MP1 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP1ForwardButton.Background = plant.MP1 == MotorState.Forward ? Brushes.MintCream: Brushes.WhiteSmoke;
+
+            MP2BackwardButton.BorderBrush = plant.MP2 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP2BackwardButton.Foreground = plant.MP2 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP2BackwardButton.Background = plant.MP2 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
+            MP2HaltButton.BorderBrush = plant.MP2 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
+            MP2HaltButton.Foreground = plant.MP2 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
+            MP2HaltButton.Background = plant.MP2 == MotorState.Halt ? Brushes.MistyRose : Brushes.WhiteSmoke;
+            MP2ForwardButton.BorderBrush = plant.MP2 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP2ForwardButton.Foreground = plant.MP2 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP2ForwardButton.Background = plant.MP2 == MotorState.Forward ? Brushes.MintCream : Brushes.WhiteSmoke;
+
+            P12Button.BorderBrush = plant.P12 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P12Button.Foreground = plant.P12 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P12Button.Background = plant.P12 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+
+            P3Button.BorderBrush = plant.P3 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P3Button.Foreground = plant.P3 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P3Button.Background = plant.P3 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+
+            P4Button.BorderBrush = plant.P4 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P4Button.Foreground = plant.P4 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P4Button.Background = plant.P4 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+
+            P5Button.BorderBrush = plant.P5 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P5Button.Foreground = plant.P5 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P5Button.Background = plant.P5 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+
+            P6Button.BorderBrush = plant.P6 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P6Button.Foreground = plant.P6 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P6Button.Background = plant.P6 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+
+            Status.Text = $"""
+            Gradation °Oe: {plant.GradationOe:N2}
+            Presse Querschnecke: {plant.PresseQuerSchnecke}
+            Füllstände:
+              Maischewanne 1: {plant.FillLevelMW1} (ausgewählt: {plant.WantMW1Selected}, Status: {plant.IsMWSelected})
+              Maischewanne 2: {plant.FillLevelMW2} (ausgewählt: {plant.WantMW2Selected}, Status: {plant.IsMW2Selected})
+              Presse 1: {plant.FillLevelPress1}
+              Presse 2: {plant.FillLevelPress2}
+              Tank 1: {plant.FillLevelT1}
+              Tank 2: {plant.FillLevelT2}
+              Tank 3: {plant.FillLevelT3}
+              Tank 4: {plant.FillLevelT4}
+              Tank 5: {plant.FillLevelT5}
+              Tank 6: {plant.FillLevelT6}
+              Tank 7: {plant.FillLevelT7}
+              Tank 8: {plant.FillLevelT8}
+              Tank 9: {plant.FillLevelT9}
+            """;
+        }
+
+        private void TroughAugerButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.IsTroughAugerActive) {
+                    App.Plant.StopTroughAuger();
+                } else {
+                    App.Plant.StartTroughAuger();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void ReblerButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.IsReblerActive) {
+                    App.Plant.StopRebler();
+                } else {
+                    App.Plant.StartRebler();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void StirrerMW1Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.IsStirrerMW1Active) {
+                    App.Plant.StopStirrerMW1();
+                } else {
+                    App.Plant.StartStirrerMW1();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void StirrerMW2Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.IsStirrerMW2Active) {
+                    App.Plant.StopStirrerMW2();
+                } else {
+                    App.Plant.StartStirrerMW2();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void BeltButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.IsBeltActive) {
+                    App.Plant.StopBelt();
+                } else {
+                    App.Plant.StartBelt();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void Auger1Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.IsAuger1Active) {
+                    App.Plant.StopAuger1();
+                } else {
+                    App.Plant.StartAuger1();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void Auger2Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.IsAuger2Active) {
+                    App.Plant.StopAuger2();
+                } else {
+                    App.Plant.StartAuger2();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void MP1BackwardButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                App.Plant.StartMP1Backward();
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void MP1HaltButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                App.Plant.StopMP1();
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void MP1ForwardButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                App.Plant.StartMP1Forward();
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+
+        private void MP2BackwardButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                App.Plant.StartMP2Backward();
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void MP2HaltButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                App.Plant.StopMP2();
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void MP2ForwardButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                App.Plant.StartMP2Forward();
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void P12Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.P12 == MotorState.Forward) {
+                    App.Plant.StopP12();
+                } else {
+                    App.Plant.StartP12();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void P3Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.P3 == MotorState.Forward) {
+                    App.Plant.StopP3();
+                } else {
+                    App.Plant.StartP3();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void P4Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.P4 == MotorState.Forward) {
+                    App.Plant.StopP4();
+                } else {
+                    App.Plant.StartP4();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void P5Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.P5 == MotorState.Forward) {
+                    App.Plant.StopP5();
+                } else {
+                    App.Plant.StartP5();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void P6Button_Click(object? sender, RoutedEventArgs? evt) {
+            if (App.Plant == null) return;
+            try {
+                if (App.Plant.P6 == MotorState.Forward) {
+                    App.Plant.StopP6();
+                } else {
+                    App.Plant.StartP6();
+                }
+            } catch (NoClearanceException exc) {
+                MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+    }
+}
@@ -4,9 +4,51 @@
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:PamhagenSysCtrl.Windows"
-        Title="Schema - Anlagensteuerung Pamhagen" Height="800" Width="1600">
-    <Grid MouseMove="SchemeCanvas_MouseMove" MouseLeftButtonDown="SchemeCanvas_MouseLeftButtonDown" MouseLeftButtonUp="SchemeCanvas_MouseLeftButtonUp">
-        <Canvas x:Name="SchemeCanvas">
-        </Canvas>
+        Title="Anlagensteuerung Pamhagen" Height="950" Width="1600" MinWidth="1500" MinHeight="950">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="24"/>
+        </Grid.RowDefinitions>
+
+        <Menu Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
+            <MenuItem Header="Einstellungen">
+                <MenuItem x:Name="Menu_Settings_ManualControl" Header="Manuelle Steuerung" Click="Menu_Settings_ManualControl_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xF271;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <Separator/>
+                <MenuItem x:Name="Menu_Settings_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Settings_Config_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEC7A;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_Settings_Directory" Header="Konfigurationsspeicherort öffnen..." Click="Menu_Settings_Directory_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xED25;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+            <MenuItem Header="Hilfe">
+                <MenuItem Header="Über">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE946;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+        </Menu>
+
+        <Grid Grid.Row="1" ClipToBounds="True">
+            <Canvas x:Name="SchemeCanvas" Width="1550" Height="900" VerticalAlignment="Center" HorizontalAlignment="Center" SnapsToDevicePixels="True"
+                    MouseMove="SchemeCanvas_MouseMove" MouseLeftButtonDown="SchemeCanvas_MouseLeftButtonDown" MouseLeftButtonUp="SchemeCanvas_MouseLeftButtonUp" Grid.ColumnSpan="2" Margin="25,0,0,0">
+            </Canvas>
+        </Grid>
+
+        <StatusBar Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="Gray">
+
+        </StatusBar>
+
    </Grid>
 </Window>
@@ -1,8 +1,8 @@
 using PamhagenSysCtrl.Helpers;
 using PamhagenSysCtrl.Helpers.Pipeline;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Media;

 namespace PamhagenSysCtrl.Windows {
    public partial class PlantSchemeWindow : Window {
@@ -12,6 +12,7 @@ namespace PamhagenSysCtrl.Windows {
        private ISource? _lastSource;
        private List<INode> _path = [];
        private ISet<INode>? _lastSelected;
+        private ISet<INode>? _hover;

        public PlantSchemeWindow() {
            InitializeComponent();
@@ -20,6 +21,28 @@ namespace PamhagenSysCtrl.Windows {
            Graph.Draw(SchemeCanvas);
        }

+        private void Menu_Settings_ManualControl_Click(object sender, RoutedEventArgs evt) {
+            var w = new ManualControlWindow();
+            w.Show();
+        }
+
+        private void Menu_Settings_Directory_Click(object sender, RoutedEventArgs evt) {
+            try {
+                Process.Start("explorer.exe", App.DataPath);
+            } catch { }
+        }
+
+        private void Menu_Settings_Config_Click(object sender, RoutedEventArgs evt) {
+            try {
+                Process.Start(new ProcessStartInfo {
+                    FileName = "notepad.exe",
+                    Arguments = App.ConfigPath,
+                    Verb = "runas",
+                    UseShellExecute = true,
+                });
+            } catch { }
+        }
+
        private void SchemeCanvas_MouseMove(object sender, MouseEventArgs evt) {
            var p = evt.GetPosition(SchemeCanvas);
            UpdateScheme(evt.GetPosition(SchemeCanvas), evt.LeftButton == MouseButtonState.Pressed);
@@ -40,24 +63,113 @@ namespace PamhagenSysCtrl.Windows {
            foreach (var c in clicked) {
                if (_lastSource == null && Graph.SelectedPaths.Any(p => p.Start == c)) {
                    var path = Graph.SelectedPaths.First(p => p.Start == c);
-                    Graph.RemovePath(path);
+                    if (!path.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false)) {
+                        Graph.RemovePath(path);
+                    }
                } else if (_lastSource != null && c is ISink sink) {
                    var res = Graph.GetPath([_lastSource, .._path, sink], (n) => n is not ISink && (n is not Valve v || !v.IsLocked));
                    if (res is Path path) {
                        Graph.AddPath(path);
                        _lastSource = null;
                    }
-                } else if (c is ISource source) {
-                    _lastSource = source;
-                    _path = [];
                } else if (_lastSource != null) {
                    var path = Graph.GetPath([_lastSource, .. _path, c], (n) => n is not ISink && (n is not Valve v || !v.IsLocked));
                    if (path != null) {
                        _path.Add(c);
                    }
+                } else if (c is ISource source) {
+                    _lastSource = source;
+                    _path = [];
                } else {
                    _lastSource = null;
                }
+                try {
+                    if (c is EntryTrough trough) {
+                        if (trough.IsActive) {
+                            App.Plant?.StopTroughAuger();
+                        } else {
+                            App.Plant?.StartTroughAuger();
+                        }
+                    } else if (c is Rebler rebler) {
+                        if (rebler.IsActive) {
+                            App.Plant?.StopRebler();
+                        } else {
+                            App.Plant?.StartRebler();
+                        }
+                    } else if (c is Switcher switcher) {
+                        if (App.Plant?.WantMW1Selected ?? false) {
+                            App.Plant?.SelectMW2();
+                        } else {
+                            App.Plant?.SelectMW1();
+                        }
+                    } else if (c is EncasedAuger auger) {
+                        if (auger == Graph.Auger1) {
+                            if (auger.IsActive) {
+                                App.Plant?.StopAuger1();
+                            } else {
+                                App.Plant?.StartAuger1();
+                            }
+                        } else if (auger == Graph.Auger2) {
+                            if (auger.IsActive) {
+                                App.Plant?.StopAuger2();
+                            } else {
+                                App.Plant?.StartAuger2();
+                            }
+                        }
+                    } else if (c is ConveyorBelt belt) {
+                        if (belt.IsActive) {
+                            App.Plant?.StopBelt();
+                        } else {
+                            App.Plant?.StartBelt();
+                        }
+                    } else if (c is Pump pump) {
+                        if (pump == Graph.MP1) {
+                            if (pump.IsActive) {
+                                App.Plant?.StopMP1();
+                            } else {
+                                App.Plant?.StartMP1Forward();
+                            }
+                        } else if (pump == Graph.MP2) {
+                            if (pump.IsActive) {
+                                App.Plant?.StopMP2();
+                            } else {
+                                App.Plant?.StartMP2Forward();
+                            }
+                        } else if (pump == Graph.P12) {
+                            if (pump.IsActive) {
+                                App.Plant?.StopP12();
+                            } else {
+                                App.Plant?.StartP12();
+                            }
+                        } else if (pump == Graph.P3) {
+                            if (pump.IsActive) {
+                                App.Plant?.StopP3();
+                            } else {
+                                App.Plant?.StartP3();
+                            }
+                        } else if (pump == Graph.P4) {
+                            if (pump.IsActive) {
+                                App.Plant?.StopP4();
+                            } else {
+                                App.Plant?.StartP4();
+                            }
+                        } else if (pump == Graph.P5) {
+                            if (pump.IsActive) {
+                                App.Plant?.StopP5();
+                            } else {
+                                App.Plant?.StartP5();
+                            }
+                        } else if (pump == Graph.P6) {
+                            if (pump.IsActive) {
+                                App.Plant?.StopP6();
+                            } else {
+                                App.Plant?.StartP6();
+                            }
+                        }
+                    }
+                } catch (NoClearanceException exc) {
+                    MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
            }
            UpdateScheme(pos, evt.LeftButton == MouseButtonState.Pressed);
        }
@@ -65,37 +177,51 @@ namespace PamhagenSysCtrl.Windows {
        private ISet<INode> UpdateScheme(Point pos, bool down) {
            foreach (var e in Graph.Edges) {
                e.Highlight = null;
+                e.Flow = null;
+            }
+            foreach (var n in Graph.Nodes) {
+                if (n is Pump p) {
+                    p.Highlight = null;
+                }
            }
            foreach (var p in Graph.SelectedPaths) {
-                Graph.ColorPipesAdjacientToPath(p, Brushes.Green, Brushes.Orange);
+                Graph.ColorPipesAdjacientToPath(p, PamhagenBrushes.Green, p.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false), PamhagenBrushes.DimOrange);
            }
-            var hover = Graph.Update(pos.X, pos.Y, down);
-            if (_lastSource != null && (hover.Count > 0 || _path.Count > 0)) {
+            _hover = Graph.GetHover(pos.X, pos.Y);
+            if (_lastSource != null && (_hover.Count > 0 || _path.Count > 0)) {
                List<INode> points = [_lastSource, .. _path];
-                if (hover.Count > 0 && !points.Contains(hover.First())) {
-                    points.Add(hover.First());
+                if (_hover.Count > 0 && !points.Contains(_hover.First())) {
+                    points.Add(_hover.First());
                }
                if (points.Count >= 2) {
                    var res = Graph.GetPath(points, (n) => n is not ISink && (n is not Valve v || !v.IsLocked));
                    if (res is Path path) {
-                        Graph.ColorPipesAdjacientToPath(path, Brushes.Green, Brushes.Orange);
+                        Graph.ColorPipesAdjacientToPath(path, PamhagenBrushes.Green, false, PamhagenBrushes.DimOrange);
                    }
                }
-            } else if (_lastSource == null && hover.Count > 0 && Graph.SelectedPaths.Any(p => p.Start == hover.First())) {
-                var path = Graph.SelectedPaths.First(p => p.Start == hover.First());
-                Graph.ColorPipesAdjacientToPath(path, Brushes.Red, null);
+            } else if (_lastSource == null && _hover.Count > 0 && Graph.SelectedPaths.Any(p => p.Start == _hover.First())) {
+                var path = Graph.SelectedPaths.First(p => p.Start == _hover.First());
+                var pumpActive = path.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false);
+                if (pumpActive) {
+                    foreach (var pump in path.Hops.Select(h => h.Node as Pump).Where(p => p != null)) {
+                        pump?.Highlight = PamhagenBrushes.Red;
+                    }
+                } else {
+                    Graph.ColorPipesAdjacientToPath(path, PamhagenBrushes.Red, false, null);
+                }
            }
            if (_lastSource != null) {
                foreach (var edge in _lastSource.Outputs) {
-                    edge.Highlight = Brushes.Green;
+                    edge.Highlight = PamhagenBrushes.Green;
                }
            }
-            Graph.Update(pos.X, pos.Y, down);
-            return hover;
+            Graph.Update(_hover, down);
+            return _hover;
        }

        public void OnUpdate(object? sender, PlantEventArgs evt) {
            if (sender is not PamhagenPlant plant) return;
+            UpdateScheme(Mouse.GetPosition(SchemeCanvas), Mouse.LeftButton == MouseButtonState.Pressed);
        }
    }
 }
Author	SHA1	Message	Date
lorenz.stechauner	9c3cc8d4be	Enhance Installer Test / Run tests (push) Failing after 13s Details	2026-08-05 16:31:32 +02:00
thomas.hilscherandlorenz.stechauner	bf8533c857	Add msi installer	2026-08-05 15:39:00 +02:00
lorenz.stechauner	47455d9291	Graph: Forbid paths trough already locked valves	2026-08-05 14:31:54 +02:00
lorenz.stechauner	db5702c0a7	Add config file and refactor windows	2026-08-05 14:16:01 +02:00
lorenz.stechauner	d9c1b79563	Add switcher	2026-08-04 23:56:32 +02:00
lorenz.stechauner	ec07d91631	Add App.manifest	2026-08-04 19:14:58 +02:00
lorenz.stechauner	59707e427d	Bugfixes and remove CommitChanges()	2026-08-04 16:39:09 +02:00
lorenz.stechauner	7b95cf4221	Add clearance logic to PamhagenPlant	2026-08-04 15:30:08 +02:00
lorenz.stechauner	0d65e419b9	Rename FlowArrow to FlowArrows	2026-08-03 15:56:24 +02:00
lorenz.stechauner	ac45092e1d	Enhance flow arrows	2026-08-03 15:54:19 +02:00
thomas.hilscher	19deed4fd7	Display flow arrows when selecting a path	2026-07-31 14:22:00 +02:00
lorenz.stechauner	79e8640ac0	Add conveyor belt and augers	2026-07-16 12:54:16 +02:00
lorenz.stechauner	62f227ca03	Add frame to press	2026-07-16 01:11:31 +02:00
lorenz.stechauner	3f6fba36e0	Add Übernahme-Trog	2026-07-16 00:09:26 +02:00
lorenz.stechauner	b8ac414673	Display filling level	2026-07-15 13:59:22 +02:00
lorenz.stechauner	4c9da5c9d5	Add Rebler	2026-07-15 00:06:26 +02:00
lorenz.stechauner	9baae02240	PlantSchemeWindow: Add MinWidth/MinHeight	2026-07-14 17:14:21 +02:00