[WIP] XBE-24

Installer/Files/config.ini

@@ -1,35 +1,7 @@
 
 [plc]
 port = COM1
-sensor_delay_open = 0  ; seconds
-sensor_delay_close = 2  ; seconds
 
 [update]
 url = https://elwig.at/files/pamhagen-sysctrl/latest
 auto = true
-
-[xbe24]
-a1 = PATH_MW2_PRESS1
-a2 = PATH_MW2_PRESS2
-a3 = PATH_MW2_T1
-a4 = PATH_MW2_T2
-a5 = PATH_MW2_T3
-a6 = PATH_MW2_T4
-b1 = START_REBLER
-b2 = STOP_REBLER
-b3 = SELECT_MW2
-b4 = TOGGLE_STIRRER_MW2
-b5 = START_MP2
-b6 = STOP_MP2
-c1 = START_TROUGH_AUGER
-c2 = STOP_TROUGH_AUGER
-c3 = SELECT_MW1
-c4 = TOGGLE_STIRRER_MW1
-c5 = START_MP1
-c6 = STOP_MP1
-d1 = PATH_MW1_PRESS1
-d2 = PATH_MW1_PRESS2
-d3 = PATH_MW1_T1
-d4 = PATH_MW1_T2
-d5 = PATH_MW1_T3
-d6 = PATH_MW1_T4

PamhagenSysCtrl/App.xaml.cs

@@ -34,12 +34,15 @@ namespace PamhagenSysCtrl {
         }
 
         protected override async void OnStartup(StartupEventArgs evt) {
-            if (Config == null)
-                return;
-
             Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0");
 
             Plant = new(Config.PlcPort);
+            try {
+                await Plant.StartThread();
+            } catch (Exception exc) {
+                // TODO
+            }
+
             base.OnStartup(evt);
 
             if (Config.UpdateUrl != null && Config.UpdateAuto) {

PamhagenSysCtrl/Helpers/Config.cs

@@ -9,16 +9,11 @@ namespace PamhagenSysCtrl.Helpers {
         private readonly string FileName;
 
         public string PlcPort = "COM1";
-        public int PlcSensorDelayOpen = 0;
-        public int PlcSensorDelayClose = 0;
         public string? UpdateUrl;
         public bool UpdateAuto;
 
-        public PamhagenPlant.ShortcutKey?[] Xbe24KeyMap;
-
         public Config(string filename) {
             FileName = filename;
-            Xbe24KeyMap = new PamhagenPlant.ShortcutKey?[24];
             Read();
         }
 
@@ -26,30 +21,12 @@ namespace PamhagenSysCtrl.Helpers {
             try {
                 var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
                 PlcPort = config["plc:port"] ?? "COM1";
-                PlcSensorDelayOpen = int.Parse(config["plc:sensor_delay_open"] ?? "0");
-                PlcSensorDelayClose = int.Parse(config["plc:sensor_delay_close"] ?? "0");
                 UpdateUrl = config["update:url"];
                 UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower());
-                var xbe24 = config.GetSection("xbe24");
-                for (char c = 'a'; c <= 'd'; c++) {
-                    for (int r = 1; r <= 6; r++) {
-                        int n = (c - 'a') * 6 + r - 1;
-                        var s = xbe24[$"{c}{r}"]?.ToUpper();
-                        Xbe24KeyMap[n] = s == null ? null : Enum.Parse<PamhagenPlant.ShortcutKey>(s);
-                    }
-                }
             } catch (Exception exc) {
                 MessageBox.Show($"Die Konfigurationsdatei konnte nicht gelesen werden:\n\n{exc.Message}", "Konfigurationsdatei lesen", MessageBoxButton.OK, MessageBoxImage.Error);
                 Application.Current.Shutdown();
             }
         }
-
-        public PamhagenPlant.ShortcutKey? MapKey(int n) {
-            return n < 0 || Xbe24KeyMap.Length < n ? null : Xbe24KeyMap[n];
-        }
-
-        public int? MapKey(PamhagenPlant.ShortcutKey key) {
-            return Xbe24KeyMap.IndexOf(key) is int n ? n == -1 ? null : n : null;
-        }
     }
 }

PamhagenSysCtrl/Helpers/Extensions.cs

@@ -1,15 +0,0 @@
-using System.Drawing;
-
-namespace PamhagenSysCtrl.Helpers {
-    public static class Extensions {
-
-        public static void SetBacklight(this Xbe24Keyboard k, PamhagenPlant.ShortcutKey key, Color color, bool flashing = false) {
-            if (App.Config.MapKey(key) is int n)
-                k.SetBacklight(n, color, flashing);
-        }
-
-        public static bool IsKeyPressed(this Xbe24Keyboard k, PamhagenPlant.ShortcutKey key) {
-            return App.Config.MapKey(key) is int n && k.IsKeyPressed(n);
-        }
-    }
-}

PamhagenSysCtrl/Helpers/PamhagenGraph.cs

@@ -29,12 +29,6 @@ namespace PamhagenSysCtrl.Helpers {
         public readonly Tank Tank7;
         public readonly Tank Tank8;
         public readonly Tank Tank9;
-        public readonly Valve V5;
-        public readonly Valve V6;
-        public readonly Valve V7;
-        public readonly Valve V8;
-
-        public readonly Dictionary<PamhagenPlant.ShortcutKey, (ISource Source, Pump Pump, INode? Intermediate, ISink Sink)> PathShortcuts;
 
         public PamhagenGraph() {
             double mw2X = -118;
@@ -72,26 +66,26 @@ namespace PamhagenSysCtrl.Helpers {
             var pr1X = -15;
             var pr2X = 23;
 
-            var trough = new EntryTrough("Auffangwanne", mw1X + 14, rebY - 20, () => App.Plant?.State.TroughAuger_IsActive ?? false);
+            var trough = new EntryTrough("Auffangwanne", mw1X + 14, rebY - 20, () => App.Plant?.IsTroughAugerActive ?? false);
             Nodes.Add(trough);
 
-            Auger1 = new EncasedAuger("", rebX - 19, rebY, () => App.Plant?.State.Auger1_IsActive ?? false);
+            Auger1 = new EncasedAuger("", rebX - 19, rebY, () => App.Plant?.IsAuger1Active ?? false);
-            var auger0 = new EncasedAuger("Pressen-\nQuerschnecke", rebX - 39, rebY, () => App.Plant?.State.PressCrossAuger_IsActive ?? false, 180, clickable: false);
+            var auger0 = new EncasedAuger("Pressen-\nQuerschnecke", rebX - 39, rebY, () => App.Plant?.IsPresseQuerSchneckeActive ?? false, 180, clickable: false);
-            Auger3 = new EncasedAuger("", rebX - 23, rebY - 24, () => App.Plant?.State.Auger3_IsActive ?? false, 135);
+            Auger3 = new EncasedAuger("", rebX - 23, rebY - 24, () => App.Plant?.IsAuger3Active ?? false, 135);
-            var belt = new ConveyorBelt("", rebX - 29, rebY - 8, () => App.Plant?.State.Auger2_IsActive ?? false);
+            var belt = new ConveyorBelt("", rebX - 29, rebY - 8, () => App.Plant?.IsAuger2Active ?? false);
             Nodes.Add(belt);
             Nodes.Add(Auger1);
             Nodes.Add(auger0);
             Nodes.Add(Auger3);
-            var rebler = new Rebler("Rebler", rebX, rebY, () => App.Plant?.State.Rebler_IsActive ?? false);
+            var rebler = new Rebler("Rebler", rebX, rebY, () => App.Plant?.IsReblerActive ?? false);
             Nodes.Add(rebler);
-            var switcher = new Switcher("", rebX, rebY + 12, () => App.Plant?.State.MW1_IsSelected == true ? 1 : App.Plant?.State.MW2_IsSelected == true ? 2 : 0, () => App.Plant?.State.MW1_WantSelected == true ? 1 : App.Plant?.State.MW2_WantSelected == true ? 2 : 0);
+            var switcher = new Switcher("", rebX, rebY + 12, () => App.Plant?.TroughSelector ?? 0, () => App.Plant == null ? 0 : App.Plant.WantMW1Selected ? 1 : 2);
             Nodes.Add(switcher);
 
-            MW1 = new Trough("MW1", mw1X, mpY - 14, () => App.Plant?.State.MW1_FillLevel ?? FillState.Unknown);
+            MW1 = new Trough("MW1", mw1X, mpY - 14, () => App.Plant?.FillLevelMW1 ?? FillState.Unknown);
-            MW2 = new Trough("MW2", mw2X, mpY - 14, () => App.Plant?.State.MW2_FillLevel ?? FillState.Unknown);
+            MW2 = new Trough("MW2", mw2X, mpY - 14, () => App.Plant?.FillLevelMW2 ?? FillState.Unknown);
-            MP1 = new Pump("MP1", mw1X, mpY, () => App.Plant?.State.MP1_State ?? default, () => App.Plant?.State.MP1_HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Contains(x)));
+            MP1 = new Pump("MP1", mw1X, mpY, () => App.Plant?.MP1 ?? default, () => App.Plant?.MP1HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
-            MP2 = new Pump("MP2", mw2X, mpY, () => App.Plant?.State.MP2_State ?? default, () => App.Plant?.State.MP2_HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Contains(x)));
+            MP2 = new Pump("MP2", mw2X, mpY, () => App.Plant?.MP2 ?? default, () => App.Plant?.MP2HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
             var x1 = new PipeJoin(mw1X, mpY + 8);
             var x2 = new PipeJoin(mw2X, mpY + 8);
 
@@ -100,10 +94,10 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(MP1, x1);
             CreatePipe(MP2, x2);
 
-            var v1 = CreateValve(1, mw1X, mpY + 16, 2);
+            var v1 = CreateValve(1, mw1X, mpY + 16);
-            var v2 = CreateValve(2, mw2X, mpY + 16, 0);
+            var v2 = CreateValve(2, mw2X, mpY + 16);
-            var v3 = CreateValve(3, mw2X + 6, mpY + 16, 2);
+            var v3 = CreateValve(3, mw2X + 6, mpY + 16);
-            var v4 = CreateValve(4, mw1X - 6, mpY + 16, 0);
+            var v4 = CreateValve(4, mw1X - 6, mpY + 16);
 
             CreatePipe(x1, v1);
             CreatePipe(x1, v4);
@@ -122,33 +116,33 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(v4, x5, true);
             CreatePipe(x5, x6, true);
 
-            V5 = CreateValve(5, x1X + 6, ltg1Y, 1);
+            var v5 = CreateValve(5, x1X + 6, ltg1Y);
-            V6 = CreateValve(6, x1X + 6, ltg2Y + 8, 3);
+            var v6 = CreateValve(6, x1X + 6, ltg2Y + 8);
-            V7 = CreateValve(7, x1X + 6, ltg2Y, 3);
+            var v7 = CreateValve(7, x1X + 6, ltg2Y);
-            V8 = CreateValve(8, x1X - 6, ltg2Y + 8, 0);
+            var v8 = CreateValve(8, x1X - 6, ltg2Y + 8);
-            var v9 = CreateValve(9, ltg2X, ltg5Y + 8, 2);
+            var v9 = CreateValve(9, ltg2X, ltg5Y + 8);
 
-            CreatePipe(x4, V5);
+            CreatePipe(x4, v5);
-            CreatePipe(x4, V6, true);
+            CreatePipe(x4, v6, true);
-            CreatePipe(x6, V7);
+            CreatePipe(x6, v7);
-            CreatePipe(x6, V8);
+            CreatePipe(x6, v8);
-            CreatePipe(V7, v9, label: "Ltg. 2", labelOffsetX: 6);
+            CreatePipe(v7, v9, label: "Ltg. 2", labelOffsetX: 6);
 
             var xv15 = new PipeJoin(ltg1X, wt1Y + 8);
             var xv11 = new PipeJoin(ltg2X, wt1Y + 14);
             var x7 = new PipeJoin(ltg2X, ltg5Y);
 
-            CreatePipe(V5, xv15, label: "Ltg. 1", labelOffsetX: 6);
+            CreatePipe(v5, xv15, label: "Ltg. 1", labelOffsetX: 6);
             CreatePipe(v9, x7);
             CreatePipe(x7, xv11);
 
-            var v10 = CreateValve(10, ltg2X + 8, ltg5Y, 3);
+            var v10 = CreateValve(10, ltg2X + 8, ltg5Y);
-            var v11 = CreateValve(11, ltg1X - 6, wt1Y + 14, 3);
+            var v11 = CreateValve(11, ltg1X - 6, wt1Y + 14);
-            var v12 = CreateValve(12, ltg1X, wt1Y, 0);
+            var v12 = CreateValve(12, ltg1X, wt1Y);
-            var v13 = CreateValve(13, ltg2X, wt1Y, 2);
+            var v13 = CreateValve(13, ltg2X, wt1Y);
-            var v14 = CreateValve(14, ltg1X - 6, wt1Y - 8, 3);
+            var v14 = CreateValve(14, ltg1X - 6, wt1Y - 8);
-            var v15 = CreateValve(15, ltg1X - 6, wt1Y + 8, 1);
+            var v15 = CreateValve(15, ltg1X - 6, wt1Y + 8);
-            var v16 = CreateValve(16, ltg1X - 6, wt1Y - 14, 1);
+            var v16 = CreateValve(16, ltg1X - 6, wt1Y - 14);
             CreatePipe(v10, x7);
             CreatePipe(xv11, v11);
             CreatePipe(xv15, v15);
@@ -162,8 +156,8 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(v16, xv16);
             CreatePipe(v14, xv14);
 
-            var v20 = CreateValve(20, ltg1X - 6, wt2Y - 14, 1);
+            var v20 = CreateValve(20, ltg1X - 6, wt2Y - 14);
-            var v21 = CreateValve(21, ltg1X - 6, wt2Y - 8, 3);
+            var v21 = CreateValve(21, ltg1X - 6, wt2Y - 8);
             var xv20 = new PipeJoin(ltg1X, wt2Y - 14);
             var xv21 = new PipeJoin(ltg2X, wt2Y - 8);
             CreatePipe(xv16, xv20);
@@ -173,9 +167,9 @@ namespace PamhagenSysCtrl.Helpers {
 
             var wt1 = new HeatExchanger("WT Most", wtX, wt1Y);
             var wt2 = new HeatExchanger("WT Warmwasser", wtX, wt2Y);
-            var v17 = CreateValve(17, wtX + 14, wt1Y, 2);
+            var v17 = CreateValve(17, wtX + 14, wt1Y);
-            var v18 = CreateValve(18, wtX + 8, wt1Y + 8, 3);
+            var v18 = CreateValve(18, wtX + 8, wt1Y + 8);
-            var v19 = CreateValve(19, wtX + 8, (wt1Y + wt2Y) / 2, 0);
+            var v19 = CreateValve(19, wtX + 8, (wt1Y + wt2Y) / 2);
             var xwt1 = new PipeJoin(wtX + 24, wt1Y + 8);
             var xwt2 = new PipeJoin(wtX + 14, wt1Y + 8);
             var xwt3 = new PipeJoin(wtX + 8, wt1Y - 8);
@@ -202,8 +196,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv22 = new PipeJoin(t1X - 3, ltg7Y);
             var xv23 = new PipeJoin(t1X + 3, ltg6Y);
-            var v22 = CreateValve(22, t1X - 3, tValveY, 0);
+            var v22 = CreateValve(22, t1X - 3, tValveY);
-            var v23 = CreateValve(23, t1X + 3, tValveY, 2);
+            var v23 = CreateValve(23, t1X + 3, tValveY);
             Tank1 = CreateTank(1, t1X, tanksY, 35000);
             CreatePipe(xv20, xv22, true, label: "Ltg. 7", labelOffsetX: 10);
             CreatePipe(xv21, xv23, true, label: "Ltg. 6", labelOffsetX: 4);
@@ -214,8 +208,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv24 = new PipeJoin(t2X - 3, ltg7Y);
             var xv25 = new PipeJoin(t2X + 3, ltg6Y);
-            var v24 = CreateValve(24, t2X - 3, tValveY, 0);
+            var v24 = CreateValve(24, t2X - 3, tValveY);
-            var v25 = CreateValve(25, t2X + 3, tValveY, 2);
+            var v25 = CreateValve(25, t2X + 3, tValveY);
             Tank2 = CreateTank(2, t2X, tanksY, 35000);
             CreatePipe(xv22, xv24);
             CreatePipe(xv23, xv25);
@@ -226,8 +220,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv26 = new PipeJoin(t3X - 3, ltg7Y);
             var xv27 = new PipeJoin(t3X + 3, ltg6Y);
-            var v26 = CreateValve(26, t3X - 3, tValveY, 0);
+            var v26 = CreateValve(26, t3X - 3, tValveY);
-            var v27 = CreateValve(27, t3X + 3, tValveY, 2);
+            var v27 = CreateValve(27, t3X + 3, tValveY);
             Tank3 = CreateTank(3, t3X, tanksY, 35000);
             CreatePipe(xv24, xv26);
             CreatePipe(xv25, xv27);
@@ -236,15 +230,15 @@ namespace PamhagenSysCtrl.Helpers {
             CreateInlet(v26, Tank3);
             CreateInlet(v27, Tank3);
 
-            var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y, 1);
+            var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y);
-            var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y, 3);
+            var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y);
             CreatePipe(xv26, v28);
             CreatePipe(xv27, v29);
 
             var xv30 = new PipeJoin(t4X - 3, ltg7Y);
             var xv31 = new PipeJoin(t4X + 3, ltg6Y);
-            var v30 = CreateValve(30, t4X - 3, tValveY, 0);
+            var v30 = CreateValve(30, t4X - 3, tValveY);
-            var v31 = CreateValve(31, t4X + 3, tValveY, 2);
+            var v31 = CreateValve(31, t4X + 3, tValveY);
             Tank4 = CreateTank(4, t4X, tanksY, 35000);
             CreatePipe(v28, xv30);
             CreatePipe(v29, xv31);
@@ -255,8 +249,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv32 = new PipeJoin(t5X - 3, ltg7Y);
             var xv33 = new PipeJoin(t5X + 3, ltg6Y);
-            var v32 = CreateValve(32, t5X - 3, tValveY, 0);
+            var v32 = CreateValve(32, t5X - 3, tValveY);
-            var v33 = CreateValve(33, t5X + 3, tValveY, 2);
+            var v33 = CreateValve(33, t5X + 3, tValveY);
             Tank5 = CreateTank(5, t5X, tanksY, 35000);
             CreatePipe(xv30, xv32, label: "Ltg. 7", labelOffsetX: 6);
             CreatePipe(xv31, xv33, label: "Ltg. 6", labelOffsetX: 0);
@@ -265,15 +259,15 @@ namespace PamhagenSysCtrl.Helpers {
             CreateInlet(v32, Tank5);
             CreateInlet(v33, Tank5);
 
-            var v34 = CreateValve(34, (t5X + t6X) / 2, ltg7Y, 1);
+            var v34 = CreateValve(34, (t5X + t6X) / 2, ltg7Y);
-            var v35 = CreateValve(35, (t5X + t6X) / 2, ltg6Y, 3);
+            var v35 = CreateValve(35, (t5X + t6X) / 2, ltg6Y);
             CreatePipe(xv32, v34);
             CreatePipe(xv33, v35);
 
             var xv36 = new PipeJoin(t6X + 3, ltg6Y);
             var xv37 = new PipeJoin(t6X - 3, ltg7Y);
-            var v36 = CreateValve(36, t6X + 3, tValveY, 2);
+            var v36 = CreateValve(36, t6X + 3, tValveY);
-            var v37 = CreateValve(37, t6X - 3, tValveY, 0);
+            var v37 = CreateValve(37, t6X - 3, tValveY);
             Tank6 = CreateTank(6, t6X, tanksY, 35000);
             CreatePipe(v34, xv37);
             CreatePipe(v35, xv36);
@@ -284,8 +278,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv38 = new PipeJoin(t7X + 3, ltg6Y);
             var xv39 = new PipeJoin(t7X - 3, ltg7Y);
-            var v38 = CreateValve(38, t7X + 3, tValveY, 2);
+            var v38 = CreateValve(38, t7X + 3, tValveY);
-            var v39 = CreateValve(39, t7X - 3, tValveY, 0);
+            var v39 = CreateValve(39, t7X - 3, tValveY);
             Tank7 = CreateTank(7, t7X, tanksY, 35000);
             CreatePipe(xv37, xv39);
             CreatePipe(xv36, xv38);
@@ -296,8 +290,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv40 = new PipeJoin(t8X + 3, ltg6Y);
             var xv41 = new PipeJoin(t8X - 3, ltg7Y);
-            var v40 = CreateValve(40, t8X + 3, tValveY, 2);
+            var v40 = CreateValve(40, t8X + 3, tValveY);
-            var v41 = CreateValve(41, t8X - 3, tValveY, 0);
+            var v41 = CreateValve(41, t8X - 3, tValveY);
             Tank8 = CreateTank(8, t8X, tanksY, 35000);
             CreatePipe(xv38, xv40, label: "Ltg. 6", labelOffsetX: 0);
             CreatePipe(xv39, xv41, label: "Ltg. 7", labelOffsetX: 6);
@@ -306,8 +300,8 @@ namespace PamhagenSysCtrl.Helpers {
             CreateInlet(v40, Tank8);
             CreateInlet(v41, Tank8);
 
-            var v42 = CreateValve(42, t9X + 3, tValveY, 2);
+            var v42 = CreateValve(42, t9X + 3, tValveY);
-            var v43 = CreateValve(43, t9X - 3, tValveY, 0);
+            var v43 = CreateValve(43, t9X - 3, tValveY);
             Tank9 = CreateTank(9, t9X, tanksY, 35000);
             CreatePipe(xv40, v42);
             CreatePipe(xv41, v43);
@@ -315,23 +309,23 @@ namespace PamhagenSysCtrl.Helpers {
             CreateInlet(v43, Tank9);
 
             var xp12 = new PipeJoin((t1X + t2X) / 2, tanksY + 16);
-            P12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 22, () => App.Plant?.State.P12_State ?? default, () => App.Plant?.State.P12_HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Contains(x)));
+            P12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 22, () => App.Plant?.P12 ?? default, () => App.Plant?.P12HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
             CreateOutlet(Tank1, xp12);
             CreateOutlet(Tank2, xp12);
             CreatePipe(xp12, P12);
 
-            P3 = new Pump("P3", t3X, tanksY + 22, () => App.Plant?.State.P3_State ?? default, () => App.Plant?.State.P3_HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Contains(x)));
+            P3 = new Pump("P3", t3X, tanksY + 22, () => App.Plant?.P3 ?? default, () => App.Plant?.P3HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
-            P4 = new Pump("P4", t4X, tanksY + 22, () => App.Plant?.State.P4_State ?? default, () => App.Plant?.State.P4_HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Contains(x)));
+            P4 = new Pump("P4", t4X, tanksY + 22, () => App.Plant?.P4 ?? default, () => App.Plant?.P4HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
-            P5 = new Pump("P5", t5X, tanksY + 22, () => App.Plant?.State.P5_State ?? default, () => App.Plant?.State.P5_HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Contains(x)));
+            P5 = new Pump("P5", t5X, tanksY + 22, () => App.Plant?.P5 ?? default, () => App.Plant?.P5HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
             CreateOutlet(Tank3, P3);
             CreateOutlet(Tank4, P4);
             CreateOutlet(Tank5, P5);
 
-            var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 30, 2);
+            var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 30);
-            var v45 = CreateValve(45, t3X, tanksY + 30, 2);
+            var v45 = CreateValve(45, t3X, tanksY + 30);
-            var v46 = CreateValve(46, (t3X + t4X) / 2, ltg5Y, 3);
+            var v46 = CreateValve(46, (t3X + t4X) / 2, ltg5Y);
-            var v47 = CreateValve(47, t4X, tanksY + 30, 2);
+            var v47 = CreateValve(47, t4X, tanksY + 30);
-            var v48 = CreateValve(48, t5X, tanksY + 30, 2);
+            var v48 = CreateValve(48, t5X, tanksY + 30);
             var xv44 = new PipeJoin((t1X + t2X) / 2, tanksY + 36);
             var xv45 = new PipeJoin(t3X, tanksY + 36);
             var xv47 = new PipeJoin(t4X, tanksY + 36);
@@ -352,7 +346,7 @@ namespace PamhagenSysCtrl.Helpers {
             var xt6 = new PipeJoin(t6X, tanksY + 22);
             var xt7 = new PipeJoin(t7X, tanksY + 22);
             var xt8 = new PipeJoin(t8X, tanksY + 22);
-            P6 = new Pump("P6", t6X, tanksY + 30, () => App.Plant?.State.P6_State ?? default, () => App.Plant?.State.P6_HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Contains(x)));
+            P6 = new Pump("P6", t6X, tanksY + 30, () => App.Plant?.P6 ?? default, () => App.Plant?.P6HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
             CreateOutlet(Tank6, xt6);
             CreateOutlet(Tank7, xt7);
             CreateOutlet(Tank8, xt8);
@@ -361,7 +355,7 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(xt7, xt6);
             CreatePipe(xt6, P6);
 
-            var v49 = CreateValve(49, t4X, tanksY + 44, 2);
+            var v49 = CreateValve(49, t4X, tanksY + 44);
             CreatePipe(xv47, v49);
 
             var prX = (pr1X + pr2X) / 2;
@@ -369,14 +363,14 @@ namespace PamhagenSysCtrl.Helpers {
             var pr2cX = prX + 3;
             Press1 = new Press("Presse 1", pr1X, prY, 20000, () => FillState.Unknown);
             Press2 = new Press("Presse 2", pr2X, prY, 15000, () => FillState.Unknown);
-            var v50 = CreateValve(50, pr2cX + 6, ltg3Y, 1);
+            var v50 = CreateValve(50, pr2cX + 6, ltg3Y);
-            var v51 = CreateValve(51, pr1cX - 6, ltg3Y, 1);
+            var v51 = CreateValve(51, pr1cX - 6, ltg3Y);
-            var v52 = CreateValve(52, pr1cX - 6, ltg4Y, 3);
+            var v52 = CreateValve(52, pr1cX - 6, ltg4Y);
-            var v53 = CreateValve(53, pr2cX + 6, ltg4Y, 3);
+            var v53 = CreateValve(53, pr2cX + 6, ltg4Y);
-            var v54 = CreateValve(54, pr2cX + 6, ltg8Y, 1);
+            var v54 = CreateValve(54, pr2cX + 6, ltg8Y);
-            var v55 = CreateValve(55, pr1cX - 6, ltg8Y, 1);
+            var v55 = CreateValve(55, pr1cX - 6, ltg8Y);
-            var v56 = CreateValve(56, pr1cX - 6, ltg9Y, 3);
+            var v56 = CreateValve(56, pr1cX - 6, ltg9Y);
-            var v57 = CreateValve(57, pr2cX + 6, ltg9Y, 3);
+            var v57 = CreateValve(57, pr2cX + 6, ltg9Y);
             var xp1 = new PipeJoin(pr1cX - 14, ltg3Y);
             var xp2 = new PipeJoin(pr1cX - 14, ltg4Y);
             var xp3 = new PipeJoin(pr2cX + 14, ltg8Y);
@@ -386,8 +380,8 @@ namespace PamhagenSysCtrl.Helpers {
             var xp7 = new PipeJoin(pr2cX, ltg8Y);
             var xp8 = new PipeJoin(pr2cX, ltg9Y);
 
-            CreatePipe(V6, xp1, true, label: "Ltg. 3", labelOffsetX: 6);
+            CreatePipe(v6, xp1, true, label: "Ltg. 3", labelOffsetX: 6);
-            CreatePipe(V8, xp2, true, label: "Ltg. 4", labelOffsetX: 18);
+            CreatePipe(v8, xp2, true, label: "Ltg. 4", labelOffsetX: 18);
             CreatePipe(v49, xp3, true, label: "Ltg. 8");
             CreatePipe(P6, xp4, true, label: "Ltg. 9");
             CreatePipe(xp1, v51, true);
@@ -410,154 +404,115 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(xp5, xp6);
             CreatePipe(xp7, xp8);
 
-            var zv1 = new ExternalValve("ZV1", pr1cX, prY - 8, 0, () => App.Plant?.State.Press1_HasClearance ?? false);
+            var zv1 = new CenterValve("ZV1", pr1cX, prY - 8, () => App.Plant?.Press1HasClearance ?? false);
-            var zv2 = new ExternalValve("ZV2", pr2cX, prY - 8, 2, () => App.Plant?.State.Press2_HasClearance ?? false);
+            var zv2 = new CenterValve("ZV2", pr2cX, prY - 8, () => App.Plant?.Press2HasClearance ?? false);
             CreatePipe(xp6, zv1, true);
             CreatePipe(xp8, zv2, true);
             CreateInlet(zv1, Press1, true);
             CreateInlet(zv2, Press2, true);
-
-            PathShortcuts = [];
-            foreach (var key in Enum.GetValues<PamhagenPlant.ShortcutKey>()) {
-                var n = Enum.GetName(key);
-                if (n?.StartsWith("PATH_") != true) continue;
-                ISource src;
-                Pump p;
-                INode? inter = null;
-                ISink sink;
-                if (n.StartsWith("PATH_MW1_")) {
-                    src = MW1;
-                    p = MP1;
-                } else if (n.StartsWith("PATH_MW2_")) {
-                    src = MW2;
-                    p = MP2;
-                } else if (n.StartsWith("PATH_T12_")) {
-                    src = Tank1;
-                    p = P12;
-                } else if (n.StartsWith("PATH_T3_")) {
-                    src = Tank3;
-                    p = P3;
-                } else if (n.StartsWith("PATH_T4_")) {
-                    src = Tank4;
-                    p = P4;
-                } else if (n.StartsWith("PATH_T5_")) {
-                    src = Tank5;
-                    p = P5;
-                } else if (n.StartsWith("PATH_P6_")) {
-                    src = Tank6;
-                    p = P6;
-                } else {
-                    continue;
-                }
-                if (n.Contains("_LTG1_")) {
-                    inter = V5;
-                } else if (n.Contains("_LTG2_")) {
-                    inter = V7;
-                } else if (n.Contains("_LTG3_")) {
-                    inter = V6;
-                } else if (n.Contains("_LTG4_")) {
-                    inter = V8;
-                }
-                if (n.EndsWith("_PRESS1")) {
-                    sink = Press1;
-                } else if (n.EndsWith("_PRESS2")) {
-                    sink = Press2;
-                } else if (n.EndsWith("_T1")) {
-                    sink = Tank1;
-                } else if (n.EndsWith("_T2")) {
-                    sink = Tank2;
-                } else if (n.EndsWith("_T3")) {
-                    sink = Tank3;
-                } else if (n.EndsWith("_T4")) {
-                    sink = Tank4;
-                } else if (n.EndsWith("_T5")) {
-                    sink = Tank5;
-                } else if (n.EndsWith("_T6")) {
-                    sink = Tank6;
-                } else if (n.EndsWith("_T7")) {
-                    sink = Tank7;
-                } else if (n.EndsWith("_T8")) {
-                    sink = Tank8;
-                } else if (n.EndsWith("_T9")) {
-                    sink = Tank9;
-                } else {
-                    continue;
-                }
-                PathShortcuts[key] = (src, p, inter, sink);
-            }
         }
 
-        protected ControlledValve CreateValve(int n, double x, double y, int o) {
+        protected Valve CreateValve(int n, double x, double y) {
-            return new(n, x, y, o, () => App.Plant?.State.Valve_OpenState(n), (v) => App.Plant?.ManualControlMode ?? false ? App.Plant.State.Valve_WantOpen(n) : SelectedPaths.Any(p => p.Contains(v)));
+            return new(n, x, y, () => App.Plant?.IsValveOpen(n) ?? false, (v) => App.Plant?.ManualControlMode ?? false ? App.Plant.WantValveOpen(n) : SelectedPaths.Any(p => p.Hops.Any(h => h.Node == v)));
         }
 
         protected static Tank CreateTank(int n, double x, double y, int capacity) {
-            return new($"Tank {n}", x, y, capacity, () => App.Plant?.State.Tanks_FillLevel[n - 1] ?? FillState.Unknown);
+            return new($"Tank {n}", x, y, capacity, () => App.Plant?.TankFillLevels[n - 1] ?? FillState.Unknown);
         }
 
         private int PathCost(Path p) {
             return
-                1000 * p.Valves.Count() +
+                1000 * p.Hops.Count(h => h.Node is Valve) +
-                (p.InnerValves.Any(v => v.Nr == 15) && !p.InnerValves.Any(v => v.Nr == 16 || v.Nr == 20) ? 10 : 0) +
+                (p.Hops.Any(h => h.Node is Valve v && v.Nr == 15) && !p.Hops.Any(h => h.Node is Valve v && (v.Nr == 16 || v.Nr == 20)) ? 10 : 0) +
-                (p.InnerValves.Any(v => v.Nr == 11) && !p.InnerValves.Any(v => v.Nr == 14 || v.Nr == 21) ? 10 : 0) +
+                (p.Hops.Any(h => h.Node is Valve v && v.Nr == 11) && !p.Hops.Any(h => h.Node is Valve v && (v.Nr == 14 || v.Nr == 21)) ? 10 : 0) +
-                (p.InnerValves.Any(v => v.Nr == 6) ? 10 : 0) +
+                (p.Hops.Any(h => h.Node is Valve v && v.Nr == 6) ? 10 : 0) +
                 p.Bends;
         }
 
         public Path? GetFreePath(IEnumerable<INode> points, bool overrideStart = false) {
             if (overrideStart) {
-                return GetPath(points, (n) => n is not ISink && (n is not ControlledValve v || !v.LockedForPaths.Any(p => p.Start != points.First())), PathCost);
+                return GetPath(points, (n) => n is not ISink && (n is not Valve v || !v.LockedForPaths.Any(p => p.Start != points.First())), PathCost);
             } else {
-                return GetPath(points, (n) => n is not ISink && (n is not ControlledValve v || !v.IsLocked), PathCost);
+                return GetPath(points, (n) => n is not ISink && (n is not Valve v || !v.IsLocked), PathCost);
             }
         }
 
-        public static IEnumerable<(INode Start, IEdge Edge, bool EdgeReverse, INode End)> TraverseSubgraph(INode start, Func<INode, bool> isBorder, HashSet<IEdge>? _visited = null, bool reverse = false) {
+        public void TraverseSubgraph(INode start, Func<INode, bool> invalid, HashSet<IEdge>? _visited = null, Action<INode, bool, IEdge>? edgeAction = null, Action<Valve>? valveAction = null, bool reverse = false) {
-            if (isBorder(start))
-                yield break;
-
             var visited = _visited ?? [];
+            if (start is Valve v) {
+                valveAction?.Invoke(v);
+            }
+            if (invalid(start)) {
+                return;
+            }
+
             foreach (var edge in start.Inputs) {
                 if (visited.Contains(edge)) continue;
                 var o = edge.IsTwoWay && edge.Start == start ? edge.End : edge.Start;
-                yield return (start, edge, reverse || _visited == null, o);
+                edgeAction?.Invoke(start, reverse || _visited == null, edge);
                 visited.Add(edge);
-                foreach (var e in TraverseSubgraph(o, isBorder, visited, reverse || _visited == null))
+                TraverseSubgraph(o, invalid, visited, edgeAction, valveAction, reverse || _visited == null);
-                    yield return e;
             }
             foreach (var edge in start.Outputs) {
                 if (visited.Contains(edge)) continue;
                 var o = edge.IsTwoWay && edge.End == start ? edge.Start : edge.End;
-                yield return (start, edge, reverse, o);
+                edgeAction?.Invoke(start, reverse, edge);
                 visited.Add(edge);
-                foreach (var e in TraverseSubgraph(o, isBorder, visited, reverse))
+                TraverseSubgraph(o, invalid, visited, edgeAction, valveAction, reverse);
-                    yield return e;
             }
         }
 
         public void AddPath(Path path) {
             _selectedPaths.Add(path);
-            path.LockValves();
+            UpdateValvesAdjacientToPath(path, true, false);
             if (App.Plant is PamhagenPlant plant) {
-                foreach (var v in path.InnerValves) plant.OpenV(v.Nr);
+                foreach (var (_, node) in path.Hops) {
-                foreach (var v in path.BorderValves) plant.CloseV(v.Nr);
+                    if (node is Valve v) {
+                        plant.OpenV(v.Nr);
+                    }
+                }
             }
         }
 
         public void RemovePath(Path path) {
             _selectedPaths.Remove(path);
-            path.UnlockValves();
+            UpdateValvesAdjacientToPath(path, false);
+            foreach (var p in _selectedPaths) UpdateValvesAdjacientToPath(p, true);
             if (App.Plant is PamhagenPlant plant) {
-                foreach (var v in path.InnerValves) plant.CloseV(v.Nr);
+                foreach (var (_, node) in path.Hops) {
+                    if (node is Valve v) {
+                        plant.CloseV(v.Nr);
+                    }
+                }
             }
         }
 
-        public static void ColorPipesAdjacientToPath(Path path, Brush? color1, MotorState flowArrows, Brush? color2) {
+        private void UpdateValvesAdjacientToPath(Path path, bool locked, bool? wantOpen = null) {
+            foreach (var (edge, node) in path.Hops) {
+                TraverseSubgraph(node, (n) => n is Valve || n is ISink || n is Pump, valveAction: (v) => {
+                    if (locked) {
+                        v.LockedForPaths.Add(path);
+                    } else {
+                        v.LockedForPaths.Remove(path);
+                    }
+                    if (wantOpen.HasValue) {
+                        if (wantOpen.Value) {
+                            App.Plant?.OpenV(v.Nr);
+                        } else {
+                            App.Plant?.CloseV(v.Nr);
+                        }
+                    }
+                });
+            }
+        }
+
+        public void ColorPipesAdjacientToPath(Path path, Brush? color1, MotorState flowArrows, Brush? color2) {
             var color = color1;
             var flowPathOffset = 0.0;
             HashSet<IEdge> visited = [];
             foreach (var (edge, node) in path.Hops) {
                 edge.Highlight = color1;
+                (edge.Start as PipeJoin)?.Highlight = color1;
                 if (flowArrows > MotorState.Halt) {
                     var dir = edge.End == node;
                     if (flowArrows == MotorState.Backward) dir = !dir;
@@ -566,17 +521,21 @@ namespace PamhagenSysCtrl.Helpers {
                 }
                 visited.Add(edge);
                 if (node is Pump) color = color2;
-                foreach (var (_, e, _, _) in TraverseSubgraph(node, (n) => n is Valve || n is ISink || n is Pump, visited)) {
+                TraverseSubgraph(node, (n) => n is Valve || n is ISink || n is Pump, visited, edgeAction: (s, r, e) => {
+                    (s as PipeJoin)?.Highlight = color;
                     e.Highlight = color;
-                }
+                });
             }
         }
 
-        public static void ColorPipesByValves(INode start, Brush? color1, MotorState flowArrows, Brush? color2) {
+        public void ColorPipesByValves(INode start, Brush? color1, MotorState flowArrows, Brush? color2) {
             var flowPathOffset = 0.0;
-            foreach (var (s, e, r, _) in TraverseSubgraph(start, (n) => n is ISink || n is Outlet || !((n as Valve)?.IsOpen ?? (n as ExternalValve)?.IsOpen ?? true))) {
+            TraverseSubgraph(start, (n) => n is ISink || n is Outlet || !((n as Valve)?.IsOpen ?? (n as CenterValve)?.IsOpen ?? true), null,
+                edgeAction: (s, r, e) => {
                     if (((e.Start as Valve)?.IsOpen ?? true) && ((e.End as Valve)?.IsOpen ?? true)) {
                         e.Highlight = color1;
+                        (e.Start as PipeJoin)?.Highlight = color1;
+                        (e.End as PipeJoin)?.Highlight = color1;
                         if (flowArrows == MotorState.Forward || flowArrows == MotorState.Backward) {
                             var dir = e.Start == s;
                             if (r) dir = !dir;
@@ -587,7 +546,7 @@ namespace PamhagenSysCtrl.Helpers {
                     } else {
                         e.Highlight = color2;
                     }
-            }
+                });
         }
     }
 }

PamhagenSysCtrl/Helpers/PamhagenPlc.cs

@@ -1,18 +1,18 @@
 using System.IO.Ports;
 
-namespace PamhagenSysCtrl.Helpers.Plc {
+namespace PamhagenSysCtrl.Helpers {
-    public class LegacyPamhagenPlc : IDisposable {
+    public class PamhagenPlc : IDisposable {
 
         public record struct SensorStates(
             long PressureSensors,
-            FillState FillLevelMW1,
+            FillState FillingLevelMW1,
-            FillState FillLevelMW2,
+            FillState FillingLevelMW2,
             bool ClearancePress1,
             bool ClearancePress2,
             int TroughSelector,
             double GradationOe,
-            FillState[] FillLevelTanks,
+            FillState[] FillingLevelTanks,
-            MotorState PressCrossAuger
+            MotorState PresseQuerSchnecke
         ) {
             public readonly bool GetDS(int n) => (PressureSensors & (1L << (n - 1))) != 0;
         }
@@ -34,12 +34,12 @@ namespace PamhagenSysCtrl.Helpers.Plc {
 
         protected readonly T1 Plc;
 
-        public string ComPort => Plc.PortName;
+        public string PortName => Plc.PortName;
-        public T1.Status LastStatus => Plc.LastStatus;
+        public T1.Status LastPlcStatus => Plc.LastStatus;
-        public T1Error LastError => Plc.LastError;
+        public T1Error LastPlcError => Plc.LastError;
 
-        public LegacyPamhagenPlc(string comPort, Parity parity = Parity.Odd) {
+        public PamhagenPlc(string portName, Parity parity = Parity.Odd) {
-            Plc = new T1(comPort, parity);
+            Plc = new T1(portName, parity);
         }
 
         public void Dispose() {
@@ -95,7 +95,7 @@ namespace PamhagenSysCtrl.Helpers.Plc {
             throw new T1Exception($"Interner Fehler: {error} ({(int)error:0000})");
         }
 
-        public async Task<(ushort RW010, ushort RW011, ushort RW012, ushort RW013, ushort RW014, ushort RW015, ushort RW016)> ReadInputRegisters() {
+        protected async Task<(ushort RW010, ushort RW011, ushort RW012, ushort RW013, ushort RW014, ushort RW015, ushort RW016)> ReadInputRegisters() {
             var d = await Plc.DataRead("RW010", 7);
             // RW010, RW011, RW012, RW013      Drucksensoren
             // RW014                           Füllstände A1, A2, Presse1, Presse2, Wannenselekt

PamhagenSysCtrl/Helpers/Pipeline/CenterValve.cs

@@ -0,0 +1,71 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class CenterValve : INode {
+
+        public const double DIAMETER = 4.8;
+
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public string Label { get; set; }
+        public Brush? Highlight { get; set; }
+
+        public bool IsOpen => CallbackIsOpen();
+        public ISet<IEdge> Inputs { get; init; }
+        public ISet<IEdge> Outputs { get; init; }
+
+        protected Func<bool> CallbackIsOpen;
+
+        private Shape? _circle;
+        private TextBlock? _text;
+
+        public CenterValve(string label, double x, double y, Func<bool> cbOpen) {
+            CenterX = x;
+            CenterY = y;
+            Label = label;
+            CallbackIsOpen = cbOpen;
+            Inputs = new HashSet<IEdge>();
+            Outputs = new HashSet<IEdge>();
+        }
+
+        public void Draw(Canvas canvas) {
+            _circle = new Ellipse() {
+                Fill = Brushes.DarkGray,
+                Stroke = Brushes.Black,
+            };
+            _text = new() {
+                Text = Label,
+                TextAlignment = TextAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                SnapsToDevicePixels = true,
+            };
+            canvas.Children.Add(_circle);
+            canvas.Children.Add(_text);
+        }
+
+        public void Scale(double scale) {
+            var border = Graph.ToBorder(scale);
+            Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
+            _circle?.StrokeThickness = border;
+            _text?.Width = DIAMETER * scale;
+            _text?.Height = DIAMETER * scale;
+            _text?.FontSize = 2 * scale;
+            _text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2 + 0.1) * scale);
+            _text?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2 + 1.1) * scale);
+        }
+
+        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 =
+              !IsOpen ? PamhagenBrushes.Red :
+              IsOpen ? PamhagenBrushes.Green :
+              Highlight ?? Brushes.DarkGray;
+        }
+    }
+}

PamhagenSysCtrl/Helpers/Pipeline/ControlledValve.cs

@@ -1,51 +0,0 @@
-using System.Windows;
-using System.Windows.Media;
-
-namespace PamhagenSysCtrl.Helpers.Pipeline {
-    public class ControlledValve : Valve {
-
-        public int Nr { get; set; }
-        public override string Label => $"V{Nr}";
-
-        public readonly ISet<Path> LockedForPaths = new HashSet<Path>();
-        public bool IsLocked => LockedForPaths.Any();
-        public bool WantOpen => CallbackWantOpen(this);
-
-        protected Func<Valve, bool> CallbackWantOpen;
-
-        public ControlledValve(int nr, double x, double y, int orientation, Func<bool?> cbOpen, Func<Valve, bool> cbWant) :
-            base(x, y, orientation, cbOpen) {
-            Nr = nr;
-            CallbackWantOpen = cbWant;
-        }
-
-        public override void Update(bool isHovering, bool isPressed) {
-            if (App.Plant?.ManualControlMode ?? false) {
-                _text?.Visibility = Visibility.Visible;
-                _triangles?.Fill =
-                    !WantOpen && IsClosed && !isHovering ? PamhagenBrushes.Red :
-                    !WantOpen && IsClosed ? PamhagenBrushes.Green :
-                    !WantOpen && !IsClosed ? PamhagenBrushes.DimRed :
-                    WantOpen && !IsOpen ? PamhagenBrushes.DimGreen :
-                    WantOpen && IsOpen && !isHovering ? PamhagenBrushes.Green :
-                    WantOpen && IsOpen ? PamhagenBrushes.Red :
-                    Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
-            } else {
-                _text?.Visibility = isHovering ? Visibility.Visible : Visibility.Hidden;
-                _triangles?.Fill =
-                    IsLocked && !WantOpen && IsClosed ? PamhagenBrushes.DimOrange :
-                    IsLocked && !WantOpen && !IsClosed ? PamhagenBrushes.Red :
-                    IsLocked && WantOpen && !IsOpen ? PamhagenBrushes.Yellow :
-                    IsLocked && WantOpen && IsOpen ? PamhagenBrushes.Green :
-                    Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
-            }
-            if (!IsClosed) {
-                _topLine?.Points[1] = _middlePoints.Open.Top;
-                _bottomLine?.Points[1] = _middlePoints.Open.Bottom;
-            } else {
-                _topLine?.Points[1] = _middlePoints.Closed.Top;
-                _bottomLine?.Points[1] = _middlePoints.Closed.Bottom;
-            }
-        }
-    }
-}

PamhagenSysCtrl/Helpers/Pipeline/ExternalValve.cs

@@ -1,29 +0,0 @@
-using System.Windows;
-using System.Windows.Media;
-
-namespace PamhagenSysCtrl.Helpers.Pipeline {
-    public class ExternalValve : Valve {
-
-        public override string Label { get; }
-
-        public ExternalValve(string label, double x, double y, int orientation, Func<bool?> cbOpen) :
-            base(x, y, orientation, cbOpen) {
-            Label = label;
-        }
-
-        public override void Update(bool isHovering, bool isPressed) {
-            _text?.Visibility = isHovering || (App.Plant?.ManualControlMode ?? false) ? Visibility.Visible : Visibility.Hidden;
-            _triangles?.Fill =
-                !IsOpen ? PamhagenBrushes.Red :
-                IsOpen ? PamhagenBrushes.Green :
-                Highlight ?? Brushes.DarkGray;
-            if (!IsClosed) {
-                _topLine?.Points[1] = _middlePoints.Open.Top;
-                _bottomLine?.Points[1] = _middlePoints.Open.Bottom;
-            } else {
-                _topLine?.Points[1] = _middlePoints.Closed.Top;
-                _bottomLine?.Points[1] = _middlePoints.Closed.Bottom;
-            }
-        }
-    }
-}

PamhagenSysCtrl/Helpers/Pipeline/Path.cs

@@ -1,43 +1,9 @@
 namespace PamhagenSysCtrl.Helpers.Pipeline {
     public record struct Path(
             INode Start,
-        (IEdge Edge, INode Node)[] Hops
+            IEnumerable<(IEdge Edge, INode Node)> Hops)
-    ) {
+    {
         public readonly int Bends => Hops.Sum(h => (h.Node is not Valve && h.Node is not PipeJoin ? 1 : 0) + (h.Edge.Start.CenterX != h.Edge.End.CenterX && h.Edge.Start.CenterY != h.Edge.End.CenterY ? 1 : 0));
         public readonly double Length => Hops.Sum(h => Math.Abs(h.Edge.Start.CenterX - h.Edge.End.CenterX) + Math.Abs(h.Edge.Start.CenterY - h.Edge.End.CenterY));
-
-        public readonly INode End => Hops.Last().Node;
-        public readonly IEnumerable<INode> Nodes => [Start, .. Hops.Select(h => h.Node)];
-
-        public readonly bool Contains(INode node) => Nodes.Any(h => h == node);
-        public readonly bool Matches(INode start, INode end) => Matches(start, null, end);
-        public readonly bool Matches(INode start, INode? intermediate, INode end) => Start == start && End == end && (intermediate == null || Nodes.Any(n => n == intermediate));
-
-        public readonly IEnumerable<Pump> Pumps => Nodes.Select(n => n as Pump).Where(p => p != null).Cast<Pump>();
-        public readonly IEnumerable<Valve> Valves => Nodes.Select(n => n as Valve).Where(v => v != null).Cast<Valve>();
-
-        private readonly IEnumerable<ControlledValve> InnerAndBorderValves => Nodes
-            .SelectMany(node => PamhagenGraph.TraverseSubgraph(node, (n) => n is ControlledValve || n is ISink || n is Pump))
-            .Select(e => e.End as ControlledValve)
-            .Where(v => v != null)
-            .Cast<ControlledValve>()
-            .Distinct();
-        public readonly IEnumerable<ControlledValve> InnerValves => Nodes.Select(n => n as ControlledValve).Where(v => v != null).Cast<ControlledValve>();
-        public readonly IEnumerable<ControlledValve> BorderValves => InnerAndBorderValves.Except(InnerValves);
-
-        public readonly bool HasActivePump => Nodes.Any(n => n is Pump p && p.IsActive);
-        public readonly bool IsReady => InnerValves.All(v => v.IsOpen && v.WantOpen && v.IsLocked) && BorderValves.All(v => v.IsClosed && !v.WantOpen && v.IsLocked);
-
-        public readonly void LockValves() {
-            foreach (var v in InnerAndBorderValves) {
-                v.LockedForPaths.Add(this);
-            }
-        }
-
-        public readonly void UnlockValves() {
-            foreach (var v in InnerAndBorderValves) {
-                v.LockedForPaths.Remove(this);
-            }
-        }
     }
 }

PamhagenSysCtrl/Helpers/Pipeline/PipeJoin.cs

@@ -1,7 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using System.Windows.Shapes;
 
 namespace PamhagenSysCtrl.Helpers.Pipeline {
     public class PipeJoin : INode {
@@ -12,11 +11,12 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         public double CenterX { get; set; }
         public double CenterY { get; set; }
         public string Label => "";
+        public Brush? Highlight { get; set; }
 
         public ISet<IEdge> Inputs { get; init; }
         public ISet<IEdge> Outputs { get; init; }
 
-        private Polygon? _rect;
+        private System.Windows.Shapes.Path? _rect;
 
         public PipeJoin(double x, double y) {
             CenterX = x;
@@ -26,8 +26,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         }
 
         public void Draw(Canvas canvas) {
-            _rect = new Polygon() {
+            _rect = new System.Windows.Shapes.Path() {
-                Fill = Brushes.Black,
+                Fill = Brushes.DarkGray,
                 Stroke = Brushes.Black,
             };
             canvas.Children.Add(_rect);
@@ -43,43 +43,66 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
             var il = Inputs.Any(e => (e.Start.CenterX < CenterX && (e.Orientation || e.Start.CenterY == CenterY)) || (e.IsTwoWay && e.End.CenterX < CenterX && (e.Orientation || e.End.CenterY == CenterY)));
             var ol = Outputs.Any(e => (e.End.CenterX < CenterX && (!e.Orientation || e.End.CenterY == CenterY)) || (e.IsTwoWay && e.Start.CenterX < CenterX && (!e.Orientation || e.Start.CenterY == CenterY)));
 
+            var size = new Size(SIZE / 2 * scale, SIZE / 2 * scale);
+            var geo = new StreamGeometry();
+            using (var ctx = geo.Open()) {
                 var points = new List<Point> {
                     new(0, 0)
                 };
+
+                ctx.BeginFigure(new((SIZE / 2 - POINT) * scale, 0), true, false);
                 if (ot && it) {
-                points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, -POINT / 2), new(SIZE / 2, POINT / 2), new(SIZE / 2 + POINT, 0)]);
+                    points.AddRange([new(SIZE / 2, -POINT / 2), new(SIZE / 2, POINT / 2), new(SIZE / 2 + POINT, 0)]);
                 } else if (ot) {
-                points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, -POINT), new(SIZE / 2 + POINT, 0)]);
+                    ctx.PolyLineTo([new(SIZE / 2 * scale, -POINT * scale), new((SIZE / 2 + POINT) * scale, 0)], true, false);
                 } else if (it) {
-                points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, POINT), new(SIZE / 2 + POINT, 0)]);
+                    ctx.PolyLineTo([new(SIZE / 2 * scale, POINT * scale), new((SIZE / 2 + POINT) * scale, 0)], true, false);
+                } else {
+                    ctx.ArcTo(new((SIZE / 2 + POINT) * scale, 0), size, 0, false, SweepDirection.Clockwise, true, false);
                 }
+
+                ctx.ArcTo(new(SIZE * scale, (SIZE / 2 - POINT) * scale), size, 0, false, SweepDirection.Clockwise, true, false);
                 points.Add(new(SIZE, 0));
                 if (or && ir) {
                     points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE + POINT / 2, SIZE / 2), new(SIZE - POINT / 2, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
                 } else if (or) {
-                points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE + POINT, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
+                    ctx.PolyLineTo([new((SIZE + POINT) * scale, SIZE / 2 * scale), new(SIZE * scale, (SIZE / 2 + POINT) * scale)], true, false);
                 } else if (ir) {
-                points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE - POINT, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
+                    ctx.PolyLineTo([new((SIZE - POINT) * scale, SIZE / 2 * scale), new(SIZE * scale, (SIZE / 2 + POINT) * scale)], true, false);
+                } else {
+                    ctx.ArcTo(new(SIZE * scale, (SIZE / 2 + POINT) * scale), size, 0, false, SweepDirection.Clockwise, true, false);
                 }
+
+                ctx.ArcTo(new((SIZE / 2 + POINT) * scale, SIZE * scale), size, 0, false, SweepDirection.Clockwise, true, false);
                 points.Add(new(SIZE, SIZE));
                 if (ob && ib) {
                     points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE + POINT / 2), new(SIZE / 2, SIZE - POINT / 2), new(SIZE / 2 - POINT, SIZE)]);
                 } else if (ob) {
-                points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE + POINT), new(SIZE / 2 - POINT, SIZE)]);
+                    ctx.PolyLineTo([new(SIZE / 2 * scale, (SIZE + POINT) * scale), new((SIZE / 2 - POINT) * scale, SIZE * scale)], true, false);
                 } else if (ib) {
-                points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE - POINT), new(SIZE / 2 - POINT, SIZE)]);
+                    ctx.PolyLineTo([new(SIZE / 2 * scale, (SIZE - POINT) * scale), new((SIZE / 2 - POINT) * scale, SIZE * scale)], true, false);
+                } else {
+                    ctx.ArcTo(new((SIZE / 2 - POINT) * scale, SIZE * scale), size, 0, false, SweepDirection.Clockwise, true, false);
                 }
+
+                ctx.ArcTo(new(0, (SIZE / 2 + POINT) * scale), size, 0, false, SweepDirection.Clockwise, true, false);
                 points.Add(new(0, SIZE));
                 if (ol && il) {
                     points.AddRange([new(0, SIZE / 2 + POINT), new(-POINT / 2, SIZE / 2), new(POINT / 2, SIZE / 2), new(0, SIZE / 2 - POINT)]);
                 } else if (ol) {
-                points.AddRange([new(0, SIZE / 2 + POINT), new(-POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]);
+                    ctx.PolyLineTo([new(-POINT * scale, SIZE / 2 * scale), new(0, (SIZE / 2 - POINT) * scale)], true, false);
                 } else if (il) {
-                points.AddRange([new(0, SIZE / 2 + POINT), new(POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]);
+                    ctx.PolyLineTo([new(POINT * scale, SIZE / 2 * scale), new(0, (SIZE / 2 - POINT) * scale)], true, false);
+                } else {
+                    ctx.ArcTo(new(0, (SIZE / 2 - POINT) * scale), size, 0, false, SweepDirection.Clockwise, true, false);
                 }
 
-            _rect?.Points = [.. points.Select(p => new Point(p.X * scale, p.Y * scale))];
+                ctx.ArcTo(new((SIZE / 2 - POINT) * scale, 0), size, 0, false, SweepDirection.Clockwise, true, false);
-            _rect?.StrokeThickness = 2;
+            }
+
+            _rect?.Data = geo;
+            // [.. points.Select(p => new Point(p.X * scale, p.Y * scale))];
+            _rect?.StrokeThickness = Graph.ToBorder(scale);
             _rect?.SetValue(Canvas.LeftProperty, (CenterX - SIZE / 2) * scale);
             _rect?.SetValue(Canvas.TopProperty, (CenterY - SIZE / 2) * scale);
         }
@@ -89,7 +112,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         }
 
         public void Update(bool isHovering, bool isPressed) {
-            _rect?.Stroke = isHovering ? Brushes.Black : Brushes.Black;
+            _rect?.Fill = Highlight ?? Brushes.DarkGray;
         }
     }
 }

PamhagenSysCtrl/Helpers/Pipeline/Pump.cs

@@ -26,7 +26,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         protected Func<Pump, bool> CallbackSelected;
 
         private Ellipse? _circle;
-        private Polyline? _triangle;
+        private Polygon? _triangle;
         private TextBlock? _text;
 
         public Pump(string label, double x, double y, Func<MotorState> cbState, Func<bool> cbClearance, Func<Pump, bool> cbSelected) {
@@ -45,11 +45,9 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                 Fill = Brushes.WhiteSmoke,
                 Stroke = Brushes.Black,
             };
-            _triangle = new Polyline() {
+            _triangle = new Polygon() {
+                Fill = Brushes.Transparent,
                 Stroke = Brushes.Black,
-                StrokeStartLineCap = PenLineCap.Square,
-                StrokeLineJoin = PenLineJoin.Round,
-                StrokeEndLineCap = PenLineCap.Square,
             };
             _text = new() {
                 Text = Label,
@@ -65,12 +63,12 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
             var border = Graph.ToBorder(scale);
             _circle?.StrokeThickness = border;
             Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
-            var dx = Math.Cos(Math.PI / 9.5) * (DIAMETER / 2);
+            var dx = Math.Cos(Math.PI / 6) * (DIAMETER / 2);
-            var dy = Math.Sin(Math.PI / 9.5) * (DIAMETER / 2);
+            var dy = Math.Sin(Math.PI / 6) * (DIAMETER / 2);
             _triangle?.Points = [
                 Graph.ToPx(CenterX - dx, CenterY - dy, scale, dxpx: border, dypx: border / 2, round: false),
-                Graph.ToPx(CenterX, CenterY + DIAMETER / 2, scale, dypx: -border, round: false),
                 Graph.ToPx(CenterX + dx, CenterY - dy, scale, dxpx: -border, dypx: border / 2, round: false),
+                Graph.ToPx(CenterX, CenterY + DIAMETER / 2, scale, dypx: -border, round: false),
             ];
             _triangle?.StrokeThickness = border;
             _text?.FontSize = 14;

PamhagenSysCtrl/Helpers/Pipeline/Valve.cs

@@ -4,143 +4,88 @@ using System.Windows.Media;
 using System.Windows.Shapes;
 
 namespace PamhagenSysCtrl.Helpers.Pipeline {
-    public abstract class Valve : INode {
+    public class Valve : INode {
 
-        public const double LENGTH = 4.8;
+        public const double DIAMETER = 4.8;
-        public const double WIDTH = 2.6;
 
         public double CenterX { get; set; }
         public double CenterY { get; set; }
-        public abstract string Label { get; }
+        public int Nr { get; set; }
+        public string Label => $"V{Nr}";
         public Brush? Highlight { get; set; }
 
-        public int Orientation { get; set; }
+        public readonly ISet<Path> LockedForPaths = new HashSet<Path>();
 
-        public bool IsOpen => CallbackIsOpen() == true;
+        public bool IsLocked => LockedForPaths.Any();
-        public bool IsClosed => CallbackIsOpen() == false;
+        public bool IsOpen => CallbackIsOpen();
-        public bool IsTransitioning => CallbackIsOpen() == null;
+        public bool WantOpen => CallbackWantOpen(this);
         public ISet<IEdge> Inputs { get; init; }
         public ISet<IEdge> Outputs { get; init; }
 
-        protected Func<bool?> CallbackIsOpen;
+        protected Func<bool> CallbackIsOpen;
+        protected Func<Valve, bool> CallbackWantOpen;
 
-        protected Rectangle? _background;
+        private Shape? _circle;
-        protected Polygon? _triangles;
+        private TextBlock? _text;
-        protected Polyline? _topLine;
-        protected Polyline? _bottomLine;
-        protected ((Point Top, Point Bottom) Closed, (Point Top, Point Bottom) Open) _middlePoints;
-        protected TextBlock? _text;
 
-        public Valve(double x, double y, int orientation, Func<bool?> cbOpen) {
+        public Valve(int nr, double x, double y, Func<bool> cbOpen, Func<Valve, bool> cbWant) {
             CenterX = x;
             CenterY = y;
+            Nr = nr;
             CallbackIsOpen = cbOpen;
+            CallbackWantOpen = cbWant;
             Inputs = new HashSet<IEdge>();
             Outputs = new HashSet<IEdge>();
-            Orientation = orientation;
         }
 
         public void Draw(Canvas canvas) {
-            _background = new Rectangle() {
+            _circle = new Ellipse() {
-                Fill = Brushes.White,
-            };
-            _triangles = new Polygon() {
                 Fill = Brushes.DarkGray,
                 Stroke = Brushes.Black,
             };
-            _topLine = new Polyline() {
-                Stroke = Brushes.Black,
-            };
-            _bottomLine = new Polyline() {
-                Stroke = Brushes.Black,
-            };
             _text = new() {
                 Text = Label,
+                TextAlignment = TextAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
                 SnapsToDevicePixels = true,
             };
-            canvas.Children.Add(_background);
+            canvas.Children.Add(_circle);
-            canvas.Children.Add(_triangles);
-            canvas.Children.Add(_topLine);
-            canvas.Children.Add(_bottomLine);
             canvas.Children.Add(_text);
         }
 
         public void Scale(double scale) {
             var border = Graph.ToBorder(scale);
-            if (Orientation == 0 || Orientation == 2) {
+            Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
-                Graph.SetCenter(_background, CenterX, CenterY, LENGTH / 2, LENGTH, scale);
+            _circle?.StrokeThickness = border;
-                _triangles?.Points = [
+            _text?.Width = DIAMETER * scale;
-                    Graph.ToPx(CenterX - WIDTH / 2, CenterY - LENGTH / 2, scale),
+            _text?.Height = DIAMETER * scale;
-                    Graph.ToPx(CenterX + WIDTH / 2, CenterY + LENGTH / 2, scale),
+            _text?.FontSize = 2 * scale;
-                    Graph.ToPx(CenterX - WIDTH / 2, CenterY + LENGTH / 2, scale),
+            _text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2 + 0.1) * scale);
-                    Graph.ToPx(CenterX + WIDTH / 2, CenterY - LENGTH / 2, scale),
+            _text?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2 + 1.1) * scale);
-                ];
-                _topLine?.Points = [
-                    Graph.ToPx(CenterX - WIDTH / 2, CenterY - LENGTH / 4, scale),
-                    Graph.ToPx(CenterX - WIDTH / 4, CenterY, scale),
-                    Graph.ToPx(CenterX - WIDTH / 2, CenterY + LENGTH / 4, scale),
-                ];
-                _bottomLine?.Points = [
-                    Graph.ToPx(CenterX + WIDTH / 2, CenterY - LENGTH / 4, scale),
-                    Graph.ToPx(CenterX + WIDTH / 4, CenterY, scale),
-                    Graph.ToPx(CenterX + WIDTH / 2, CenterY + LENGTH / 4, scale),
-                ];
-                if (_topLine != null && _bottomLine != null)
-                    _middlePoints = ((_topLine.Points[1], _bottomLine.Points[1]),
-                        (Graph.ToPx(CenterX - WIDTH / 3, CenterY, scale), Graph.ToPx(CenterX + WIDTH / 3, CenterY, scale)));
-            } else {
-                Graph.SetCenter(_background, CenterX, CenterY, LENGTH, LENGTH / 2, scale);
-                _triangles?.Points = [
-                    Graph.ToPx(CenterX - LENGTH / 2, CenterY - WIDTH / 2, scale),
-                    Graph.ToPx(CenterX + LENGTH / 2, CenterY + WIDTH / 2, scale),
-                    Graph.ToPx(CenterX + LENGTH / 2, CenterY - WIDTH / 2, scale),
-                    Graph.ToPx(CenterX - LENGTH / 2, CenterY + WIDTH / 2, scale),
-                ];
-                _topLine?.Points = [
-                    Graph.ToPx(CenterX - LENGTH / 4, CenterY - WIDTH / 2, scale),
-                    Graph.ToPx(CenterX, CenterY - WIDTH / 4, scale),
-                    Graph.ToPx(CenterX + LENGTH / 4, CenterY - WIDTH / 2, scale),
-                ];
-                _bottomLine?.Points = [
-                    Graph.ToPx(CenterX - LENGTH / 4, CenterY + WIDTH / 2, scale),
-                    Graph.ToPx(CenterX, CenterY + WIDTH / 4, scale),
-                    Graph.ToPx(CenterX + LENGTH / 4, CenterY + WIDTH / 2, scale),
-                ];
-                if (_topLine != null && _bottomLine != null)
-                    _middlePoints = ((_topLine.Points[1], _bottomLine.Points[1]),
-                        (Graph.ToPx(CenterX, CenterY - WIDTH / 3, scale), Graph.ToPx(CenterX, CenterY + WIDTH / 3, scale)));
-            }
-            _triangles?.StrokeThickness = border;
-            _topLine?.StrokeThickness = border;
-            _bottomLine?.StrokeThickness = border;
-            _text?.Width = 40;
-            _text?.Height = 16;
-            _text?.FontSize = 12;
-            _text?.TextAlignment = Orientation == 0 ? TextAlignment.Right : Orientation == 2 ? TextAlignment.Left : TextAlignment.Center;
-            if (Orientation == 0) {
-                _text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 1.5) * scale - 40);
-                _text?.SetValue(Canvas.TopProperty, CenterY * scale - 8);
-            } else if (Orientation == 2) {
-                _text?.SetValue(Canvas.LeftProperty, (CenterX + WIDTH / 1.5) * scale);
-                _text?.SetValue(Canvas.TopProperty, CenterY * scale - 8 );
-            } else if (Orientation == 1) {
-                _text?.SetValue(Canvas.LeftProperty, CenterX * scale - 20);
-                _text?.SetValue(Canvas.TopProperty, (CenterY - WIDTH / 2) * scale - 16);
-            } else {
-                _text?.SetValue(Canvas.LeftProperty, CenterX * scale - 20);
-                _text?.SetValue(Canvas.TopProperty, (CenterY + WIDTH / 2) * scale);
-            }
         }
 
         public bool IsInside(double x, double y) {
-            if (Orientation == 0 || Orientation == 2) {
+            return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
-                return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= LENGTH / 2;
-            } else {
-                return Math.Abs(x - CenterX) <= LENGTH / 2 && Math.Abs(y - CenterY) <= WIDTH / 2;
-            }
         }
 
-        public abstract void Update(bool isHovering, bool isPressed);
+        public void Update(bool isHovering, bool isPressed) {
+            if (App.Plant?.ManualControlMode ?? false) {
+                _circle?.Fill =
+                    !WantOpen && !IsOpen && !isHovering ? PamhagenBrushes.Red :
+                    !WantOpen && !IsOpen ? PamhagenBrushes.Green :
+                    !WantOpen && IsOpen ? PamhagenBrushes.DimRed :
+                    WantOpen && !IsOpen ? PamhagenBrushes.DimGreen :
+                    WantOpen && IsOpen && !isHovering ? PamhagenBrushes.Green :
+                    WantOpen && IsOpen ? PamhagenBrushes.Red :
+                    Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
+            } else {
+                _circle?.Fill =
+                    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);
+            }
+        }
     }
 }

PamhagenSysCtrl/Helpers/Plc/PamhagenPlc.cs

@@ -1,347 +0,0 @@
-using System.IO.Ports;
-
-namespace PamhagenSysCtrl.Helpers.Plc {
-    public class PamhagenPlc : IDisposable {
-
-        private bool _manualControlMode = false;
-        private bool _overridePathClearnaces = false;
-        private bool _overrideDryRunClearances = false;
-        public bool ManualControlMode { get => _manualControlMode; set { _manualControlMode = value; UpdateInterlocks(); } }
-        public bool OverridePathClearances { get => _overridePathClearnaces; set { _overridePathClearnaces = value; UpdateInterlocks(); } }
-        public bool OverrideDryRunClearances { get => _overrideDryRunClearances; set { _overrideDryRunClearances = value; UpdateInterlocks(); } }
-
-        internal bool MP1_WantActive { get; private set; }
-        internal bool MP2_WantActive { get; private set; }
-        internal bool P12_WantActive { get; private set; }
-        internal bool P3_WantActive { get; private set; }
-        internal bool P4_WantActive { get; private set; }
-        internal bool P5_WantActive { get; private set; }
-        internal bool P6_WantActive { get; private set; }
-
-        protected LegacyPamhagenPlc Plc;
-        public PamhagenState State { get; private set; }
-
-        public string? ComPort => Plc?.ComPort;
-        public T1.Status? LastStatus => Plc?.LastStatus;
-        public T1Error? LastError => Plc?.LastError;
-
-        internal LegacyPamhagenPlc.ActuatorStates Actuators;
-        internal LegacyPamhagenPlc.ActuatorStates LastActuators;
-        internal LegacyPamhagenPlc.SensorStates[] LastSensors = [];
-
-        internal readonly int ConsiderLastSensorsOpen;
-        internal readonly int ConsiderLastSensorsClose;
-
-        public PamhagenPlc(string comPort, int sensorDelayOpenMs, int sensorDelayCloseMs, Parity parity = Parity.Odd) {
-            Plc = new(comPort, parity);
-            ConsiderLastSensorsOpen = sensorDelayOpenMs / 125 + 1;
-            ConsiderLastSensorsClose = sensorDelayCloseMs / 125 + 1;
-            LastSensors = new LegacyPamhagenPlc.SensorStates[Math.Max(ConsiderLastSensorsOpen, ConsiderLastSensorsClose)];
-        }
-
-        public void Dispose() {
-            GC.SuppressFinalize(this);
-            Plc.Dispose();
-        }
-
-        public async Task Initialize() {
-            await Plc.TestConnection();
-            Actuators = await Plc.ReadOutputs();
-            LastActuators = Actuators;
-            var sensors = await Plc.ReadInputs();
-            LastSensors[0] = sensors;
-            State = new(LastSensors, this);
-        }
-
-        public async Task Shutdown() {
-            await Plc.WriteOutputs(new() { Valves = Actuators.Valves });
-        }
-
-        public async Task Update() {
-            UpdateInterlocks();
-
-            if (Actuators != LastActuators) {
-                LastActuators = Actuators;
-                await Plc.WriteOutputs(LastActuators);
-            }
-            var sensors = await Plc.ReadInputs();
-            Array.Copy(LastSensors, 0, LastSensors, 1, LastSensors.Length - 1);
-            LastSensors[0] = sensors;
-            State = new(LastSensors, this);
-
-            UpdateInterlocks();
-        }
-
-        protected void UpdateInterlocks() {
-            if (!ManualControlMode) {
-                if (State.PressCrossAuger_IsActive && !State.Auger2_IsActive) StartAuger2();
-                if (State.Rebler_IsActive && !State.Auger1_IsActive) StartAuger1();
-                if (State.Auger1_IsActive && !State.Auger2_IsActive) StartAuger2();
-                if (State.Auger2_IsActive && !State.Auger3_IsActive) StartAuger3();
-                if (State.TroughAuger_IsActive && !State.TroughAuger_HasClearance)
-                    StopTroughAuger();
-                if (!State.PressCrossAuger_IsActive && !State.Auger1_IsActive) {
-                    StopAuger2();
-                    StopAuger3();
-                }
-            }
-
-            if (State.MP1_IsActive && !State.MP1_HasClearance) StopMP1();
-            if (State.MP2_IsActive && !State.MP2_HasClearance) StopMP2();
-            if (State.P12_IsActive && !State.P12_HasClearance) DisableP12();
-            if (State.P3_IsActive && !State.P3_HasClearance) DisableP3();
-            if (State.P4_IsActive && !State.P4_HasClearance) DisableP4();
-            if (State.P5_IsActive && !State.P5_HasClearance) DisableP5();
-            if (State.P6_IsActive && !State.P6_HasClearance) DisableP6();
-
-            if (MP1_WantActive && State.MP1_HasClearance) StartMP1Forward();
-            if (MP2_WantActive && State.MP2_HasClearance) StartMP2Forward();
-            if (P12_WantActive && State.P12_HasClearance) EnableP12();
-            if (P3_WantActive && State.P3_HasClearance) EnableP3();
-            if (P4_WantActive && State.P4_HasClearance) EnableP4();
-            if (P5_WantActive && State.P5_HasClearance) EnableP5();
-            if (P6_WantActive && State.P6_HasClearance) EnableP6();
-
-            if (!ManualControlMode) {
-                if (State.MP1_State == MotorState.Forward && State.MW1_FillLevel >= FillState.Half && !State.MW1_Stirrer_IsActive) {
-                    StartStirrerMW1();
-                } else if (State.MW2_Stirrer_IsActive && (!State.MP1_IsActive || State.MW1_FillLevel < FillState.Half)) {
-                    StopStirrerMW1();
-                }
-                if (State.MP2_State == MotorState.Forward && State.MW2_FillLevel >= FillState.Half && !State.MW2_Stirrer_IsActive) {
-                    StartStirrerMW2();
-                } else if (State.MW2_Stirrer_IsActive && (!State.MP2_IsActive || State.MW2_FillLevel < FillState.Half)) {
-                    StopStirrerMW2();
-                }
-            }
-        }
-
-        public void OpenV(int n) => SetV(n, true);
-        public void CloseV(int n) => SetV(n, false);
-
-        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);
-        }
-
-        public void SelectMW1() {
-            Actuators.SetV(58, true);
-        }
-
-        public void SelectMW2() {
-            Actuators.SetV(58, false);
-        }
-
-        public void StartTroughAuger() {
-            if (!ManualControlMode && !State.TroughAuger_HasClearance)
-                throw new NoClearanceException("Schnecke Auffangwanne hat keine Freigabe");
-            Actuators.TroughAuger = true;
-        }
-
-        public void StopTroughAuger() {
-            Actuators.TroughAuger = false;
-        }
-
-        public void StartRebler() {
-            Actuators.Rebler = true;
-            if (!ManualControlMode) StartAuger1();
-        }
-
-        public void StopRebler() {
-            if (!ManualControlMode) StopTroughAuger();
-            Actuators.Rebler = false;
-            if (!ManualControlMode) StopAuger1();
-        }
-
-        public void StartStirrerMW1() {
-            Actuators.StirrerMW1 = true;
-        }
-
-        public void StopStirrerMW1() {
-            Actuators.StirrerMW1 = false;
-        }
-
-        public void StartStirrerMW2() {
-            Actuators.StirrerMW2 = true;
-        }
-
-        public void StopStirrerMW2() {
-            Actuators.StirrerMW2 = false;
-        }
-
-        public void StartAuger1() {
-            Actuators.Auger1 = true;
-            if (!ManualControlMode) StartAuger2();
-        }
-
-        public void StopAuger1() {
-            if (!ManualControlMode && State.Rebler_IsActive) throw new NoClearanceException("Rebler aktiv");
-            Actuators.Auger1 = false;
-            if (!ManualControlMode && !State.PressCrossAuger_IsActive)
-                StopAuger2();
-        }
-
-        public void StartAuger2() {
-            Actuators.Auger2 = true;
-            if (!ManualControlMode) StartAuger3();
-        }
-
-        public void StopAuger2() {
-            if (!ManualControlMode && State.PressCrossAuger_IsActive) throw new NoClearanceException("Presse-Querschnecke aktiv");
-            if (!ManualControlMode && State.Auger1_IsActive) throw new NoClearanceException("Förderschnecke 1 aktiv");
-            Actuators.Auger2 = false;
-            if (!ManualControlMode)
-                StopAuger3();
-        }
-
-        public void StartAuger3() {
-            Actuators.Auger3 = true;
-        }
-
-        public void StopAuger3() {
-            if (!ManualControlMode && State.Auger2_IsActive) throw new NoClearanceException("Förderschnecke 2 aktiv");
-            Actuators.Auger3 = false;
-        }
-
-        public void StartGradationPump() {
-            Actuators.GradationPump = true;
-        }
-
-        public void StopGradationPump() {
-            Actuators.GradationPump = false;
-        }
-
-        public void StartMP1Forward() {
-            if (!State.MP1_HasClearance) {
-                if (!State.MP1_HasDryRunClearance || !State.MP1_WantsPathClearance)
-                    throw new NoClearanceException("MP1 hat keine Freigabe");
-                MP1_WantActive = true;
-                return;
-            }
-            MP1_WantActive = false;
-            if (Actuators.MP1 == MotorState.Backward) throw new NoClearanceException("MP1 läuft bereits (zurück)");
-            Actuators.MP1 = MotorState.Forward;
-            if (State.MW1_FillLevel >= FillState.Half) StartStirrerMW1();
-        }
-
-        public void StartMP1Backward() {
-            MP1_WantActive = false;
-            if (!State.MP1_HasClearance) throw new NoClearanceException("MP1 hat keine Freigabe");
-            if (Actuators.MP1 == MotorState.Forward) throw new NoClearanceException("MP1 läuft bereits (vor)");
-            Actuators.MP1 = MotorState.Backward;
-        }
-
-        public void StopMP1() {
-            MP1_WantActive = false;
-            Actuators.MP1 = MotorState.Halt;
-            if (!ManualControlMode) StopStirrerMW1();
-        }
-
-        public void StartMP2Forward() {
-            if (!State.MP2_HasClearance) {
-                if (!State.MP2_HasDryRunClearance || !State.MP2_WantsPathClearance)
-                    throw new NoClearanceException("MP2 hat keine Freigabe");
-                MP2_WantActive = true;
-                return;
-            }
-            MP2_WantActive = false;
-            if (Actuators.MP2 == MotorState.Backward) throw new NoClearanceException("MP2 läuft bereits (zurück)");
-            Actuators.MP2 = MotorState.Forward;
-            if (State.MW2_FillLevel >= FillState.Half) StartStirrerMW2();
-        }
-
-        public void StartMP2Backward() {
-            MP2_WantActive = false;
-            if (!State.MP2_HasClearance) throw new NoClearanceException("MP2 hat keine Freigabe");
-            if (Actuators.MP2 == MotorState.Forward) throw new NoClearanceException("MP2 läuft bereits (vor)");
-            Actuators.MP2 = MotorState.Backward;
-        }
-
-        public void StopMP2() {
-            MP2_WantActive = false;
-            Actuators.MP2 = MotorState.Halt;
-            if (!ManualControlMode) StopStirrerMW1();
-        }
-
-        public void EnableP12() {
-            if (!State.P12_HasClearance) {
-                if (!State.P12_HasDryRunClearance || !State.P12_WantsPathClearance)
-                    throw new NoClearanceException("P1/2 hat keine Freigabe");
-                P12_WantActive = true;
-                return;
-            }
-            P12_WantActive = false;
-            if (!State.P12_HasClearance) throw new NoClearanceException("P1/2 hat keine Freigabe");
-            Actuators.P12 = MotorState.Forward;
-        }
-
-        public void DisableP12() {
-            P12_WantActive = false;
-            Actuators.P12 = MotorState.Halt;
-        }
-
-        public void EnableP3() {
-            if (!State.P3_HasClearance) {
-                if (!State.P3_HasDryRunClearance || !State.P3_WantsPathClearance)
-                    throw new NoClearanceException("P3 hat keine Freigabe");
-                P3_WantActive = true;
-                return;
-            }
-            P3_WantActive = false;
-            Actuators.P3 = MotorState.Forward;
-        }
-
-        public void DisableP3() {
-            P3_WantActive = false;
-            Actuators.P3 = MotorState.Halt;
-        }
-
-        public void EnableP4() {
-            if (!State.P4_HasClearance) {
-                if (!State.P4_HasDryRunClearance || !State.P4_WantsPathClearance)
-                    throw new NoClearanceException("P4 hat keine Freigabe");
-                P4_WantActive = true;
-                return;
-            }
-            P4_WantActive = false;
-            Actuators.P4 = MotorState.Forward;
-        }
-
-        public void DisableP4() {
-            P4_WantActive = false;
-            Actuators.P4 = MotorState.Halt;
-        }
-
-        public void EnableP5() {
-            if (!State.P5_HasClearance) {
-                if (!State.P5_HasDryRunClearance || !State.P5_WantsPathClearance)
-                    throw new NoClearanceException("P5 hat keine Freigabe");
-                P5_WantActive = true;
-                return;
-            }
-            P5_WantActive = false;
-            Actuators.P5 = MotorState.Forward;
-        }
-
-        public void DisableP5() {
-            P5_WantActive = false;
-            Actuators.P5 = MotorState.Halt;
-        }
-
-        public void EnableP6() {
-            if (!State.P6_HasClearance) {
-                if (!State.P6_HasDryRunClearance || !State.P6_WantsPathClearance)
-                    throw new NoClearanceException("P6 hat keine Freigabe");
-                P6_WantActive = true;
-                return;
-            }
-            P6_WantActive = false;
-            Actuators.P6 = MotorState.Forward;
-        }
-
-        public void DisableP6() {
-            P6_WantActive = false;
-            Actuators.P6 = MotorState.Halt;
-        }
-    }
-}

PamhagenSysCtrl/Helpers/Plc/PamhagenState.cs

@@ -1,342 +0,0 @@
-namespace PamhagenSysCtrl.Helpers.Plc {
-    public readonly record struct PamhagenState {
-
-        private readonly LegacyPamhagenPlc.SensorStates Sensors;
-        private readonly PamhagenPlc Plc;
-        private LegacyPamhagenPlc.ActuatorStates Actuators => Plc == null ? default : Plc.Actuators;
-
-        public bool ManualControlMode => Plc != null && Plc.ManualControlMode;
-        public bool OverridePathClearances => Plc != null && Plc.OverridePathClearances;
-        public bool OverrideDryRunClearances => Plc != null && Plc.OverrideDryRunClearances;
-
-        public long Valves => Actuators.Valves;
-        public readonly long OpenValves { get; }
-        public readonly long ClosedValves { get; }
-
-        public bool MW1_IsSelected => Sensors.TroughSelector == 1;
-        public bool MW2_IsSelected => Sensors.TroughSelector == 2;
-        public bool MW1_WantSelected => Actuators.GetV(58);
-        public bool MW2_WantSelected => !Actuators.GetV(58);
-        public FillState MW1_FillLevel => Sensors.FillLevelMW1;
-        public FillState MW2_FillLevel => Sensors.FillLevelMW2;
-
-        public FillState[] Tanks_FillLevel => Sensors.FillLevelTanks ?? [FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown];
-        public FillState T1_FillLevel => Sensors.FillLevelTanks[0];
-        public FillState T2_FillLevel => Sensors.FillLevelTanks[1];
-        public FillState T3_FillLevel => Sensors.FillLevelTanks[2];
-        public FillState T4_FillLevel => Sensors.FillLevelTanks[3];
-        public FillState T5_FillLevel => Sensors.FillLevelTanks[4];
-        public FillState T6_FillLevel => Sensors.FillLevelTanks[5];
-        public FillState T7_FillLevel => Sensors.FillLevelTanks[6];
-        public FillState T8_FillLevel => Sensors.FillLevelTanks[7];
-        public FillState T9_FillLevel => Sensors.FillLevelTanks[8];
-
-        public MotorState PressCrossAuger_State => Sensors.PressCrossAuger;
-        public bool PressCrossAuger_IsActive => PressCrossAuger_State == MotorState.Forward;
-
-        public bool TroughAuger_IsActive => Actuators.TroughAuger;
-        public bool Rebler_IsActive => Actuators.Rebler;
-        public bool MW1_Stirrer_IsActive => Actuators.StirrerMW1;
-        public bool MW2_Stirrer_IsActive => Actuators.StirrerMW2;
-        public bool Auger1_IsActive => Actuators.Auger1;
-        public bool Auger2_IsActive => Actuators.Auger2;
-        public bool Auger3_IsActive => Actuators.Auger3;
-        public bool WasteDisposal_IsActive => Auger1_IsActive || Auger2_IsActive || Auger3_IsActive;
-
-        public MotorState MP1_State => Actuators.MP1;
-        public MotorState MP2_State => Actuators.MP2;
-        public MotorState P12_State => Actuators.P12;
-        public MotorState P3_State => Actuators.P3;
-        public MotorState P4_State => Actuators.P4;
-        public MotorState P5_State => Actuators.P5;
-        public MotorState P6_State => Actuators.P6;
-        public bool MP1_IsActive => Actuators.MP1 == MotorState.Forward || Actuators.MP1 == MotorState.Backward;
-        public bool MP2_IsActive => Actuators.MP2 == MotorState.Forward || Actuators.MP2 == MotorState.Backward;
-        public bool P12_IsActive => Actuators.P12 == MotorState.Forward;
-        public bool P3_IsActive => Actuators.P3 == MotorState.Forward;
-        public bool P4_IsActive => Actuators.P4 == MotorState.Forward;
-        public bool P5_IsActive => Actuators.P5 == MotorState.Forward;
-        public bool P6_IsActive => Actuators.P6 == MotorState.Forward;
-
-        public bool Press1_HasClearance => Sensors.ClearancePress1;
-        public bool Press2_HasClearance => Sensors.ClearancePress2;
-        public bool TroughAuger_HasClearance => Rebler_IsActive && !(MW1_IsSelected && MW1_FillLevel == FillState.Full) && !(MW2_IsSelected && MW2_FillLevel == FillState.Full);
-
-        private readonly bool MP1_PathClearance;
-        private readonly bool MP2_PathClearance;
-        private readonly bool P12_PathClearance;
-        private readonly bool P3_PathClearance;
-        private readonly bool P4_PathClearance;
-        private readonly bool P5_PathClearance;
-        private readonly bool P6_PathClearance;
-        private readonly bool MP1_DryRunClearance;
-        private readonly bool MP2_DryRunClearance;
-        private readonly bool P12_DryRunClearance;
-        private readonly bool P3_DryRunClearance;
-        private readonly bool P4_DryRunClearance;
-        private readonly bool P5_DryRunClearance;
-        private readonly bool P6_DryRunClearance;
-
-        public readonly bool MP1_WantsPathClearance { get; }
-        public readonly bool MP2_WantsPathClearance { get; }
-        public readonly bool P12_WantsPathClearance { get; }
-        public readonly bool P3_WantsPathClearance { get; }
-        public readonly bool P4_WantsPathClearance { get; }
-        public readonly bool P5_WantsPathClearance { get; }
-        public readonly bool P6_WantsPathClearance { get; }
-
-        public bool MP1_WantActive => Plc.MP1_WantActive;
-        public bool MP2_WantActive => Plc.MP2_WantActive;
-        public bool P12_WantActive => Plc.P12_WantActive;
-        public bool P3_WantActive => Plc.P3_WantActive;
-        public bool P4_WantActive => Plc.P4_WantActive;
-        public bool P5_WantActive => Plc.P5_WantActive;
-        public bool P6_WantActive => Plc.P6_WantActive;
-
-        public bool MP1_HasPathClearance => OverridePathClearances || MP1_PathClearance;
-        public bool MP2_HasPathClearance => OverridePathClearances || MP2_PathClearance;
-        public bool P12_HasPathClearance => OverridePathClearances || P12_PathClearance;
-        public bool P3_HasPathClearance => OverridePathClearances || P3_PathClearance;
-        public bool P4_HasPathClearance => OverridePathClearances || P4_PathClearance;
-        public bool P5_HasPathClearance => OverridePathClearances || P5_PathClearance;
-        public bool P6_HasPathClearance => OverridePathClearances || P6_PathClearance;
-        public bool MP1_HasDryRunClearance => OverrideDryRunClearances || MP1_DryRunClearance;
-        public bool MP2_HasDryRunClearance => OverrideDryRunClearances || MP2_DryRunClearance;
-        public bool P12_HasDryRunClearance => OverrideDryRunClearances || P12_DryRunClearance;
-        public bool P3_HasDryRunClearance => OverrideDryRunClearances || P3_DryRunClearance;
-        public bool P4_HasDryRunClearance => OverrideDryRunClearances || P4_DryRunClearance;
-        public bool P5_HasDryRunClearance => OverrideDryRunClearances || P5_DryRunClearance;
-        public bool P6_HasDryRunClearance => OverrideDryRunClearances || P6_DryRunClearance;
-        public bool MP1_HasClearance => MP1_HasDryRunClearance && MP1_HasPathClearance;
-        public bool MP2_HasClearance => MP2_HasDryRunClearance && MP2_HasPathClearance;
-        public bool P12_HasClearance => P12_HasDryRunClearance && P12_HasPathClearance;
-        public bool P3_HasClearance => P3_HasDryRunClearance && P3_HasPathClearance;
-        public bool P4_HasClearance => P4_HasDryRunClearance && P4_HasPathClearance;
-        public bool P5_HasClearance => P4_HasDryRunClearance && P5_HasPathClearance;
-        public bool P6_HasClearance => P6_HasDryRunClearance && P6_HasPathClearance;
-
-        public PamhagenState(IEnumerable<LegacyPamhagenPlc.SensorStates> sensors, PamhagenPlc plc) {
-            Sensors = sensors.First();
-            Plc = plc;
-
-            OpenValves = sensors.Take(Plc.ConsiderLastSensorsOpen).Aggregate(-1L, (m, s) => m & ~s.PressureSensors);
-            ClosedValves = sensors.Take(Plc.ConsiderLastSensorsClose).Aggregate(-1L, (m, s) => m & s.PressureSensors);
-
-            MP1_WantsPathClearance = WantsPathClearnace(this, Paths.MP1);
-            MP2_WantsPathClearance = WantsPathClearnace(this, Paths.MP2);
-            P12_WantsPathClearance = WantsPathClearnace(this, Paths.P12);
-            P3_WantsPathClearance = WantsPathClearnace(this, Paths.P3);
-            P4_WantsPathClearance = WantsPathClearnace(this, Paths.P4);
-            P5_WantsPathClearance = WantsPathClearnace(this, Paths.P5);
-            P6_WantsPathClearance = WantsPathClearnace(this, Paths.P6);
-
-            MP1_PathClearance = HasPathClearance(this, Paths.MP1);
-            MP2_PathClearance = HasPathClearance(this, Paths.MP2);
-            P12_PathClearance = HasPathClearance(this, Paths.P12);
-            P3_PathClearance = HasPathClearance(this, Paths.P3);
-            P4_PathClearance = HasPathClearance(this, Paths.P4);
-            P5_PathClearance = HasPathClearance(this, Paths.P5);
-            P6_PathClearance = HasPathClearance(this, Paths.P6);
-
-            MP1_DryRunClearance = MW1_FillLevel != FillState.Empty;
-            MP2_DryRunClearance = MW2_FillLevel != FillState.Empty;
-            P12_DryRunClearance = T1_FillLevel != FillState.Empty || T2_FillLevel != FillState.Empty;
-            P3_DryRunClearance = T3_FillLevel != FillState.Empty;
-            P4_DryRunClearance = T4_FillLevel != FillState.Empty;
-            P5_DryRunClearance = T5_FillLevel != FillState.Empty;
-            P6_DryRunClearance = true;
-        }
-
-        public bool Valve_IsClosed(int n) => (ClosedValves & (1L << (n - 1))) != 0;
-        public bool Valve_IsTransitioning(int n) => !Valve_IsClosed(n) && !Valve_IsOpen(n);
-        public bool Valve_IsOpen(int n) => (OpenValves & (1L << (n - 1))) != 0;
-        public bool? Valve_OpenState(int n) => Valve_IsOpen(n) ? true : Valve_IsClosed(n) ? false : null;
-        public bool Valve_WantOpen(int n) => Actuators.GetV(n);
-        public bool Valve_WantClosed(int n) => !Valve_WantOpen(n);
-
-        private record struct ValveStates(int[] Open, int[] Closed) {
-            public readonly ValveStateMask ToMask() => new(Open.Aggregate(0L, (m, n) => m | (1L << (n - 1))), Open.Concat(Closed).Aggregate(0L, (m, n) => m | (1L << (n - 1))));
-            public static ValveStates operator +(ValveStates a, ValveStates b) {
-                return new([.. a.Open, .. b.Open], [.. a.Closed, .. b.Closed]);
-            }
-        }
-
-        private record struct ValveStateMask(long States, long Mask) {
-            public static ValveStateMask[] From(IEnumerable<ValveStates> states) => [.. states.Select(s => s.ToMask())];
-            public static bool operator ==(long a, ValveStateMask b) => (a & b.Mask) == b.States;
-            public static bool operator >=(long a, ValveStateMask b) => (a & b.States) == b.States;
-            public static bool operator !=(long a, ValveStateMask b) => !(a == b);
-            public static bool operator <=(long a, ValveStateMask b) => !(a >= b);
-        }
-
-        private static bool HasSinglePathClearance(PamhagenState state, IEnumerable<ValveStateMask> masks) {
-            return masks.Any(m => state.Valves == m && state.OpenValves == m && ~state.ClosedValves == m);
-        }
-
-        private static bool HasAnyPathClearance(PamhagenState state, IEnumerable<ValveStateMask> masks) {
-            return masks.Any(m => state.Valves >= m && state.OpenValves >= m && ~state.ClosedValves >= m);
-        }
-
-        private static bool WantsSinglePathClearance(PamhagenState state, IEnumerable<ValveStateMask> masks) {
-            return masks.Any(m => state.Valves == m);
-        }
-
-        private static bool WantsAnyPathClearance(PamhagenState state, IEnumerable<ValveStateMask> masks) {
-            return masks.Any(m => state.Valves >= m);
-        }
-
-        private static bool HasPathClearance(PamhagenState state, (ValveStateMask[] Press1, ValveStateMask[] Press2, ValveStateMask[][] Tanks) masks) {
-            return
-                (HasSinglePathClearance(state, masks.Press1) && state.Press1_HasClearance) ||
-                (HasSinglePathClearance(state, masks.Press2) && state.Press2_HasClearance) ||
-                (HasSinglePathClearance(state, masks.Tanks[0]) && state.T1_FillLevel != FillState.Full) ||
-                (HasSinglePathClearance(state, masks.Tanks[1]) && state.T2_FillLevel != FillState.Full) ||
-                (HasSinglePathClearance(state, masks.Tanks[2]) && state.T3_FillLevel != FillState.Full) ||
-                (HasSinglePathClearance(state, masks.Tanks[3]) && state.T4_FillLevel != FillState.Full) ||
-                (HasSinglePathClearance(state, masks.Tanks[4]) && state.T5_FillLevel != FillState.Full) ||
-                (HasSinglePathClearance(state, masks.Tanks[5]) && state.T6_FillLevel != FillState.Full) ||
-                (HasSinglePathClearance(state, masks.Tanks[6]) && state.T7_FillLevel != FillState.Full) ||
-                (HasSinglePathClearance(state, masks.Tanks[7]) && state.T8_FillLevel != FillState.Full) ||
-                (HasSinglePathClearance(state, masks.Tanks[8]) && state.T9_FillLevel != FillState.Full) ||
-                false;
-        }
-
-        private static bool WantsPathClearnace(PamhagenState state, (ValveStateMask[] Press1, ValveStateMask[] Press2, ValveStateMask[][] Tanks) masks) {
-            return
-                (WantsSinglePathClearance(state, masks.Press1) && state.Press1_HasClearance) ||
-                (WantsSinglePathClearance(state, masks.Press2) && state.Press2_HasClearance) ||
-                (WantsSinglePathClearance(state, masks.Tanks[0]) && state.T1_FillLevel != FillState.Full) ||
-                (WantsSinglePathClearance(state, masks.Tanks[1]) && state.T2_FillLevel != FillState.Full) ||
-                (WantsSinglePathClearance(state, masks.Tanks[2]) && state.T3_FillLevel != FillState.Full) ||
-                (WantsSinglePathClearance(state, masks.Tanks[3]) && state.T4_FillLevel != FillState.Full) ||
-                (WantsSinglePathClearance(state, masks.Tanks[4]) && state.T5_FillLevel != FillState.Full) ||
-                (WantsSinglePathClearance(state, masks.Tanks[5]) && state.T6_FillLevel != FillState.Full) ||
-                (WantsSinglePathClearance(state, masks.Tanks[6]) && state.T7_FillLevel != FillState.Full) ||
-                (WantsSinglePathClearance(state, masks.Tanks[7]) && state.T8_FillLevel != FillState.Full) ||
-                (WantsSinglePathClearance(state, masks.Tanks[8]) && state.T9_FillLevel != FillState.Full) ||
-                false;
-        }
-
-        private static bool HasPathClearance(PamhagenState state, (ValveStateMask[] Press1, ValveStateMask[] Press2) masks) {
-            return
-                (HasSinglePathClearance(state, masks.Press1) && state.Press1_HasClearance) ||
-                (HasSinglePathClearance(state, masks.Press2) && state.Press2_HasClearance) ||
-                false;
-        }
-
-        private static bool WantsPathClearnace(PamhagenState state, (ValveStateMask[] Press1, ValveStateMask[] Press2) masks) {
-            return
-                (WantsSinglePathClearance(state, masks.Press1) && state.Press1_HasClearance) ||
-                (WantsSinglePathClearance(state, masks.Press2) && state.Press2_HasClearance) ||
-                false;
-        }
-
-        private static readonly (
-            (ValveStateMask[] Press1, ValveStateMask[] Press2, ValveStateMask[][] Tanks) MP1,
-            (ValveStateMask[] Press1, ValveStateMask[] Press2, ValveStateMask[][] Tanks) MP2,
-            (ValveStateMask[] Press1, ValveStateMask[] Press2, ValveStateMask[][] Tanks) P12,
-            (ValveStateMask[] Press1, ValveStateMask[] Press2, ValveStateMask[][] Tanks) P3,
-            (ValveStateMask[] Press1, ValveStateMask[] Press2, ValveStateMask[][] Tanks) P4,
-            (ValveStateMask[] Press1, ValveStateMask[] Press2, ValveStateMask[][] Tanks) P5,
-            (ValveStateMask[] Press1, ValveStateMask[] Press2) P6
-        ) Paths;
-
-        static PamhagenState() {
-            ValveStates[] wt_aa = [
-                new([12], [15, 16, 20]),  // bypass
-                new([15, 18, 16], [11, 12, 14, 17, 19, 20]),  // WT1
-                new([15, 17, 20], [11, 12, 18, 19, 21]),  // WT2
-                new([15, 18, 19, 20], [11, 12, 14, 16, 17, 21]),  // WT1+WT2
-            ];
-            ValveStates[] wt_ab = [
-                new([15, 18, 14], [11, 12, 13, 16, 17, 19, 21]),  // WT1
-                new([15, 17, 21], [11, 12, 13, 18, 19, 20]),  // WT2
-                new([15, 18, 19, 21], [11, 12, 13, 14, 16, 17, 20]),  // WT1+WT2
-            ];
-            ValveStates[] wt_ba = [
-                new([11, 18, 16], [15, 12, 13, 14, 17, 19, 20]),  // WT1
-                new([11, 17, 20], [15, 12, 13, 18, 19, 21]),  // WT2
-                new([11, 18, 19, 20], [15, 12, 13, 14, 16, 17, 21]),  // WT1+WT2
-            ];
-            ValveStates[] wt_bb = [
-                new([13], [11, 14, 21]),  // bypass
-                new([11, 18, 14], [15, 13, 16, 17, 19, 21]),  // WT1
-                new([11, 17, 21], [15, 13, 18, 19, 20]),  // WT2
-                new([11, 18, 19, 21], [15, 13, 14, 16, 17, 20]),  // WT1+WT2
-            ];
-
-            ValveStates[][] tanks = [
-                [new([22], [24, 26, 28]), new([23], [25, 27, 29])],
-                [new([24], [22, 26, 28]), new([25], [23, 27, 29])],
-                [new([26], [22, 24, 28]), new([27], [23, 25, 29])],
-                [new([28, 30], [22, 24, 26, 32, 34]), new([29, 31], [23, 25, 27, 33, 35])],
-                [new([28, 32], [22, 24, 26, 30, 34]), new([29, 33], [23, 25, 27, 31, 35])],
-                [new([28, 34, 37], [22, 24, 26, 30, 32, 39, 41, 43]), new([29, 35, 36], [23, 25, 27, 31, 33, 38, 40, 42])],
-                [new([28, 34, 39], [22, 24, 26, 30, 32, 37, 41, 43]), new([29, 35, 38], [23, 25, 27, 31, 33, 36, 40, 42])],
-                [new([28, 34, 41], [22, 24, 26, 30, 32, 37, 39, 43]), new([29, 35, 40], [23, 25, 27, 31, 33, 36, 38, 42])],
-                [new([28, 34, 43], [22, 24, 26, 30, 32, 37, 39, 41]), new([29, 35, 42], [23, 25, 27, 31, 33, 36, 38, 40])],
-            ];
-
-            ValveStates[] mp1_pr1 = [
-                new([1, 6, 51], [3, 4, 5, 50, 52, 53, 55]),
-                new([4, 8, 52], [1, 2, 7, 50, 51, 53, 56]),
-            ];
-            ValveStates[] mp1_pr2 = [
-                new([1, 6, 55], [3, 4, 5, 51, 54, 56, 57]),
-                new([4, 8, 56], [1, 2, 7, 52, 54, 55, 57]),
-            ];
-            ValveStates mp1_wt_a = new([1, 5], [3, 4, 6]);
-            ValveStates mp1_wt_b = new([4, 7, 9], [1, 2, 8, 10]);
-            ValveStates[] mp1_a = [.. wt_aa.Select(m => mp1_wt_a + m), .. wt_ba.Select(m => mp1_wt_b + m)];
-            ValveStates[] mp1_b = [.. wt_ab.Select(m => mp1_wt_a + m), .. wt_bb.Select(m => mp1_wt_b + m)];
-            ValveStates[][] mp1_t = [.. tanks.Select<ValveStates[], ValveStates[]>(t => [.. mp1_a.Select(m => m + t[0]), .. mp1_b.Select(m => m + t[1])])];
-
-            ValveStates[] mp2_pr1 = [
-                  new([2, 8, 52], [3, 4, 7, 50, 51, 53, 56]),
-                  new([3, 6, 51], [1, 2, 5, 50, 52, 53, 55]),
-            ];
-            ValveStates[] mp2_pr2 = [
-                new([2, 8, 56], [3, 4, 7, 52, 54, 55, 57]),
-                new([3, 6, 55], [2, 1, 5, 51, 54, 56, 57]),
-            ];
-            ValveStates mp2_wt_a = new([3, 5], [1, 2, 6]);
-            ValveStates mp2_wt_b = new([2, 7, 9], [3, 4, 8, 10]);
-            ValveStates[] mp2_a = [.. wt_aa.Select(m => mp2_wt_a + m), .. wt_ba.Select(m => mp2_wt_b + m)];
-            ValveStates[] mp2_b = [.. wt_ab.Select(m => mp2_wt_a + m), .. wt_bb.Select(m => mp2_wt_b + m)];
-            ValveStates[][] mp2_t = [.. tanks.Select<ValveStates[], ValveStates[]>(t => [.. mp2_a.Select(m => m + t[0]), .. mp2_b.Select(m => m + t[1])])];
-
-            ValveStates[] p12_pr1 = [new([44, 46, 49, 50], [10, 45, 47, 48, 54, 51, 52, 53])];
-            ValveStates[] p12_pr2 = [new([44, 46, 49, 54], [10, 45, 47, 48, 50, 55, 56, 57])];
-            ValveStates[] p12_b = [new([44, 10], [9, 45, 46])];
-            ValveStates[][] p12_t = [.. tanks.Select<ValveStates[], ValveStates[]>(t => [.. p12_b.Select(m => m + t[1])])];
-
-            ValveStates[] p3_pr1 = [new([45, 46, 49, 50], [10, 44, 47, 48, 51, 52, 53, 54])];
-            ValveStates[] p3_pr2 = [new([45, 46, 49, 54], [10, 44, 47, 48, 50, 55, 56, 57])];
-            ValveStates[] p3_b = [new([45, 10], [9, 44, 46])];
-            ValveStates[][] p3_t = [.. tanks.Select<ValveStates[], ValveStates[]>(t => [.. p3_b.Select(m => m + t[1])])];
-
-            ValveStates[] p4_pr1 = [new([47, 49, 50], [46, 48, 51, 52, 53, 54])];
-            ValveStates[] p4_pr2 = [new([47, 49, 54], [46, 48, 50, 55, 56, 57])];
-            ValveStates[] p4_b = [new([47, 46, 10], [9, 44, 45, 48, 49])];
-            ValveStates[][] p4_t = [.. tanks.Select<ValveStates[], ValveStates[]>(t => [.. p4_b.Select(m => m + t[1])])];
-
-            ValveStates[] p5_pr1 = [new([48, 49, 50], [46, 47, 51, 52, 53, 54])];
-            ValveStates[] p5_pr2 = [new([48, 49, 54], [46, 47, 50, 55, 56, 57])];
-            ValveStates[] p5_b = [new([48, 46, 10], [9, 44, 45, 47, 49])];
-            ValveStates[][] p5_t = [.. tanks.Select<ValveStates[], ValveStates[]>(t => [.. p5_b.Select(m => m + t[1])])];
-
-            ValveStates[] p6_pr1 = [new([53], [50, 51, 52, 57])];
-            ValveStates[] p6_pr2 = [new([57], [53, 54, 55, 56])];
-
-            Paths = (
-                (ValveStateMask.From(mp1_pr1), ValveStateMask.From(mp1_pr2), [.. mp1_t.Select(t => ValveStateMask.From(t))]),
-                (ValveStateMask.From(mp2_pr1), ValveStateMask.From(mp2_pr2), [.. mp2_t.Select(t => ValveStateMask.From(t))]),
-                (ValveStateMask.From(p12_pr1), ValveStateMask.From(p12_pr2), [.. p12_t.Select(t => ValveStateMask.From(t))]),
-                (ValveStateMask.From(p3_pr1), ValveStateMask.From(p3_pr2), [.. p3_t.Select(t => ValveStateMask.From(t))]),
-                (ValveStateMask.From(p4_pr1), ValveStateMask.From(p4_pr2), [.. p4_t.Select(t => ValveStateMask.From(t))]),
-                (ValveStateMask.From(p5_pr1), ValveStateMask.From(p5_pr2), [.. p5_t.Select(t => ValveStateMask.From(t))]),
-                (ValveStateMask.From(p6_pr1), ValveStateMask.From(p6_pr2))
-            );
-        }
-    }
-}

PamhagenSysCtrl/Helpers/T1.cs

@@ -2,7 +2,7 @@ using System.IO;
 using System.IO.Ports;
 using System.Text;
 
-namespace PamhagenSysCtrl.Helpers.Plc {
+namespace PamhagenSysCtrl.Helpers {
     public class T1 : IDisposable {
 
         public enum Mode { HALT = 1, RUN = 2, RUN_F = 3, HOLD = 4, ERROR = 6 }
@@ -51,7 +51,7 @@ namespace PamhagenSysCtrl.Helpers.Plc {
             Serial.WriteLine(line.ToString());
         }
 
-        protected async Task<(string Command, string Data)> ReceiveResponse(string? expectedCmd = null) {
+        protected async Task<(string, string)> ReceiveResponse(string? expectedCmd = null) {
             var line = Serial.ReadLine();
             if (line.Length < 8 || !line.StartsWith("(A") || !line.EndsWith(')') || line[^4] != '&') {
                 throw new FormatException("Invalid response from PLC (T1)");

PamhagenSysCtrl/Helpers/T1Error.cs

@@ -1,4 +1,4 @@
-namespace PamhagenSysCtrl.Helpers.Plc {
+namespace PamhagenSysCtrl.Helpers {
     public enum T1Error {
         UNKNOWN_ERROR                   =   -1,
         NO_ERROR                        =    0,

PamhagenSysCtrl/Helpers/T1Exception.cs

@@ -1,4 +1,4 @@
-namespace PamhagenSysCtrl.Helpers.Plc {
+namespace PamhagenSysCtrl.Helpers {
     public class T1Exception(string msg) : Exception(msg) {
     }
 }

PamhagenSysCtrl/Helpers/Xbe24Keyboard.cs

@@ -1,6 +1,6 @@
-using PIEHidNetCore;
+using PIEHidNetCore;
-using System.Drawing;
 using System.IO;
+using System.Windows.Media;
 
 namespace PamhagenSysCtrl.Helpers {
     public class Xbe24Keyboard : IDisposable, PIEDataHandler, PIEErrorHandler {
@@ -11,21 +11,6 @@ namespace PamhagenSysCtrl.Helpers {
             public readonly bool GetKey(int n) => (Rows[n / 6] & (1 << (n % 6))) != 0;
         }
 
-        public static readonly Color DefaltBacklight = Color.FromArgb(3, 3, 3);
-        public static readonly Color Neutral = Color.FromArgb(4, 4, 4);
-        public static readonly Color Red = Color.FromArgb(255, 0, 0);
-        public static readonly Color Green = Color.FromArgb(0, 255, 0);
-        public static readonly Color Blue = Color.FromArgb(0, 0, 255);
-        public static readonly Color Yellow = Color.FromArgb(255, 255, 0);
-        public static readonly Color Magenta = Color.FromArgb(255, 0, 255);
-        public static readonly Color Cyan = Color.FromArgb(0, 255, 255);
-        public static readonly Color Orange = Color.FromArgb(255, 32, 0);
-        public static readonly Color DarkPurple = Color.FromArgb(128, 0, 128);
-        public static readonly Color Purple = Color.FromArgb(255, 64, 255);
-        public static readonly Color LightRed = Color.FromArgb(32, 4, 4);
-        public static readonly Color LightGreen = Color.FromArgb(4, 32, 4);
-        public static readonly Color LightBlue = Color.FromArgb(4, 4, 32);
-
         protected readonly PIEDevice XbeDevice;
 
         private KeyState LastKeyState = new(new byte[4]);
@@ -36,7 +21,6 @@ namespace PamhagenSysCtrl.Helpers {
         public event EventHandler<int>? KeyDown;
         public event EventHandler<int>? KeyUp;
         public event EventHandler<KeyState>? KeysChanged;
-        public event EventHandler<int>? Error;
 
         public Xbe24Keyboard(int pid = 0x0555) {
             foreach (var device in PIEDevice.EnumeratePIE()) {
@@ -55,13 +39,9 @@ namespace PamhagenSysCtrl.Helpers {
                 throw new IOException($"Unable to SetDataCallback for XBE keyboard: {res}");
             if ((res = XbeDevice.SetErrorCallback(this)) != 0)
                 throw new IOException($"Unable to SetErrorCallback for XBE keyboard: {res}");
-
-            SetBacklight(DefaltBacklight);
         }
 
         public void Dispose() {
-            GC.SuppressFinalize(this);
-            SetBacklight(DefaltBacklight);
             XbeDevice?.CloseInterface();
         }
 
@@ -77,7 +57,7 @@ namespace PamhagenSysCtrl.Helpers {
         public void HandlePIEHidError(PIEDevice sourceDevice, int error) {
             if (sourceDevice != XbeDevice)
                 return;
-            Error?.Invoke(this, error);
+            // TODO
         }
 
         protected void HandleKeyStateChange(KeyState current, KeyState last) {

PamhagenSysCtrl/Windows/ManualControlWindow.xaml.cs

@@ -29,14 +29,14 @@ namespace PamhagenSysCtrl {
                     if (App.Plant == null || sender is not Button b) return;
                     var i = int.Parse($"{b.Content}"[1..]);
                     if (i == 58) {
-                        if (App.Plant.State.MW1_WantSelected) {
+                        if (App.Plant.WantMW1Selected) {
                             App.Plant.SelectMW2();
                         } else {
                             App.Plant.SelectMW1();
                         }
                     } else if (i > 57) {
                         return;
-                    } else if (App.Plant.State.Valve_WantOpen(i)) {
+                    } else if (App.Plant.WantValveOpen(i)) {
                         App.Plant.CloseV(i);
                     } else {
                         App.Plant.OpenV(i);
@@ -60,8 +60,8 @@ namespace PamhagenSysCtrl {
             if (sender is not PamhagenPlant plant) return;
 
             for (int i = 1; i <= 58; i++) {
-                var target = plant.State.Valve_WantClosed(i);
+                var target = plant.WantValveClosed(i);
-                var actual = plant.State.Valve_IsClosed(i);
+                var actual = plant.IsValveClosed(i);
                 if (ValvePanel.Children[i - 1] is not Button b)
                     continue;
                 b.BorderBrush = target ? Brushes.DarkRed : Brushes.DarkGreen;
@@ -69,97 +69,98 @@ namespace PamhagenSysCtrl {
                 b.Background = actual ? Brushes.MistyRose : Brushes.MintCream;
             }
 
-            ReblerButton.BorderBrush = plant.State.Rebler_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            ReblerButton.BorderBrush = plant.IsReblerActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            ReblerButton.Foreground = plant.State.Rebler_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            ReblerButton.Foreground = plant.IsReblerActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            ReblerButton.Background = plant.State.Rebler_IsActive ? Brushes.MintCream: Brushes.MistyRose;
+            ReblerButton.Background = plant.IsReblerActive ? Brushes.MintCream: Brushes.MistyRose;
 
-            TroughAugerButton.BorderBrush = plant.State.TroughAuger_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            TroughAugerButton.BorderBrush = plant.IsTroughAugerActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            TroughAugerButton.Foreground = plant.State.TroughAuger_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            TroughAugerButton.Foreground = plant.IsTroughAugerActive ? Brushes.DarkGreen : Brushes.DarkRed;
-            TroughAugerButton.Background = plant.State.TroughAuger_IsActive ? Brushes.MintCream : Brushes.MistyRose;
+            TroughAugerButton.Background = plant.IsTroughAugerActive ? Brushes.MintCream : Brushes.MistyRose;
 
-            StirrerMW1Button.BorderBrush = plant.State.MW1_Stirrer_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            StirrerMW1Button.BorderBrush = plant.IsStirrerMW1Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            StirrerMW1Button.Foreground = plant.State.MW1_Stirrer_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            StirrerMW1Button.Foreground = plant.IsStirrerMW1Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            StirrerMW1Button.Background = plant.State.MW1_Stirrer_IsActive ? Brushes.MintCream : Brushes.MistyRose;
+            StirrerMW1Button.Background = plant.IsStirrerMW1Active ? Brushes.MintCream : Brushes.MistyRose;
 
-            StirrerMW2Button.BorderBrush = plant.State.MW2_Stirrer_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            StirrerMW2Button.BorderBrush = plant.IsStirrerMW2Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            StirrerMW2Button.Foreground = plant.State.MW2_Stirrer_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            StirrerMW2Button.Foreground = plant.IsStirrerMW2Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            StirrerMW2Button.Background = plant.State.MW2_Stirrer_IsActive ? Brushes.MintCream : Brushes.MistyRose;
+            StirrerMW2Button.Background = plant.IsStirrerMW2Active ? Brushes.MintCream : Brushes.MistyRose;
 
-            Auger1Button.BorderBrush = plant.State.Auger1_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger1Button.BorderBrush = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger1Button.Foreground = plant.State.Auger1_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger1Button.Foreground = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger1Button.Background = plant.State.Auger1_IsActive ? Brushes.MintCream : Brushes.MistyRose;
+            Auger1Button.Background = plant.IsAuger1Active ? Brushes.MintCream : Brushes.MistyRose;
 
-            Auger2Button.BorderBrush = plant.State.Auger2_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger2Button.BorderBrush = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger2Button.Foreground = plant.State.Auger2_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger2Button.Foreground = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger2Button.Background = plant.State.Auger2_IsActive ? Brushes.MintCream : Brushes.MistyRose;
+            Auger2Button.Background = plant.IsAuger2Active ? Brushes.MintCream : Brushes.MistyRose;
 
-            Auger3Button.BorderBrush = plant.State.Auger3_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger3Button.BorderBrush = plant.IsAuger3Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger3Button.Foreground = plant.State.Auger3_IsActive ? Brushes.DarkGreen : Brushes.DarkRed;
+            Auger3Button.Foreground = plant.IsAuger3Active ? Brushes.DarkGreen : Brushes.DarkRed;
-            Auger3Button.Background = plant.State.Auger3_IsActive ? Brushes.MintCream : Brushes.MistyRose;
+            Auger3Button.Background = plant.IsAuger3Active ? Brushes.MintCream : Brushes.MistyRose;
 
-            MP1BackwardButton.BorderBrush = plant.State.MP1_State == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP1BackwardButton.BorderBrush = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP1BackwardButton.Foreground = plant.State.MP1_State == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP1BackwardButton.Foreground = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP1BackwardButton.Background = plant.State.MP1_State == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
+            MP1BackwardButton.Background = plant.MP1 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
-            MP1HaltButton.BorderBrush = plant.State.MP1_State == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
+            MP1HaltButton.BorderBrush = plant.MP1 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
-            MP1HaltButton.Foreground = plant.State.MP1_State == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
+            MP1HaltButton.Foreground = plant.MP1 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
-            MP1HaltButton.Background = plant.State.MP1_State == MotorState.Halt ? Brushes.MistyRose : Brushes.WhiteSmoke;
+            MP1HaltButton.Background = plant.MP1 == MotorState.Halt ? Brushes.MistyRose : Brushes.WhiteSmoke;
-            MP1ForwardButton.BorderBrush = plant.State.MP1_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP1ForwardButton.BorderBrush = plant.MP1 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP1ForwardButton.Foreground = plant.State.MP1_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP1ForwardButton.Foreground = plant.MP1 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP1ForwardButton.Background = plant.State.MP1_State == MotorState.Forward ? Brushes.MintCream: Brushes.WhiteSmoke;
+            MP1ForwardButton.Background = plant.MP1 == MotorState.Forward ? Brushes.MintCream: Brushes.WhiteSmoke;
 
-            MP2BackwardButton.BorderBrush = plant.State.MP2_State == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP2BackwardButton.BorderBrush = plant.MP2 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP2BackwardButton.Foreground = plant.State.MP2_State == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP2BackwardButton.Foreground = plant.MP2 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP2BackwardButton.Background = plant.State.MP2_State == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
+            MP2BackwardButton.Background = plant.MP2 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
-            MP2HaltButton.BorderBrush = plant.State.MP2_State == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
+            MP2HaltButton.BorderBrush = plant.MP2 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
-            MP2HaltButton.Foreground = plant.State.MP2_State == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
+            MP2HaltButton.Foreground = plant.MP2 == MotorState.Halt ? Brushes.DarkRed : Brushes.SlateGray;
-            MP2HaltButton.Background = plant.State.MP2_State == MotorState.Halt ? Brushes.MistyRose : Brushes.WhiteSmoke;
+            MP2HaltButton.Background = plant.MP2 == MotorState.Halt ? Brushes.MistyRose : Brushes.WhiteSmoke;
-            MP2ForwardButton.BorderBrush = plant.State.MP2_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP2ForwardButton.BorderBrush = plant.MP2 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP2ForwardButton.Foreground = plant.State.MP2_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
+            MP2ForwardButton.Foreground = plant.MP2 == MotorState.Forward ? Brushes.DarkGreen : Brushes.SlateGray;
-            MP2ForwardButton.Background = plant.State.MP2_State == MotorState.Forward ? Brushes.MintCream : Brushes.WhiteSmoke;
+            MP2ForwardButton.Background = plant.MP2 == MotorState.Forward ? Brushes.MintCream : Brushes.WhiteSmoke;
 
-            P12Button.BorderBrush = plant.State.P12_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P12Button.BorderBrush = plant.P12 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P12Button.Foreground = plant.State.P12_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P12Button.Foreground = plant.P12 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P12Button.Background = plant.State.P12_State == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+            P12Button.Background = plant.P12 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
 
-            P3Button.BorderBrush = plant.State.P3_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P3Button.BorderBrush = plant.P3 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P3Button.Foreground = plant.State.P3_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P3Button.Foreground = plant.P3 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P3Button.Background = plant.State.P3_State == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+            P3Button.Background = plant.P3 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
 
-            P4Button.BorderBrush = plant.State.P4_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P4Button.BorderBrush = plant.P4 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P4Button.Foreground = plant.State.P4_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P4Button.Foreground = plant.P4 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P4Button.Background = plant.State.P4_State == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+            P4Button.Background = plant.P4 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
 
-            P5Button.BorderBrush = plant.State.P5_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P5Button.BorderBrush = plant.P5 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P5Button.Foreground = plant.State.P5_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P5Button.Foreground = plant.P5 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P5Button.Background = plant.State.P5_State == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+            P5Button.Background = plant.P5 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
 
-            P6Button.BorderBrush = plant.State.P6_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P6Button.BorderBrush = plant.P6 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P6Button.Foreground = plant.State.P6_State == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
+            P6Button.Foreground = plant.P6 == MotorState.Forward ? Brushes.DarkGreen : Brushes.DarkRed;
-            P6Button.Background = plant.State.P6_State == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
+            P6Button.Background = plant.P6 == MotorState.Forward ? Brushes.MintCream : Brushes.MistyRose;
 
             Status.Text = $"""
-            Presse Querschnecke: {plant.State.PressCrossAuger_State}
+            Gradation °Oe: {plant.GradationOe:N2}
+            Presse Querschnecke: {plant.PresseQuerSchnecke}
             Füllstände:
-              Maischewanne 1: {plant.State.MW2_FillLevel} (ausgewählt: {plant.State.MW1_WantSelected}, Status: {plant.State.MW1_IsSelected})
+              Maischewanne 1: {plant.FillLevelMW1} (ausgewählt: {plant.WantMW1Selected}, Status: {plant.IsMW1Selected})
-              Maischewanne 2: {plant.State.MW2_FillLevel} (ausgewählt: {plant.State.MW2_WantSelected}, Status: {plant.State.MW2_IsSelected})
+              Maischewanne 2: {plant.FillLevelMW2} (ausgewählt: {plant.WantMW2Selected}, Status: {plant.IsMW2Selected})
-              Presse 1: {plant.State.Press1_HasClearance}
+              Presse 1: {plant.Press1HasClearance}
-              Presse 2: {plant.State.Press2_HasClearance}
+              Presse 2: {plant.Press2HasClearance}
-              Tank 1: {plant.State.T1_FillLevel}
+              Tank 1: {plant.FillLevelT1}
-              Tank 2: {plant.State.T2_FillLevel}
+              Tank 2: {plant.FillLevelT2}
-              Tank 3: {plant.State.T3_FillLevel}
+              Tank 3: {plant.FillLevelT3}
-              Tank 4: {plant.State.T4_FillLevel}
+              Tank 4: {plant.FillLevelT4}
-              Tank 5: {plant.State.T5_FillLevel}
+              Tank 5: {plant.FillLevelT5}
-              Tank 6: {plant.State.T6_FillLevel}
+              Tank 6: {plant.FillLevelT6}
-              Tank 7: {plant.State.T7_FillLevel}
+              Tank 7: {plant.FillLevelT7}
-              Tank 8: {plant.State.T8_FillLevel}
+              Tank 8: {plant.FillLevelT8}
-              Tank 9: {plant.State.T9_FillLevel}
+              Tank 9: {plant.FillLevelT9}
             """;
         }
 
         private void TroughAugerButton_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.TroughAuger_IsActive) {
+                if (App.Plant.IsTroughAugerActive) {
                     App.Plant.StopTroughAuger();
                 } else {
                     App.Plant.StartTroughAuger();
@@ -172,7 +173,7 @@ namespace PamhagenSysCtrl {
         private void ReblerButton_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.Rebler_IsActive) {
+                if (App.Plant.IsReblerActive) {
                     App.Plant.StopRebler();
                 } else {
                     App.Plant.StartRebler();
@@ -185,7 +186,7 @@ namespace PamhagenSysCtrl {
         private void StirrerMW1Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.MW1_Stirrer_IsActive) {
+                if (App.Plant.IsStirrerMW1Active) {
                     App.Plant.StopStirrerMW1();
                 } else {
                     App.Plant.StartStirrerMW1();
@@ -198,7 +199,7 @@ namespace PamhagenSysCtrl {
         private void StirrerMW2Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.MW2_Stirrer_IsActive) {
+                if (App.Plant.IsStirrerMW2Active) {
                     App.Plant.StopStirrerMW2();
                 } else {
                     App.Plant.StartStirrerMW2();
@@ -211,7 +212,7 @@ namespace PamhagenSysCtrl {
         private void Auger1Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.Auger1_IsActive) {
+                if (App.Plant.IsAuger1Active) {
                     App.Plant.StopAuger1();
                 } else {
                     App.Plant.StartAuger1();
@@ -224,7 +225,7 @@ namespace PamhagenSysCtrl {
         private void Auger2Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.Auger2_IsActive) {
+                if (App.Plant.IsAuger2Active) {
                     App.Plant.StopAuger2();
                 } else {
                     App.Plant.StartAuger2();
@@ -237,7 +238,7 @@ namespace PamhagenSysCtrl {
         private void Auger3Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.Auger3_IsActive) {
+                if (App.Plant.IsAuger3Active) {
                     App.Plant.StopAuger3();
                 } else {
                     App.Plant.StartAuger3();
@@ -305,10 +306,10 @@ namespace PamhagenSysCtrl {
         private void P12Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.P12_IsActive) {
+                if (App.Plant.P12 == MotorState.Forward) {
-                    App.Plant.DisableP12();
+                    App.Plant.StopP12();
                 } else {
-                    App.Plant.EnableP12();
+                    App.Plant.StartP12();
                 }
             } catch (NoClearanceException exc) {
                 MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -318,10 +319,10 @@ namespace PamhagenSysCtrl {
         private void P3Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.P3_IsActive) {
+                if (App.Plant.P3 == MotorState.Forward) {
-                    App.Plant.DisableP3();
+                    App.Plant.StopP3();
                 } else {
-                    App.Plant.EnableP3();
+                    App.Plant.StartP3();
                 }
             } catch (NoClearanceException exc) {
                 MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -331,10 +332,10 @@ namespace PamhagenSysCtrl {
         private void P4Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.P4_IsActive) {
+                if (App.Plant.P4 == MotorState.Forward) {
-                    App.Plant.DisableP4();
+                    App.Plant.StopP4();
                 } else {
-                    App.Plant.EnableP4();
+                    App.Plant.StartP4();
                 }
             } catch (NoClearanceException exc) {
                 MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -344,10 +345,10 @@ namespace PamhagenSysCtrl {
         private void P5Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.P5_IsActive) {
+                if (App.Plant.P5 == MotorState.Forward) {
-                    App.Plant.DisableP5();
+                    App.Plant.StopP5();
                 } else {
-                    App.Plant.EnableP5();
+                    App.Plant.StartP5();
                 }
             } catch (NoClearanceException exc) {
                 MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -357,10 +358,10 @@ namespace PamhagenSysCtrl {
         private void P6Button_Click(object? sender, RoutedEventArgs? evt) {
             if (App.Plant == null) return;
             try {
-                if (App.Plant.State.P6_IsActive) {
+                if (App.Plant.P6 == MotorState.Forward) {
-                    App.Plant.DisableP6();
+                    App.Plant.StopP6();
                 } else {
-                    App.Plant.EnableP6();
+                    App.Plant.StartP6();
                 }
             } catch (NoClearanceException exc) {
                 MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);

PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs

@@ -1,6 +1,5 @@
 using PamhagenSysCtrl.Helpers;
 using PamhagenSysCtrl.Helpers.Pipeline;
-using PamhagenSysCtrl.Helpers.Plc;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
@@ -27,7 +26,7 @@ namespace PamhagenSysCtrl.Windows {
         public Path? HoveringPath {
             get {
                 foreach (var b in FastSelectPaths.Where(b => b.Key.IsMouseOver)) {
-                    if (Graph.SelectedPaths.Any(p => p.Matches(b.Value.Source, b.Value.Sink)))
+                    if (Graph.SelectedPaths.Any(p => p.Start == b.Value.Source && p.Hops.Last().Node == b.Value.Sink))
                         continue;
                     return Graph.GetFreePath([b.Value.Source, b.Value.Sink], true);
                 }
@@ -68,10 +67,8 @@ namespace PamhagenSysCtrl.Windows {
                 [FastSelectButton_MW1_Tank5]  = (Graph.MW1, Graph.MP1, Graph.Tank5),
                 [FastSelectButton_MW2_Tank5]  = (Graph.MW2, Graph.MP2, Graph.Tank5),
             };
-            if (App.Plant != null) {
+            App.Plant?.Update += OnUpdate;
-                Status_Connection.Text = $"Nein ({App.Plant.PlcComPort})";
+            App.Plant?.InitializePaths();
-                App.Plant.Update += OnUpdate;
-            }
         }
 
         private void OnClosed(object sender, EventArgs evt) {
@@ -216,7 +213,7 @@ namespace PamhagenSysCtrl.Windows {
         private void FastSelectButton_Click(object sender, RoutedEventArgs? evt) {
             if (sender is not Button b || !FastSelectPaths.TryGetValue(b, out var val))
                 return;
-            App.Plant?.FastSelect(val.Source, null, val.Sink);
+            App.Plant?.FastSelect(val.Source, val.Sink);
             OnUpdate(null, null);
             _lastSource = null;
         }
@@ -344,7 +341,7 @@ namespace PamhagenSysCtrl.Windows {
             }
             foreach (var c in clicked) {
                 if (App.Plant?.ManualControlMode ?? false) {
-                    if (c is ControlledValve v) {
+                    if (c is Valve v) {
                         if (v.WantOpen) {
                             App.Plant.CloseV(v.Nr);
                         } else {
@@ -354,7 +351,7 @@ namespace PamhagenSysCtrl.Windows {
                 } else {
                     if (_lastSource == null && Graph.SelectedPaths.Any(p => p.Start == c)) {
                         var path = Graph.SelectedPaths.First(p => p.Start == c);
-                        if (!path.HasActivePump) {
+                        if (!path.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false)) {
                             Graph.RemovePath(path);
                         }
                     } else if (_lastSource != null && c is ISink sink) {
@@ -388,7 +385,7 @@ namespace PamhagenSysCtrl.Windows {
                             App.Plant?.StartRebler();
                         }
                     } else if (c is Switcher switcher) {
-                        if (App.Plant?.State.MW1_WantSelected ?? false) {
+                        if (App.Plant?.WantMW1Selected ?? false) {
                             App.Plant?.SelectMW2();
                         } else {
                             App.Plant?.SelectMW1();
@@ -428,33 +425,33 @@ namespace PamhagenSysCtrl.Windows {
                             }
                         } else if (pump == Graph.P12) {
                             if (pump.IsActive) {
-                                App.Plant?.DisableP12();
+                                App.Plant?.StopP12();
                             } else {
-                                App.Plant?.EnableP12();
+                                App.Plant?.StartP12();
                             }
                         } else if (pump == Graph.P3) {
                             if (pump.IsActive) {
-                                App.Plant?.DisableP3();
+                                App.Plant?.StopP3();
                             } else {
-                                App.Plant?.EnableP3();
+                                App.Plant?.StartP3();
                             }
                         } else if (pump == Graph.P4) {
                             if (pump.IsActive) {
-                                App.Plant?.DisableP4();
+                                App.Plant?.StopP4();
                             } else {
-                                App.Plant?.EnableP4();
+                                App.Plant?.StartP4();
                             }
                         } else if (pump == Graph.P5) {
                             if (pump.IsActive) {
-                                App.Plant?.DisableP5();
+                                App.Plant?.StopP5();
                             } else {
-                                App.Plant?.EnableP5();
+                                App.Plant?.StartP5();
                             }
                         } else if (pump == Graph.P6) {
                             if (pump.IsActive) {
-                                App.Plant?.DisableP6();
+                                App.Plant?.StopP6();
                             } else {
-                                App.Plant?.EnableP6();
+                                App.Plant?.StartP6();
                             }
                         }
                     }
@@ -485,8 +482,9 @@ namespace PamhagenSysCtrl.Windows {
         private void UpdateFastSelectPathButton(IEnumerable<Path> paths, Path? hoverPathDeactivate, Button b) {
             var e = FastSelectPaths[b];
             SetFastSelectButton(b,
-                paths.Any(p => p.Matches(e.Source, e.Sink)) ? (hoverPathDeactivate?.Matches(e.Source, e.Sink) ?? false) ? 2 : 1 : 0,
+                paths.Any(p => p.Start == e.Source && p.Hops.Last().Node == e.Sink) ? (hoverPathDeactivate?.Start == e.Source && hoverPathDeactivate?.Hops.Last().Node == e.Sink) ? 2 : 1 : 0,
                 e.Pump.IsActive || Graph.GetFreePath([e.Source, e.Sink], overrideStart: true) == null);
+
         }
 
         private ISet<INode> UpdateScheme(Point pos, bool down) {
@@ -497,24 +495,28 @@ namespace PamhagenSysCtrl.Windows {
             foreach (var n in Graph.Nodes) {
                 if (n is Pump p) {
                     p.Highlight = null;
+                } else if (n is PipeJoin j) {
+                    j.Highlight = null;
                 }
             }
 
-            SetFastSelectButton(FastSelectButton_EntryTrough_Start, App.Plant?.State.TroughAuger_IsActive ?? false ? 1 : 0, !(App.Plant?.State.TroughAuger_HasClearance ?? false));
+            SetFastSelectButton(FastSelectButton_EntryTrough_Start, App.Plant?.IsTroughAugerActive ?? false ? 1 : 0, !(App.Plant?.TroughAugerHasClearance ?? false));
-            SetFastSelectButton(FastSelectButton_EntryTrough_Stop, App.Plant?.State.TroughAuger_IsActive ?? false ? 0 : 2);
+            SetFastSelectButton(FastSelectButton_EntryTrough_Stop, App.Plant?.IsTroughAugerActive ?? false ? 0 : 2);
-            SetFastSelectButton(FastSelectButton_MW1, App.Plant?.State.MW1_IsSelected?? false ? 1 : 0);
+            SetFastSelectButton(FastSelectButton_MW1, App.Plant?.IsMW1Selected ?? false ? 1 : 0);
-            SetFastSelectButton(FastSelectButton_MW2, App.Plant?.State.MW2_IsSelected ?? false ? 1 : 0);
+            SetFastSelectButton(FastSelectButton_MW2, App.Plant?.IsMW2Selected ?? false ? 1 : 0);
-            SetFastSelectButton(FastSelectButton_MP1_Forward, App.Plant?.State.MP1_State == MotorState.Forward ? 1 : 0, !(App.Plant?.State.MP1_HasClearance ?? false));
+            
-            SetFastSelectButton(FastSelectButton_MP1_Stop, App.Plant?.State.MP1_State == MotorState.Halt ? 2 : 0);
+            SetFastSelectButton(FastSelectButton_MP1_Forward, App.Plant?.MP1 == MotorState.Forward ? 1 : 0, !(App.Plant?.MP1HasClearance ?? false));
-            SetFastSelectButton(FastSelectButton_MP2_Forward, App.Plant?.State.MP2_State == MotorState.Forward ? 1 : 0, !(App.Plant?.State.MP2_HasClearance ?? false));
+            SetFastSelectButton(FastSelectButton_MP1_Stop, App.Plant?.MP1 == MotorState.Halt ? 2 : 0);
-            SetFastSelectButton(FastSelectButton_MP2_Stop, App.Plant?.State.MP2_State == MotorState.Halt ? 2 : 0);
+
+            SetFastSelectButton(FastSelectButton_MP2_Forward, App.Plant?.MP2 == MotorState.Forward ? 1 : 0, !(App.Plant?.MP2HasClearance ?? false));
+            SetFastSelectButton(FastSelectButton_MP2_Stop, App.Plant?.MP2 == MotorState.Halt ? 2 : 0);
 
             _hover = Graph.GetHover(pos.X, pos.Y, RoundedScale);
             var hoverButtons = FastSelectPaths.Where(b => b.Key.IsMouseOver).ToDictionary();
             Path? hoverPathDeactivate = null;
             if (App.Plant?.ManualControlMode ?? false) {
                 foreach (var src in Graph.Nodes.Where(n => n is Pump)) {
-                    PamhagenGraph.ColorPipesByValves(src, PamhagenBrushes.Green, (src as Pump)?.State ?? default, PamhagenBrushes.DimOrange);
+                    Graph.ColorPipesByValves(src, PamhagenBrushes.Green, (src as Pump)?.State ?? default, PamhagenBrushes.DimOrange);
                 }
                 MP1_Target.Text = "Vor";
                 MP2_Target.Text = "Vor";
@@ -522,21 +524,27 @@ namespace PamhagenSysCtrl.Windows {
                 MP2_Target.FontSize = 16;
             } else {
                 foreach (var p in Graph.SelectedPaths) {
-                    PamhagenGraph.ColorPipesAdjacientToPath(p, PamhagenBrushes.Green, p.Pumps.Select(p => p.State).FirstOrDefault(n => n != MotorState.Halt), PamhagenBrushes.DimOrange);
+                    Graph.ColorPipesAdjacientToPath(p, PamhagenBrushes.Green, p.Hops.Select(h => (h.Node as Pump)?.State ?? default).FirstOrDefault(n => n != MotorState.Halt), PamhagenBrushes.DimOrange);
                 }
                 if (_lastSource == null && _hover.Count > 0 && Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == _hover.First()) is Path path1) {
-                    if (path1.HasActivePump) {
+                    var pumpActive = path1.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false);
-                        foreach (var p in path1.Pumps) p.Highlight = PamhagenBrushes.Red;
+                    if (pumpActive) {
+                        foreach (var pump in path1.Hops.Select(h => h.Node as Pump).Where(p => p != null)) {
+                            pump?.Highlight = PamhagenBrushes.Red;
+                        }
                     } else {
                         hoverPathDeactivate = path1;
-                        PamhagenGraph.ColorPipesAdjacientToPath(path1, PamhagenBrushes.Red, default, null);
+                        Graph.ColorPipesAdjacientToPath(path1, PamhagenBrushes.Red, default, null);
                     }
                 } else if (hoverButtons.Count != 0 && Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == hoverButtons.First().Value.Source) is Path path2) {
-                    if (path2.HasActivePump) {
+                    var pumpActive = path2.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false);
-                        foreach (var p in path2.Pumps) p.Highlight = PamhagenBrushes.Red;
+                    if (pumpActive) {
+                        foreach (var pump in path2.Hops.Select(h => h.Node as Pump).Where(p => p != null)) {
+                            pump?.Highlight = PamhagenBrushes.Red;
+                        }
                     } else {
                         hoverPathDeactivate = path2;
-                        PamhagenGraph.ColorPipesAdjacientToPath(path2, PamhagenBrushes.Red, default, null);
+                        Graph.ColorPipesAdjacientToPath(path2, PamhagenBrushes.Red, default, null);
                     }
                 }
                 if (_lastSource != null) {
@@ -545,19 +553,19 @@ namespace PamhagenSysCtrl.Windows {
                     }
                 }
                 if (HoveringPath is Path hoveringPath) {
-                    PamhagenGraph.ColorPipesAdjacientToPath(hoveringPath, PamhagenBrushes.Green, default, PamhagenBrushes.DimOrange);
+                    Graph.ColorPipesAdjacientToPath(hoveringPath, PamhagenBrushes.Green, default, PamhagenBrushes.DimOrange);
                 }
 
                 if (Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == Graph.MW1) is Path pmw1) {
                     MP1_Target.Text = "\u2b9e " + string.Join(" \u2b9e ", pmw1.Hops
-                        .Select(h => h.Node is Valve || h.Node is Pump ? null : h.Node.Label)
+                        .Select(h => h.Node is Valve || h.Node is Pump || h.Node is CenterValve ? null : h.Node.Label)
                         .Where(l => !string.IsNullOrWhiteSpace(l)));
                 } else {
                     MP1_Target.Text = "Vor";
                 }
                 if (Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == Graph.MW2) is Path pmw2) {
                     MP2_Target.Text = "\u2b9e " + string.Join(" \u2b9e ", pmw2.Hops
-                        .Select(h => h.Node is Valve || h.Node is Pump ? null : h.Node.Label)
+                        .Select(h => h.Node is Valve || h.Node is Pump || h.Node is CenterValve ? null : h.Node.Label)
                         .Where(l => !string.IsNullOrWhiteSpace(l)));
                 } else {
                     MP2_Target.Text = "Vor";
@@ -580,17 +588,10 @@ namespace PamhagenSysCtrl.Windows {
 
         public void OnUpdate(object? sender, PlantEventArgs? evt) {
             if (App.Plant is PamhagenPlant p) {
-                if (p.IsPlcConnected) {
+                Status_Connection.Text = $"Ja ({p.PlcPortName}" + (p.LastRttNs != null ? $", {p.LastRttNs / 1000000.0:N0} ms" : "") + ")";
-                    Status_Connection.Text = $"Ja ({p.PlcComPort}" + (p.LastRttNs != null ? $", {p.LastRttNs / 1000000.0:N0} ms" : "") + ")";
                 Status_Plc.Text = $"{p.LastPlcStatus?.Mode} ({p.LastPlcStatus?.Flags:X3}) / {p.LastPlcError?.GetName()} ({(int?)p.LastPlcError:0000})";
-                    Status_CompressedAir.Text = Enumerable.Range(1, 57).Any(p.State.Valve_IsClosed) ? "Ein" : Enumerable.Range(1, 57).Any(p.State.Valve_WantClosed) ? "Aus" : "?";
+                Status_CompressedAir.Text = Enumerable.Range(1, 57).Any(p.IsValveClosed) ? "Ein" : Enumerable.Range(1, 57).Any(p.WantValveClosed) ? "Aus" : "?";
-                    Status_ValvesOpen.Text = Enumerable.Range(1, 57).Count(p.State.Valve_IsOpen) + " / " + Enumerable.Range(1, 57).Count(p.State.Valve_WantOpen) + " / 57";
+                Status_ValvesOpen.Text = Enumerable.Range(1, 57).Count(p.IsValveOpen) + " / " + Enumerable.Range(1, 57).Count(p.WantValveOpen) + " / 57";
-                } else {
-                    Status_Connection.Text = p.PlcConnectionError is string err ? $"Nein ({p.PlcComPort}, {err})" : $"Nein ({p.PlcComPort})";
-                    Status_Plc.Text = "-";
-                    Status_CompressedAir.Text = "-";
-                    Status_ValvesOpen.Text = "-";
-                }
             }
             UpdateScheme(Mouse.GetPosition(SchemeCanvas), Mouse.LeftButton == MouseButtonState.Pressed);
         }

Simulator/plc.py

@@ -1,233 +0,0 @@
-#!/bin/env python3
-
-import socket
-import time
-import random
-import argparse
-
-
-mw1 = 0
-mw2 = 0
-t1 = 0
-t2 = 0
-t3 = 0
-t4 = 0
-t5 = 0
-t6 = 0
-t7 = 0
-t8 = 0
-t9 = 0
-pr1 = 0
-pr2 = 0
-
-mw1_max = 5000
-mw2_max = 5000
-t_max = 35000
-pr1_max = 20000
-pr2_max = 15000
-
-ENTRY_RATE = 20 / 20
-PUMP_RATE = 5 / 20
-
-rw = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-
-
-def are_valves_open(valves, *ns):
-    mask = 0
-    for n in ns:
-        mask |= 1 << (n - 1)
-    return (~valves & mask) == mask
-
-
-def send_cmd(cmd: str, data: str) -> None:
-    msg = f'(A01{cmd}{data}&'
-    chk = sum(c for c in msg.encode('ascii')) & 0xFF
-    msg += f'{chk:02X})\r'
-    time.sleep(len(msg) * 8 / 9600 * 2)
-    print(f'-> {msg}')
-    client.send(msg.encode('ascii'))
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('socket')
-    args = parser.parse_args()
-
-    client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    client.connect(args.socket)
-
-    while True:
-        line = b''
-        while b'\r' not in line:
-            line += client.recv(256)
-        cmds = line.split(b'\r')
-        line = cmds[-1]
-        cmds = [c.decode('ascii') for c in cmds[:-1]]
-        for cmd in cmds:
-            print(f'<- {cmd}')
-            time.sleep(len(cmd) * 8 / 9600 * 2)
-            if not cmd.startswith('(A01') or not cmd.endswith(')') or len(cmd) < 7:
-                send_cmd('CE', '02')
-                continue
-            c, d = cmd[4:6], cmd[6:-1]
-            if cmd[-4] == '&':
-                chk1 = int(cmd[-3:-1], 16)
-                chk2 = sum(c for c in cmd[:-3].encode('ascii')) & 0xFF
-                if chk1 != chk2:
-                    send_cmd('CE', '03')
-                    continue
-                d = d[:-3]
-            if c == 'TS':
-                send_cmd('TS', d)
-            elif c == 'ST':
-                send_cmd('ST', '0002')
-            elif c == 'DR':
-                # FIXME
-                d = d.split(',')
-                s = int(d[0][2:])
-                l = int(d[1])
-                send_cmd('DR', ''.join(f'{r:04X}' for r in rw[s:s+l]))
-            elif c == 'DW':
-                # FIXME
-                d = d.split(',')
-                s = int(d[0][2:])
-                l = int(d[1])
-                for i in range(l):
-                    rw[s + i] = int(d[2 + i], 16)
-                send_cmd('ST', '0002')
-            else:
-                send_cmd('CE', '01')
-
-            # tick - valves
-            for i in range(0, 60):
-                want_open = rw[i // 16] & (1 << (i % 16)) == 0
-                is_open = rw[10 + i // 16] & (1 << (i % 16)) != 0
-                if want_open and not is_open:
-                    if random.random() > 0.875:
-                        rw[10 + i // 16] |= 1 << (i % 16)
-                elif not want_open and is_open:
-                    if random.random() > 0.875:
-                        rw[10 + i // 16] &= ~(1 << (i % 16))
-
-            # tick - wannen
-            want_a1_selected = (rw[5] & 0x0004) != 0
-            want_a2_selected = not want_a1_selected
-            is_a1_selected = (rw[14] & 0x0200) != 0
-            is_a2_selected = (rw[14] & 0x0100) != 0
-            if is_a1_selected and not want_a1_selected:
-                rw[14] &= 0xFDFF
-            elif not is_a1_selected and want_a1_selected:
-                if random.random() > 0.875:
-                    rw[14] |= 0x0200
-            if is_a2_selected and not want_a2_selected:
-                rw[14] &= 0xFEFF
-            elif not is_a2_selected and want_a2_selected:
-                if random.random() > 0.875:
-                    rw[14] |= 0x0100
-
-            # tick - pipeline
-            valves = (rw[13] << 48) | (rw[12] << 32) | (rw[11] << 16) | rw[10]
-            wannen_schnecke = (rw[5] & 0x1) != 0
-            mp1 = (rw[4] & 0x002) != 0
-            mp2 = (rw[4] & 0x004) != 0
-            p12 = (rw[4] & 0x010) != 0
-            p3 =  (rw[4] & 0x020) != 0
-            p4 =  (rw[4] & 0x040) != 0
-            p5 =  (rw[4] & 0x080) != 0
-            p6 =  (rw[4] & 0x100) != 0
-            if wannen_schnecke and is_a1_selected:
-                mw1 += ENTRY_RATE
-            elif wannen_schnecke and is_a2_selected:
-                mw2 += ENTRY_RATE
-
-            if mp1 and mw1 > 0:
-                mw1 -= PUMP_RATE
-                if are_valves_open(valves, 1, 6, 51) or are_valves_open(valves, 4, 8, 52):
-                    pr1 += PUMP_RATE
-                elif are_valves_open(valves, 1, 6, 55) or are_valves_open(valves, 4, 8, 56):
-                    pr2 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 22) or are_valves_open(valves, 4, 7, 9, 13, 23):
-                    t1 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 24) or are_valves_open(valves, 4, 7, 9, 13, 25):
-                    t2 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 26) or are_valves_open(valves, 4, 7, 9, 13, 27):
-                    t3 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 28, 30) or are_valves_open(valves, 4, 7, 9, 13, 29, 31):
-                    t4 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 28, 32) or are_valves_open(valves, 4, 7, 9, 13, 29, 33):
-                    t5 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 28, 34, 37) or are_valves_open(valves, 4, 7, 9, 13, 29, 35, 36):
-                    t6 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 28, 34, 39) or are_valves_open(valves, 4, 7, 9, 13, 29, 35, 38):
-                    t7 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 28, 34, 41) or are_valves_open(valves, 4, 7, 9, 13, 29, 35, 40):
-                    t8 += PUMP_RATE
-                elif are_valves_open(valves, 1, 5, 12, 28, 34, 43) or are_valves_open(valves, 4, 7, 9, 13, 29, 35, 42):
-                    t9 += PUMP_RATE
-
-            if mp2 and mw2 > 0:
-                mw2 -= PUMP_RATE
-                if are_valves_open(valves, 2, 8, 52) or are_valves_open(valves, 3, 6, 51):
-                    pr1 += PUMP_RATE
-                elif are_valves_open(valves, 2, 8, 56) or are_valves_open(valves, 3, 6, 55):
-                    pr2 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 22) or are_valves_open(valves, 2, 7, 9, 13, 23):
-                    t1 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 24) or are_valves_open(valves, 2, 7, 9, 13, 25):
-                    t2 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 26) or are_valves_open(valves, 2, 7, 9, 13, 27):
-                    t3 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 28, 30) or are_valves_open(valves, 2, 7, 9, 13, 29, 31):
-                    t4 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 28, 32) or are_valves_open(valves, 2, 7, 9, 13, 29, 33):
-                    t5 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 28, 34, 37) or are_valves_open(valves, 2, 7, 9, 13, 29, 35, 36):
-                    t6 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 28, 34, 39) or are_valves_open(valves, 2, 7, 9, 13, 29, 35, 38):
-                    t7 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 28, 34, 41) or are_valves_open(valves, 2, 7, 9, 13, 29, 35, 40):
-                    t8 += PUMP_RATE
-                elif are_valves_open(valves, 3, 5, 12, 28, 34, 43) or are_valves_open(valves, 2, 7, 9, 13, 29, 35, 42):
-                    t9 += PUMP_RATE
-
-            if p6 and (t6 > 0 or t7 > 0 or t8 > 0 or t9 > 0):
-                if t6 > 0:
-                    t6 -= PUMP_RATE
-                if t7 > 0:
-                    t7 -= PUMP_RATE
-                if t8 > 0:
-                    t8 -= PUMP_RATE
-                if t9 > 0:
-                    t9 -= PUMP_RATE
-                if are_valves_open(valves, 53):
-                    pr1 += PUMP_RATE
-                elif are_valves_open(valves, 57):
-                    pr2 += PUMP_RATE
-
-            # tick - fill levels
-            rw[14] &= 0xFF00
-            rw[14] |= 0x0004 if mw1 > 50 else 0
-            rw[14] |= 0x0002 if mw1 > mw1_max / 2 else 0
-            rw[14] |= 0x0001 if mw1 > mw1_max * 0.875 else 0
-            rw[14] |= 0x0020 if mw2 > 50 else 0
-            rw[14] |= 0x0010 if mw2 > mw2_max / 2 else 0
-            rw[14] |= 0x0008 if mw2 > mw2_max * 0.875 else 0
-            rw[14] |= 0x0040 if pr1 > pr1_max * 0.875 else 0
-            rw[14] |= 0x0080 if pr2 > pr2_max * 0.875 else 0
-            rw[16] &= 0xC000
-            rw[16] |= 0x0001 if t1 > 50 else 0
-            rw[16] |= 0x0002 if t1 > t_max * 0.875 else 0
-            rw[16] |= 0x0004 if t2 > 50 else 0
-            rw[16] |= 0x0008 if t2 > t_max * 0.875 else 0
-            rw[16] |= 0x0010 if t3 > 50 else 0
-            rw[16] |= 0x0020 if t3 > t_max * 0.875 else 0
-            rw[16] |= 0x0040 if t4 > 50 else 0
-            rw[16] |= 0x0080 if t4 > t_max * 0.875 else 0
-            rw[16] |= 0x0100 if t5 > 50 else 0
-            rw[16] |= 0x0200 if t5 > t_max * 0.875 else 0
-            rw[16] |= 0x0400 if t6 > t_max * 0.875 else 0
-            rw[16] |= 0x0800 if t7 > t_max * 0.875 else 0
-            rw[16] |= 0x1000 if t8 > t_max * 0.875 else 0
-            rw[16] |= 0x2000 if t9 > t_max * 0.875 else 0
-
-            print(mw1, mw2, t1, t2, t3, t4, t5, t6, t7, t8, t9, pr1, pr2)

XBE-24/keys.svg

@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="78mm" height="117mm" viewBox="0 0 780 1170">
-
-    <title>XBE-24 Key Legend Pamhagen</title>
-
-    <defs>
-        <path id="key" d="M 5,5 l 150,0 l 0,130 q -75,35 -150,0 Z"
-              stroke-width="10" stroke="#808080" paint-order="stroke"/>
-        <path id="start" d="M 0,-40 l 40,40 l -40,40 l -40,-40 Z M 0,-20 l 0,40 Z"
-              stroke-width="7" stroke="#004000" fill-opacity="0"
-              stroke-linejoin="round"/>
-        <path id="stop" d="M 0,40 a 40,40 180 0,0 0,-80 a 40,40 180 1,0 0,80 m 0,-5 l -30.310889,-52.5 l 60.621778,0 Z"
-              stroke-width="7" stroke="#400000" fill-opacity="0"/>
-        <path id="on-off" d="M 0,40 a 40,40 180 0,0 0,-80 a 40,40 180 1,0 0,80 Z M 0,-20 l 0,40 Z"
-              stroke-width="7" stroke="#000000" fill-opacity="0"
-              stroke-linejoin="round"/>
-        <path id="arrow-down" d="M 0,-35 l 15,0 l 0,50 l 10,0 l -25,25 l -25,-25 l 10,0 l 0,-50 Z"
-              fill="#000040"/>
-        <use id="arrow-left-down" href="#arrow-down" transform="rotate(30)"/>
-        <path id="arrow-from-mw1" d="M -70,-20 l 80,0 l 0,30 l 10,0 l -20,20 l -20,-20 l 10,0 l 0,-10 l -60,0 Z"
-              fill="#000040"/>
-        <use id="arrow-from-mw2" href="#arrow-from-mw1" transform="scale(-1,1)"/>
-        <path id="press" d="M 35,0 l 10,0 l 0,55 l -20,0 l 0,-10 l -50,0 l 0,10 l -20,0 l 0,-55 l 10,0 a 35,35 180 0,1 70,0 a 35,35 180 0,1 -70,0"
-              stroke-width="5" stroke="#000000" fill-opacity="0"/>
-        <!--path id="tank" d="M 35,-32 l 0,90 l -10,0 l 0,-23 l 10,-9 l -30,25 l -10,0 l -30,-25 l 10,9 l 0,23 l -10,0 l 0,-90 Z"
-              stroke-width="5" stroke="#000000" fill-opacity="0"/-->
-        <path id="tank" d="M 35,-32 l 0,90 l -10,0 l 0,-23 l -20,16 l -10,0 l -20,-16 l 0,23 l -10,0 l 0,-90 Z"
-              stroke-width="5" stroke="#000000" fill-opacity="0"/>
-    </defs>
-
-    <rect x="0" y="0" width="780" height="1170" stroke="#000000" fill="#FFFFFF" stroke-width="5"/>
-
-    <g id="k0">
-        <use href="#key" x="25" y="30" fill="#E8E8FF"/>
-        <use href="#press" x="105" y="110"/>
-        <text x="105" y="110" font-size="35" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">P1</text>
-        <use href="#arrow-from-mw2" x="105" y="60"/>
-        <text x="148" y="50" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW2</text>
-    </g>
-    <g id="k1">
-        <use href="#key" x="25" y="220" fill="#E8E8FF"/>
-        <use href="#press" x="105" y="300"/>
-        <text x="105" y="300" font-size="35" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">P2</text>
-        <use href="#arrow-from-mw2" x="105" y="250"/>
-        <text x="148" y="240" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW2</text>
-    </g>
-    <g id="k2">
-        <use href="#key" x="25" y="410" fill="#E8E8FF"/>
-        <use href="#tank" x="105" y="490"/>
-        <text x="105" y="490" font-size="30" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">RT1</text>
-        <use href="#arrow-from-mw2" x="105" y="440"/>
-        <text x="148" y="430" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW2</text>
-    </g>
-    <g id="k3">
-        <use href="#key" x="25" y="600" fill="#E8E8FF"/>
-        <use href="#tank" x="105" y="680"/>
-        <text x="105" y="680" font-size="30" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">RT2</text>
-        <use href="#arrow-from-mw2" x="105" y="630"/>
-        <text x="148" y="620" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW2</text>
-    </g>
-    <g id="k4">
-        <use href="#key" x="25" y="790" fill="#E8E8FF"/>
-        <use href="#tank" x="105" y="870"/>
-        <text x="105" y="870" font-size="30" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">RT3</text>
-        <use href="#arrow-from-mw2" x="105" y="820"/>
-        <text x="148" y="810" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW2</text>
-    </g>
-    <g id="k5">
-        <use href="#key" x="25" y="980" fill="#E8E8FF"/>
-        <use href="#tank" x="105" y="1060"/>
-        <text x="105" y="1060" font-size="30" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">RT4</text>
-        <use href="#arrow-from-mw2" x="105" y="1010"/>
-        <text x="148" y="1000" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW2</text>
-    </g>
-
-    <g id="k6">
-        <use href="#key" x="215" y="30" fill="#E8FFE8"/>
-        <use href="#start" x="295" y="85"/>
-        <text x="295" y="150" font-size="40" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">Rebler</text>
-    </g>
-    <g id="k7">
-        <use href="#key" x="215" y="220" fill="#FFE8E8"/>
-        <use href="#stop" x="295" y="275"/>
-        <text x="295" y="340" font-size="40" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">Rebler</text>
-    </g>
-    <g id="k8">
-        <use href="#key" x="215" y="410" fill="#E8E8FF"/>
-        <use href="#arrow-left-down" x="300" y="465"/>
-        <text x="295" y="530" font-size="45" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW2</text>
-    </g>
-    <g id="k9">
-        <use href="#key" x="215" y="600" fill="#FFFFFF"/>
-        <use href="#on-off" x="295" y="655"/>
-        <text x="295" y="710" font-size="25" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;"><tspan>Rührer</tspan><tspan font-size="30" dx="-2.5em" dy="0.875em">MW2</tspan></text>
-    </g>
-    <g id="k10">
-        <use href="#key" x="215" y="790" fill="#E8FFE8"/>
-        <use href="#start" x="295" y="845"/>
-        <text x="295" y="913" font-size="45" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MP2</text>
-    </g>
-    <g id="k11">
-        <use href="#key" x="215" y="980" fill="#FFE8E8"/>
-        <use href="#stop" x="295" y="1035"/>
-        <text x="295" y="1103" font-size="45" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MP2</text>
-    </g>
-
-    <g id="k12">
-        <use href="#key" x="405" y="30" fill="#E8FFE8"/>
-        <use href="#start" x="485" y="85"/>
-        <text x="485" y="140" font-size="25" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;"><tspan>Trog-</tspan><tspan dx="-3.5em" dy="0.875em">schnecke</tspan></text>
-    </g>
-    <g id="k13">
-        <use href="#key" x="405" y="220" fill="#FFE8E8"/>
-        <use href="#stop" x="485" y="275"/>
-        <text x="485" y="330" font-size="25" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;"><tspan>Trog-</tspan><tspan dx="-3.5em" dy="0.875em">schnecke</tspan></text>
-    </g>
-    <g id="k14">
-        <use href="#key" x="405" y="410" fill="#E8E8FF"/>
-        <use href="#arrow-down" x="485" y="465"/>
-        <text x="485" y="530" font-size="45" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW1</text>
-    </g>
-    <g id="k15">
-        <use href="#key" x="405" y="600" fill="#FFFFFF"/>
-        <use href="#on-off" x="485" y="655"/>
-        <text x="485" y="710" font-size="25" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;"><tspan>Rührer</tspan><tspan font-size="30" dx="-2.5em" dy="0.875em">MW1</tspan></text>
-    </g>
-    <g id="k16">
-        <use href="#key" x="405" y="790" fill="#E8FFE8"/>
-        <use href="#start" x="485" y="845"/>
-        <text x="485" y="913" font-size="45" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MP1</text>
-    </g>
-    <g id="k17">
-        <use href="#key" x="405" y="980" fill="#FFE8E8"/>
-        <use href="#stop" x="485" y="1035"/>
-        <text x="485" y="1103" font-size="45" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MP1</text>
-    </g>
-
-    <g id="k18">
-        <use href="#key" x="595" y="30" fill="#E8E8FF"/>
-        <use href="#press" x="675" y="110"/>
-        <text x="675" y="110" font-size="35" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">P1</text>
-        <use href="#arrow-from-mw1" x="675" y="60"/>
-        <text x="632" y="50" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW1</text>
-    </g>
-    <g id="k19">
-        <use href="#key" x="595" y="220" fill="#E8E8FF"/>
-        <use href="#press" x="675" y="300"/>
-        <text x="675" y="300" font-size="35" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">P2</text>
-        <use href="#arrow-from-mw1" x="675" y="250"/>
-        <text x="632" y="240" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW1</text>
-    </g>
-    <g id="k20">
-        <use href="#key" x="595" y="410" fill="#E8E8FF"/>
-        <use href="#tank" x="675" y="490"/>
-        <text x="675" y="490" font-size="30" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">RT1</text>
-        <use href="#arrow-from-mw1" x="675" y="440"/>
-        <text x="632" y="430" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW1</text>
-    </g>
-    <g id="k21">
-        <use href="#key" x="595" y="600" fill="#E8E8FF"/>
-        <use href="#tank" x="675" y="680"/>
-        <text x="675" y="680" font-size="30" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">RT2</text>
-        <use href="#arrow-from-mw1" x="675" y="630"/>
-        <text x="632" y="620" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW1</text>
-    </g>
-    <g id="k22">
-        <use href="#key" x="595" y="790" fill="#E8E8FF"/>
-        <use href="#tank" x="675" y="870"/>
-        <text x="675" y="870" font-size="30" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">RT3</text>
-        <use href="#arrow-from-mw1" x="675" y="820"/>
-        <text x="632" y="810" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW1</text>
-    </g>
-    <g id="k23">
-        <use href="#key" x="595" y="980" fill="#E8E8FF"/>
-        <use href="#tank" x="675" y="1060"/>
-        <text x="675" y="1060" font-size="30" text-anchor="middle" dominant-baseline="central"
-              style="font-family:Arial,sans-serif; font-weight:bold;">RT4</text>
-        <use href="#arrow-from-mw1" x="675" y="1010"/>
-        <text x="632" y="1000" font-size="20" text-anchor="middle" dominant-baseline="central" fill="#FFFFFF"
-              style="font-family:Arial,sans-serif; font-weight:bold;">MW1</text>
-    </g>
-</svg>